X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e2f55c1c1b3345be7c7737a27eb27c8964420b9c..f24309ad3e7b2a805f032afdef9765dc6d0bc022:/app/assets/javascripts/osm.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index ad6d5cb9c..cb3737351 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -101,15 +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; },