nakarte

commit f0e67c2d834bfb70b30eeb81d63dd935f715971e
parent c980058632840a8d5b32e42fd91a2dc171f9e466
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Fri,  7 Dec 2018 21:50:45 +0100

[geocaching] switch to new json file #191

Diffstat:
M
src/config.js
 | 
2
+-
M
src/lib/leaflet.layer.geocaching-su/index.js
 | 
7
++++---

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/config.js b/src/config.js
@@ -8,6 +8,6 @@ export default Object.assign({
     elevationsServer: 'https://elevation.nakarte.me/',
     newsUrl: 'https://nakarte-me.blogspot.com',
     wikimediaCommonsCoverageUrl: 'https://tiles.nakarte.me/wikimedia_commons_images/{z}/{x}/{y}',
-    geocachingSuUrl: 'https://nakarte.me/geocachingSu/geocaching_su.json',
+    geocachingSuUrl: 'https://nakarte.me/geocachingSu/geocaching_su2.json',
     tracksStorageServer: 'https://tracks.nakarte.me',
 }, secrets);
diff --git a/src/lib/leaflet.layer.geocaching-su/index.js b/src/lib/leaflet.layer.geocaching-su/index.js
@@ -63,12 +63,12 @@ const GeocachingSu = L.Layer.CanvasMarkers.extend({
             return zoom >= 10 ? marker._label : null;
         };
 
-        const markers = data.map(([label, url, lat, lng]) => {
+        const markers = data.map(([label, cacheId, lat, lng]) => {
             return {
                 latlng: {lat, lng},
                 _label: label,
                 label: getLabel,
-                icon, url
+                icon, cacheId
             }
         });
         this.addMarkers(markers);
@@ -77,7 +77,8 @@ const GeocachingSu = L.Layer.CanvasMarkers.extend({
     },
 
     openCachePage: function(e) {
-        openPopupWindow(e.marker.url, 900, 'geocaching_su');
+        const url = `https://geocaching.su/?pn=101&cid=${e.marker.cacheId}`
+        openPopupWindow(url, 900, 'geocaching_su');
     }
 });