From 04991a61daf535b5cf2abced8d7277358d78acea Mon Sep 17 00:00:00 2001
From: christeck <christeck@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sat, 30 Aug 2008 14:56:05 +0000
Subject: [PATCH] revert: While introducing contour_line_* I have completely
 overseen that hight_line_* already exists. Wiki updated.

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1345 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/navit/item_def.h  |  3 ---
 navit/navit/navit.xml   | 33 +++++++++++++++++++++++++--------
 navit/navit/osm2navit.c |  6 +++---
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/navit/navit/item_def.h b/navit/navit/item_def.h
index ea67e8d..e7a02a3 100644
--- a/navit/navit/item_def.h
+++ b/navit/navit/item_def.h
@@ -364,9 +364,6 @@ ITEM(piste_downhill_intermediate)
 ITEM(piste_downhill_advanced)
 ITEM(piste_downhill_expert)
 ITEM(piste_downhill_freeride)
-ITEM(contour_line_major)
-ITEM(contour_line_medium)
-ITEM(contour_line_minor)
 /* Area */
 ITEM2(0xc0000000,area)
 ITEM2(0xc0000001,area_unspecified)
diff --git a/navit/navit/navit.xml b/navit/navit/navit.xml
index 2748028..adc11fe 100644
--- a/navit/navit/navit.xml
+++ b/navit/navit/navit.xml
@@ -1542,16 +1542,33 @@ It's always the top left corner of the icon, so you need to consider the icon's
 						<polygon color="#ff6347" />
 					</item>
 				</layer>
-				
-				<layer name="Elevation Lines">
-					<item type="height_line_1" order="0-">
-						<polyline color="#000000" width="1" /> 
+
+				<layer name="Contour Lines">
+					<item type="height_line_1" order="8">
+						<polyline color="#A9A9A9" width="1" /> 
+						<label label_size="8" /> 
 					</item>
-					<item type="height_line_2" order="0-">
-						<polyline color="#000000" width="2" /> 
+					<item type="height_line_1" order="9">
+						<polyline color="#A9A9A9" width="2" /> 
+						<label label_size="8" /> 
 					</item>
-				</layer>
-				
+					<item type="height_line_2" order="9">
+						<polyline color="#A9A9A9" width="1" /> 
+						<label label_size="8" /> 
+					</item>
+					<item type="height_line_1" order="10-">
+						<polyline color="#A9A9A9" width="3" /> 
+						<label label_size="8" /> 
+					</item>
+					<item type="height_line_2" order="10-">
+						<polyline color="#A9A9A9" width="2" /> 
+						<label label_size="8" /> 
+					</item>
+					<item type="height_line_3" order="10-">
+						<polyline color="#A9A9A9" width="1" /> 
+					</item>
+				</layer> <!-- "Contour Lines" -->
+
 				<layer name="Waterways">
 					<item type="water_line" order="0-">
 						<polyline color="#82c8ea" width="2" /> 
diff --git a/navit/navit/osm2navit.c b/navit/navit/osm2navit.c
index 05ef8dc..21525d1 100644
--- a/navit/navit/osm2navit.c
+++ b/navit/navit/osm2navit.c
@@ -155,9 +155,9 @@ static char *attrmap={
 	"n	amenity=toilets		poi_toilets\n"
 	"n	tourism=viewpoint		poi_viewpoint\n"
 	"w	*=*			street_unkn\n"
-	"w	contour_ext=elevation_major	contour_line_major\n"
-	"w	contour_ext=elevation_medium	contour_line_medium\n"
-	"w	contour_ext=elevation_minor	contour_line_minor\n"
+	"w	contour_ext=elevation_major	height_line_1\n"
+	"w	contour_ext=elevation_medium	height_line_2\n"
+	"w	contour_ext=elevation_minor	height_line_3\n"
 	"w	amenity=place_of_worship	poly_building\n"
 	"w	building=*	poly_building\n"
 	"w	aeroway=aerodrome	poly_airport\n"
-- 
2.7.4