Fixes

[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 5c555a25ac9e37908bace402cf5673d95387d108..a3022f9ae905598e165918b9f11042be92f6cba4 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -12,7 +12,7 @@ OSM = {
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
 
-    if (object.type != "node") {
+    if (object.type === "way" || object.type === "relation") {
       url += "/full";
     } else if (object.version) {
       url += "/" + object.version;
@@ -38,7 +38,7 @@ OSM = {
   },
 
   mapParams: function (search) {
-    var params = OSM.params(search), mapParams = {}, bounds, loc;
+    var params = OSM.params(search), mapParams = {}, bounds, loc, match;
 
     if (params.mlon && params.mlat) {
       mapParams.marker = true;
@@ -46,7 +46,11 @@ OSM = {
       mapParams.mlat = parseFloat(params.mlat);
     }
 
-    if (params.node || params.way || params.relation) {
+    match = window.location.pathname.match(/\/browse\/(node|way|relation|changeset)\/(\d+)/);
+    if (match) {
+      mapParams.object_zoom = true;
+      mapParams.object = {type: match[1], id: parseInt(match[2])};
+    } else if (params.node || params.way || params.relation || params.note) {
       mapParams.object_zoom = true;
 
       if (params.node) {
@@ -58,6 +62,13 @@ OSM = {
       }
     }
 
+    match = window.location.pathname.match(/\/browse\/note\/(\d+)/);
+    if (match) {
+      mapParams.note = parseInt(match[1]);
+    } else if (params.note) {
+      mapParams.note = parseInt(params.note);
+    }
+
     if (params.bbox) {
       params.bbox = params.bbox.split(',');
       bounds = L.latLngBounds(
@@ -73,10 +84,6 @@ OSM = {
          parseFloat(params.maxlon)]);
     }
 
-    if (params.box === 'yes') {
-      mapParams.box = bounds;
-    }
-
     var hash = OSM.parseHash(location.hash);
 
     // Decide on a map starting position. Various ways of doing this.
@@ -123,10 +130,6 @@ OSM = {
 
     mapParams.layers = hash.layers || (loc && loc[3]) || '';
 
-    if (params.note) {
-      mapParams.note = parseInt(params.note);
-    }
-
     var scale = parseFloat(params.scale);
     if (scale > 0) {
       mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);