Rework the way the move listener is disabled during initial
positiong of pages to avoid accidentally leaving it disabled
for the first user move of the map in some cases.
function addObject(type, id, center) {
var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
function addObject(type, id, center) {
var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
- if (!window.location.hash && bounds.isValid()) {
- OSM.router.moveListenerOff();
- map.once('moveend', OSM.router.moveListenerOn);
- if (center || !map.getBounds().contains(bounds)) map.fitBounds(bounds);
+ if (!window.location.hash && bounds.isValid() &&
+ (center || !map.getBounds().contains(bounds))) {
+ OSM.router.withoutMoveListener(function () {
+ map.fitBounds(bounds);
+ });
latLng = L.latLng(data.coordinates.split(','));
if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
latLng = L.latLng(data.coordinates.split(','));
if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
- OSM.router.moveListenerOff();
- map.once('moveend', OSM.router.moveListenerOn);
- map.setView(latLng, 15, {reset: true});
+ OSM.router.withoutMoveListener(function () {
+ map.setView(latLng, 15, {reset: true});
+ });
OSM.Router also handles updating the hash portion of the URL containing transient
map state such as the position and zoom level. Some route controllers may wish to
temporarily suppress updating the hash (for example, to omit the hash on pages
OSM.Router also handles updating the hash portion of the URL containing transient
map state such as the position and zoom level. Some route controllers may wish to
temporarily suppress updating the hash (for example, to omit the hash on pages
- such as `/way/1234` unless the map is moved). This can be done by calling
- `OSM.router.moveListenerOff` and `OSM.router.moveListenerOn`.
+ such as `/way/1234` unless the map is moved). This can be done by using
+ `OSM.router.withoutMoveListener` to run a block of code that may update
+ move the map without the hash changing.
*/
OSM.Router = function(map, rts) {
var escapeRegExp = /[\-{}\[\]+?.,\\\^$|#\s]/g;
*/
OSM.Router = function(map, rts) {
var escapeRegExp = /[\-{}\[\]+?.,\\\^$|#\s]/g;
router.stateChange(state, hash);
};
router.stateChange(state, hash);
};
- router.moveListenerOn = function() {
- map.on('moveend', router.updateHash);
- };
+ router.withoutMoveListener = function (callback) {
+ function disableMoveListener() {
+ map.off('moveend', router.updateHash);
+ map.once('moveend', function () {
+ map.on('moveend', router.updateHash);
+ });
+ }
- router.moveListenerOff = function() {
- map.off('moveend', router.updateHash);
+ map.once('movestart', disableMoveListener);
+ callback();
+ map.off('movestart', disableMoveListener);
};
router.load = function() {
};
router.load = function() {