Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'trial/viass' into trial/gui

Browse Source
This commit is contained in:
DennisSchiefer 2012-05-16 12:29:44 +01:00
commit 03bb7f4f40
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WebContent/OSRM.config.js
View File

@ -19,7 +19,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
// [has to be loaded directly after OSRM.base] // [has to be loaded directly after OSRM.base]
OSRM.DEFAULTS = { OSRM.DEFAULTS = {
HOST_ROUTING_URL: 'http://router.project-osrm.org/viaroute', //HOST_ROUTING_URL: 'http://router.project-osrm.org/viaroute',
HOST_ROUTING_URL: 'http://i10pc68:5000/viaroute',
HOST_SHORTENER_URL: 'http://map.project-osrm.org/shorten/', HOST_SHORTENER_URL: 'http://map.project-osrm.org/shorten/',
HOST_TIMESTAMP_URL: 'http://router.project-osrm.org/timestamp', HOST_TIMESTAMP_URL: 'http://router.project-osrm.org/timestamp',
HOST_GEOCODER_URL: 'http://nominatim.openstreetmap.org/search', HOST_GEOCODER_URL: 'http://nominatim.openstreetmap.org/search',

4
WebContent/base/OSRM.HistoryRoutes.js
View File

@ -136,10 +136,8 @@ OSRM.extend( OSRM.HistoryRoute,{
if(positions.length == 0) if(positions.length == 0)
return route; return route;
route.push( {lat: positions[0].lat, lng: positions[0].lng });
for(var i=0; i<OSRM.G.response.via_points.length; i++) 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: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; return route;
}, },
@ -192,4 +190,4 @@ OSRM.extend( OSRM.HistoryRoute,{
for(var i=0; i<hints.length; i++) for(var i=0; i<hints.length; i++)
this._history[history_id].markers[i].hint = hints[i]; this._history[history_id].markers[i].hint = hints[i];
} }
}); });

10
WebContent/base/OSRM.Via.js
View File

@ -47,12 +47,12 @@ findViaIndex: function( new_via_position ) {
// find correct index to insert new via node // find correct index to insert new via node
var via_points = OSRM.G.response.via_points; 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(); var via_index = Array();
for(var i=0; i<via_points.length; i++) { for(var i=1; i<via_points.length-1; i++) {
via_index[i] = OSRM.Via._findNearestRouteSegment( new L.LatLng(via_points[i][0], via_points[i][1]) ); via_index[i-1] = OSRM.Via._findNearestRouteSegment( new L.LatLng(via_points[i][0], via_points[i][1]) );
if(via_index[i] > nearest_index) { if(via_index[i-1] > nearest_index) {
new_via_index = i; new_via_index = i-1;
break; break;
} }
} }

5
WebContent/routing/OSRM.Routing.js
View File

@ -171,14 +171,11 @@ _updateHints: function(response) {
// snap all markers to the received route // snap all markers to the received route
_snapRoute: function() { _snapRoute: function() {
var positions = OSRM.G.route.getPositions();
var markers = OSRM.G.markers.route; var markers = OSRM.G.markers.route;
var via_points = OSRM.G.response.via_points; var via_points = OSRM.G.response.via_points;
markers[0].setPosition( positions[0] );
markers[markers.length-1].setPosition( positions[positions.length-1] );
for(var i=0; i<via_points.length; i++) for(var i=0; i<via_points.length; i++)
markers[i+1].setPosition( new L.LatLng(via_points[i][0], via_points[i][1]) ); markers[i].setPosition( new L.LatLng(via_points[i][0], via_points[i][1]) );
OSRM.Geocoder.updateAddress(OSRM.C.SOURCE_LABEL); OSRM.Geocoder.updateAddress(OSRM.C.SOURCE_LABEL);
OSRM.Geocoder.updateAddress(OSRM.C.TARGET_LABEL); OSRM.Geocoder.updateAddress(OSRM.C.TARGET_LABEL);