X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ba4a3e3ce96eddc9bbbcde1f255a80f65f49dc8f..8c82be0537e1bbdcbd7f20d5f26deaae09774281:/app/assets/javascripts/router.js diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index cadb6b628..9657549b1 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -106,19 +106,15 @@ OSM.Router = function(map, rts) { currentPath = path; currentRoute = routes.recognize(currentPath); currentRoute.run('popstate', currentPath); - var state = e.originalEvent.state; - if (state.center) { - map.setView(state.center, state.zoom, {animate: false}); - map.updateLayers(state.layers); - } + map.setState(e.originalEvent.state, {animate: false}); }); router.route = function (url) { var path = url.replace(/#.*/, ''), route = routes.recognize(path); if (!route) return false; - window.history.pushState(OSM.parseHash(url) || {}, document.title, url); currentRoute.run('unload'); + window.history.pushState(OSM.parseHash(url), document.title, url); currentPath = path; currentRoute = route; currentRoute.run('pushstate', currentPath); @@ -154,9 +150,7 @@ OSM.Router = function(map, rts) { if (hash === currentHash) return; currentHash = hash; var state = OSM.parseHash(hash); - if (!state) return; - map.setView(state.center, state.zoom); - map.updateLayers(state.layers); + map.setState(state); router.stateChange(state, hash); }; @@ -173,6 +167,11 @@ OSM.Router = function(map, rts) { router.stateChange(loadState || {}); }; + router.setCurrentPath = function (path) { + currentPath = path; + currentRoute = routes.recognize(currentPath); + }; + map.on('moveend baselayerchange overlaylayerchange', router.updateHash); $(window).on('hashchange', router.hashUpdated);