X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/560763d224c7b4020c04c9f04553277d92b80dc2..e3062aa794b89a37b53f4b4b39ea1c985f9da82d:/app/assets/javascripts/osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 4c5faa829..15c1682d5 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -8,6 +8,7 @@ OSM = {
   API_VERSION:           <%= API_VERSION.to_json %>,
   STATUS:                <%= STATUS.to_json %>,
   MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,
+  OVERPASS_URL:          <%= OVERPASS_URL.to_json %>,
 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
@@ -46,6 +47,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,10 +63,15 @@ OSM = {
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
-    } else if (params.lon && params.lat) {
-      mapParams.lon = parseFloat(params.lon);
-      mapParams.lat = parseFloat(params.lat);
-      mapParams.zoom = parseInt(params.zoom || 5);
+    } 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.mlon && params.mlat) {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
@@ -101,37 +108,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);
-
-    var args = hash.map.split("/");
-    if (args.length !== 3) {
-      return false;
-    }
+    hash = querystring.parse(hash.substr(i + 1));
 
-    var zoom = parseInt(args[0], 10),
-      lat = parseFloat(args[1]),
-      lon = parseFloat(args[2]);
+    var map = (hash.map || '').split('/'),
+      zoom = parseInt(map[0], 10),
+      lat = parseFloat(map[1]),
+      lon = parseFloat(map[2]);
 
-    if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) {
-      return false;
+    if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) {
+      args.center = new L.LatLng(lat, lon);
+      args.zoom = zoom;
     }
 
-    args = {
-      center: new L.LatLng(lat, lon),
-      zoom: zoom
-    };
-
     if (hash.layers) {
       args.layers = hash.layers;
     }
@@ -155,7 +150,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 +160,31 @@ 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('|');
+  },
+
+  distance: function(latlng1, latlng2) {
+    var lat1 = latlng1.lat * Math.PI / 180,
+      lng1 = latlng1.lng * Math.PI / 180,
+      lat2 = latlng2.lat * Math.PI / 180,
+      lng2 = latlng2.lng * Math.PI / 180,
+      latdiff = lat2 - lat1,
+      lngdiff = lng2 - lng1;
+
+    return 6372795 * 2 * Math.asin(
+      Math.sqrt(
+        Math.pow(Math.sin(latdiff / 2), 2) + 
+        Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(lngdiff / 2), 2)
+      ));
   }
 };