Improve click behavior on changeset entries

[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 0b84686634428c666ddd5fd7d9e4be25d98109e5..7b5df18655ec9255678e1c281b578fe8f6a971fc 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -46,6 +46,15 @@ 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) {
+      mapParams.object = {type: 'way', id: parseInt(params.way)};
+    } else if (params.relation) {
+      mapParams.object = {type: 'relation', id: parseInt(params.relation)};
+    }
+
     var hash = OSM.parseHash(location.hash);
 
     // Decide on a map starting position. Various ways of doing this.
@@ -53,6 +62,15 @@ OSM = {
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
+    } else if (params.bbox) {
+      var bbox = params.bbox.split(',');
+      mapParams.bounds = L.latLngBounds(
+        [parseFloat(bbox[1]), parseFloat(bbox[0])],
+        [parseFloat(bbox[3]), parseFloat(bbox[2])]);
+    } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
+      mapParams.bounds = L.latLngBounds(
+        [parseFloat(params.minlat), parseFloat(params.minlon)],
+        [parseFloat(params.maxlat), parseFloat(params.maxlon)]);
     } else if (params.lon && params.lat) {
       mapParams.lon = parseFloat(params.lon);
       mapParams.lat = parseFloat(params.lat);
@@ -106,6 +124,10 @@ OSM = {
 
     hash = querystring.parse(hash);
 
+    if (hash.map === undefined) {
+      return false;
+    }
+
     var args = hash.map.split("/");
     if (args.length !== 3) {
       return false;