Add:Core:Add display of mini roundabout and turning circle

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

diff --git a/navit/src/item_def.h b/navit/src/item_def.h
index 5d2df6b..d2100c9 100644 (file)
--- a/navit/src/item_def.h
+++ b/navit/src/item_def.h
@@ -233,6 +233,8 @@ ITEM(nav_roundabout_l8)
 ITEM(poi_peak)
 ITEM(poi_rail_station)
 ITEM(poi_image)
+ITEM(mini_roundabout)
+ITEM(turning_circle)
 /* Line */
 ITEM2(0x80000000,line)
 ITEM2(0x80000001,line_unspecified)

diff --git a/navit/src/navit.xml b/navit/src/navit.xml
index 7408110..347c6a8 100644 (file)
--- a/navit/src/navit.xml
+++ b/navit/src/navit.xml
@@ -755,6 +755,12 @@ Change to your home coordinates.
                        <item type="town_label_1e7,district_label_1e7" order="1-">
                                <circle color="#000000" radius="3" label_size="15" />
                        </item>
+                       <item type="mini_roundabout" order="12-">
+                                <icon src="mini_roundabout.xpm" />
+                        </item>
+                       <item type="turning_circle" order="12-">
+                                <icon src="mini_roundabout.xpm" />
+                        </item>
                        <item type="track" order="3-">
                                <polyline color="#3f3f3f" width="1" />
                        </item>

diff --git a/navit/src/osm2navit.c b/navit/src/osm2navit.c
index 581212b..94f7a8f 100644 (file)
--- a/navit/src/osm2navit.c
+++ b/navit/src/osm2navit.c
@@ -66,8 +66,10 @@ static char *attrmap={
        "n      amenity=telephone       poi_telephone\n"
        "n      amenity=theatre         poi_theater\n"
        "n      highway=bus_stop        poi_bus_stop\n"
+       "n      highway=mini_roundabout mini_roundabout\n"
        "n      highway=motorway_junction       highway_exit\n"
        "n      highway=traffic_signals traffic_signals\n"
+       "n      highway=turning_circle  turning_circle\n"
        "n      leisure=slipway         poi_boat_ramp\n"
        "n      leisure=fishing         poi_fish\n"
        "n      sport=golf      poi_golf\n"