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

Add support for nogo weights in BRouter interface

Browse source
This commit is contained in:
Phyks (Lucas Verney) 2019-01-04 23:08:54 +01:00
parent 7f4a0bfe3b
commit d43827cdd2
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
js/router/BRouter.js
View file

@ -218,6 +218,10 @@ L.BRouter = L.Class.extend({
s += this._formatLatLng(circle.getLatLng()); s += this._formatLatLng(circle.getLatLng());
s += L.BRouter.NUMBER_SEPARATOR; s += L.BRouter.NUMBER_SEPARATOR;
s += Math.round(circle.getRadius()); s += Math.round(circle.getRadius());
if (circle.options.weight) {
s += L.BRouter.NUMBER_SEPARATOR;
s += circle.options.weight;
}
if (i < (nogos.length - 1)) { if (i < (nogos.length - 1)) {
s += L.BRouter.GROUP_SEPARATOR; s += L.BRouter.GROUP_SEPARATOR;
} }
@ -236,11 +240,16 @@ L.BRouter = L.Class.extend({
groups = s.split(L.BRouter.GROUP_SEPARATOR); groups = s.split(L.BRouter.GROUP_SEPARATOR);
for (var i = 0; i < groups.length; i++) { for (var i = 0; i < groups.length; i++) {
// lng,lat,radius // lng,lat,radius(,weight)
numbers = groups[i].split(L.BRouter.NUMBER_SEPARATOR); numbers = groups[i].split(L.BRouter.NUMBER_SEPARATOR);
// TODO refactor: pass simple obj, create circle in NogoAreas; use shapeOptions of instance // TODO refactor: pass simple obj, create circle in NogoAreas; use shapeOptions of instance
// [lat,lng],radius // [lat,lng],radius
nogos.push(L.circle([numbers[1], numbers[0]], {radius: numbers[2]})); // Parse as a nogo circle
var nogoOptions = {radius: numbers[2]};
if (numbers.length > 3) {
nogoOptions.weight = numbers[3];
}
nogos.push(L.circle([numbers[1], numbers[0]], nogoOptions));
} }
return nogos; return nogos;
@ -258,4 +267,4 @@ L.BRouter = L.Class.extend({
L.bRouter = function (options) { L.bRouter = function (options) {
return new L.BRouter(options); return new L.BRouter(options);
}; };