1.8.0

Add popover for rider markers
2022-09-14 19:05:41 +02:00 · 2022-09-14 19:05:15 +02:00
6 changed files with 29 additions and 27 deletions
--- a/dist/assets/index.8fd3a327.js
+++ b/dist/assets/index.8fd3a327.js
--- a/dist/assets/index.8fd3a327.js.map
+++ b/dist/assets/index.8fd3a327.js.map
--- a/dist/index.html
+++ b/dist/index.html
@@ -7,7 +7,7 @@
    <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>
-    <script type="module" crossorigin src="/assets/index.2d0ee7b9.js"></script>
+    <script type="module" crossorigin src="/assets/index.8fd3a327.js"></script>
    <link rel="stylesheet" href="/assets/index.eed9f443.css">
  </head>
  <body>
--- a/main.js
+++ b/main.js
@@ -104,8 +104,7 @@ async function main() {

  const vanFeature= new Feature({
    geometry: new Point([8.918618, 44.407408]),
-    name: 'Support Van',
-    trackable: true
+    name: 'Support Van'
  });

  vectorSourceTrackedPoints.addFeature(vanFeature);
@@ -191,15 +190,6 @@ async function main() {
    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
@@ -208,9 +198,7 @@ async function main() {
      return feature;
    });
    disposePopover();
-    if (!feature) {
-      return;
-    }
+    if (!feature) return;
    popup.setPosition(evt.coordinate);
    popover = new bootstrap.Popover(popupEl, {
      placement: 'top',
@@ -242,7 +230,7 @@ async function main() {
    const el = document.createElement('img');
    el.src = `https://r2b22.kip.pe/avatars/${name}.png`;
    el.id = `user-${name}`;
-    el.style = 'width: 40px; height: 40px; border-radius: 20px;';
+    el.style = 'width: 40px; height: 40px; border-radius: 20px; cursor: pointer';
    document.getElementById('people').append(el);
  }

@@ -261,7 +249,6 @@ async function main() {
    fetch('https://r2b22.kip.pe/last.json')
      .then(response => response.json())
      .then(data => {
-        // console.debug(data);
        const vanData = data.find(i => i.name == 'satoshithevan');
        const vanCoords = [vanData.lon, vanData.lat];
        vanFeature.getGeometry().setCoordinates(vanCoords);
@@ -272,6 +259,21 @@ async function main() {
          createParticipantOverlay(item.name);
          const overlay = peopleOverlays[item.name];
          overlay.setPosition([item.lon, item.lat]);
+
+          function clickHandler () {
+            disposePopover();
+            popup.setPosition([item.lon, item.lat]);
+            popover = new bootstrap.Popover(popupEl, {
+              placement: 'top',
+              html: true,
+              content: `Rider: ${item.name}`
+            });
+            popover.show();
+          }
+
+          const avatarEl = document.getElementById(`user-${item.name}`);
+          avatarEl.removeEventListener('click', clickHandler);
+          avatarEl.addEventListener('click', clickHandler);
        }
      });

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "ol-vite",
-  "version": "1.7.0",
+  "version": "1.8.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "ol-vite",
-      "version": "1.7.0",
+      "version": "1.8.0",
      "dependencies": {
        "ol": "latest"
      },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "map",
-  "version": "1.7.0",
+  "version": "1.8.0",
  "scripts": {
    "start": "vite",
    "build": "vite build",
Author	SHA1	Message	Date
Râu Cao	a8c0aefbd6	1.8.0	2022-09-14 19:05:41 +02:00
Râu Cao	9c18cc19b7	Add popover for rider markers	2022-09-14 19:05:15 +02:00