Fix the "Where am I?" link

[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 e414d26ffa0a1b783420212781e0516a4c0fdd40..d2fc81e387a48ee897125c6caa71e0ea66bcc6a1 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -81,6 +81,8 @@ OSM = {
       mapParams.zoom = hash.zoom;
       mapParams.object_zoom = false;
     } else if (bounds) {
       mapParams.zoom = hash.zoom;
       mapParams.object_zoom = false;
     } else if (bounds) {

+      mapParams.lon = bounds.getCenter().lng; // Not used by main map, but
+      mapParams.lat = bounds.getCenter().lat; // are used by iD/Potlatch.

       mapParams.bounds = bounds;
       mapParams.object_zoom = false;
     } else if (params.lon && params.lat) {
       mapParams.bounds = bounds;
       mapParams.object_zoom = false;
     } else if (params.lon && params.lat) {


@@ -139,26 +141,28 @@ OSM = {
   },
 
   formatHash: function(args) {
   },
 
   formatHash: function(args) {

+    var center, zoom, layers;
+

     if (args instanceof L.Map) {
     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;
     }
 
     return hash;