Restore support for #layers=X with no map parameter

https://trac.openstreetmap.org/ticket/5056

diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index f65325e37b94cffbd580afa25e1f647409918975..af7ce202da4ec23f2bee1f018d9c0efc93b39139 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -243,6 +243,11 @@ L.OSM.Map = L.Map.extend({
       zoom: this.getZoom(),
       layers: this.getLayersCode()
     }
       zoom: this.getZoom(),
       layers: this.getLayersCode()
     }

+  },
+
+  setState: function(state, options) {
+    if (state.center) this.setView(state.center, state.zoom, options);
+    this.updateLayers(state.layers);

   }
 });
 
   }
 });
 

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 7b5df18655ec9255678e1c281b578fe8f6a971fc..922bd2639d031fe93135d7c586c0a270df1a3bfc 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -111,41 +111,25 @@ OSM = {
   },
 
   parseHash: function(hash) {
   },
 
   parseHash: function(hash) {

+    var args = {};
+

     var i = hash.indexOf('#');
     if (i < 0) {
     var i = hash.indexOf('#');
     if (i < 0) {

-      return false;
+      return args;

     }
 
     }
 

-    hash = hash.substr(i + 1);
-
-    if (hash === '') {
-      return false;
-    }
+    hash = querystring.parse(hash.substr(i + 1));

 
 

-    hash = querystring.parse(hash);
-
-    if (hash.map === undefined) {
-      return false;
-    }
+    var map = (hash.map || '').split('/'),
+      zoom = parseInt(map[0], 10),
+      lat = parseFloat(map[1]),
+      lon = parseFloat(map[2]);

 
 

-    var args = hash.map.split("/");
-    if (args.length !== 3) {
-      return false;
+    if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) {
+      args.center = new L.LatLng(lat, lon);
+      args.zoom = zoom;

     }
 
     }
 

-    var zoom = parseInt(args[0], 10),
-      lat = parseFloat(args[1]),
-      lon = parseFloat(args[2]);
-
-    if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) {
-      return false;
-    }
-
-    args = {
-      center: new L.LatLng(lat, lon),
-      zoom: zoom
-    };
-

     if (hash.layers) {
       args.layers = hash.layers;
     }
     if (hash.layers) {
       args.layers = hash.layers;
     }

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index cadb6b628f1b672fa9dd46aaa6a2adf5279ddca1..200edd2664fa94e4b9aeaf78bceff3bcab3e64ac 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -106,18 +106,14 @@ OSM.Router = function(map, rts) {
       currentPath = path;
       currentRoute = routes.recognize(currentPath);
       currentRoute.run('popstate', currentPath);
       currentPath = path;
       currentRoute = routes.recognize(currentPath);
       currentRoute.run('popstate', currentPath);

-      var state = e.originalEvent.state;
-      if (state.center) {
-        map.setView(state.center, state.zoom, {animate: false});
-        map.updateLayers(state.layers);
-      }
+      map.setState(e.originalEvent.state, {animate: false});

     });
 
     router.route = function (url) {
       var path = url.replace(/#.*/, ''),
         route = routes.recognize(path);
       if (!route) return false;
     });
 
     router.route = function (url) {
       var path = url.replace(/#.*/, ''),
         route = routes.recognize(path);
       if (!route) return false;

-      window.history.pushState(OSM.parseHash(url) || {}, document.title, url);
+      window.history.pushState(OSM.parseHash(url), document.title, url);

       currentRoute.run('unload');
       currentPath = path;
       currentRoute = route;
       currentRoute.run('unload');
       currentPath = path;
       currentRoute = route;


@@ -154,9 +150,7 @@ OSM.Router = function(map, rts) {
     if (hash === currentHash) return;
     currentHash = hash;
     var state = OSM.parseHash(hash);
     if (hash === currentHash) return;
     currentHash = hash;
     var state = OSM.parseHash(hash);

-    if (!state) return;
-    map.setView(state.center, state.zoom);
-    map.updateLayers(state.layers);
+    map.setState(state);

     router.stateChange(state, hash);
   };
 
     router.stateChange(state, hash);
   };