From 996ab4ef03a122ae7f01f205ff4ce0262a6c9c39 Mon Sep 17 00:00:00 2001
From: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Wed, 17 Sep 2014 19:11:43 +0000
Subject: Fix:Core:Removed deprecated distance_metric attributes from
 navit_shipped.xml, as a follow up to r5822

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5898 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/navit_shipped.xml | 540 ++++++++++++++++++++++++------------------------
 1 file changed, 270 insertions(+), 270 deletions(-)

diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 2bbbb1e55..457d6e292 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -184,64 +184,64 @@ Waypoint</text></img>
 
 		<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"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="roundabout" speed="10" route_weight="10"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
@@ -254,64 +254,64 @@ Waypoint</text></img>
 
 		<vehicleprofile name="car_shortest" 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="60">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="60">
-					<announcement level="0" distance_metric="50"/>
-					<announcement level="1" distance_metric="200"/>
-					<announcement level="2" distance_metric="500"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_3_city" speed="40" route_weight="60">
-					<announcement level="0" distance_metric="50"/>
-					<announcement level="1" distance_metric="200"/>
-					<announcement level="2" distance_metric="500"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_4_city" speed="50" route_weight="60">
-					<announcement level="0" distance_metric="50"/>
-					<announcement level="1" distance_metric="200"/>
-					<announcement level="2" distance_metric="500"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="highway_city" speed="80" route_weight="60">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_2_land" speed="65" route_weight="60">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_3_land" speed="70" route_weight="60">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_4_land" speed="80" route_weight="60">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_n_lanes" speed="120" route_weight="60">
-					<announcement level="0" distance_metric="300"/>
-					<announcement level="1" distance_metric="1000"/>
-					<announcement level="2" distance_metric="2000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="highway_land" speed="120" route_weight="60">
-					<announcement level="0" distance_metric="300"/>
-					<announcement level="1" distance_metric="1000"/>
-					<announcement level="2" distance_metric="2000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="ramp" speed="40" route_weight="60">
-					<announcement level="0" distance_metric="50"/>
-					<announcement level="1" distance_metric="200"/>
-					<announcement level="2" distance_metric="500"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="roundabout" speed="10" route_weight="60"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="60"/>
@@ -319,188 +319,188 @@ Waypoint</text></img>
 
 		<vehicleprofile name="car_avoid_tolls" flags="0x4000000" flags_forward_mask="0x4000402" 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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="roundabout" speed="10" route_weight="10"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
 		</vehicleprofile>
 		<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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</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"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="path,track_ground" speed="12" route_weight="12">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="track_gravelled" speed="17" route_weight="15">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<!-- cycleways, paved tracks, serviceways etc. are the favourite ways -->
 			<roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<!-- residential, unclassified, living street etc. -->
 			<roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<!-- tertiary and minor roads are acceptable, but should be avoided in favour of tracks and cycleways -->
 			<roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<!-- secondary etc. are acceptable when necessary -->
 			<roadprofile item_types="street_3_city" speed="22" route_weight="10">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<!-- primary, trunk etc. should be avoided -->
 			<roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<!-- Those types do not appear in maptool.c and therefore are not used ATM -->
 			<roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="roundabout" speed="20" route_weight="10"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
@@ -508,108 +508,108 @@ Waypoint</text></img>
 
 		<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"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="hiking_mountain" speed="4" route_weight="4">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="track_gravelled,track_unpaved,track_grass,track_ground,hiking" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="track_paved" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="cycleway" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="roundabout" speed="5" route_weight="5"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
 		</vehicleprofile>
 		<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"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="footway,path,steps" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="track_gravelled" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="track_paved" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="cycleway" speed="5" route_weight="5">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="4">
-					<announcement level="0" distance_metric="25"/>
-					<announcement level="1" distance_metric="100"/>
-					<announcement level="2" distance_metric="200"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="2">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="4">
-					<announcement level="0" distance_metric="100"/>
-					<announcement level="1" distance_metric="400"/>
-					<announcement level="2" distance_metric="1000"/>
+					<announcement level="0"/>
+					<announcement level="1"/>
+					<announcement level="2"/>
 			</roadprofile>
 			<roadprofile item_types="roundabout" speed="5" route_weight="2"/>
 			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
@@ -642,64 +642,64 @@ Waypoint</text></img>
                                 vehicle_width="274" vehicle_height="411" vehicle_length="2134"
                                 vehicle_weight="36287" vehicle_axle_weight="15422">
                         <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="5">
-                                        <announcement level="0" distance_metric="25"/>
-                                        <announcement level="1" distance_metric="100"/>
-                                        <announcement level="2" distance_metric="200"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="street_2_city,track_paved" speed="20" route_weight="20">
-                                        <announcement level="0" distance_metric="50"/>
-                                        <announcement level="1" distance_metric="200"/>
-                                        <announcement level="2" distance_metric="500"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="street_3_city" speed="30" route_weight="30">
-                                        <announcement level="0" distance_metric="50"/>
-                                        <announcement level="1" distance_metric="200"/>
-                                        <announcement level="2" distance_metric="500"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                        <roadprofile item_types="street_4_city" speed="40" route_weight="40">
-                                        <announcement level="0" distance_metric="50"/>
-                                        <announcement level="1" distance_metric="200"/>
-                                        <announcement level="2" distance_metric="500"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="highway_city" speed="70" route_weight="70">
-                                        <announcement level="0" distance_metric="100"/>
-                                        <announcement level="1" distance_metric="400"/>
-                                        <announcement level="2" distance_metric="1000"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="street_1_land" speed="50" route_weight="50">
-                                        <announcement level="0" distance_metric="100"/>
-                                        <announcement level="1" distance_metric="400"/>
-                                        <announcement level="2" distance_metric="1000"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="street_2_land" speed="55" route_weight="55">
-                                        <announcement level="0" distance_metric="100"/>
-                                        <announcement level="1" distance_metric="400"/>
-                                        <announcement level="2" distance_metric="1000"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="street_3_land" speed="60" route_weight="60">
-                                        <announcement level="0" distance_metric="100"/>
-                                        <announcement level="1" distance_metric="400"/>
-                                        <announcement level="2" distance_metric="1000"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="street_4_land" speed="70" route_weight="70">
-                                        <announcement level="0" distance_metric="100"/>
-                                        <announcement level="1" distance_metric="400"/>
-                                        <announcement level="2" distance_metric="1000"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="street_n_lanes" speed="80" route_weight="80">
-                                        <announcement level="0" distance_metric="300"/>
-                                        <announcement level="1" distance_metric="1000"/>
-                                        <announcement level="2" distance_metric="2000"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="highway_land" speed="80" route_weight="80">
-                                        <announcement level="0" distance_metric="300"/>
-                                        <announcement level="1" distance_metric="1000"/>
-                                        <announcement level="2" distance_metric="2000"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="ramp" speed="30" route_weight="30">
-                                        <announcement level="0" distance_metric="50"/>
-                                        <announcement level="1" distance_metric="200"/>
-                                        <announcement level="2" distance_metric="500"/>
+                                        <announcement level="0"/>
+                                        <announcement level="1"/>
+                                        <announcement level="2"/>
                         </roadprofile>
                         <roadprofile item_types="roundabout" speed="5" route_weight="5"/>
                         <roadprofile item_types="ferry" speed="40" route_weight="40"/>
-- 
cgit v1.2.1