Fix:Tools:Cleaned up osm2navit mappings
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Mon, 8 Dec 2008 16:23:09 +0000 (16:23 +0000)
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Mon, 8 Dec 2008 16:23:09 +0000 (16:23 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1771 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/navit/osm2navit.c

index 22c78ea..df436c0 100644 (file)
@@ -60,287 +60,288 @@ static int ignore_unkown = 0, coverage=0;
 
 static char *attrmap={
        "n      *=*                     point_unkn\n"
-       "n      amenity=hospital        poi_hospital\n"
+       "n      Annehmlichkeit=Hochsitz poi_hunting_stand\n"
+       "n      aeroway=aerodrome       poi_airport\n"
+       "n      aeroway=airport         poi_airport\n"
+       "n      aeroway=helipad         poi_heliport\n"
+       "n      aeroway=terminal        poi_airport\n"
        "n      amenity=atm             poi_bank\n"
        "n      amenity=bank            poi_bank\n"
-       "n      amenity=pub             poi_bar\n"
-       "n      amenity=cafe            poi_cafe\n"
+       "n      amenity=bench           poi_bench\n"
+       "n      amenity=biergarten      poi_biergarten\n"
        "n      amenity=bus_station     poi_bus_station\n"
-       "n      amenity=parking         poi_car_parking\n"
+       "n      amenity=cafe            poi_cafe\n"
        "n      amenity=cinema          poi_cinema\n"
+       "n      amenity=college         poi_school_college\n"
+       "n      amenity=courthouse      poi_justice\n"
+       "n      amenity=drinking_water  poi_potable_water\n"
+       "n      amenity=fast_food       poi_fastfood\n"
        "n      amenity=fire_station    poi_firebrigade\n"
+       "n      amenity=fountain        poi_fountain\n"
        "n      amenity=fuel            poi_fuel\n"
-       "n      amenity=courthouse      poi_justice\n"
+       "n      amenity=grave_yard      poi_cemetery\n"
+       "n      amenity=hospital        poi_hospital\n"
+       "n      amenity=hunting_stand   poi_hunting_stand\n"
+       "n      amenity=kindergarten    poi_kindergarten\n"
        "n      amenity=library         poi_library\n"
+       "n      amenity=park_bench      poi_bench\n"
+       "n      amenity=parking         poi_car_parking\n"
        "n      amenity=pharmacy        poi_pharmacy\n"
        "n      amenity=place_of_worship,religion=christian     poi_church\n"
        "n      amenity=police          poi_police\n"
-       "n      amenity=post_office     poi_post_office\n"
        "n      amenity=post_box        poi_post_box\n"
+       "n      amenity=post_office     poi_post_office\n"
+       "n      amenity=prison          poi_prison\n"
+       "n      amenity=pub             poi_bar\n"
        "n      amenity=public_building poi_public_office\n"
        "n      amenity=restaurant      poi_restaurant\n"
-       "n      amenity=fast_food       poi_fastfood\n"
-       "n      amenity=toilets         poi_restroom\n"
        "n      amenity=school          poi_school\n"
-       "n      amenity=university      poi_school_university\n"
-       "n      amenity=college         poi_school_college\n"
+       "n      amenity=shelter         poi_shelter\n"
+       "n      amenity=taxi            poi_taxi\n"
+       "n      amenity=tec_common      tec_common\n"
        "n      amenity=telephone       poi_telephone\n"
        "n      amenity=theatre         poi_theater\n"
-       "n      amenity=townhall                poi_townhall\n"
-       "n      amenity=tec_common              tec_common\n"
-       "n      highway=bus_stop        poi_bus_stop\n"
+       "n      amenity=toilets         poi_restroom\n"
+       "n      amenity=toilets         poi_toilets\n"
+       "n      amenity=townhall        poi_townhall\n"
+       "n      amenity=university      poi_school_university\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"
        "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      historic=boundary_stone poi_boundary_stone\n"
+       "n      historic=castle         poi_castle\n"
+       "n      historic=memorial       poi_memorial\n"
+       "n      historic=monument       poi_monument\n"
+       "n      historic=ruins          poi_ruins\n"
+       "n      landuse=cemetery        poi_cemetery\n"
        "n      leisure=fishing         poi_fish\n"
-       "n      sport=golf      poi_golf\n"
        "n      leisure=golf_course     poi_golf\n"
        "n      leisure=marina          poi_marine\n"
+       "n      leisure=slipway         poi_boat_ramp\n"
        "n      leisure=sports_centre   poi_sport\n"
        "n      leisure=stadium         poi_stadium\n"
-       "n      shop=supermarket        poi_shopping\n"
-       "n      shop=convenience        poi_shop_grocery\n"
-       "n      tourism=attraction      poi_attraction\n"
-       "n      tourism=camp_site       poi_camp_rv\n"
-       "n      tourism=caravan_site    poi_camp_rv\n"
-       "n      tourism=hotel           poi_hotel\n"
-       "n      tourism=motel           poi_motel\n"
-       "n      tourism=guest_house     poi_guesthouse\n"
-       "n      tourism=hostel          poi_hostel\n"
-       "n      tourism=information     poi_information\n"
-       "n      tourism=museum          poi_museum_history\n"
-       "n      tourism=picnic_site     poi_picnic\n"
-       "n      tourism=theme_park      poi_resort\n"
-       "n      tourism=zoo             poi_zoo\n"
-       "n      amenity=grave_yard      poi_cemetery\n"
-       "n      landuse=cemetery        poi_cemetery\n"
+       "n      man_made=tower          poi_tower\n"
        "n      military=airfield       poi_military\n"
-       "n      military=bunker         poi_military\n"
        "n      military=barracks       poi_military\n"
-       "n      military=range          poi_military\n"
+       "n      military=bunker         poi_military\n"
        "n      military=danger_area    poi_danger_area\n"
-       "n      sport=swimming  poi_swimming\n"
-       "n      sport=skiing            poi_skiing\n"
-       "n      aeroway=aerodrome       poi_airport\n"
-       "n      aeroway=airport         poi_airport\n"
-       "n      aeroway=terminal        poi_airport\n"
-       "n      aeroway=helipad         poi_heliport\n"
-       "n      man_made=tower  poi_tower\n"
+       "n      military=range          poi_military\n"
        "n      natural=bay             poi_bay\n"
        "n      natural=peak            poi_peak\n"
-       "n      place=suburb            district_label\n"
        "n      place=city              town_label_2e5\n"
-       "n      place=town              town_label_2e4\n"
-       "n      place=village           town_label_2e3\n"
        "n      place=hamlet            town_label_2e2\n"
        "n      place=locality          town_label_2e0\n"
+       "n      place=suburb            district_label\n"
+       "n      place=town              town_label_2e4\n"
+       "n      place=village           town_label_2e3\n"
        "n      railway=halt            poi_rail_halt\n"
-       "n      railway=level_crossing          poi_level_crossing\n"
+       "n      railway=level_crossing  poi_level_crossing\n"
        "n      railway=station         poi_rail_station\n"
-       "n      railway=tram_stop               poi_rail_tram_stop\n"
-       "n      amenity=park_bench              poi_bench\n"
-       "n      amenity=bench           poi_bench\n"
-       "n      amenity=biergarten              poi_biergarten\n"
-       "n      historic=boundary_stone         poi_boundary_stone\n"
-       "n      historic=castle         poi_castle\n"
-       "n      historic=ruins          poi_ruins\n"
-       "n      Annehmlichkeit=Hochsitz         poi_hunting_stand\n"
-       "n      amenity=hunting_stand           poi_hunting_stand\n"
-       "n      historic=memorial               poi_memorial\n"
-       "n      historic=monument               poi_monument\n"
-       "n      amenity=shelter         poi_shelter\n"
-       "n      amenity=fountain                poi_fountain\n"
-       "n      amenity=drinking_water          poi_potable_water\n"
-       "n      amenity=toilets         poi_toilets\n"
-       "n      tourism=viewpoint               poi_viewpoint\n"
-       "n      amenity=taxi    poi_taxi\n"
-       "n      amenity=prison  poi_prison\n"
-       "n      amenity=kindergarten    poi_kindergarten\n"
-       "n      shop=butcher    poi_shop_butcher\n"
-       "n      shop=baker      poi_shop_baker\n"
-       "n      shop=kiosk      poi_shop_kiosk\n"
-       "n      car=car_rental  poi_car_rent\n"
-       "n      sport=stadium           poi_stadium\n"
-       "n      sport=soccer            poi_soccer\n"
-       "n      sport=basketball        poi_basketball\n"
+       "n      railway=tram_stop       poi_rail_tram_stop\n"
+       "n      shop=baker              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=kiosk              poi_shop_kiosk\n"
+       "n      shop=supermarket        poi_shopping\n"
        "n      sport=baseball          poi_baseball\n"
+       "n      sport=basketball        poi_basketball\n"
        "n      sport=climbing          poi_climbing\n"
+       "n      sport=golf              poi_golf\n"
        "n      sport=motor_sports      poi_motor_sport\n"
+       "n      sport=skiing            poi_skiing\n"
+       "n      sport=soccer            poi_soccer\n"
+       "n      sport=stadium           poi_stadium\n"
+       "n      sport=swimming          poi_swimming\n"
        "n      sport=tennis            poi_tennis\n"
+       "n      tourism=attraction      poi_attraction\n"
+       "n      tourism=camp_site       poi_camp_rv\n"
+       "n      tourism=caravan_site    poi_camp_rv\n"
+       "n      tourism=guest_house     poi_guesthouse\n"
+       "n      tourism=hostel          poi_hostel\n"
+       "n      tourism=hotel           poi_hotel\n"
+       "n      tourism=information     poi_information\n"
+       "n      tourism=motel           poi_motel\n"
+       "n      tourism=museum          poi_museum_history\n"
+       "n      tourism=picnic_site     poi_picnic\n"
+       "n      tourism=theme_park      poi_resort\n"
+       "n      tourism=viewpoint       poi_viewpoint\n"
+       "n      tourism=zoo             poi_zoo\n"
        "w      *=*                     street_unkn\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      aerialway=cable_car     lift_cable_car\n"
+       "w      aerialway=chair_lift    lift_chair\n"
+       "w      aerialway=drag_lift     lift_drag\n"
        "w      aeroway=aerodrome       poly_airport\n"
        "w      aeroway=apron           poly_apron\n"
        "w      aeroway=runway          aeroway_runway\n"
        "w      aeroway=taxiway         aeroway_taxiway\n"
        "w      aeroway=terminal        poly_terminal\n"
+       "w      amenity=college         poly_college\n"
+       "w      amenity=grave_yard      poly_cemetery\n"
+       "w      amenity=parking         poly_car_parking\n"
+       "w      amenity=place_of_worship        poly_building\n"
+       "w      amenity=university      poly_university\n"
+       "w      boundary=administrative border_country\n"
+       "w      boundary=civil          border_civil\n"
+       "w      boundary=national_park  border_national_park\n"
+       "w      boundary=political      border_political\n"
+       "w      building=*              poly_building\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      cycleway=track          cycleway\n"
        "w      highway=bridleway       bridleway\n"
-       "w      highway=path,horse=designated   bridleway\n"
-       "w      highway=cycleway        cycleway\n"
+       "w      highway=bus_guideway    bus_guideway\n"
+       "w      highway=construction    street_construction\n"
        "w      highway=cyclepath       cycleway\n"
-       "w      highway=path,bicycle=designated cycleway\n"
+       "w      highway=cycleway        cycleway\n"
        "w      highway=footway         footway\n"
-       "w      piste:type=nordic       piste_nordic\n"
        "w      highway=footway,piste:type=nordic       footway_and_piste_nordic\n"
-       "w      route=ski       piste_nordic\n"
-       "w      piste:type=downhill,piste:difficulty=novice     piste_downhill_novice\n"
-       "w      piste:type=downhill,piste:difficulty=easy       piste_downhill_easy\n"
-       "w      piste:type=downhill,piste:difficulty=intermediate       piste_downhill_intermediate\n"
-       "w      piste:type=downhill,piste:difficulty=advanced   piste_downhill_advanced\n"
-       "w      piste:type=downhill,piste:difficulty=expert     piste_downhill_expert\n"
-       "w      piste:type=downhill,piste:difficulty=freeride   piste_downhill_freeride\n"
+       "w      highway=living_street   living_street\n"
+       "w      highway=minor           street_1_land\n"
+       "w      highway=motorway        highway_city\n"
+       "w      highway=motorway_link   ramp\n"
+       "w      highway=parking_lane    street_parking_lane\n"
+       "w      highway=path            path\n"
+       "w      highway=path,bicycle=designated cycleway\n"
        "w      highway=path,foot=designated    footway\n"
-       "w      highway=steps   steps\n"
-       "w      highway=path    path\n"
-       "w      highway=path,sac_scale=hiking   hiking\n"
-       "w      highway=path,sac_scale=mountain_hiking  hiking_mountain\n"
+       "w      highway=path,horse=designated   bridleway\n"
+       "w      highway=path,sac_scale=alpine_hiking                    hiking_alpine\n"
+       "w      highway=path,sac_scale=demanding_alpine_hiking          hiking_alpine_demanding\n"
        "w      highway=path,sac_scale=demanding_mountain_hiking        hiking_mountain_demanding\n"
-       "w      highway=path,sac_scale=alpine_hiking    hiking_alpine\n"
-       "w      highway=path,sac_scale=demanding_alpine_hiking  hiking_alpine_demanding\n"
-       "w      highway=path,sac_scale=difficult_alpine_hiking  hiking_alpine_difficult\n"
-       "w      highway=unsurfaced      track_gravelled\n"
-       "w      highway=track           track_gravelled\n"
-       "w      highway=track,tracktype=grade1          track_paved\n"
-       "w      highway=track,surface=paved             track_paved\n"
-       "w      highway=track,tracktype=grade2          track_gravelled\n"
-       "w      highway=track,surface=gravel            track_gravelled\n"
-       "w      highway=track,tracktype=grade3          track_unpaved\n"
-       "w      highway=track,surface=unpaved           track_unpaved\n"
-       "w      highway=track,tracktype=grade4          track_ground\n"
-       "w      highway=track,surface=ground            track_ground\n"
-       "w      highway=track,tracktype=grade5          track_grass\n"
-       "w      highway=track,surface=grass             track_grass\n"
-       "w      highway=parking_lane    street_parking_lane\n"
-       "w      highway=service,service=parking_aisle   street_parking_lane\n"
-       "w      highway=service         street_service\n"
-       "w      highway=service,area=1  poly_service\n"
-       "w      highway=construction            street_construction\n"
+       "w      highway=path,sac_scale=difficult_alpine_hiking          hiking_alpine_difficult\n"
+       "w      highway=path,sac_scale=hiking           hiking\n"
+       "w      highway=path,sac_scale=mountain_hiking  hiking_mountain\n"
        "w      highway=pedestrian      street_pedestrian\n"
        "w      highway=pedestrian,area=1       poly_pedestrian\n"
-       "w      highway=plaza   poly_plaza\n"
-       "w      landuse=plaza   poly_plaza\n"
+       "w      highway=plaza           poly_plaza\n"
+       "w      highway=primary         street_4_city\n"
+       "w      highway=primary_link    ramp\n"
        "w      highway=residential     street_1_city\n"
        "w      highway=residential,area=1      poly_street_1\n"
-       "w      highway=living_street           living_street\n"
-       "w      highway=unclassified    street_1_city\n"
-       "w      highway=unclassified,area=1     poly_street_1\n"
-       "w      highway=road    street_1_city\n"
-       "w      highway=minor           street_1_land\n"
-       "w      highway=tertiary        street_2_city\n"
-       "w      highway=tertiary,area=1 poly_street_2\n"
-       "w      highway=tertiary_link   ramp\n"
+       "w      highway=road            street_1_city\n"
        "w      highway=secondary       street_3_city\n"
        "w      highway=secondary,area=1        poly_street_3\n"
        "w      highway=secondary_link  ramp\n"
-       "w      highway=primary         street_4_city\n"
-       "w      highway=primary_link    ramp\n"
+       "w      highway=service         street_service\n"
+       "w      highway=service,area=1  poly_service\n"
+       "w      highway=service,service=parking_aisle   street_parking_lane\n"
+       "w      highway=steps           steps\n"
+       "w      highway=tertiary        street_2_city\n"
+       "w      highway=tertiary,area=1 poly_street_2\n"
+       "w      highway=tertiary_link   ramp\n"
+       "w      highway=track           track_gravelled\n"
+       "w      highway=track,surface=grass             track_grass\n"
+       "w      highway=track,surface=gravel            track_gravelled\n"
+       "w      highway=track,surface=ground            track_ground\n"
+       "w      highway=track,surface=paved             track_paved\n"
+       "w      highway=track,surface=unpaved           track_unpaved\n"
+       "w      highway=track,tracktype=grade1          track_paved\n"
+       "w      highway=track,tracktype=grade2          track_gravelled\n"
+       "w      highway=track,tracktype=grade3          track_unpaved\n"
+       "w      highway=track,tracktype=grade4          track_ground\n"
+       "w      highway=track,tracktype=grade5          track_grass\n"
        "w      highway=trunk           street_4_city\n"
        "w      highway=trunk_link      ramp\n"
-       "w      highway=motorway        highway_city\n"
-       "w      highway=motorway_link   ramp\n"
+       "w      highway=unclassified    street_1_city\n"
+       "w      highway=unclassified,area=1     poly_street_1\n"
+       "w      highway=unsurfaced      track_gravelled\n"
+       "w      historic=archaeological_site    poly_archaeological_site\n"
+       "w      historic=battlefield    poly_battlefield\n"
+       "w      historic=ruins          poly_ruins\n"
        "w      historic=town gate      poly_building\n"
-       "w      cycleway=track          cycleway\n"
-       "w      amenity=parking         poly_car_parking\n"
        "w      landuse=allotments      poly_allotments\n"
+       "w      landuse=basin           poly_basin\n"
+       "w      landuse=brownfield      poly_brownfield\n"
        "w      landuse=cemetery        poly_cemetery\n"
-       "w      amenity=grave_yard      poly_cemetery\n"
+       "w      landuse=commercial      poly_commercial\n"
+       "w      landuse=construction    poly_construction\n"
+       "w      landuse=farm            poly_farm\n"
+       "w      landuse=farmland        poly_farm\n"
+       "w      landuse=farmyard        poly_town\n"
        "w      landuse=forest          poly_wood\n"
+       "w      landuse=greenfield      poly_greenfield\n"
        "w      landuse=industrial      poly_industry\n"
-       "w      landuse=residential     poly_town\n"
-       "w      landuse=residential,area=1      poly_town\n"
-       "w      landuse=farmyard        poly_town\n"
-       "w      amenity=college poly_college\n"
-       "w      amenity=university      poly_university\n"
-       "w      tourism=camp_site       poly_camp_site\n"
-       "w      tourism=caravan_site    poly_caravan_site\n"
-       "w      tourism=picnic_site     poly_picnic_site\n"
-       "w      tourism=theme_park      poly_theme_park\n"
-       "w      tourism=attraction      poly_attraction\n"
-       "w      tourism=zoo     poly_zoo\n"
-       "w      tourism=artwork poly_artwork\n"
-       "w      historic=archaeological_site    poly_archaeological_site\n"
-       "w      historic=ruins  poly_ruins\n"
-       "w      historic=battlefield    poly_battlefield\n"
-       "w      landuse=quarry  poly_quarry\n"
        "w      landuse=landfill        poly_landfill\n"
-       "w      landuse=retail  poly_retail\n"
-       "w      landuse=commercial      poly_commercial\n"
-       "w      landuse=brownfield      poly_brownfield\n"
-       "w      landuse=greenfield      poly_greenfield\n"
-       "w      landuse=construction    poly_construction\n"
-       "w      landuse=railway poly_railway\n"
-       "w      natural=glacier poly_glacier\n"
-       "w      natural=scree   poly_scree\n"
-       "w      natural=scrub   poly_scrub\n"
-       "w      natural=fell    poly_fell\n"
-       "w      natural=heath   poly_heath\n"
-       "w      natural=marsh   poly_marsh\n"
-       "w      natural=mud     poly_mud\n"
-       "w      natural=beach   poly_beach\n"
-       "w      natural=land    poly_land\n"
-       "w      landuse=basin   poly_basin\n"
+       "w      landuse=military        poly_military\n"
+       "w      landuse=plaza           poly_plaza\n"
+       "w      landuse=quarry          poly_quarry\n"
+       "w      landuse=railway         poly_railway\n"
+       "w      landuse=recreation_ground               poly_recreation_ground\n"
        "w      landuse=reservoir       poly_reservoir\n"
-       "w      landuse=farm    poly_farm\n"
-       "w      landuse=farmland        poly_farm\n"
+       "w      landuse=residential     poly_town\n"
+       "w      landuse=residential,area=1      poly_town\n"
+       "w      landuse=retail          poly_retail\n"
+       "w      landuse=village_green   poly_village_green\n"
        "w      landuse=vineyard        poly_farm\n"
+       "w      leisure=common          poly_common\n"
+       "w      leisure=fishing         poly_fishing\n"
+       "w      leisure=garden          poly_garden\n"
+       "w      leisure=golf_course     poly_golf_course\n"
+       "w      leisure=marina          poly_marina\n"
+       "w      leisure=nature_reserve  poly_nature_reserve\n"
        "w      leisure=park            poly_park\n"
-       "w      landuse=village_green           poly_village_green\n"
-       "w      landuse=recreation_ground               poly_recreation_ground\n"
-       "w      natural=wood            poly_wood\n"
-       "w      natural=water           poly_water\n"
-       "w      natural=coastline       water_line\n"
-       "w      place=suburb            poly_town\n"
-       "w      place=town              poly_town\n"
-       "w      landuse=military        poly_military\n"
+       "w      leisure=pitch           poly_sports_pitch\n"
+       "w      leisure=playground      poly_playground\n"
+       "w      leisure=sports_centre   poly_sport\n"
+       "w      leisure=stadium         poly_sports_stadium\n"
+       "w      leisure=track           poly_sports_track\n"
+       "w      leisure=water_park      poly_water_park\n"
        "w      military=airfield       poly_airfield\n"
        "w      military=barracks       poly_barracks\n"
        "w      military=danger_area    poly_danger_area\n"
-       "w      military=range  poly_range\n"
        "w      military=naval_base     poly_naval_base\n"
-       "w      power=line      powerline\n"
-       "w      railway=rail            rail\n"
+       "w      military=range          poly_range\n"
+       "w      natural=beach           poly_beach\n"
+       "w      natural=coastline       water_line\n"
+       "w      natural=fell            poly_fell\n"
+       "w      natural=glacier         poly_glacier\n"
+       "w      natural=heath           poly_heath\n"
+       "w      natural=land            poly_land\n"
+       "w      natural=marsh           poly_marsh\n"
+       "w      natural=mud             poly_mud\n"
+       "w      natural=scree           poly_scree\n"
+       "w      natural=scrub           poly_scrub\n"
+       "w      natural=water           poly_water\n"
+       "w      natural=wood            poly_wood\n"
+       "w      piste:type=downhill,piste:difficulty=advanced           piste_downhill_advanced\n"
+       "w      piste:type=downhill,piste:difficulty=easy               piste_downhill_easy\n"
+       "w      piste:type=downhill,piste:difficulty=expert             piste_downhill_expert\n"
+       "w      piste:type=downhill,piste:difficulty=freeride           piste_downhill_freeride\n"
+       "w      piste:type=downhill,piste:difficulty=intermediate       piste_downhill_intermediate\n"
+       "w      piste:type=downhill,piste:difficulty=novice             piste_downhill_novice\n"
+       "w      piste:type=nordic       piste_nordic\n"
+       "w      place=suburb            poly_town\n"
+       "w      place=town              poly_town\n"
+       "w      power=line              powerline\n"
+       "w      railway=abandoned       rail_abandoned\n"
+       "w      railway=disused         rail_disused\n"
+       "w      railway=light_rail      rail_light\n"
+       "w      railway=monorail        rail_mono\n"
        "w      railway=narrow_gauge    rail_narrow_gauge\n"
-       "w      railway=light_rail              rail_light\n"
+       "w      railway=preserved       rail_preserved\n"
+       "w      railway=rail            rail\n"
        "w      railway=subway          rail_subway\n"
        "w      railway=tram            rail_tram\n"
-       "w      railway=monorail                rail_mono\n"
-       "w      railway=preserved               rail_preserved\n"
-       "w      railway=disused         rail_disused\n"
-       "w      railway=abandoned               rail_abandoned\n"
-       "w      aerialway=cable_car             lift_cable_car\n"
-       "w      aerialway=chair_lift            lift_chair\n"
-       "w      aerialway=drag_lift             lift_drag\n"
-       "w      leisure=golf_course     poly_golf_course\n"
-       "w      sport=*         poly_sport\n"
-       "w      leisure=sports_centre           poly_sport\n"
-       "w      leisure=stadium         poly_sports_stadium\n"
-       "w      leisure=track           poly_sports_track\n"
-       "w      leisure=pitch           poly_sports_pitch\n"
-       "w      leisure=water_park              poly_water_park\n"
-       "w      leisure=marina          poly_marina\n"
-       "w      leisure=fishing         poly_fishing\n"
-       "w      leisure=garden          poly_garden\n"
-       "w      leisure=common          poly_common\n"
-       "w      leisure=playground              poly_playground\n"
-       "w      leisure=nature_reserve          poly_nature_reserve\n"
+       "w      route=ferry             ferry\n"
+       "w      route=ski               piste_nordic\n"
+       "w      sport=*                 poly_sport\n"
+       "w      tourism=artwork         poly_artwork\n"
+       "w      tourism=attraction      poly_attraction\n"
+       "w      tourism=camp_site       poly_camp_site\n"
+       "w      tourism=caravan_site    poly_caravan_site\n"
+       "w      tourism=picnic_site     poly_picnic_site\n"
+       "w      tourism=theme_park      poly_theme_park\n"
+       "w      tourism=zoo             poly_zoo\n"
        "w      waterway=canal          water_canal\n"
-       "w      waterway=river          water_river\n"
-       "w      waterway=stream         water_stream\n"
        "w      waterway=drain          water_drain\n"
+       "w      waterway=river          water_river\n"
        "w      waterway=riverbank      poly_water\n"
-       "w      boundary=administrative border_country\n"
-       "w      boundary=civil  border_civil\n"
-       "w      boundary=political      border_political\n"
-       "w      boundary=national_park  border_national_park\n"
-       "w      route=ferry             ferry\n"
-       "w      highway=bus_guideway            bus_guideway\n"
+       "w      waterway=stream         water_stream\n"
 };
 
 struct coord {