1.4.0

Add plausible analytics script
1.3.0
2022-09-11 12:31:26 +02:00 · 2022-09-11 12:30:52 +02:00 · 2022-09-09 20:29:41 +02:00 · 2022-09-09 20:29:18 +02:00 · 2022-09-09 20:29:00 +02:00 · 2022-09-08 09:49:18 +02:00
9 changed files with 46599 additions and 52773 deletions
--- a/dist/assets/index.148d1b99.js
+++ b/dist/assets/index.148d1b99.js
--- a/dist/assets/index.148d1b99.js.map
+++ b/dist/assets/index.148d1b99.js.map
--- a/dist/assets/index.1d1993b1.js
+++ b/dist/assets/index.1d1993b1.js
--- a/dist/index.html
+++ b/dist/index.html
@@ -6,7 +6,8 @@
    <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>
+    <script defer data-domain="r2b22.kip.pe" src="https://plausible.io/js/plausible.js"></script>
    <script type="module" crossorigin src="/assets/index.148d1b99.js"></script>
    <link rel="stylesheet" href="/assets/index.eed9f443.css">
  </head>
  <body>
--- a/geo/route.json
+++ b/geo/route.json
--- a/index.html
+++ b/index.html
@@ -6,6 +6,7 @@
    <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 defer data-domain="r2b22.kip.pe" src="https://plausible.io/js/plausible.js"></script>
  </head>
  <body>
    <div id="map"><div id="popup"></div></div>
--- a/main.js
+++ b/main.js
@@ -7,12 +7,13 @@ 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'
 useGeographic();
 async function main() {
  const styles = {
    lineOrange: new Style({
      stroke: new Stroke({
@@ -60,7 +61,9 @@ const styles = {
  // Route
  //
-const lastStageFinished = 4;
+  const tourStatus = await fetch('https://r2b22.kip.pe/status.json').then(res => res.json());
  const lastStageFinished = tourStatus.lastStageFinished;
  const stagesCompleted = geojsonRoute.features.slice(0, lastStageFinished);
  const stagesAhead = geojsonRoute.features.slice(lastStageFinished);
  const vectorSourceStagesCompleted = new VectorSource();
@@ -96,17 +99,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 +123,8 @@ const view = new View({
    zoom: 6.6
  })
  window.view = view;
  const map = new Map({
    target: 'map',
    layers: [
@@ -128,11 +134,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 +171,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 +201,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 +215,61 @@ 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);
 }
 main();
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "ol-vite",
-  "version": "1.0.1",
+  "version": "1.4.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "ol-vite",
-      "version": "1.0.1",
+      "version": "1.4.0",
      "dependencies": {
        "ol": "latest"
      },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "map",
-  "version": "1.0.1",
+  "version": "1.4.0",
  "scripts": {
    "start": "vite",
    "build": "vite build",
Author	SHA1	Message	Date
Râu Cao	0d66bc1266	1.4.0	2022-09-11 12:31:26 +02:00
Râu Cao	ba3982d9a6	Add plausible analytics script	2022-09-11 12:30:52 +02:00
Râu Cao	f2cc9a9783	1.3.0	2022-09-09 20:29:41 +02:00
Râu Cao	0c1aeebdf7	Load current tour status from server	2022-09-09 20:29:18 +02:00
Râu Cao	3324a57206	Update route	2022-09-09 20:29:00 +02:00
Râu Cao	cf8e6882f8	1.2.1	2022-09-08 09:49:18 +02:00
Râu Cao	6c4959deda	Hackety hack, no time	2022-09-08 09:48:51 +02:00
Râu Cao	e00b5576e6	1.2.0	2022-09-06 21:09:39 +02:00
Râu Cao	e06b9d5109	MVP	2022-09-06 21:09:06 +02:00
Râu Cao	b527049acb	1.1.0	2022-09-04 20:55:44 +02:00
Râu Cao	18ea53313f	WIP tracked POIs	2022-09-04 20:53:37 +02:00