Improve display of alternative download sources

[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 7b5df18655ec9255678e1c281b578fe8f6a971fc..922bd2639d031fe93135d7c586c0a270df1a3bfc 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -111,41 +111,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.substr(i + 1));
 
-    hash = querystring.parse(hash);
-
-    if (hash.map === undefined) {
-      return false;
-    }
+    var map = (hash.map || '').split('/'),
+      zoom = parseInt(map[0], 10),
+      lat = parseFloat(map[1]),
+      lon = parseFloat(map[2]);
 
-    var args = hash.map.split("/");
-    if (args.length !== 3) {
-      return false;
+    if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) {
+      args.center = new L.LatLng(lat, lon);
+      args.zoom = zoom;
     }
 
-    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;
     }