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 f3c1c3607a834ddb8b5e6879e677ee63f3d46880..d2fc81e387a48ee897125c6caa71e0ea66bcc6a1 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,13 +1,14 @@
 OSM = {
 <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
-  PIWIK_LOCATION:   <%= PIWIK_LOCATION.to_json %>,
-  PIWIK_SITE:       <%= PIWIK_SITE.to_json %>,
+  PIWIK_LOCATION:        <%= PIWIK_LOCATION.to_json %>,
+  PIWIK_SITE:            <%= PIWIK_SITE.to_json %>,
 <% end %>
 
-  MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
-  SERVER_URL:       <%= SERVER_URL.to_json %>,
-  API_VERSION:      <%= API_VERSION.to_json %>,
-  STATUS:           <%= STATUS.to_json %>,
+  MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,
+  SERVER_URL:            <%= SERVER_URL.to_json %>,
+  API_VERSION:           <%= API_VERSION.to_json %>,
+  STATUS:                <%= STATUS.to_json %>,
+  MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,
 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
@@ -22,7 +23,7 @@ OSM = {
   },
 
   mapParams: function (search) {
-    var params = {}, mapParams = {}, loc;
+    var params = {}, mapParams = {}, bounds, loc;
 
     search = (search || window.location.search).replace('?', '').split(/&|;/);
 
@@ -40,10 +41,6 @@ OSM = {
       mapParams.mlat = parseFloat(params.mlat);
     }
 
-    if (params.layers) {
-      mapParams.layers = params.layers;
-    }
-
     if (params.node || params.way || params.relation) {
       mapParams.object_zoom = true;
 
@@ -56,21 +53,37 @@ OSM = {
       }
     }
 
-    // Decide on a lat lon to initialise the map with. Various ways of doing this
     if (params.bbox) {
-      var bbox = params.bbox.split(",");
-      mapParams.bbox = true;
-      mapParams.minlon = parseFloat(bbox[0]);
-      mapParams.minlat = parseFloat(bbox[1]);
-      mapParams.maxlon = parseFloat(bbox[2]);
-      mapParams.maxlat = parseFloat(bbox[3]);
-      mapParams.object_zoom = false;
+      params.bbox = params.bbox.split(',');
+      bounds = L.latLngBounds(
+        [parseFloat(params.bbox[1]),
+         parseFloat(params.bbox[0])],
+        [parseFloat(params.bbox[3]),
+         parseFloat(params.bbox[2])]);
     } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
-      mapParams.bbox = true;
-      mapParams.minlon = parseFloat(params.minlon);
-      mapParams.minlat = parseFloat(params.minlat);
-      mapParams.maxlon = parseFloat(params.maxlon);
-      mapParams.maxlat = parseFloat(params.maxlat);
+      bounds = L.latLngBounds(
+        [parseFloat(params.minlat),
+         parseFloat(params.minlon)],
+        [parseFloat(params.maxlat),
+         parseFloat(params.maxlon)]);
+    }
+
+    if (params.box === 'yes') {
+      mapParams.box = bounds;
+    }
+
+    var hash = OSM.parseHash(location.hash);
+
+    // Decide on a map starting position. Various ways of doing this.
+    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) {
       mapParams.lon = parseFloat(params.lon);
@@ -87,27 +100,26 @@ 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;
       mapParams.zoom = 10;
     } else if (OSM.location) {
-      mapParams.bbox = true;
-      mapParams.minlon = OSM.location.minlon;
-      mapParams.minlat = OSM.location.minlat;
-      mapParams.maxlon = OSM.location.maxlon;
-      mapParams.maxlat = OSM.location.maxlat;
+      mapParams.bounds = L.latLngBounds(
+        [OSM.location.minlat,
+         OSM.location.minlon],
+        [OSM.location.maxlat,
+         OSM.location.maxlon]);
     } else {
       mapParams.lon = -0.1;
       mapParams.lat = 51.5;
       mapParams.zoom = parseInt(params.zoom || 5);
     }
 
-    if (mapParams.bbox) {
-      mapParams.box = params.box == "yes";
-      mapParams.lon = (mapParams.minlon + mapParams.maxlon) / 2;
-      mapParams.lat = (mapParams.minlat + mapParams.maxlat) / 2;
+    mapParams.layers = hash.layers || (loc && loc[3]) || '';
+
+    if (params.note) {
+      mapParams.note = parseInt(params.note);
     }
 
     var scale = parseFloat(params.scale);
@@ -116,5 +128,43 @@ 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 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;
   }
 };