ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Reduce changes with upstream

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2017-04-28 10:35:06 +02:00
parent 3d3dd376a4
commit 915189b171
2 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
js/index.js
View file

@ -71,7 +71,7 @@
if (result) {
routing.clear();
onUpdate();
urlHash.updateHash();
urlHash.onMapMove();
}
}
});
@ -271,19 +271,24 @@
return params;
};
urlHash = new L.Hash(map, mapLayers, function() {
var url = router.getUrl(routing.getWaypoints(), null);
return '&' + url.substr('brouter?'.length+1);
}, onHashChangeCb, onInvalidHashChangeCb);
routingOptions.on('update', urlHash.updateHash, urlHash);
nogos.on('update', urlHash.updateHash, urlHash);
urlHash = new L.Hash(map, mapLayers);
urlHash.additionalCb = function() {
var url = router.getUrl(routing.getWaypoints(), null);
return '&' + url.substr('brouter?'.length+1);
};
urlHash.onHashChangeCb = onHashChangeCb;
urlHash.onInvalidHashChangeCb = onInvalidHashChangeCb;
urlHash.layers = mapLayers;
routingOptions.on('update', urlHash.onMapMove, urlHash);
nogos.on('update', urlHash.onMapMove, urlHash);
// waypoint add, move, delete (but last)
routing.on('routing:routeWaypointEnd', urlHash.updateHash, urlHash);
routing.on('routing:routeWaypointEnd', urlHash.onMapMove, urlHash);
// delete last waypoint
routing.on('waypoint:click', function (evt) {
var r = evt.marker._routing;
if (!r.prevMarker && !r.nextMarker) {
urlHash.updateHash();
urlHash.onMapMove();
}
}, urlHash);