Don't set state if it doesn't exist

[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 a3022f9ae905598e165918b9f11042be92f6cba4..cb37373518341fb44807973da75bf0732dc53fff 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -38,7 +38,7 @@ OSM = {
   },
 
   mapParams: function (search) {
-    var params = OSM.params(search), mapParams = {}, bounds, loc, match;
+    var params = OSM.params(search), mapParams = {}, loc, match;
 
     if (params.mlon && params.mlat) {
       mapParams.marker = true;
@@ -46,42 +46,12 @@ OSM = {
       mapParams.mlat = parseFloat(params.mlat);
     }
 
-    match = window.location.pathname.match(/\/browse\/(node|way|relation|changeset)\/(\d+)/);
-    if (match) {
-      mapParams.object_zoom = true;
-      mapParams.object = {type: match[1], id: parseInt(match[2])};
-    } else if (params.node || params.way || params.relation || params.note) {
-      mapParams.object_zoom = true;
-
-      if (params.node) {
-        mapParams.object = {type: 'node', id: parseInt(params.node)};
-      } else if (params.way) {
-        mapParams.object = {type: 'way', id: parseInt(params.way)};
-      } else if (params.relation) {
-        mapParams.object = {type: 'relation', id: parseInt(params.relation)};
-      }
-    }
-
-    match = window.location.pathname.match(/\/browse\/note\/(\d+)/);
-    if (match) {
-      mapParams.note = parseInt(match[1]);
-    } else if (params.note) {
-      mapParams.note = parseInt(params.note);
-    }
-
-    if (params.bbox) {
-      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) {
-      bounds = L.latLngBounds(
-        [parseFloat(params.minlat),
-         parseFloat(params.minlon)],
-        [parseFloat(params.maxlat),
-         parseFloat(params.maxlon)]);
+    if (params.node) {
+      mapParams.object = {type: 'node', id: parseInt(params.node)};
+    } else if (params.way) {
+      mapParams.object = {type: 'way', id: parseInt(params.way)};
+    } else if (params.relation) {
+      mapParams.object = {type: 'relation', id: parseInt(params.relation)};
     }
 
     var hash = OSM.parseHash(location.hash);
@@ -91,22 +61,14 @@ OSM = {
       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);
       mapParams.lat = parseFloat(params.lat);
       mapParams.zoom = parseInt(params.zoom || 5);
-      mapParams.object_zoom = false;
     } else if (params.mlon && params.mlat) {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
       mapParams.zoom = parseInt(params.zoom || 12);
-      mapParams.object_zoom = false;
     } else if (loc = $.cookie('_osm_location')) {
       loc = loc.split("|");
       mapParams.lon = parseFloat(loc[0]);
@@ -139,12 +101,41 @@ OSM = {
   },
 
   parseHash: function(hash) {
-    if (hash.indexOf('#') === 0) {
-      hash = hash.substr(1);
+    var i = hash.indexOf('#');
+    if (i < 0) {
+      return false;
     }
+
+    hash = hash.substr(i + 1);
+
+    if (hash === '') {
+      return false;
+    }
+
     hash = querystring.parse(hash);
-    var args = L.Hash.parseHash(hash.map || '') || {};
-    if (hash.layers) args.layers = hash.layers;
+
+    var args = hash.map.split("/");
+    if (args.length !== 3) {
+      return false;
+    }
+
+    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;
+    }
+
     return args;
   },