cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expose more router functions

Browse source
This commit is contained in:
John Firebaugh 2013-11-14 12:26:58 -08:00
parent 22408c3e5b
commit c9600ea323
1 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

47
app/assets/javascripts/router.js
View file

@ -50,25 +50,7 @@ OSM.Router = function(map, rts) {
currentRoute.run('load', currentPath);
var stateChange;
map.on('moveend baselayerchange overlaylayerchange', function() {
var hash = OSM.formatHash(map);
if (hash === currentHash) return;
currentHash = hash;
stateChange(OSM.parseHash(hash), hash);
});
$(window).on('hashchange', function() {
var hash = location.hash;
if (hash === currentHash) return;
currentHash = hash;
var state = OSM.parseHash(hash);
if (!state) return;
map.setView(state.center, state.zoom);
map.updateLayers(state.layers);
stateChange(state, hash);
});
var router, stateChange;
if (window.history && window.history.pushState) {
stateChange = function(state, hash) {
@ -94,7 +76,7 @@ OSM.Router = function(map, rts) {
}
});
return function (url) {
router = function (url) {
var path = url.replace(/#.*/, ''),
route = routes.recognize(path);
if (!route) return false;
@ -110,8 +92,31 @@ OSM.Router = function(map, rts) {
window.location.replace(hash);
};
return function (url) {
router = function (url) {
window.location.assign(url);
}
}
router.updateHash = function() {
var hash = OSM.formatHash(map);
if (hash === currentHash) return;
currentHash = hash;
stateChange(OSM.parseHash(hash), hash);
};
router.hashUpdated = function() {
var hash = location.hash;
if (hash === currentHash) return;
currentHash = hash;
var state = OSM.parseHash(hash);
if (!state) return;
map.setView(state.center, state.zoom);
map.updateLayers(state.layers);
stateChange(state, hash);
};
map.on('moveend baselayerchange overlaylayerchange', router.updateHash);
$(window).on('hashchange', router.hashUpdated);
return router;
};