1.0.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.1d1993b1.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>

geo/poi.json

@@ -1,18 +1,200 @@
 {
-    "type": "FeatureCollection",
+  "type": "FeatureCollection",
-    "features": [
+  "features": [
-        {
+    {
-            "type": "Feature",
+      "type": "Feature",
-            "properties": {
+      "properties": {
-                "name": "Start in Genoa"
+        "name": "Start in Genoa"
-            },
+      },
-            "geometry": {
+      "geometry": {
-              "type": "Point",
+        "type": "Point",
-              "coordinates": [
+        "coordinates": [
-                  8.918618,
+          8.918618,
-                  44.407408
+          44.407408
-              ]
+        ]
-            }
+      }
-        }
+    },
-    ]
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Borgonovo"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          9.378806,
+          44.391897
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Parma"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          10.327455,
+          44.804661
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Legnago"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          11.311988,
+          45.192941
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Treviso"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          12.245634,
+          45.666013
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Udine"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          13.235893,
+          46.064534
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Villach"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          13.843945,
+          46.615745
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Bad Mitterndorf"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          13.931899,
+          47.555034
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Fuschl am See"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          13.29709,
+          47.802267
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Halfing"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          12.276169,
+          47.951902
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in München"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          11.574704,
+          48.137281
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Regensburg"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          12.094785,
+          49.020419
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Rothenburg o. d. Tauber"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          10.179171,
+          49.376898
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Start/Finish in Karlsruhe"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          8.404369,
+          49.013486
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Finish in Straßbourg"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          7.767981,
+          48.598389
+        ]
+      }
+    }
+  ]
 }

index.html

@@ -5,9 +5,11 @@
     <!-- <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">
   </head>
   <body>
-    <div id="map"></div>
+    <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>
     <script type="module" src="./main.js"></script>
   </body>
 </html>

main.js

@@ -1,9 +1,11 @@
 import './style.css';
+import {Map, View} from 'ol';
 import Feature from 'ol/Feature';
 import GeoJSON from 'ol/format/GeoJSON';
-import {Map, View} from 'ol';
+import Overlay from 'ol/Overlay';
+import Point from 'ol/geom/Point';
 import {Tile as TileLayer, Vector as VectorLayer} from 'ol/layer';
-import {Icon, Stroke, Style} from 'ol/style';
+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 geojsonRoute from './geo/route.json'
@@ -31,11 +33,33 @@ const styles = {
       anchor: [0.5, 46],
       anchorXUnits: 'fraction',
       anchorYUnits: 'pixels',
-      src: 'data/icon.png',
+      src: '/img/icon.png',
     }),
+  }),
+  iconVan: new Style({
+    image: new Icon({
+      anchor: [0.5, 16],
+      anchorXUnits: 'fraction',
+      anchorYUnits: 'pixels',
+      src: '/img/van-100px.png',
+    }),
+  }),
+  circleBlack: new Style({
+    image: new CircleStyle({
+      radius: 7,
+      fill: new Fill({color: '#FF9900'}),
+      stroke: new Stroke({
+        color: 'white',
+        width: 2,
+      }),
+    })
   })
 }
 
+//
+// Route
+//
+
 const lastStageFinished = 4;
 const stagesCompleted = geojsonRoute.features.slice(0, lastStageFinished);
 const stagesAhead = geojsonRoute.features.slice(lastStageFinished);
@@ -59,18 +83,40 @@ const stagesAheadLayer = new VectorLayer({
   style: styles.lineGrey
 });
 
+//
+// Points of Interest
+//
+
 const vectorSourcePOI = new VectorSource({
   features: new GeoJSON().readFeatures(geojsonPOI),
 });
 
 const poiLayer = new VectorLayer({
   source: vectorSourcePOI,
-  style: styles.iconStop,
+  style: styles.circleBlack,
 });
 
+const vectorSourceVan = new VectorSource();
+
+const vanFeature= new Feature({
+  geometry: new Point([ 12.498556, 45.780383 ]),
+  name: 'Support Van'
+});
+
+vectorSourceVan.addFeature(vanFeature);
+
+const vanLayer = new VectorLayer({
+  source: vectorSourceVan,
+  style: styles.iconVan
+});
+
+//
+// Map initialization
+//
+
 const view = new View({
-  center: [10.6, 46.5],
+  center: [10.6, 46.9],
-  zoom: 6
+  zoom: 6.6
 })
 
 const map = new Map({
@@ -81,7 +127,56 @@ const map = new Map({
     }),
     stagesCompletedLayer,
     stagesAheadLayer,
-    poiLayer
+    poiLayer,
+    vanLayer
   ],
   view: view
 });
+
+//
+// Popups
+//
+const popupEl = document.getElementById('popup');
+
+const popup = new Overlay({
+  element: popupEl,
+  positioning: 'bottom-center',
+  stopEvent: false,
+});
+map.addOverlay(popup);
+
+let popover;
+function disposePopover() {
+  if (popover) {
+    popover.dispose();
+    popover = undefined;
+  }
+}
+
+// display popup on click
+map.on('click', function (evt) {
+  const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
+    return feature;
+  });
+  disposePopover();
+  if (!feature) {
+    return;
+  }
+  popup.setPosition(evt.coordinate);
+  popover = new bootstrap.Popover(popupEl, {
+    placement: 'top',
+    html: true,
+    content: feature.get('name'),
+  });
+  popover.show();
+});
+
+// change mouse cursor when over marker
+map.on('pointermove', function (evt) {
+  map.getTargetElement().style.cursor = map.hasFeatureAtPixel(evt.pixel)
+    ? 'pointer'
+    : '';
+});
+
+// Close the popup when the map is moved
+map.on('movestart', disposePopover);

package-lock.json

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

package.json

@@ -1,10 +1,11 @@
 {
   "name": "map",
-  "version": "1.0.0",
+  "version": "1.0.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"

readme.md

@@ -1,14 +1,11 @@
-# OpenLayers + Vite
+# R2B22 Live Map
 
-This example demonstrates how the `ol` package can be used with [Vite](https://vitejs.dev/).
+An interactive map for [Road2Bitcoin 2022](https://teamsatoshi.org/wiki/Road2Bitcoin_2022)
 
-To get started, run the following (requires Node 14+):
+## Development
 
-    npx create-ol-app my-app --template vite
+Start a development server (available at http://localhost:5173):
 
-Then change into your new `my-app` directory and start a development server (available at http://localhost:5173):
-
-    cd my-app
     npm start
 
 To generate a build ready for production: