Add:Core:Added Aurel's patches about various items definitions. Thanks

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@852 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/src/item_def.h b/src/item_def.h
index 25aeb95..d3aaa66 100644 (file)
--- a/src/item_def.h
+++ b/src/item_def.h
@@ -285,3 +285,4 @@ ITEM(poly_farm)
 ITEM(poly_sport_tennis)
 ITEM(poly_apron)
 ITEM(poly_terminal)
+ITEM(street_pedestrian)

diff --git a/src/navit.xml b/src/navit.xml
index 3bf8e43..bb7bd9a 100644 (file)
--- a/src/navit.xml
+++ b/src/navit.xml
@@ -94,9 +94,12 @@ Change to your home coordinates.
                        <item type="poly_sport" order="0-">
                                <polygon color="#4af04f" /> 
                        </item>
-                       <item type="poly_industry,poly_building,poly_place" order="0-">
+                       <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" /> 
@@ -107,6 +110,12 @@ Change to your home coordinates.
                        <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>
@@ -167,6 +176,42 @@ 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="street_service"     order="11">
                                <polyline color="#d2d2d2" width="4" />
                                <polyline color="#fefefe" width="2" />
@@ -644,11 +689,11 @@ Change to your home coordinates.
                        <item type="poi_bowling" order="0-">
                                <icon src="bowling.xpm" />
                        </item>
-                       <item type="poi_bus_station" order="0-">
-                               <icon src="bus_station.xpm" />
+                       <item type="poi_bus_station" order="12-">
+                               <icon src="bus.xpm" />
                        </item>
-                       <item type="poi_bus_stop" order="0-">
-                               <icon src="bus_stop.xpm" />
+                       <item type="poi_bus_stop" order="12-">
+                               <icon src="bus.xpm" />
                        </item>
                        <item type="poi_bussines_service" order="0-">
                                <icon src="bussines_service.xpm" />

diff --git a/src/osm2navit.c b/src/osm2navit.c
index 210af71..fe2dfd6 100644 (file)
--- a/src/osm2navit.c
+++ b/src/osm2navit.c
@@ -60,6 +60,7 @@ static char *attrmap={
        "n      amenity college         poi_school\n"
        "n      amenity telephone       poi_telephone\n"
        "n      amenity theatre         poi_theater\n"
+       "n      highway bus_stop        poi_bus_stop\n"
        "n      highway traffic_signals traffic_signals\n"
        "n      leisure slipway         poi_boat_ramp\n"
        "n      leisure fishing         poi_fish\n"
@@ -111,19 +112,19 @@ static char *attrmap={
        "w      aeroway runway          aeroway_runway\n"
        "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 service         street_service\n"
-       "w      highway pedestrian      street_nopass\n"
+       "w      highway pedestrian      street_pedestrian\n"
        "w      highway residential     street_1_city\n"
        "w      highway unclassified    street_1_city\n"
        "w      highway minor           street_1_land\n"
        "w      highway tertiary        street_2_city\n"
        "w      highway secondary       street_3_city\n"
-       "w      highway pedestrian      street_nopass\n"
        "w      highway unsurfaced      street_nopass\n"
        "w      highway primary         street_4_city\n"
        "w      highway primary_link    ramp\n"
@@ -156,7 +157,7 @@ static char *attrmap={
        "w      waterway        weir            water_line\n"
        "w      waterway        stream          water_line\n"
        "w      waterway        drain           water_line\n"
-       "w      waterway        riverbank       water_line\n"
+       "w      waterway        riverbank       poly_water\n"
        "w      boundary        administrative  border_country\n"
        "w      route           ferry           ferry\n"
 };