X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/031afed7aae4492a96bdf389ffc504a9955677ad..7c13b43f316d76226e0812651ea1026c337a5e03:/app/assets/javascripts/osm.js.erb diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 7b5df1865..922bd2639 100644 --- 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; }