Add:core:Made routing parameters vehicleprofile dependent by adding route_depth tag. Fixes #456 if there are enough memory and CPU.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5216 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 68 insertions, 5 deletions

diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 2d1c7844..98f1e3cc 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -133,7 +133,7 @@ Waypoint</text></img>
 		<!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 -->
 		<tracking cdf_histsize="0"/>
 
-		<vehicleprofile name="car" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25">
+		<vehicleprofile name="car" route_depth="4:25%,8:40000,18:10000" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25">
 			<roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10">
 					<announcement level="0" distance_metric="25"/>
 					<announcement level="1" distance_metric="100"/>
@@ -327,8 +327,71 @@ Waypoint</text></img>
 			<roadprofile item_types="roundabout" speed="10" route_weight="10"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
 		</vehicleprofile>
-
-		<vehicleprofile name="bike" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0" static_speed="5" static_distance="25">
+		<vehicleprofile name="car_pedantic" route_depth="18:25%,18:40000" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25">
+			<roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10">
+					<announcement level="0" distance_metric="25"/>
+					<announcement level="1" distance_metric="100"/>
+					<announcement level="2" distance_metric="200"/>
+			</roadprofile>
+			<roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30">
+					<announcement level="0" distance_metric="50"/>
+					<announcement level="1" distance_metric="200"/>
+					<announcement level="2" distance_metric="500"/>
+			</roadprofile>
+			<roadprofile item_types="street_3_city" speed="40" route_weight="40">
+					<announcement level="0" distance_metric="50"/>
+					<announcement level="1" distance_metric="200"/>
+					<announcement level="2" distance_metric="500"/>
+			</roadprofile>
+			<roadprofile item_types="street_4_city" speed="50" route_weight="50">
+					<announcement level="0" distance_metric="50"/>
+					<announcement level="1" distance_metric="200"/>
+					<announcement level="2" distance_metric="500"/>
+			</roadprofile>
+			<roadprofile item_types="highway_city" speed="80" route_weight="80">
+					<announcement level="0" distance_metric="100"/>
+					<announcement level="1" distance_metric="400"/>
+					<announcement level="2" distance_metric="1000"/>
+			</roadprofile>
+			<roadprofile item_types="street_1_land" speed="60" route_weight="60">
+					<announcement level="0" distance_metric="100"/>
+					<announcement level="1" distance_metric="400"/>
+					<announcement level="2" distance_metric="1000"/>
+			</roadprofile>
+			<roadprofile item_types="street_2_land" speed="65" route_weight="65">
+					<announcement level="0" distance_metric="100"/>
+					<announcement level="1" distance_metric="400"/>
+					<announcement level="2" distance_metric="1000"/>
+			</roadprofile>
+			<roadprofile item_types="street_3_land" speed="70" route_weight="70">
+					<announcement level="0" distance_metric="100"/>
+					<announcement level="1" distance_metric="400"/>
+					<announcement level="2" distance_metric="1000"/>
+			</roadprofile>
+			<roadprofile item_types="street_4_land" speed="80" route_weight="80">
+					<announcement level="0" distance_metric="100"/>
+					<announcement level="1" distance_metric="400"/>
+					<announcement level="2" distance_metric="1000"/>
+			</roadprofile>
+			<roadprofile item_types="street_n_lanes" speed="120" route_weight="120">
+					<announcement level="0" distance_metric="300"/>
+					<announcement level="1" distance_metric="1000"/>
+					<announcement level="2" distance_metric="2000"/>
+			</roadprofile>
+			<roadprofile item_types="highway_land" speed="120" route_weight="120">
+					<announcement level="0" distance_metric="300"/>
+					<announcement level="1" distance_metric="1000"/>
+					<announcement level="2" distance_metric="2000"/>
+			</roadprofile>
+			<roadprofile item_types="ramp" speed="40" route_weight="40">
+					<announcement level="0" distance_metric="50"/>
+					<announcement level="1" distance_metric="200"/>
+					<announcement level="2" distance_metric="500"/>
+			</roadprofile>
+			<roadprofile item_types="roundabout" speed="10" route_weight="10"/>
+			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
+		</vehicleprofile>
+		<vehicleprofile name="bike" route_depth="18:25%,18:40000" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0" static_speed="5" static_distance="25">
 			<roadprofile item_types="steps" speed="2" route_weight="5">
 					<announcement level="0" distance_metric="25"/>
 					<announcement level="1" distance_metric="100"/>
@@ -389,7 +452,7 @@ Waypoint</text></img>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
 		</vehicleprofile>
 
-		<vehicleprofile name="pedestrian" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10">
+		<vehicleprofile name="pedestrian" route_depth="18:25%,18:10000" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10">
 			<roadprofile item_types="footway,bridleway,path,steps" speed="5" route_weight="5">
 					<announcement level="0" distance_metric="25"/>
 					<announcement level="1" distance_metric="100"/>
@@ -438,7 +501,7 @@ Waypoint</text></img>
 			<roadprofile item_types="roundabout" speed="5" route_weight="5"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
 		</vehicleprofile>
-		<vehicleprofile name="horse" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10">
+		<vehicleprofile name="horse" route_depth="18:25%,18:40000" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10">
 			<roadprofile item_types="bridleway" speed="10" route_weight="10">
 					<announcement level="0" distance_metric="25"/>
 					<announcement level="1" distance_metric="100"/>