1.6.0

Add legacy routes
1.5.0
2022-09-14 10:18:29 +02:00 · 2022-09-14 10:17:55 +02:00 · 2022-09-13 07:55:53 +02:00 · 2022-09-13 07:55:09 +02:00 · 2022-09-11 12:31:26 +02:00 · 2022-09-11 12:30:52 +02:00
15 changed files with 229152 additions and 52845 deletions
--- a/dist/assets/index.03aa5401.js
+++ b/dist/assets/index.03aa5401.js
--- a/dist/assets/index.24fe7964.js
+++ b/dist/assets/index.24fe7964.js
--- a/dist/assets/index.24fe7964.js.map
+++ b/dist/assets/index.24fe7964.js.map
--- a/dist/img/avatars/raucao.png
+++ b/dist/img/avatars/raucao.png
--- a/dist/img/avatars/tobyyoungfox.jpg
+++ b/dist/img/avatars/tobyyoungfox.jpg
--- 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.03aa5401.js"></script>
+    <script defer data-domain="r2b22.kip.pe" src="https://plausible.io/js/plausible.js"></script>
    <script type="module" crossorigin src="/assets/index.24fe7964.js"></script>
    <link rel="stylesheet" href="/assets/index.eed9f443.css">
  </head>
  <body>
--- a/geo/legacy-route.json
+++ b/geo/legacy-route.json
--- a/geo/r2b22-poi.json
+++ b/geo/r2b22-poi.json
--- a/geo/r2b22-route.json
+++ b/geo/r2b22-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,14 @@ 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, fromLonLat} from 'ol/proj';
+import {useGeographic} from 'ol/proj';
-import geojsonRoute from './geo/route.json'
+import geojsonRoute from './geo/r2b22-route.json'
-import geojsonPOI from './geo/poi.json'
+import geojsonPOI from './geo/r2b22-poi.json';
 import geojsonLegacy from './geo/legacy-route.json';
 useGeographic();
 async function main() {
  const styles = {
    lineOrange: new Style({
      stroke: new Stroke({
@@ -60,7 +62,9 @@ const styles = {
  // Route
  //
-const lastStageFinished = 2;
+  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();
@@ -111,6 +115,18 @@ const trackedPointsLayer = new VectorLayer({
    style: styles.iconVan
  });
  //
  // Legacy routes
  //
  const vectorSourceLegacy = new VectorSource();
  vectorSourceLegacy.addFeatures(new GeoJSON().readFeatures(geojsonLegacy));
  const legacyLayer = new VectorLayer({
    source: vectorSourceLegacy,
    style: styles.lineOrange
  });
  //
  // Map initialization
  //
@@ -130,6 +146,7 @@ const map = new Map({
      }),
      stagesCompletedLayer,
      stagesAheadLayer,
      legacyLayer,
      poiLayer,
      trackedPointsLayer
    ],
@@ -219,8 +236,8 @@ map.on('movestart', disposePopover);
  //
  const updateInterval = 5000;
-let followedFeature = vanFeature;
+  // let followedFeature = vanFeature;
-let followedZoomed = false;
+  // let followedZoomed = false;
  // let followedFeature = null;
  function startFollowing(feature, followLink) {
@@ -243,8 +260,9 @@ function updateData(startInterval=false) {
      .then(response => response.json())
      .then(data => {
        console.log(data);
-      const coords = [data.lon, data.lat];
+        const van_data = data.find(i => i.name == 'satoshithevan');
-      vanFeature.getGeometry().setCoordinates(coords);
+        const van_coords = [van_data.lon, van_data.lat];
        vanFeature.getGeometry().setCoordinates(van_coords);
        // let zoomLevel;
        // if (!followedZoomed) {
@@ -267,3 +285,6 @@ function updateData(startInterval=false) {
  }
  updateData(true);
 }
 main();
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "ol-vite",
-  "version": "1.2.1",
+  "version": "1.6.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "ol-vite",
-      "version": "1.2.1",
+      "version": "1.6.0",
      "dependencies": {
        "ol": "latest"
      },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "map",
-  "version": "1.2.1",
+  "version": "1.6.0",
  "scripts": {
    "start": "vite",
    "build": "vite build",
--- a/public/img/avatars/raucao.png
+++ b/public/img/avatars/raucao.png
--- a/public/img/avatars/tobyyoungfox.jpg
+++ b/public/img/avatars/tobyyoungfox.jpg
Author	SHA1	Message	Date
Râu Cao	67707b7ded	1.6.0	2022-09-14 10:18:29 +02:00
Râu Cao	9c96037e32	Add legacy routes	2022-09-14 10:17:55 +02:00
Râu Cao	fc4c63b519	1.5.0	2022-09-13 07:55:53 +02:00
Râu Cao	fe1c9f6300	Adjust for multiple tracked POIs	2022-09-13 07:55:09 +02:00
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