From 32ced88b5ff6cde9a1d9e51c2d4523944c70175e Mon Sep 17 00:00:00 2001
From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Mon, 24 Mar 2008 17:39:29 +0000
Subject: [PATCH] Add:Core:Added patches from Christoph Eckert

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@958 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/src/item_def.h  |    7 +
 navit/src/navit.xml   | 1070 +++++++++++++++++++++++++++++++++++++++++++++++--
 navit/src/osm2navit.c |   13 +-
 3 files changed, 1042 insertions(+), 48 deletions(-)

diff --git a/navit/src/item_def.h b/navit/src/item_def.h
index 2eb2832..b46823b 100644
--- a/navit/src/item_def.h
+++ b/navit/src/item_def.h
@@ -278,6 +278,13 @@ ITEM(coverage)
 ITEM(street_pedestrian)
 ITEM(bridge)
 ITEM(tunnel)
+ITEM(bridleway)
+ITEM(cycleway)
+ITEM(footway)
+ITEM(steps)
+ITEM(track_paved)
+ITEM(track_gravelled)
+ITEM(track_unpaved)
 /* Area */
 ITEM2(0xc0000000,area)
 ITEM2(0xc0000001,area_unspecified)
diff --git a/navit/src/navit.xml b/navit/src/navit.xml
index e4ccff3..b7cd45c 100644
--- a/navit/src/navit.xml
+++ b/navit/src/navit.xml
@@ -79,7 +79,7 @@ Change to your home coordinates.
 		<map type="garmin" enabled="yes" data="/path/to/img" debug="4"/>
 	</mapset>
 
-	<layout name="Tag" color= "#ffefb7">
+	<layout name="Car" color= "#ffefb7">
 		<layer name="sea" details="0">
 			<item type="image" order="0-">
 				<image />
@@ -188,42 +188,67 @@ Change to your home coordinates.
 			<item type="street_nopass" order="10-">
 				<polyline color="#000000" width="1" /> 
 			</item>
- 			<item type="street_pedestrian" order="10">
- 				<polyline color="#d2d2d2" width="3" />
- 				<polyline color="#dddddd" width="1" />
- 			</item>
- 			<item type="street_pedestrian" order="11">
- 				<polyline color="#d2d2d2" width="5" />
- 				<polyline color="#dddddd" width="3" />
- 			</item>
- 			<item type="street_pedestrian" order="12">
- 				<polyline color="#d2d2d2" width="8" />
- 				<polyline color="#dddddd" width="6" />
- 			</item>
- 			<item type="street_pedestrian" order="13">
- 				<polyline color="#d2d2d2" width="9" />
- 				<polyline color="#dddddd" width="7" />
- 			</item>
- 			<item type="street_pedestrian" order="14">
- 				<polyline color="#d2d2d2" width="13" />
- 				<polyline color="#dddddd" width="9" />
- 			</item>
- 			<item type="street_pedestrian" order="15">
- 				<polyline color="#d2d2d2" width="18" />
- 				<polyline color="#dddddd" width="14" />
- 			</item>
- 			<item type="street_pedestrian" order="16">
- 				<polyline color="#d2d2d2" width="21" />
- 				<polyline color="#dddddd" width="17" />
- 			</item>
- 			<item type="street_pedestrian" order="17">
- 				<polyline color="#d2d2d2" width="25" />
- 				<polyline color="#dddddd" width="21" />
- 			</item>
- 			<item type="street_pedestrian" order="18">
- 				<polyline color="#d2d2d2" width="40" />
- 				<polyline color="#dddddd" width="34" />
- 			</item>
+			<item type="track_paved" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="track_gravelled" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="track_unpaved" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="bridleway" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="cycleway" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="footway" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="steps" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="street_pedestrian" order="10">
+				<polyline color="#d2d2d2" width="3" />
+				<polyline color="#dddddd" width="1" />
+			</item>
+			<item type="street_pedestrian" order="11">
+				<polyline color="#d2d2d2" width="5" />
+				<polyline color="#dddddd" width="3" />
+			</item>
+			<item type="street_pedestrian" order="12">
+				<polyline color="#d2d2d2" width="8" />
+				<polyline color="#dddddd" width="6" />
+			</item>
+			<item type="street_pedestrian" order="13">
+				<polyline color="#d2d2d2" width="9" />
+				<polyline color="#dddddd" width="7" />
+			</item>
+			<item type="street_pedestrian" order="14">
+				<polyline color="#d2d2d2" width="13" />
+				<polyline color="#dddddd" width="9" />
+			</item>
+			<item type="street_pedestrian" order="15">
+				<polyline color="#d2d2d2" width="18" />
+				<polyline color="#dddddd" width="14" />
+			</item>
+			<item type="street_pedestrian" order="16">
+				<polyline color="#d2d2d2" width="21" />
+				<polyline color="#dddddd" width="17" />
+			</item>
+			<item type="street_pedestrian" order="17">
+				<polyline color="#d2d2d2" width="25" />
+				<polyline color="#dddddd" width="21" />
+			</item>
+			<item type="street_pedestrian" order="18">
+				<polyline color="#d2d2d2" width="40" />
+				<polyline color="#dddddd" width="34" />
+			</item>
+			<item type="street_service"	order="10">
+				<polyline color="#d2d2d2" width="4" />
+				<polyline color="#fefefe" width="2" />
+			</item>
 			<item type="street_service"	order="11">
 				<polyline color="#d2d2d2" width="4" />
 				<polyline color="#fefefe" width="2" />
@@ -256,7 +281,7 @@ Change to your home coordinates.
 				<polyline color="#d2d2d2" width="11" />
 				<polyline color="#fefefe" width="9" />
 			</item>
-
+			
 			<item type="street_0,street_1_city,street_1_land" order="10">
 				<polyline color="#d2d2d2" width="4" /> 
 				<polyline color="#ffffff" width="2" /> 
@@ -617,9 +642,9 @@ Change to your home coordinates.
 				<circle color="#000000" radius="3" label_size="15" />
 			</item>
 			<item type="track" order="3-">
-                                <polyline color="#3f3f3f" width="1" />
-                        </item>
-
+				<polyline color="#3f3f3f" width="1" />
+			</item>
+			
 			<item type="poi_airport" order="5-">
 				<icon src="airport.xpm" />
 			</item>
@@ -1017,7 +1042,968 @@ Change to your home coordinates.
 			</item>
 		</layer>
 	</layout>
-	<layout name="Nacht" color="#ffefb7">
+	<layout name="Bike" color= "#ffefb7">
+		<layer name="sea" details="0">
+			<item type="image" order="0-">
+				<image />
+			</item>
+			<item type="poly_wood" order="0-">
+				<polygon color="#8ec78d" /> 
+			</item>
+			<item type="poly_town" order="0-">
+				<polygon color="#ffc895" /> 
+				<polyline color="#ebb481" /> 
+			</item>
+			<item type="poly_water" order="0-">
+				<polygon color="#82c8ea" /> 
+				<polyline color="#5096b8" /> 
+				<label label_size="5" /> 
+			</item>
+			<item type="poly_park" order="0-">
+				<polygon color="#7cc334" /> 
+				<label label_size="5" /> 
+			</item>
+			<item type="poly_airport" order="0-">
+				<polygon color="#a0a0a0" /> 
+			</item>
+			<item type="poly_sport" order="0-">
+				<polygon color="#4af04f" /> 
+			</item>
+			<item type="poly_industry,poly_place" order="0-">
+				<polygon color="#e6e6e6" /> 
+			</item>
+			<item type="poly_building" order="0-">
+				<polygon color="#b6a6a6" />
+			</item>
+			<item type="water_line" order="0-">
+				<polyline color="#5096b8" width="1" /> 
+				<label label_size="5" /> 
+			</item>
+			<item type="poly_apron" order="0-">
+				<polygon color="#d0d0d0" />
+			</item>
+			<item type="poly_terminal" order="7-">
+				<polygon color="#e3c6a6" />
+			</item>
+			<item type="poly_cemetery" order="1-">
+				<polygon color="#bde3cb" />
+			</item>
+			<item type="poly_car_parking" order="1-">
+				<polygon color="#e7cf87" />
+			</item>
+			<item type="rail" order="6-">
+				<polyline color="#808080" width="3" /> 
+			</item>
+			<item type="ferry" order="5-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="border_country" order="0-">
+				<polyline color="#b8434e" width="1" /> 
+			</item>
+			<item type="border_state" order="0-">
+				<polyline color="#808080" width="1" /> 
+			</item>
+			<item type="height_line_1" order="0-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="height_line_2" order="0-">
+				<polyline color="#000000" width="2" /> 
+			</item>
+			<item type="street_route" order="2">
+				<polyline color="#0000a0" width="4" /> 
+			</item>
+			<item type="street_route" order="3-5">
+				<polyline color="#0000a0" width="8" /> 
+			</item>
+			<item type="street_route" order="6">
+				<polyline color="#0000a0" width="10" /> 
+			</item>
+			<item type="street_route" order="7-8">
+				<polyline color="#0000a0" width="16" /> 
+			</item>
+			<item type="street_route" order="9-10">
+				<polyline color="#0000a0" width="20" /> 
+			</item>
+			<item type="street_route" order="11">
+				<polyline color="#0000a0" width="28" /> 
+			</item>
+			<item type="street_route" order="12">
+				<polyline color="#0000a0" width="32" /> 
+			</item>
+			<item type="street_route" order="13">
+				<polyline color="#0000a0" width="52" /> 
+			</item>
+			<item type="street_route" order="14">
+				<polyline color="#0000a0" width="64" /> 
+			</item>
+			<item type="street_route" order="15">
+				<polyline color="#0000a0" width="68" /> 
+			</item>
+			<item type="street_route" order="16">
+				<polyline color="#0000a0" width="132" /> 
+			</item>
+			<item type="street_route" order="17">
+				<polyline color="#0000a0" width="268" /> 
+			</item>
+			<item type="street_route" order="18">
+				<polyline color="#0000a0" width="530" /> 
+			</item>
+			<item type="street_nopass" order="10-">
+				<polyline color="#000000" width="1" /> 
+			</item>
+			<item type="track_paved" order="10-">
+				<polyline color="#d2d2d2" width="4" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="track_gravelled" order="10-">
+				<polyline color="#d2d2d2" width="3" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="track_unpaved" order="10-">
+				<polyline color="#d2d2d2" width="2" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="bridleway" order="10-">
+				<polyline color="#d2d2d2" width="2" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="cycleway" order="10-">
+				<polyline color="#d2d2d2" width="3" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="footway" order="10-">
+				<polyline color="#d2d2d2" width="2" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="steps" order="10-">
+				<polyline color="#d2d2d2" width="1" />
+				<polyline color="#fefefe" width="2" /> 
+			</item>
+			<item type="street_pedestrian" order="10">
+				<polyline color="#d2d2d2" width="3" />
+				<polyline color="#dddddd" width="1" />
+			</item>
+			<item type="street_pedestrian" order="11">
+				<polyline color="#d2d2d2" width="5" />
+				<polyline color="#dddddd" width="3" />
+			</item>
+			<item type="street_pedestrian" order="12">
+				<polyline color="#d2d2d2" width="8" />
+				<polyline color="#dddddd" width="6" />
+			</item>
+			<item type="street_pedestrian" order="13">
+				<polyline color="#d2d2d2" width="9" />
+				<polyline color="#dddddd" width="7" />
+			</item>
+			<item type="street_pedestrian" order="14">
+				<polyline color="#d2d2d2" width="13" />
+				<polyline color="#dddddd" width="9" />
+			</item>
+			<item type="street_pedestrian" order="15">
+				<polyline color="#d2d2d2" width="18" />
+				<polyline color="#dddddd" width="14" />
+			</item>
+			<item type="street_pedestrian" order="16">
+				<polyline color="#d2d2d2" width="21" />
+				<polyline color="#dddddd" width="17" />
+			</item>
+			<item type="street_pedestrian" order="17">
+				<polyline color="#d2d2d2" width="25" />
+				<polyline color="#dddddd" width="21" />
+			</item>
+			<item type="street_pedestrian" order="18">
+				<polyline color="#d2d2d2" width="40" />
+				<polyline color="#dddddd" width="34" />
+			</item>
+			<item type="street_service"	order="10">
+				<polyline color="#d2d2d2" width="4" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="street_service"	order="11">
+				<polyline color="#d2d2d2" width="4" />
+				<polyline color="#fefefe" width="2" />
+			</item>
+			<item type="street_service"	order="12">
+				<polyline color="#d2d2d2" width="5" />
+				<polyline color="#fefefe" width="3" />
+			</item>
+			<item type="street_service"	order="13">
+				<polyline color="#d2d2d2" width="6" />
+				<polyline color="#fefefe" width="4" />
+			</item>
+			<item type="street_service"	order="14">
+				<polyline color="#d2d2d2" width="7" />
+				<polyline color="#fefefe" width="5" />
+			</item>
+			<item type="street_service"	order="15">
+				<polyline color="#d2d2d2" width="8" />
+				<polyline color="#fefefe" width="6" />
+			</item>
+			<item type="street_service"	order="16">
+				<polyline color="#d2d2d2" width="9" />
+				<polyline color="#fefefe" width="7" />
+			</item>
+			<item type="street_service"	order="17">
+				<polyline color="#d2d2d2" width="10" />
+				<polyline color="#fefefe" width="8" />
+			</item>
+			<item type="street_service"	order="18">
+				<polyline color="#d2d2d2" width="11" />
+				<polyline color="#fefefe" width="9" />
+			</item>
+			
+			<item type="street_0,street_1_city,street_1_land" order="10">
+				<polyline color="#d2d2d2" width="4" /> 
+				<polyline color="#ffffff" width="2" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="11">
+				<polyline color="#d2d2d2" width="6" /> 
+				<polyline color="#ffffff" width="4" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="12">
+				<polyline color="#d2d2d2" width="10" /> 
+				<polyline color="#ffffff" width="8" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="13">
+				<polyline color="#d2d2d2" width="12" /> 
+				<polyline color="#ffffff" width="9" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="14">
+				<polyline color="#d2d2d2" width="15" /> 
+				<polyline color="#ffffff" width="13" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="15">
+				<polyline color="#d2d2d2" width="17" /> 
+				<polyline color="#ffffff" width="14" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="16">
+				<polyline color="#d2d2d2" width="33" /> 
+				<polyline color="#ffffff" width="26" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="17">
+				<polyline color="#d2d2d2" width="69" /> 
+				<polyline color="#ffffff" width="61" /> 
+			</item>
+			<item type="street_0,street_1_city,street_1_land" order="18">
+				<polyline color="#d2d2d2" width="132" /> 
+				<polyline color="#ffffff" width="126" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="7-8">
+				<polyline color="#c0c0c0" width="2" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="9">
+				<polyline color="#c0c0c0" width="4" /> 
+				<polyline color="#ffff00" width="2" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="10">
+				<polyline color="#c0c0c0" width="6" /> 
+				<polyline color="#ffff00" width="4" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="11">
+				<polyline color="#c0c0c0" width="8" /> 
+				<polyline color="#ffff00" width="6" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="12">
+				<polyline color="#c0c0c0" width="12" /> 
+				<polyline color="#ffff00" width="9" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="13">
+				<polyline color="#c0c0c0" width="15" /> 
+				<polyline color="#ffff00" width="11" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="14">
+				<polyline color="#c0c0c0" width="18" /> 
+				<polyline color="#ffff00" width="14" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="15">
+				<polyline color="#c0c0c0" width="21" /> 
+				<polyline color="#ffff00" width="17" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="16">
+				<polyline color="#c0c0c0" width="35" /> 
+				<polyline color="#ffff00" width="30" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="17">
+				<polyline color="#c0c0c0" width="73" /> 
+				<polyline color="#ffff00" width="67" /> 
+			</item>
+			<item type="street_2_city,street_2_land" order="18">
+				<polyline color="#c0c0c0" width="144" /> 
+				<polyline color="#ffff00" width="138" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="7-8">
+				<polyline color="#a0a0a0" width="3" /> 
+				<polyline color="#ffff00" width="1" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="9">
+				<polyline color="#a0a0a0" width="5" /> 
+				<polyline color="#ffff00" width="3" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="10">
+				<polyline color="#a0a0a0" width="8" /> 
+				<polyline color="#ffff00" width="6" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="11">
+				<polyline color="#a0a0a0" width="9" /> 
+				<polyline color="#ffff00" width="7" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="12">
+				<polyline color="#a0a0a0" width="13" /> 
+				<polyline color="#ffff00" width="9" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="13">
+				<polyline color="#a0a0a0" width="18" /> 
+				<polyline color="#ffff00" width="14" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="14">
+				<polyline color="#a0a0a0" width="21" /> 
+				<polyline color="#ffff00" width="17" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="15">
+				<polyline color="#a0a0a0" width="25" /> 
+				<polyline color="#ffff00" width="21" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="16">
+				<polyline color="#a0a0a0" width="40" /> 
+				<polyline color="#ffff00" width="34" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="17">
+				<polyline color="#a0a0a0" width="79" /> 
+				<polyline color="#ffff00" width="73" /> 
+			</item>
+			<item type="street_3_city,street_3_land,ramp,roundabout" order="18">
+				<polyline color="#a0a0a0" width="156" /> 
+				<polyline color="#ffff00" width="150" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="2-6">
+				<polyline color="#404040" width="1" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="7-8">
+				<polyline color="#404040" width="3" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="9">
+				<polyline color="#000000" width="5" /> 
+				<polyline color="#ff0000" width="3" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="10">
+				<polyline color="#000000" width="6" /> 
+				<polyline color="#ff0000" width="4" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="11">
+				<polyline color="#000000" width="9" /> 
+				<polyline color="#ff0000" width="7" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="12">
+				<polyline color="#000000" width="13" /> 
+				<polyline color="#ff0000" width="9" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="13">
+				<polyline color="#000000" width="18" /> 
+				<polyline color="#ff0000" width="14" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="14">
+				<polyline color="#000000" width="21" /> 
+				<polyline color="#ff0000" width="17" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="15">
+				<polyline color="#000000" width="24" /> 
+				<polyline color="#ff0000" width="20" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="16">
+				<polyline color="#000000" width="39" /> 
+				<polyline color="#ff0000" width="33" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="17">
+				<polyline color="#000000" width="78" /> 
+				<polyline color="#ff0000" width="72" /> 
+			</item>
+			<item type="street_4_city,street_4_land,street_n_lanes" order="18">
+				<polyline color="#000000" width="156" /> 
+				<polyline color="#ff0000" width="150" /> 
+			</item>
+			<item type="highway_city,highway_land" order="2">
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="3-5">
+				<polyline color="#ff0000" width="3" /> 
+				<polyline color="#ffff00" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="6">
+				<polyline color="#ff0000" width="4" /> 
+				<polyline color="#ffff00" width="2" /> 
+			</item>
+			<item type="highway_city,highway_land" order="7-8">
+				<polyline color="#ff0000" width="7" /> 
+				<polyline color="#ffff00" width="5" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="9-10">
+				<polyline color="#ff0000" width="9" /> 
+				<polyline color="#ffff00" width="5" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="11">
+				<polyline color="#ff0000" width="13" /> 
+				<polyline color="#ffff00" width="9" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="12">
+				<polyline color="#ff0000" width="15" /> 
+				<polyline color="#ffff00" width="10" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="13">
+				<polyline color="#ff0000" width="25" /> 
+				<polyline color="#ffff00" width="17" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="14">
+				<polyline color="#ff0000" width="31" /> 
+				<polyline color="#ffff00" width="24" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="15">
+				<polyline color="#ff0000" width="33" /> 
+				<polyline color="#ffff00" width="27" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="16">
+				<polyline color="#ff0000" width="65" /> 
+				<polyline color="#ffff00" width="59" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="17">
+				<polyline color="#ff0000" width="133" /> 
+				<polyline color="#ffff00" width="127" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="highway_city,highway_land" order="18">
+				<polyline color="#ff0000" width="264" /> 
+				<polyline color="#ffff00" width="258" /> 
+				<polyline color="#ff0000" width="1" /> 
+			</item>
+			<item type="street_unkn" order="0-">
+				<polyline color="#8080ff" width="3" /> 
+			</item>
+			<item type="highway_exit_label" order="10-">
+				<circle color="#000000" radius="3" label_size="7" />
+			</item>
+			<item type="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes" order="10-18">
+				<label label_size="8" />
+			</item>
+			<item type="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
+				<label label_size="9" />
+			</item>
+			<item type="street_nopass,street_0,street_1_city,street_1_land" order="12-18">
+				<label label_size="9" />
+			</item>
+			<item type="aeroway_taxiway" order="10">
+				<polyline color="#989994" width="4" />
+				<polyline color="#d3dbbc" width="2" />
+			</item>
+			<item type="aeroway_taxiway" order="11">
+				<polyline color="#989994" width="6" />
+				<polyline color="#d3dbbc" width="4" />
+			</item>
+			<item type="aeroway_taxiway" order="12">
+				<polyline color="#989994" width="10" />
+				<polyline color="#d3dbbc" width="8" />
+			</item>
+			<item type="aeroway_taxiway" order="13">
+				<polyline color="#989994" width="12" />
+				<polyline color="#d3dbbc" width="9" />
+			</item>
+			<item type="aeroway_taxiway" order="14">
+				<polyline color="#989994" width="15" />
+				<polyline color="#d3dbbc" width="13" />
+			</item>
+			<item type="aeroway_taxiway" order="15">
+				<polyline color="#989994" width="17" />
+				<polyline color="#d3dbbc" width="14" />
+			</item>
+			<item type="aeroway_taxiway" order="16">
+				<polyline color="#989994" width="33" />
+				<polyline color="#d3dbbc" width="26" />
+			</item>
+			<item type="aeroway_taxiway" order="17">
+				<polyline color="#989994" width="69" />
+				<polyline color="#d3dbbc" width="61" />
+			</item>
+			<item type="aeroway_taxiway" order="18">
+				<polyline color="#989994" width="132" />
+				<polyline color="#d3dbbc" width="126" />
+			</item>
+			<item type="aeroway_runway" order="2-6">
+				<polyline color="#404040" width="1" />
+			</item>
+			<item type="aeroway_runway" order="7-8">
+				<polyline color="#404040" width="3" />
+				<polyline color="#d3dbbc" width="1" />
+			</item>
+			<item type="aeroway_runway" order="9">
+				<polyline color="#6b6f5f" width="5" />
+				<polyline color="#d3dbbc" width="3" />
+			</item>
+			<item type="aeroway_runway" order="10">
+				<polyline color="#6b6f5f" width="6" />
+				<polyline color="#d3dbbc" width="4" />
+			</item>
+			<item type="aeroway_runway" order="11">
+				<polyline color="#6b6f5f" width="9" />
+				<polyline color="#d3dbbc" width="7" />
+			</item>
+			<item type="aeroway_runway" order="12">
+				<polyline color="#6b6f5f" width="13" />
+				<polyline color="#d3dbbc" width="9" />
+			</item>
+			<item type="aeroway_runway" order="13">
+				<polyline color="#6b6f5f" width="18" />
+				<polyline color="#d3dbbc" width="14" />
+			</item>
+			<item type="aeroway_runway" order="14">
+				<polyline color="#6b6f5f" width="21" />
+				<polyline color="#d3dbbc" width="17" />
+			</item>
+			<item type="aeroway_runway" order="15">
+				<polyline color="#6b6f5f" width="24" />
+				<polyline color="#d3dbbc" width="20" />
+			</item>
+			<item type="aeroway_runway" order="16">
+				<polyline color="#6b6f5f" width="39" />
+				<polyline color="#d3dbbc" width="33" />
+			</item>
+			<item type="aeroway_runway" order="17">
+				<polyline color="#6b6f5f" width="78" />
+				<polyline color="#d3dbbc" width="72" />
+			</item>
+			<item type="aeroway_runway" order="18">
+				<polyline color="#6b6f5f" width="156" />
+				<polyline color="#d3dbbc" width="150" />
+			</item>
+			<item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
+				<circle color="#000000" radius="3" label_size="7" />
+			</item>
+			<item type="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
+				<circle color="#000000" radius="3" label_size="7" />
+			</item>
+			<item type="town_label_1e3,town_label_2e3,town_label_5e3" order="10-">
+				<circle color="#000000" radius="3" label_size="7" />
+			</item>
+			<item type="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
+				<circle color="#000000" radius="3" label_size="7" />
+			</item>
+			<item type="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
+				<circle color="#000000" radius="3" label_size="7" />
+			</item>
+			<item type="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
+				<circle color="#000000" radius="3" label_size="10" />
+			</item>
+			<item type="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
+				<circle color="#000000" radius="3" label_size="10" />
+			</item>
+			<item type="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
+				<circle color="#000000" radius="3" label_size="15" />
+			</item>
+			<item type="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
+				<circle color="#000000" radius="3" label_size="15" />
+			</item>
+			<item type="town_label_1e7,district_label_1e7" order="1-">
+				<circle color="#000000" radius="3" label_size="15" />
+			</item>
+			<item type="track" order="3-">
+				<polyline color="#3f3f3f" width="1" />
+			</item>
+			
+			<item type="poi_airport" order="5-">
+				<icon src="airport.xpm" />
+			</item>
+			<item type="town_ghost" order="0-">
+				<icon src="ghost_town.xpm" />
+			</item>
+			<item type="poi_hotel" order="12-">
+				<icon src="hotel.xpm" />
+			</item>
+			<item type="poi_car_parking" order="11-">
+				<icon src="parking.xpm" />
+			</item>
+			<item type="poi_car_dealer_parts" order="0-">
+				<icon src="car_dealer.xpm" />
+			</item>
+			<item type="poi_fuel" order="10-">
+				<icon src="fuel.xpm" />
+			</item>
+			<item type="poi_shopping" order="10-">
+				<icon src="shopping.xpm" />
+			</item>
+			<item type="poi_attraction" order="5-">
+				<icon src="attraction.xpm" />
+			</item>
+			<item type="poi_cafe" order="12-">
+				<icon src="cafe.xpm" />
+			</item>
+			<item type="poi_bar" order="12-">
+				<icon src="bar.xpm" />
+			</item>
+			<item type="poi_bridge" order="0-">
+				<icon src="bridge.xpm" />
+			</item>
+			<item type="highway_exit" order="11-">
+				<icon src="exit.xpm" />
+			</item>
+			<item type="poi_camp_rv" order="9-">
+				<icon src="camping.xpm" />
+			</item>
+			<item type="poi_museum_history" order="12-">
+				<icon src="museum.xpm" />
+			</item>
+			<item type="poi_hospital" order="12-">
+				<icon src="hospital.xpm" />
+			</item>
+			<item type="point_unkn" order="0-">
+				<circle color="#8080ff" radius="3" />
+			</item>
+			<item type="poi_dining" order="12-">
+				<icon src="dining.xpm" />
+			</item>
+			<item type="poi_fastfood" order="12-">
+				<icon src="fastfood.xpm" />
+			</item>
+			<item type="poi_police" order="12-">
+				<icon src="police.xpm" />
+			</item>
+			<item type="poi_auto_club" order="0-">
+				<icon src="auto_club.xpm" />
+			</item>
+			<item type="poi_autoservice" order="0-">
+				<icon src="autoservice.xpm" />
+			</item>
+			<item type="poi_bank" order="12-">
+				<icon src="bank.xpm" />
+			</item>
+			<item type="poi_bay" order="0-">
+				<icon src="bay.xpm" />
+			</item>
+			<item type="poi_bend" order="0-">
+				<icon src="bend.xpm" />
+			</item>
+			<item type="poi_boat_ramp" order="0-">
+				<icon src="boat_ramp.xpm" />
+			</item>
+			<item type="poi_border_station" order="0-">
+				<icon src="border_station.xpm" />
+			</item>
+			<item type="poi_bowling" order="0-">
+				<icon src="bowling.xpm" />
+			</item>
+			<item type="poi_bus_station" order="12-">
+				<icon src="bus.xpm" />
+			</item>
+			<item type="poi_bus_stop" order="12-">
+				<icon src="bus.xpm" />
+			</item>
+			<item type="poi_bussines_service" order="0-">
+				<icon src="bussines_service.xpm" />
+			</item>
+			<item type="poi_car_rent" order="0-">
+				<icon src="car_rent.xpm" />
+			</item>
+			<item type="poi_car_wash" order="0-">
+				<icon src="car_wash.xpm" />
+			</item>
+			<item type="poi_casino" order="0-">
+				<icon src="casino.xpm" />
+			</item>
+			<item type="poi_cemetery" order="0-">
+				<icon src="cemetery.xpm" />
+			</item>
+			<item type="poi_church" order="11-">
+				<icon src="church.xpm" />
+			</item>
+			<item type="poi_cinema" order="12-">
+				<icon src="cinema.xpm" />
+			</item>
+			<item type="poi_civil" order="0-">
+				<icon src="civil.xpm" />
+			</item>
+			<item type="poi_communication" order="0-">
+				<icon src="communication.xpm" />
+			</item>
+			<item type="poi_concert" order="0-">
+				<icon src="concert.xpm" />
+			</item>
+			<item type="poi_cove" order="0-">
+				<icon src="cove.xpm" />
+			</item>
+			<item type="poi_crossing" order="0-">
+				<icon src="crossing.xpm" />
+			</item>
+			<item type="poi_dam" order="0-">
+				<icon src="dam.xpm" />
+			</item>
+			<item type="poi_danger_area" order="0-">
+				<icon src="danger_area.xpm" />
+			</item>
+			<item type="poi_dangerous" order="0-">
+				<icon src="dangerous.xpm" />
+			</item>
+			<item type="poi_daymark" order="0-">
+				<icon src="daymark.xpm" />
+			</item>
+			<item type="poi_diving" order="0-">
+				<icon src="diving.xpm" />
+			</item>
+			<item type="poi_drinking_water" order="0-">
+				<icon src="drinking_water.xpm" />
+			</item>
+			<item type="poi_emergency" order="0-">
+				<icon src="emergency.xpm" />
+			</item>
+			<item type="poi_fair" order="0-">
+				<icon src="fair.xpm" />
+			</item>
+			<item type="poi_firebrigade" order="12-">
+				<icon src="firebrigade.xpm" />
+			</item>
+			<item type="poi_fish" order="0-">
+				<icon src="fish.xpm" />
+			</item>
+			<item type="poi_forbiden_area" order="0-">
+				<icon src="forbiden_area.xpm" />
+			</item>
+			<item type="poi_garmin" order="0-">
+				<icon src="garmin.xpm" />
+			</item>
+			<item type="poi_golf" order="12-">
+				<icon src="golf.xpm" />
+			</item>
+			<item type="poi_goverment_building" order="0-">
+				<icon src="goverment_building.xpm" />
+			</item>
+			<item type="poi_height" order="0-">
+				<icon src="height.xpm" />
+			</item>
+			<item type="poi_heliport" order="0-">
+				<icon src="heliport.xpm" />
+			</item>
+			<item type="poi_hotspring" order="0-">
+				<icon src="hotspring.xpm" />
+			</item>
+			<item type="poi_icesport" order="0-">
+				<icon src="icesport.xpm" />
+			</item>
+			<item type="poi_information" order="12-">
+				<icon src="information.xpm" />
+			</item>
+			<item type="poi_justice" order="0-">
+				<icon src="justice.xpm" />
+			</item>
+			<item type="poi_landmark" order="0-">
+				<icon src="landmark.xpm" />
+			</item>
+			<item type="poi_levee" order="0-">
+				<icon src="levee.xpm" />
+			</item>
+			<item type="poi_library" order="12-">
+				<icon src="library.xpm" />
+			</item>
+			<item type="poi_locale" order="0-">
+				<icon src="locale.xpm" />
+			</item>
+			<item type="poi_loudspeaker" order="0-">
+				<icon src="loudspeaker.xpm" />
+			</item>
+			<item type="poi_mall" order="0-">
+				<icon src="mall.xpm" />
+			</item>
+			<item type="poi_manmade_feature" order="0-">
+				<icon src="manmade_feature.xpm" />
+			</item>
+			<item type="poi_marine" order="0-">
+				<icon src="marine.xpm" />
+			</item>
+			<item type="poi_marine_type" order="0-">
+				<icon src="marine_type.xpm" />
+			</item>
+			<item type="poi_mark" order="0-">
+				<icon src="mark.xpm" />
+			</item>
+			<item type="poi_military" order="0-">
+				<icon src="military.xpm" />
+			</item>
+			<item type="poi_mine" order="0-">
+				<icon src="mine.xpm" />
+			</item>
+			<item type="poi_nondangerous" order="0-">
+				<icon src="nondangerous.xpm" />
+			</item>
+			<item type="poi_oil_field" order="0-">
+				<icon src="oil_field.xpm" />
+			</item>
+			<item type="poi_personal_service" order="0-">
+				<icon src="personal_service.xpm" />
+			</item>
+			<item type="poi_pharmacy" order="12-">
+				<icon src="pharmacy.xpm" />
+			</item>
+			<item type="poi_post" order="13-">
+				<icon src="post.xpm" />
+			</item>
+			<item type="poi_public_office" order="0-">
+				<icon src="public_office.xpm" />
+			</item>
+			<item type="poi_repair_service" order="0-">
+				<icon src="repair_service.xpm" />
+			</item>
+			<item type="poi_resort" order="0-">
+				<icon src="resort.xpm" />
+			</item>
+			<item type="poi_rest_room" order="13-">
+				<icon src="rest_room.xpm" />
+			</item>
+			<item type="poi_restaurant" order="12-">
+				<icon src="restaurant.xpm" />
+			</item>
+			<item type="poi_restricted_area" order="0-">
+				<icon src="restricted_area.xpm" />
+			</item>
+			<item type="poi_restroom" order="13-">
+				<icon src="restroom.xpm" />
+			</item>
+			<item type="poi_sailing" order="0-">
+				<icon src="sailing.xpm" />
+			</item>
+			<item type="poi_scenic_area" order="0-">
+				<icon src="scenic_area.xpm" />
+			</item>
+			<item type="poi_school" order="12-">
+				<icon src="school.xpm" />
+			</item>
+			<item type="poi_service" order="0-">
+				<icon src="service.xpm" />
+			</item>
+			<item type="poi_shop_apparel" order="0-">
+				<icon src="shop_apparel.xpm" />
+			</item>
+			<item type="poi_shop_computer" order="0-">
+				<icon src="shop_computer.xpm" />
+			</item>
+			<item type="poi_shop_department" order="0-">
+				<icon src="shop_department.xpm" />
+			</item>
+			<item type="poi_shop_furnish" order="0-">
+				<icon src="shop_furnish.xpm" />
+			</item>
+			<item type="poi_shop_grocery" order="0-">
+				<icon src="shop_grocery.xpm" />
+			</item>
+			<item type="poi_shop_handg" order="0-">
+				<icon src="shop_handg.xpm" />
+			</item>
+			<item type="poi_shop_merchandise" order="0-">
+				<icon src="shop_merchandise.xpm" />
+			</item>
+			<item type="poi_shop_retail" order="0-">
+				<icon src="shop_retail.xpm" />
+			</item>
+			<item type="poi_shower" order="0-">
+				<icon src="shower.xpm" />
+			</item>
+			<item type="poi_skiing" order="12-">
+				<icon src="skiing.xpm" />
+			</item>
+			<item type="poi_social_service" order="0-">
+				<icon src="social_service.xpm" />
+			</item>
+			<item type="poi_sounding" order="0-">
+				<icon src="sounding.xpm" />
+			</item>
+			<item type="poi_sport" order="0-">
+				<icon src="sport.xpm" />
+			</item>
+			<item type="poi_stadium" order="0-">
+				<icon src="stadium.xpm" />
+			</item>
+			<item type="poi_subdivision" order="0-">
+				<icon src="subdivision.xpm" />
+			</item>
+			<item type="poi_swimming" order="12-">
+				<icon src="swimming.xpm" />
+			</item>
+			<item type="poi_telephone" order="13-">
+				<icon src="telephone.xpm" />
+			</item>
+			<item type="poi_theater" order="12-">
+				<icon src="theater.xpm" />
+			</item>
+			<item type="poi_tide" order="0-">
+				<icon src="tide.xpm" />
+			</item>
+			<item type="poi_tower" order="13-">
+				<icon src="tower.xpm" />
+			</item>
+			<item type="poi_trail" order="0-">
+				<icon src="trail.xpm" />
+			</item>
+			<item type="poi_truck_stop" order="0-">
+				<icon src="truck_stop.xpm" />
+			</item>
+			<item type="poi_tunnel" order="0-">
+				<icon src="tunnel.xpm" />
+			</item>
+			<item type="poi_wine" order="0-">
+				<icon src="wine.xpm" />
+			</item>
+			<item type="poi_worship" order="0-">
+				<icon src="worship.xpm" />
+			</item>
+			<item type="poi_wrecker" order="0-">
+				<icon src="wrecker.xpm" />
+			</item>
+			<item type="poi_zoo" order="0-">
+				<icon src="zoo.xpm" />
+			</item>
+			<item type="poi_picnic" order="11-">
+				<icon src="picnic.xpm" />
+			</item>
+			<item type="poi_gc_multi" order="0-">
+				<icon src="gc_multi.xpm" />
+			</item>
+			<item type="poi_gc_tradi" order="0-">
+				<icon src="gc_tradi.xpm" />
+			</item>
+			<item type="poi_gc_event" order="0-">
+				<icon src="gc_event.xpm" />
+			</item>
+			<item type="poi_gc_mystery" order="0-">
+				<icon src="gc_mystery.xpm" />
+			</item>
+			<item type="poi_gc_question" order="0-">
+				<icon src="gc_question.xpm" />
+			</item>
+			<item type="poi_gc_stages" order="0-">
+				<icon src="gc_stages.xpm" />
+			</item>
+			<item type="poi_gc_reference" order="0-">
+				<icon src="gc_reference.xpm" />
+			</item>
+			<item type="poi_gc_webcam" order="0-">
+				<icon src="gc_webcam.xpm" />
+			</item>
+			<item type="traffic_signals" order="13-">
+				<icon src="traffic_signals.xpm" />
+			</item>
+			<item type="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
+				<polygon color="#a0a0a0" />
+				<label label_size="5" /> 
+			</item>
+			<item type="rg_segment" order="0-">
+				<polyline color="#FF089C" width="1" />
+			</item>
+			<item type="rg_point" order="0-">
+				<circle color="#FF089C" radius="10"  label_size="7" />
+			</item>
+		</layer>
 	</layout>
 </navit>
 </config>
diff --git a/navit/src/osm2navit.c b/navit/src/osm2navit.c
index fd7ec6e..2a9719e 100644
--- a/navit/src/osm2navit.c
+++ b/navit/src/osm2navit.c
@@ -122,11 +122,12 @@ static char *attrmap={
 	"w	aeroway	taxiway		aeroway_taxiway\n"
 	"w	aeroway	terminal	poly_terminal\n"
 	"w	amenity	parking		poly_car_parking\n"
-	"w	highway	cycleway	street_nopass\n"
-	"w	highway	footway		street_nopass\n"
-	"w	highway	steps		street_nopass\n"
-	"w	highway	cyclepath	street_nopass\n"
-	"w	highway	track		street_nopass\n"
+	"w	highway	bridleway	bridleway\n"
+	"w	highway	cycleway	cycleway\n"
+	"w	highway	cyclepath	cycleway\n"
+	"w	highway	footway		footway\n"
+	"w	highway	steps		steps\n"
+	"w	highway	track		track_gravelled\n"
 	"w	highway	service		street_service\n"
 	"w	highway	pedestrian	street_pedestrian\n"
 	"w	highway	residential	street_1_city\n"
@@ -134,7 +135,7 @@ static char *attrmap={
 	"w	highway	minor		street_1_land\n"
 	"w	highway	tertiary	street_2_city\n"
 	"w	highway	secondary	street_3_city\n"
-	"w	highway	unsurfaced	street_nopass\n"
+	"w	highway	unsurfaced	track_gravelled\n"
 	"w	highway	primary		street_4_city\n"
 	"w	highway	primary_link	ramp\n"
 	"w	highway	trunk		street_4_city\n"
-- 
2.7.4