Merge 14394:14533 from trunk.

[rails.git] / config / potlatch / autocomplete.txt

diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt
index 3480355ee873908362e19e5392f21b52d21f08be..a3c80c7da1ac2b3fead6d2f4210214af1077e20b 100755 (executable)
--- a/config/potlatch/autocomplete.txt
+++ b/config/potlatch/autocomplete.txt
@@ -1,14 +1,15 @@
 # Potlatch autocomplete values
 # each line should be: key / way|point|POI (tab) list_of_values
 # '-' indicates no autocomplete for values
 # Potlatch autocomplete values
 # each line should be: key / way|point|POI (tab) list_of_values
 # '-' indicates no autocomplete for values

-highway/way            motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,service,bridleway,cycleway,footway,pedestrian,steps
-highway/point  mini_roundabout,traffic_signals,crossing,gate,stile,cattle_grid,toll_booth,incline,viaduct,motorway_junction,services,ford,bus_stop
+highway/way            motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,service,bridleway,cycleway,footway,pedestrian,steps,living_street,track,road
+highway/point  mini_roundabout,traffic_signals,crossing,gate,stile,cattle_grid,toll_booth,incline,viaduct,motorway_junction,services,ford,bus_stop,turning_circle
+tracktype/way  grade1,grade2,grade3,grade4,grade5

 junction/way   roundabout
 cycleway/way   lane,track,opposite_lane,opposite_track,opposite
 junction/way   roundabout
 cycleway/way   lane,track,opposite_lane,opposite_track,opposite

-waterway/way   river,canal,stream,drain,dock
+waterway/way   river,canal,stream,drain,dock,riverbank

 waterway/point lock_gate,lock,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir
 waterway/POI   boatyard,water_point,waste_disposal,mooring
 waterway/point lock_gate,lock,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir
 waterway/POI   boatyard,water_point,waste_disposal,mooring

-railway/way            rail,tram,light_rail,subway,preserved,disused,abandoned,narrow_gauge,monorail
+railway/way            rail,tram,light_rail,subway,preserved,disused,abandoned,narrow_gauge,monorail,platform

 railway/point  station,halt,viaduct,crossing,level_crossing,subway_entrance
 railway/POI            subway_entrance
 aeroway/way            runway,taxiway,apron
 railway/point  station,halt,viaduct,crossing,level_crossing,subway_entrance
 railway/POI            subway_entrance
 aeroway/way            runway,taxiway,apron


@@ -20,12 +21,12 @@ man_made/point      works,beacon,survey_point,power_wind,power_hydro,power_fossil,pow
 man_made/way   reservoir_covered,pier
 leisure/POI            sports_centre,golf_course,stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,playground,garden,common,slipway
 leisure/way            sports_centre,golf_course,stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,playground,garden,common
 man_made/way   reservoir_covered,pier
 leisure/POI            sports_centre,golf_course,stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,playground,garden,common,slipway
 leisure/way            sports_centre,golf_course,stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,playground,garden,common

-amenity/POI            pub,biergarten,cafe,nightclub,restaurant,fast_food,parking,bicycle_parking,bicycle_rental,car_rental,car_shasring,fuel,telephone,toilets,recycling,public_building,place_of_worship,grave_yard,post_office,post_box,school,university,college,pharmacy,hospital,library,police,fire_station,bus_station,theatre,cinema,arts_centre,courthouse,prison,bank,bureau_de_change,atm,town_hall
+amenity/POI            pub,biergarten,cafe,nightclub,restaurant,fast_food,parking,bicycle_parking,bicycle_rental,car_rental,car_sharing,fuel,telephone,toilets,recycling,public_building,place_of_worship,grave_yard,post_office,post_box,school,university,college,pharmacy,hospital,library,police,fire_station,bus_station,theatre,cinema,arts_centre,courthouse,prison,bank,bureau_de_change,atm,town_hall

 amenity/way            parking,bicycle_parking,car_rental,car_sharing,public_building,grave_yard,school,university,college,hospital,town_hall
 shop/POI               supermarket,convenience,bicycle,outdoor
 shop/way               supermarket
 tourism/POI            information,camp_site,caravan_site,caravan_site,picnic_site,viewpoint,theme_park,hotel,motel,guest_house,hostel,attraction,zoo
 amenity/way            parking,bicycle_parking,car_rental,car_sharing,public_building,grave_yard,school,university,college,hospital,town_hall
 shop/POI               supermarket,convenience,bicycle,outdoor
 shop/way               supermarket
 tourism/POI            information,camp_site,caravan_site,caravan_site,picnic_site,viewpoint,theme_park,hotel,motel,guest_house,hostel,attraction,zoo

-tourism/way            camp_site,caravan_site,picnic_site,theme_parkattraction,zoo
+tourism/way            camp_site,caravan_site,picnic_site,theme_park,attraction,zoo

 historic/POI   castle,monument,memorial,museum,archaeological_site,icon,ruins
 historic/way   archaeological_site,ruins
 landuse/POI            farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,cemetery,village_green,recreation_ground
 historic/POI   castle,monument,memorial,museum,archaeological_site,icon,ruins
 historic/way   archaeological_site,ruins
 landuse/POI            farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,cemetery,village_green,recreation_ground


@@ -81,12 +82,31 @@ is_in/way           -
 note/point             -
 note/POI               -
 note/way               -
 note/point             -
 note/POI               -
 note/way               -

-source/point   -
-source/POI             -
-source/way             -
+source/point   survey,Yahoo,NPE,local_knowledge,GPS,cadastre
+source/POI             survey,Yahoo,NPE,local_knowledge,GPS,cadastre
+source/way             survey,Yahoo,NPE,local_knowledge,GPS,cadastre

 postal_code/point      -
 postal_code/POI                -
 postal_code/way                -
 description/point      -
 description/POI                -
 description/way                -
 postal_code/point      -
 postal_code/POI                -
 postal_code/way                -
 description/point      -
 description/POI                -
 description/way                -

+addr:housenumber/point -
+addr:street/point              -
+addr:full/point                        -
+addr:postcode/point            -
+addr:city/point                        -
+addr:country/point             -
+addr:housenumber/POI   -
+addr:street/POI                        -
+addr:full/POI                  -
+addr:postcode/POI              -
+addr:city/POI                  -
+addr:country/POI               -
+addr:housenumber/way   -
+addr:street/way                        -
+addr:full/way                  -
+addr:postcode/way              -
+addr:city/way                  -
+addr:country/way               -
+addr:interpolation/way even,odd,all,alphabetic