Strip any trailing slash from the initial location

[rails.git] / app / assets / javascripts / osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index cb37373518341fb44807973da75bf0732dc53fff..d350b28969ccc020e3e403fd259da648c1bdebcf 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -46,6 +46,7 @@ OSM = {
       mapParams.mlat = parseFloat(params.mlat);
     }
 
+    // Old-style object parameters; still in use for edit links e.g. /edit?way=1234
     if (params.node) {
       mapParams.object = {type: 'node', id: parseInt(params.node)};
     } else if (params.way) {
@@ -114,6 +115,10 @@ OSM = {
 
     hash = querystring.parse(hash);
 
+    if (hash.map === undefined) {
+      return false;
+    }
+
     var args = hash.map.split("/");
     if (args.length !== 3) {
       return false;
@@ -147,7 +152,7 @@ OSM = {
       zoom = args.getZoom();
       layers = args.getLayersCode();
     } else {
-      center = L.latLng(args.lat, args.lon);
+      center = args.center || L.latLng(args.lat, args.lon);
       zoom = args.zoom;
       layers = args.layers || '';
     }