Merge remote-tracking branch 'osmlab/user-display'

[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 5343b039cc8d6e82f3e4875a8e4cc1a3b06b398b..eb5ce64f310b178126b5885186e6032a809ef8a4 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -22,8 +22,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,16 +35,18 @@ OSM = {
       params[key] = decodeURIComponent(val);
     }
 
+    return params;
+  },
+
+  mapParams: function (search) {
+    var params = OSM.params(search), mapParams = {}, bounds, loc;
+
     if (params.mlon && params.mlat) {
       mapParams.marker = true;
       mapParams.mlon = parseFloat(params.mlon);
       mapParams.mlat = parseFloat(params.mlat);
     }
 
-    if (params.layers) {
-      mapParams.layers = params.layers;
-    }
-
     if (params.node || params.way || params.relation) {
       mapParams.object_zoom = true;
 
@@ -76,14 +78,17 @@ OSM = {
       mapParams.box = bounds;
     }
 
+    var hash = OSM.parseHash(location.hash);
+
     // Decide on a map starting position. Various ways of doing this.
-    var hash = L.Hash.parseHash(location.hash);
-    if (hash) {
+    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.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) {
@@ -101,7 +106,6 @@ OSM = {
       mapParams.lon = parseFloat(loc[0]);
       mapParams.lat = parseFloat(loc[1]);
       mapParams.zoom = parseInt(loc[2]);
-      mapParams.layers = loc[3];
     } else if (OSM.home) {
       mapParams.lon = OSM.home.lon;
       mapParams.lat = OSM.home.lat;
@@ -118,7 +122,7 @@ OSM = {
       mapParams.zoom = parseInt(params.zoom || 5);
     }
 
-    mapParams.notes = params.notes == "yes";
+    mapParams.layers = hash.layers || (loc && loc[3]) || '';
 
     if (params.note) {
       mapParams.note = parseInt(params.note);
@@ -132,10 +136,41 @@ OSM = {
     return mapParams;
   },
 
+  parseHash: function(hash) {
+    if (hash.indexOf('#') === 0) {
+      hash = hash.substr(1);
+    }
+    hash = querystring.parse(hash);
+    var args = L.Hash.parseHash(hash.map || '') || {};
+    if (hash.layers) args.layers = hash.layers;
+    return args;
+  },
+
   formatHash: function(args) {
-    var precision = zoomPrecision(args.zoom);
-    return '#' + args.zoom +
-           '/' + args.lat.toFixed(precision) +
-           '/' + args.lon.toFixed(precision);
+    var center, zoom, layers;
+
+    if (args instanceof L.Map) {
+      center = args.getCenter();
+      zoom = args.getZoom();
+      layers = args.getLayersCode();
+    } else {
+      center = L.latLng(args.lat, args.lon);
+      zoom = args.zoom;
+      layers = args.layers || '';
+    }
+
+    center = center.wrap();
+    layers = layers.replace('M', '');
+
+    var precision = zoomPrecision(zoom),
+      hash = '#map=' + zoom +
+        '/' + center.lat.toFixed(precision) +
+        '/' + center.lng.toFixed(precision);
+
+    if (layers) {
+      hash += '&layers=' + layers;
+    }
+
+    return hash;
   }
 };