X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/68a3df4d53c84508bf443058040379c3a18eb1a7..2f0794738c022f060a07d45f6bed3ea68ea4d166:/app/assets/javascripts/osm.js.erb?ds=inline

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 392bf5e0c..922bd2639 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -62,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);
@@ -102,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);
-
-    if (hash === '') {
-      return false;
-    }
+    hash = querystring.parse(hash.substr(i + 1));
 
-    hash = querystring.parse(hash);
+    var map = (hash.map || '').split('/'),
+      zoom = parseInt(map[0], 10),
+      lat = parseFloat(map[1]),
+      lon = parseFloat(map[2]);
 
-    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;
     }