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

Do not override nogos on url load (#349)

Browse source
This commit is contained in:
Gautier P 2020-12-02 21:11:57 +01:00
parent fde629fcb0
commit 8ca602575c
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/index.js
View file

@ -394,11 +394,6 @@
var opts = router.parseUrlParams(url2params(url)); var opts = router.parseUrlParams(url2params(url));
router.setOptions(opts); router.setOptions(opts);
routingOptions.setOptions(opts); routingOptions.setOptions(opts);
if (circlego && opts.circlego) {
// must be done before nogos!
circlego.options.radius = opts.circlego[2];
circlego.setCircle([opts.circlego[0], opts.circlego[1]]);
}
nogos.setOptions(opts); nogos.setOptions(opts);
profile.update(opts); profile.update(opts);
@ -410,6 +405,10 @@
if (opts.pois) { if (opts.pois) {
pois.setMarkers(opts.pois); pois.setMarkers(opts.pois);
} }
if (circlego && opts.circlego) {
circlego.options.radius = opts.circlego[2];
circlego.setCircle([opts.circlego[0], opts.circlego[1]], opts.polylines != null);
}
}; };
var onInvalidHashChangeCb = function(params) { var onInvalidHashChangeCb = function(params) {

6
js/plugin/CircleGoArea.js
View file

@ -96,10 +96,10 @@ BR.CircleGoArea = L.Control.extend({
}, },
onMapClick: function(e) { onMapClick: function(e) {
this.setCircle([e.latlng.lng, e.latlng.lat]); this.setCircle([e.latlng.lng, e.latlng.lat], false);
}, },
setCircle: function(center) { setCircle: function(center, skipNogo) {
var self = this; var self = this;
var icon = L.VectorMarkers.icon({ var icon = L.VectorMarkers.icon({
icon: 'home', icon: 'home',
@ -119,7 +119,7 @@ BR.CircleGoArea = L.Control.extend({
this.clear(); this.clear();
marker.addTo(this.circleLayer); marker.addTo(this.circleLayer);
this.setNogoCircle(center); if (!skipNogo) this.setNogoCircle(center);
this.draw(false); this.draw(false);
}, },