Remove unused bounds parameters

[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 409cda8d84fd51426c0a0e93feda73a297e38d80..215d5b7ca220e746456fa077584b140cd6277b54 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,7 +1,6 @@
 OSM = {
-<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
-  PIWIK_LOCATION:        <%= PIWIK_LOCATION.to_json %>,
-  PIWIK_SITE:            <%= PIWIK_SITE.to_json %>,
+<% if defined?(PIWIK) %>
+  PIWIK:                 <%= PIWIK.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,
@@ -13,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;
@@ -22,8 +21,8 @@ OSM = {
     return url;
   },
 
-  mapParams: function (search) {
-    var params = {}, mapParams = {}, bounds, loc;
+  params: function(search) {
+    var params = {};
 
     search = (search || window.location.search).replace('?', '').split(/&|;/);
 
@@ -35,13 +34,23 @@ OSM = {
       params[key] = decodeURIComponent(val);
     }
 
+    return params;
+  },
+
+  mapParams: function (search) {
+    var params = OSM.params(search), mapParams = {}, loc, match;
+
     if (params.mlon && params.mlat) {
       mapParams.marker = true;
       mapParams.mlon = parseFloat(params.mlon);
       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) {
@@ -53,36 +62,21 @@ OSM = {
       }
     }
 
-    if (params.bbox) {
-      params.bbox = params.bbox.split(',');
-      bounds = L.latLngBounds(
-        [parseFloat(params.bbox[1]),
-         parseFloat(params.bbox[0])],
-        [parseFloat(params.bbox[3]),
-         parseFloat(params.bbox[2])]);
-    } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
-      bounds = L.latLngBounds(
-        [parseFloat(params.minlat),
-         parseFloat(params.minlon)],
-        [parseFloat(params.maxlat),
-         parseFloat(params.maxlon)]);
-    }
-
-    if (params.box === 'yes') {
-      mapParams.box = bounds;
+    match = window.location.pathname.match(/\/browse\/note\/(\d+)/);
+    if (match) {
+      mapParams.note = parseInt(match[1]);
+    } else if (params.note) {
+      mapParams.note = parseInt(params.note);
     }
 
     var hash = OSM.parseHash(location.hash);
 
     // Decide on a map starting position. Various ways of doing this.
-    if (hash.lat && hash.lon) {
+    if (hash.center) {
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
       mapParams.object_zoom = false;
-    } else if (bounds) {
-      mapParams.bounds = bounds;
-      mapParams.object_zoom = false;
     } else if (params.lon && params.lat) {
       mapParams.lon = parseFloat(params.lon);
       mapParams.lat = parseFloat(params.lat);
@@ -116,10 +110,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);
@@ -139,26 +129,28 @@ OSM = {
   },
 
   formatHash: function(args) {
+    var center, zoom, layers;
+
     if (args instanceof L.Map) {
-      args = {
-        lat: args.getCenter().lat,
-        lon: args.getCenter().lng,
-        zoom: args.getZoom(),
-        layers: args.getLayersCode()
-      };
+      center = args.getCenter();
+      zoom = args.getZoom();
+      layers = args.getLayersCode();
+    } else {
+      center = L.latLng(args.lat, args.lon);
+      zoom = args.zoom;
+      layers = args.layers || '';
     }
 
-    var precision = zoomPrecision(args.zoom),
-      hash = '#map=' + args.zoom +
-        '/' + args.lat.toFixed(precision) +
-        '/' + args.lon.toFixed(precision);
+    center = center.wrap();
+    layers = layers.replace('M', '');
 
-    if (args.layers) {
-      args.layers = args.layers.replace('M', '');
-    }
+    var precision = zoomPrecision(zoom),
+      hash = '#map=' + zoom +
+        '/' + center.lat.toFixed(precision) +
+        '/' + center.lng.toFixed(precision);
 
-    if (args.layers) {
-      hash += '&layers=' + args.layers;
+    if (layers) {
+      hash += '&layers=' + layers;
     }
 
     return hash;