summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-10-05 12:06:54 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-10-05 12:06:54 +0000
commita36f9854edc8e7e3df1a17cc5c51a2a184285554 (patch)
tree0ecfd9675534892f4891938736b5dc14f60c407b
parentd15648d3cddb190a71c393d269668c65ac49136f (diff)
downloadnavit-a36f9854edc8e7e3df1a17cc5c51a2a184285554.tar.gz
Add:Core:Added some new osm types
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2631 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r--navit/item_def.h4
-rw-r--r--navit/osm2navit.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/navit/item_def.h b/navit/item_def.h
index b16dd7f4f..1de3e4518 100644
--- 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 8add6a668..d21ec0d7d 100644
--- 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"