Add:Core:Added some new osm types

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

diff --git a/navit/item_def.h b/navit/item_def.h
index b16dd7f..1de3e45 100644 (file)
--- a/navit/item_def.h
+++ b/navit/item_def.h
@@ -306,6 +306,10 @@ ITEM(selected_point)
 ITEM(power_tower)
 ITEM(route_start_reverse)
 ITEM(log_entry)
+ITEM(poi_playground)
+ITEM(barrier_cycle)
+ITEM(barrier_bollard)
+ITEM(poi_vending_machine)
 /* Line */
 ITEM2(0x80000000,line)
 ITEM2(0x80000001,line_unspecified)

diff --git a/navit/osm2navit.c b/navit/osm2navit.c
index 8add6a6..d21ec0d 100644 (file)
--- a/navit/osm2navit.c
+++ b/navit/osm2navit.c
@@ -123,6 +123,9 @@ static char *attrmap={
        "n      amenity=toilets         poi_toilets\n"
        "n      amenity=townhall        poi_townhall\n"
        "n      amenity=university      poi_school_university\n"
+       "n      amenity=vending_machine poi_vending_machine\n"
+       "n      barrier=bollard         barrier_bollard\n"
+       "n      barrier=cycle_barrier   barrier_cycle\n"        
        "n      car=car_rental          poi_car_rent\n"
        "n      highway=bus_station     poi_bus_station\n"
        "n      highway=bus_stop        poi_bus_stop\n"
@@ -139,6 +142,7 @@ static char *attrmap={
        "n      leisure=fishing         poi_fish\n"
        "n      leisure=golf_course     poi_golf\n"
        "n      leisure=marina          poi_marine\n"
+       "w      leisure=playground      poi_playground\n"
        "n      leisure=slipway         poi_boat_ramp\n"
        "n      leisure=sports_centre   poi_sport\n"
        "n      leisure=stadium         poi_stadium\n"
@@ -162,9 +166,11 @@ static char *attrmap={
        "n      railway=station         poi_rail_station\n"
        "n      railway=tram_stop       poi_rail_tram_stop\n"
        "n      shop=baker              poi_shop_baker\n"
+       "n      shop=bakery             poi_shop_baker\n"
        "n      shop=butcher            poi_shop_butcher\n"
        "n      shop=car_repair         poi_repair_service\n"
        "n      shop=convenience        poi_shop_grocery\n"
+       "n      shop=garden_centre      poi_shop_handg\n"
        "n      shop=kiosk              poi_shop_kiosk\n"
        "n      shop=supermarket        poi_shopping\n"
        "n      sport=baseball          poi_baseball\n"