almost there

jcardus · Feb 16, 2024 · c53f1b7 · c53f1b7
1 parent 95957e0
commit c53f1b7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "traccar-route-replay",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "private": true,
   "scripts": {
     "dev": "nuxt",
@@ -17,7 +17,7 @@
     "@deck.gl/mapbox": "8.9.34",
     "@deck.gl/mesh-layers": "8.9.34",
     "@nuxtjs/axios": "^5.13.6",
-    "@nuxtjs/i18n": "^7.3.1",
+    "@nuxtjs/i18n": "7.3.1",
     "@turf/bbox": "^6.5.0",
     "@turf/bearing": "^6.5.0",
     "@turf/circle": "^6.5.0",

diff --git a/pages/index.vue b/pages/index.vue
@@ -14,7 +14,7 @@
         <button
           class="mapboxgl-ctrl-icon svg-button"
           style="background-image: url('backward.svg')"
-          @click="(i - 1 >= 0) && i--"
+          @click="clickBackward"
         />
         <button
           class="mapboxgl-ctrl-icon svg-button"
@@ -24,7 +24,7 @@
         <button
           class="mapboxgl-ctrl-icon svg-button"
           style="background-image: url('forward.svg')"
-          @click="(i + 1 < path.length) && i++"
+          @click="clickForward"
         />
         <div class="mapboxgl-ctrl-timeline__label">
           <input v-model="from" type="datetime-local">
@@ -44,9 +44,6 @@
         <label for="follow">{{ $t('Follow vehicle') }}</label>
       </div>
     </div>
-    <div ref="datetime" class="mapboxgl-ctrl mapboxgl-ctrl-group mapboxgl-ctrl-timeline__label" style="padding: 3px">
-      {{ timestamps[i] && new Date(timestamps[i]).toLocaleString() }}
-    </div>
     <div ref="speedometer" class="mapboxgl-ctrl">
       <speedometer :speed="route[i] && route[i].speed * 1.852" />
     </div>
@@ -152,9 +149,6 @@ export default {
     }
   },
   watch: {
-    /* currentTime (value) {
-      this.$refs.noUiSlider.noUiSlider.set([value])
-    }, */
     geofences () {
       const features = featureCollection(
         this.geofences
@@ -178,6 +172,9 @@ export default {
         map.getSource('route').setData(lineString(this.path.slice(0, this.i)))
       }
       if (this.path[this.i]) {
+        if (this.playing) {
+          this.updateSlider()
+        }
         const model = get3dModel(this.device && this.device.category)
         overlay.setProps({
           layers: [new ScenegraphLayer({
@@ -348,7 +345,6 @@ export default {
     map.on('style.load', this.styleLoaded)
     map.on('styleimagemissing', this.styleImageMissing)
     map.addControl({ onAdd: () => this.$refs.slider }, 'top-right')
-    map.addControl({ onAdd: () => this.$refs.datetime }, 'top-right')
     map.addControl({ onAdd: () => this.$refs.speedometer }, 'top-right')
     map.addControl(new mapboxgl.NavigationControl())
     map.addControl({ onAdd: () => this.$refs.styleSwitcher })
@@ -366,6 +362,7 @@ export default {
           { to: value => new Date(value).toLocaleString() },
           { to: value => new Date(value).toLocaleString() }
         ],
+        step: 1,
         pips: {
           mode: 'positions',
           values: [0, 50, 100],
@@ -379,6 +376,21 @@ export default {
     this.$refs.noUiSlider.noUiSlider.on('update', ([from, to]) => { this.currentTime = to })
   },
   methods: {
+    updateSlider () {
+      this.$refs.noUiSlider.noUiSlider.set([null, this.currentTime])
+    },
+    clickBackward () {
+      if (this.i - 1 >= 0) {
+        this.i--
+        this.updateSlider()
+      }
+    },
+    clickForward () {
+      if (this.i + 1 < this.path.length) {
+        this.i++
+        this.updateSlider()
+      }
+    },
     styleImageMissing (e) {
       if (e.id.startsWith('regulatory')) {
         const img = new Image(20, 20)