Merge branch 'trial/viass' into trial/gui

This commit is contained in:
DennisSchiefer
2012-05-16 12:29:44 +01:00
4 changed files with 9 additions and 13 deletions
+1 -3
View File
@@ -136,10 +136,8 @@ OSRM.extend( OSRM.HistoryRoute,{
if(positions.length == 0)
return route;
route.push( {lat: positions[0].lat, lng: positions[0].lng });
for(var i=0; i<OSRM.G.response.via_points.length; i++)
route.push( {lat:OSRM.G.response.via_points[i][0], lng:OSRM.G.response.via_points[i][1]} );
route.push( {lat: positions[positions.length-1].lat, lng: positions[positions.length-1].lng });
return route;
},
@@ -192,4 +190,4 @@ OSRM.extend( OSRM.HistoryRoute,{
for(var i=0; i<hints.length; i++)
this._history[history_id].markers[i].hint = hints[i];
}
});
});
+5 -5
View File
@@ -47,12 +47,12 @@ findViaIndex: function( new_via_position ) {
// find correct index to insert new via node
var via_points = OSRM.G.response.via_points;
var new_via_index = via_points.length;
var new_via_index = via_points.length-2;
var via_index = Array();
for(var i=0; i<via_points.length; i++) {
via_index[i] = OSRM.Via._findNearestRouteSegment( new L.LatLng(via_points[i][0], via_points[i][1]) );
if(via_index[i] > nearest_index) {
new_via_index = i;
for(var i=1; i<via_points.length-1; i++) {
via_index[i-1] = OSRM.Via._findNearestRouteSegment( new L.LatLng(via_points[i][0], via_points[i][1]) );
if(via_index[i-1] > nearest_index) {
new_via_index = i-1;
break;
}
}