1.2.1

.gitignore

@@ -1,2 +1 @@
 node_modules
-dist

dist/assets/index.eed9f443.css

@@ -0,0 +1 @@
+.ol-box{box-sizing:border-box;border-radius:2px;border:1.5px solid rgb(179,197,219);background-color:#fff6}.ol-mouse-position{top:8px;right:8px;position:absolute}.ol-scale-line{background:rgba(0,60,136,.3);border-radius:4px;bottom:8px;left:8px;padding:2px;position:absolute}.ol-scale-line-inner{border:1px solid #eee;border-top:none;color:#eee;font-size:10px;text-align:center;margin:1px;will-change:contents,width;transition:all .25s}.ol-scale-singlebar-even{background-color:#000}.ol-scale-singlebar-odd{background-color:#fff}.ol-scale-bar{position:absolute;bottom:8px;left:8px}.ol-scale-step-marker{width:1px;height:15px;background-color:#000;float:right;z-index:10}.ol-scale-step-text{position:absolute;bottom:-5px;font-size:12px;z-index:11;color:#000;text-shadow:-2px 0 #FFFFFF,0 2px #FFFFFF,2px 0 #FFFFFF,0 -2px #FFFFFF}.ol-scale-text{position:absolute;font-size:14px;text-align:center;bottom:25px;color:#000;text-shadow:-2px 0 #FFFFFF,0 2px #FFFFFF,2px 0 #FFFFFF,0 -2px #FFFFFF}.ol-scale-singlebar{position:relative;height:10px;z-index:9;box-sizing:border-box;border:1px solid black}.ol-unsupported{display:none}.ol-viewport,.ol-unselectable{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}.ol-viewport canvas{all:unset}.ol-selectable{-webkit-touch-callout:default;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}.ol-grabbing{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.ol-grab{cursor:move;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.ol-control{position:absolute;background-color:#fff6;border-radius:4px;padding:2px}.ol-control:hover{background-color:#fff9}.ol-zoom{top:.5em;left:.5em}.ol-rotate{top:.5em;right:.5em;transition:opacity .25s linear,visibility 0s linear}.ol-rotate.ol-hidden{opacity:0;visibility:hidden;transition:opacity .25s linear,visibility 0s linear .25s}.ol-zoom-extent{top:4.643em;left:.5em}.ol-full-screen{right:.5em;top:.5em}.ol-control button{display:block;margin:1px;padding:0;color:#fff;font-weight:700;text-decoration:none;font-size:inherit;text-align:center;height:1.375em;width:1.375em;line-height:.4em;background-color:#003c8880;border:none;border-radius:2px}.ol-control button::-moz-focus-inner{border:none;padding:0}.ol-zoom-extent button{line-height:1.4em}.ol-compass{display:block;font-weight:400;font-size:1.2em;will-change:transform}.ol-touch .ol-control button{font-size:1.5em}.ol-touch .ol-zoom-extent{top:5.5em}.ol-control button:hover,.ol-control button:focus{text-decoration:none;background-color:#003c88b3}.ol-zoom .ol-zoom-in{border-radius:2px 2px 0 0}.ol-zoom .ol-zoom-out{border-radius:0 0 2px 2px}.ol-attribution{text-align:right;bottom:.5em;right:.5em;max-width:calc(100% - 1.3em);display:flex;flex-flow:row-reverse;align-items:center}.ol-attribution a{color:#003c88b3;text-decoration:none}.ol-attribution ul{margin:0;padding:1px .5em;color:#000;text-shadow:0 0 2px #fff;font-size:12px}.ol-attribution li{display:inline;list-style:none}.ol-attribution li:not(:last-child):after{content:" "}.ol-attribution img{max-height:2em;max-width:inherit;vertical-align:middle}.ol-attribution button{flex-shrink:0}.ol-attribution.ol-collapsed ul{display:none}.ol-attribution:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-attribution.ol-uncollapsible{bottom:0;right:0;border-radius:4px 0 0}.ol-attribution.ol-uncollapsible img{margin-top:-.2em;max-height:1.6em}.ol-attribution.ol-uncollapsible button{display:none}.ol-zoomslider{top:4.5em;left:.5em;height:200px}.ol-zoomslider button{position:relative;height:10px}.ol-touch .ol-zoomslider{top:5.5em}.ol-overviewmap{left:.5em;bottom:.5em}.ol-overviewmap.ol-uncollapsible{bottom:0;left:0;border-radius:0 4px 0 0}.ol-overviewmap .ol-overviewmap-map,.ol-overviewmap button{display:block}.ol-overviewmap .ol-overviewmap-map{border:1px solid #7b98bc;height:150px;margin:2px;width:150px}.ol-overviewmap:not(.ol-collapsed) button{bottom:2px;left:2px;position:absolute}.ol-overviewmap.ol-collapsed .ol-overviewmap-map,.ol-overviewmap.ol-uncollapsible button{display:none}.ol-overviewmap:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-overviewmap-box{border:2px dotted rgba(0,60,136,.7)}.ol-overviewmap .ol-overviewmap-box:hover{cursor:move}html,body{margin:0;height:100%}#map{position:absolute;top:0;bottom:0;width:100%}

dist/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <!-- <link rel="icon" type="image/x&#45;icon" href="https://openlayers.org/favicon.ico" /> -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Road2Bitcoin Live Map</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css">
+    <script type="module" crossorigin src="/assets/index.03aa5401.js"></script>
+    <link rel="stylesheet" href="/assets/index.eed9f443.css">
+  </head>
+  <body>
+    <div id="map"><div id="popup"></div></div>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"></script>
+    
+  </body>
+</html>

main.js

@@ -7,7 +7,7 @@ import Point from 'ol/geom/Point';
 import {Tile as TileLayer, Vector as VectorLayer} from 'ol/layer';
 import {Circle as CircleStyle, Fill, Icon, Stroke, Style} from 'ol/style';
 import {OSM, Vector as VectorSource} from 'ol/source';
-import {useGeographic} from 'ol/proj';
+import {useGeographic, fromLonLat} from 'ol/proj';
 import geojsonRoute from './geo/route.json'
 import geojsonPOI from './geo/poi.json'
 
@@ -33,7 +33,7 @@ const styles = {
       anchor: [0.5, 46],
       anchorXUnits: 'fraction',
       anchorYUnits: 'pixels',
-      src: 'data/icon.png',
+      src: '/img/icon.png',
     }),
   }),
   iconVan: new Style({
@@ -41,7 +41,7 @@ const styles = {
       anchor: [0.5, 16],
       anchorXUnits: 'fraction',
       anchorYUnits: 'pixels',
-      src: 'data/van-100px.png',
+      src: '/img/van-100px.png',
     }),
   }),
   circleBlack: new Style({
@@ -60,7 +60,7 @@ const styles = {
 // Route
 //
 
-const lastStageFinished = 4;
+const lastStageFinished = 2;
 const stagesCompleted = geojsonRoute.features.slice(0, lastStageFinished);
 const stagesAhead = geojsonRoute.features.slice(lastStageFinished);
 const vectorSourceStagesCompleted = new VectorSource();
@@ -96,17 +96,18 @@ const poiLayer = new VectorLayer({
   style: styles.circleBlack,
 });
 
-const vectorSourceVan = new VectorSource();
+const vectorSourceTrackedPoints = new VectorSource();
 
 const vanFeature= new Feature({
-  geometry: new Point([ 12.498556, 45.780383 ]),
+  geometry: new Point([8.918618, 44.407408]),
-  name: 'Support Van'
+  name: 'Support Van',
+  trackable: true
 });
 
-vectorSourceVan.addFeature(vanFeature);
+vectorSourceTrackedPoints.addFeature(vanFeature);
 
-const vanLayer = new VectorLayer({
+const trackedPointsLayer = new VectorLayer({
-  source: vectorSourceVan,
+  source: vectorSourceTrackedPoints,
   style: styles.iconVan
 });
 
@@ -119,6 +120,8 @@ const view = new View({
   zoom: 6.6
 })
 
+window.view = view;
+
 const map = new Map({
   target: 'map',
   layers: [
@@ -128,11 +131,23 @@ const map = new Map({
     stagesCompletedLayer,
     stagesAheadLayer,
     poiLayer,
-    vanLayer
+    trackedPointsLayer
   ],
   view: view
 });
 
+//
+// Center map on current/next stage
+//
+
+setTimeout(() => {
+  const nextStageFeature = new GeoJSON().readFeature(stagesAhead[0]);
+  view.fit(nextStageFeature.getGeometry(), {
+    maxZoom: 10,
+    duration: 1000
+  });
+}, 3000);
+
 //
 // Popups
 //
@@ -153,6 +168,23 @@ function disposePopover() {
   }
 }
 
+function createPopoverHtml(feature) {
+  const container = document.createElement('div');
+  const title = document.createElement('div');
+  title.textContent = feature.get('name');
+  container.append(title);
+  return container.innerHTML;
+  // if (feature.get('trackable')) {
+  //   const linkParent = document.createElement('div');
+  //   const followLink = document.createElement('a');
+  //   followLink.textContent = 'Follow';
+  //   followLink.href = '#';
+  //   followLink.addEventListener('click', startFollowing(feature, followLink));
+  //   linkParent.append(followLink);
+  //   container.append(linkParent);
+  // }
+}
+
 // display popup on click
 map.on('click', function (evt) {
   const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
@@ -166,7 +198,7 @@ map.on('click', function (evt) {
   popover = new bootstrap.Popover(popupEl, {
     placement: 'top',
     html: true,
-    content: feature.get('name'),
+    content: createPopoverHtml(feature)
   });
   popover.show();
 });
@@ -180,3 +212,58 @@ map.on('pointermove', function (evt) {
 
 // Close the popup when the map is moved
 map.on('movestart', disposePopover);
+
+
+//
+// Tracking
+//
+
+const updateInterval = 5000;
+let followedFeature = vanFeature;
+let followedZoomed = false;
+// let followedFeature = null;
+
+function startFollowing(feature, followLink) {
+  followedFeature = feature;
+  followLink.textContent = 'Stop following';
+  // followLink.removeEventListener('click', startFollowing);
+  followLink.addEventListener('click', stopFollowing(feature, followLink));
+}
+
+function stopFollowing(feature, followLink) {
+  followedFeature = null;
+  followedZoomed = false;
+  followLink.textContent = 'Stop following';
+  // followLink.removeEventListener('click', stopFollowing);
+  followLink.addEventListener('click', startFollowing(feature, followLink));
+}
+
+function updateData(startInterval=false) {
+  fetch('https://r2b22.kip.pe/last.json')
+    .then(response => response.json())
+    .then(data => {
+      console.log(data);
+      const coords = [data.lon, data.lat];
+      vanFeature.getGeometry().setCoordinates(coords);
+
+      // let zoomLevel;
+      // if (!followedZoomed) {
+      //   zoomLevel = 13;
+      //   followedZoomed = true;
+      // }
+
+      // if (followedFeature) {
+      //   view.animate({
+      //     center: followedFeature.getGeometry().getCoordinates(),
+      //     duration: 500,
+      //     zoom: zoomLevel
+      //   });
+      // }
+    });
+
+  if (startInterval) {
+    setInterval(updateData, updateInterval);
+  }
+}
+
+updateData(true);

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ol-vite",
-  "version": "1.0.0",
+  "version": "1.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ol-vite",
-      "version": "1.0.0",
+      "version": "1.2.1",
       "dependencies": {
         "ol": "latest"
       },

package.json

@@ -1,10 +1,11 @@
 {
   "name": "map",
-  "version": "1.0.0",
+  "version": "1.2.1",
   "scripts": {
     "start": "vite",
     "build": "vite build",
-    "serve": "vite preview"
+    "serve": "vite preview",
+    "version": "npm run build && git add dist/"
   },
   "devDependencies": {
     "vite": "^3.0.3"