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

add error handling for permalinks

Browse source
This commit is contained in:
Norbert Renner 2014-08-23 13:12:55 +02:00
parent 2c5906ad7b
commit c4d87b122c
2 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/index.js
View file

@ -155,7 +155,7 @@
}
}
});
routing.on('routing:routeWaypointEnd', function(evt) {
routing.on('routing:routeWaypointEnd routing:setWaypointsEnd', function(evt) {
onUpdate(evt && evt.err);
});

48
js/plugin/Routing.js
View file

@ -52,21 +52,43 @@ BR.Routing = L.Routing.extend({
this._segments.clearLayers();
}
,setWaypoints: function(latLngs) {
,setWaypoints: function(latLngs, cb) {
var i;
var callbackCount = 0;
var firstErr;
var $this = this;
var index = 0;
var add = function() {
if (!latLngs || index >= latLngs.length) { return; }
var prev = $this._waypoints._last;
$this.addWaypoint(latLngs[index], prev, null, function(err, m) {
add(++index);
});
var callback = function(err, data) {
callbackCount++;
firstErr = firstErr || err;
if (callbackCount >= latLngs.length) {
$this.fire('routing:setWaypointsEnd', { err: firstErr });
if (cb) {
cb(firstErr);
}
}
};
add();
this.fire('routing:setWaypointsStart');
for (i = 0; latLngs && i < latLngs.length; i++) {
this.addWaypoint(latLngs[i], this._waypoints._last, null, callback);
}
}
// patch to fix error when line is null or error line
// (when called while still segments to calculate, e.g. permalink or fast drawing)
,toPolyline: function() {
var latLngs = [];
this._eachSegment(function(m1, m2, line) {
// omit if null (still calculating) or error
// NOTE: feature check specific to BRouter GeoJSON response, workaround to detect error line
if (line && line.feature) {
latLngs = latLngs.concat(line.getLatLngs());
}
});
return L.polyline(latLngs);
}
,_routeSegment: function(m1, m2, cb) {
@ -100,7 +122,11 @@ BR.Routing = L.Routing.extend({
var segments = [];
this._eachSegment(function(m1, m2, line) {
// omit if null (still calculating) or error
// NOTE: feature check specific to BRouter GeoJSON response, workaround to detect error line
if (line && line.feature) {
segments.push(line);
}
});
return segments;