Prechádzať zdrojové kódy

Stash position in url bar and restore from it

Johannes Zellner 8 rokov pred
rodič
commit
945a2feb2b
1 zmenil súbory, kde vykonal 24 pridanie a 5 odobranie
  1. 24 5
      public/index.js

+ 24 - 5
public/index.js

@@ -29,9 +29,28 @@ function setupMap() {
     var nav = new mapboxgl.NavigationControl();
     map.addControl(nav, 'top-right');
 
-    // attempt to set a closer default
-    navigator.geolocation.getCurrentPosition(function (position) {
-        map.jumpTo({ center: [ position.coords.longitude, position.coords.latitude ], zoom: 12 });
+    // set map position either based on url or default
+    var u = new URL(window.location);
+    var lon = u.searchParams.get('lon');
+    var lat = u.searchParams.get('lat');
+    var zoom = u.searchParams.get('zoom');
+
+    if (lon && lat) {
+        map.jumpTo({ center: [ lon, lat ], zoom: zoom || 12 });
+    } else {
+        navigator.geolocation.getCurrentPosition(function (position) {
+            map.jumpTo({ center: [ position.coords.longitude, position.coords.latitude ], zoom: 12 });
+        });
+    }
+
+    // Update the url bar to match position
+    map.on('moveend', function (event) {
+        var u = new URL(window.location);
+        u.searchParams.set('lon', map.getCenter().lng);
+        u.searchParams.set('lat', map.getCenter().lat);
+        u.searchParams.set('zoom', map.getZoom());
+
+        history.replaceState({}, window.document.title, u);
     });
 }
 
@@ -126,8 +145,8 @@ app = new Vue({
 
             var params = {
                 search: this.querySearchString,
-                lat: map.getCenter().latitude,
-                lon: map.getCenter().longitude
+                lat: map.getCenter().lat,
+                lon: map.getCenter().lng
             };
 
             axios.get('/api/places', {