Merge remote-tracking branch 'upstream/master' into routing

[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 4c5faa8293d959eff71b7d0e2a6abf3cb4d8915f..033b2de8122e991513ab9f431ba8a504b4b2c4aa 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) {
@@ -61,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);
@@ -101,37 +111,25 @@ OSM = {
   },
 
   parseHash: function(hash) {
+    var args = {};
+
     var i = hash.indexOf('#');
     if (i < 0) {
-      return false;
+      return args;
     }
 
-    hash = hash.substr(i + 1);
+    hash = querystring.parse(hash.substr(i + 1));
 
-    if (hash === '') {
-      return false;
-    }
+    var map = (hash.map || '').split('/'),
+      zoom = parseInt(map[0], 10),
+      lat = parseFloat(map[1]),
+      lon = parseFloat(map[2]);
 
-    hash = querystring.parse(hash);
-
-    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;
     }
@@ -155,7 +153,7 @@ OSM = {
     center = center.wrap();
     layers = layers.replace('M', '');
 
-    var precision = zoomPrecision(zoom),
+    var precision = OSM.zoomPrecision(zoom),
       hash = '#map=' + zoom +
         '/' + center.lat.toFixed(precision) +
         '/' + center.lng.toFixed(precision);
@@ -165,5 +163,16 @@ OSM = {
     }
 
     return hash;
+  },
+
+  zoomPrecision: function(zoom) {
+    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+  },
+
+  locationCookie: function(map) {
+    var center = map.getCenter().wrap(),
+      zoom = map.getZoom(),
+      precision = OSM.zoomPrecision(zoom);
+    return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join('|');
   }
 };