]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Merge branch 'master' into openstreetbugs
[rails.git] / config / wiki_pages.yml
index 75304637db8a8d7dc551793dcaaf79dcb26277d9..0cb7d28f0abca2687cdedf9dde6724cd3d71cec4 100644 (file)
@@ -6,6 +6,7 @@ cz:
   key:
     historic: Cz:Key:historic
     railway: Cz:Key:railway
+    tracktype: Cz:Key:tracktype
   tag:
     route=trolleybus: Cz:Tag:route=trolleybus
 da:
@@ -35,9 +36,11 @@ de:
     cycleway: DE:Key:cycleway
     denomination: DE:Key:denomination
     description: DE:Key:description
+    destination: DE:Key:destination
     disused: DE:Key:disused
     drink: DE:Key:drink
     embankment: DE:Key:embankment
+    emergency: DE:Key:emergency
     fixme: DE:Key:fixme
     geological: DE:Key:geological
     hazmat: DE:Key:hazmat
@@ -70,6 +73,7 @@ de:
     sac_scale: DE:Key:sac scale
     service: DE:Key:service
     shop: DE:Key:shop
+    smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
     sport: DE:Key:sport
     step_count: DE:Key:step count
@@ -105,10 +109,12 @@ de:
     amenity=recycling: DE:Tag:amenity=recycling
     amenity=register_office: DE:Tag:amenity=register office
     amenity=school: DE:Tag:amenity=school
+    amenity=telephone: DE:Tag:amenity=telephone
     amenity=toilets: DE:Tag:amenity=toilets
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=waste_basket: DE:Tag:amenity=waste basket
     barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
+    barrier=lift_gate: DE:Tag:barrier=lift gate
     boundary=water_protection_area: DE:Tag:boundary=water protection area
     club-mate=yes: DE:Tag:club-mate=yes
     highway=bus_stop: DE:Tag:highway=bus stop
@@ -145,7 +151,10 @@ de:
     landuse=farm: DE:Tag:landuse=farm
     landuse=farmyard: DE:Tag:landuse=farmyard
     landuse=forest: DE:Tag:landuse=forest
+    landuse=meadow: DE:Tag:landuse=meadow
     landuse=orchard: DE:Tag:landuse=orchard
+    landuse=quarry: DE:Tag:landuse=quarry
+    landuse=village_green: DE:Tag:landuse=village green
     leisure=dog_park: DE:Tag:leisure=dog park
     leisure=playground: DE:Tag:leisure=playground
     leisure=slipway: DE:Tag:leisure=slipway
@@ -161,6 +170,7 @@ de:
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
     natural=wood: DE:Tag:natural=wood
+    pipeline=marker: DE:Tag:pipeline=marker
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=generator: DE:Tag:power=generator
@@ -205,6 +215,7 @@ en:
     aerialway: Key:aerialway
     aeroway: Key:aeroway
     amenity: Key:amenity
+    architect: Key:architect
     area: Key:area
     atv: Key:atv
     barrier: Key:barrier
@@ -229,8 +240,10 @@ en:
     cutting: Key:cutting
     cycleway: Key:cycleway
     denomination: Key:denomination
+    depth: Key:depth
     description: Key:description
     designation: Key:designation
+    destination: Key:destination
     direction: Key:direction
     dispensing: Key:dispensing
     disused: Key:disused
@@ -246,7 +259,10 @@ en:
     fence_type: Key:fence type
     fenced: Key:fenced
     fixme: Key:fixme
+    flood_prone: Key:flood prone
     foot: Key:foot
+    ford: Key:ford
+    fuel:discount: Key:fuel:discount
     gauge: Key:gauge
     geological: Key:geological
     hazmat: Key:hazmat
@@ -265,10 +281,12 @@ en:
     layer: Key:layer
     lcn_ref: Key:lcn ref
     leisure: Key:leisure
+    length: Key:length
     lit: Key:lit
     lit:perceived: Key:lit:perceived
     lock: Key:lock
     man_made: Key:man made
+    managed: Key:managed
     manhole: Key:manhole
     maxairdraft: Key:maxairdraft
     maxaxleload: Key:maxaxleload
@@ -284,6 +302,8 @@ en:
     maxwidth: Key:maxwidth
     military: Key:military
     minspeed: Key:minspeed
+    monitoring:glonass: Key:monitoring:glonass
+    monitoring:gps: Key:monitoring:gps
     mooring: Key:mooring
     motorcar: Key:motorcar
     motorcycle: Key:motorcycle
@@ -395,6 +415,7 @@ en:
     amenity=baby_hatch: Tag:amenity=baby hatch
     amenity=bank: Tag:amenity=bank
     amenity=bar: Tag:amenity=bar
+    amenity=bbq: Tag:amenity=bbq
     amenity=bench: Tag:amenity=bench
     amenity=bicycle_parking: Tag:amenity=bicycle parking
     amenity=bicycle_rental: Tag:amenity=bicycle rental
@@ -413,6 +434,8 @@ en:
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=courthouse: Tag:amenity=courthouse
     amenity=crematorium: Tag:amenity=crematorium
+    amenity=dentist: Tag:amenity=dentist
+    amenity=doctors: Tag:amenity=doctors
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=embassy: Tag:amenity=embassy
     amenity=emergency_phone: Tag:amenity=emergency phone
@@ -471,6 +494,8 @@ en:
     barrier=fence: Tag:barrier=fence
     barrier=gate: Tag:barrier=gate
     barrier=hedge: Tag:barrier=hedge
+    barrier=horse_stile: Tag:barrier=horse stile
+    barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
     barrier=kissing_gate: Tag:barrier=kissing gate
     barrier=lift_gate: Tag:barrier=lift gate
     barrier=retaining_wall: Tag:barrier=retaining wall
@@ -503,6 +528,7 @@ en:
     highway=emergency_access_point: Tag:highway=emergency access point
     highway=footway: Tag:highway=footway
     highway=ford: Tag:highway=ford
+    highway=give_way: Tag:highway=give way
     highway=living_street: Tag:highway=living street
     highway=mini_roundabout: Tag:highway=mini roundabout
     highway=motorway: Tag:highway=motorway
@@ -517,6 +543,7 @@ en:
     highway=proposed: Tag:highway=proposed
     highway=raceway: Tag:highway=raceway
     highway=residential: Tag:highway=residential
+    highway=rest_area: Tag:highway=rest area
     highway=road: Tag:highway=road
     highway=secondary: Tag:highway=secondary
     highway=secondary_link: Tag:highway=secondary link
@@ -593,26 +620,32 @@ en:
     leisure=miniature_golf: Tag:leisure=miniature golf
     leisure=nature_reserve: Tag:leisure=nature reserve
     leisure=park: Tag:leisure=park
+    leisure=picnic_table: Tag:leisure=picnic table
     leisure=pitch: Tag:leisure=pitch
     leisure=playground: Tag:leisure=playground
     leisure=slipway: Tag:leisure=slipway
     leisure=sports_centre: Tag:leisure=sports centre
     leisure=track: Tag:leisure=track
     leisure=water_park: Tag:leisure=water park
+    man_made=beacon: Tag:man made=beacon
     man_made=compass_rose: Tag:man made=compass rose
     man_made=crane: Tag:man made=crane
     man_made=cutline: Tag:man made=cutline
     man_made=dyke: Tag:man made=dyke
+    man_made=flagpole: Tag:man made=flagpole
     man_made=ground_station: Tag:man made=ground station
+    man_made=groyne: Tag:man made=groyne
     man_made=jetty: Tag:man made=jetty
     man_made=lighthouse: Tag:man made=lighthouse
     man_made=mineshaft: Tag:man made=mineshaft
+    man_made=monitoring_station: Tag:man made=monitoring station
     man_made=pier: Tag:man made=pier
     man_made=pipeline: Tag:man made=pipeline
     man_made=pumping_rig: Tag:man made=pumping rig
     man_made=reservoir_covered: Tag:man made=reservoir covered
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
+    man_made=tower: Tag:man made=tower
     man_made=wastewater_plant: Tag:man made=wastewater plant
     man_made=water_tower: Tag:man made=water tower
     man_made=water_well: Tag:man made=water well
@@ -635,6 +668,7 @@ en:
     natural=land: Tag:natural=land
     natural=meadow: Tag:natural=meadow
     natural=peak: Tag:natural=peak
+    natural=scrub: Tag:natural=scrub
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
     natural=tree: Tag:natural=tree
@@ -643,17 +677,28 @@ en:
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
     office=accountant: Tag:office=accountant
+    office=architect: Tag:office=architect
+    office=company: Tag:office=company
     office=employment_agency: Tag:office=employment agency
+    office=estate_agent: Tag:office=estate agent
+    office=government: Tag:office=government
+    office=insurance: Tag:office=insurance
     office=lawyer: Tag:office=lawyer
+    office=newspaper: Tag:office=newspaper
+    office=ngo: Tag:office=ngo
+    office=quango: Tag:office=quango
+    office=travel_agent: Tag:office=travel agent
     pipeline=marker: Tag:pipeline=marker
     pipeline=valve: Tag:pipeline=valve
     place=city: Tag:place=city
     place=continent: Tag:place=continent
     place=country: Tag:place=country
     place=county: Tag:place=county
+    place=farm: Tag:place=farm
     place=hamlet: Tag:place=hamlet
     place=island: Tag:place=island
     place=islet: Tag:place=islet
+    place=isolated_dwelling: Tag:place=isolated dwelling
     place=locality: Tag:place=locality
     place=region: Tag:place=region
     place=state: Tag:place=state
@@ -673,6 +718,7 @@ en:
     railway=crossing: Tag:railway=crossing
     railway=halt: Tag:railway=halt
     railway=level_crossing: Tag:railway=level crossing
+    railway=miniature: Tag:railway=miniature
     railway=monorail: Tag:railway=monorail
     railway=platform: Tag:railway=platform
     railway=rail: Tag:railway=rail
@@ -683,6 +729,7 @@ en:
     railway=tram: Tag:railway=tram
     railway=tram_stop: Tag:railway=tram stop
     railway=turntable: Tag:railway=turntable
+    religion=pagan: Tag:religion=pagan
     route=bus: Tag:route=bus
     route=canal: Tag:route=canal
     route=detour: Tag:route=detour
@@ -705,9 +752,11 @@ en:
     shop=SpotColor: Tag:shop=SpotColor
     shop=alcohol: Tag:shop=alcohol
     shop=bakery: Tag:shop=bakery
+    shop=beauty: Tag:shop=beauty
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
     shop=books: Tag:shop=books
+    shop=boutique: Tag:shop=boutique
     shop=butcher: Tag:shop=butcher
     shop=car: Tag:shop=car
     shop=car_repair: Tag:shop=car repair
@@ -736,17 +785,22 @@ en:
     shop=hairdresser: Tag:shop=hairdresser
     shop=hearing_aids: Tag:shop=hearing aids
     shop=hifi: Tag:shop=hifi
+    shop=ice_cream: Tag:shop=ice cream
     shop=jewelry: Tag:shop=jewelry
     shop=kiosk: Tag:shop=kiosk
     shop=laundry: Tag:shop=laundry
     shop=locksmith: Tag:shop=locksmith
     shop=mall: Tag:shop=mall
     shop=massage: Tag:shop=massage
+    shop=money_lender: Tag:shop=money lender
     shop=motorcycle: Tag:shop=motorcycle
+    shop=motorcycle_repair: Tag:shop=motorcycle repair
     shop=newsagent: Tag:shop=newsagent
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
+    shop=pawnbroker: Tag:shop=pawnbroker
+    shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
     shop=shoes: Tag:shop=shoes
     shop=sports: Tag:shop=sports
@@ -755,10 +809,15 @@ en:
     shop=systembolaget: Tag:shop=systembolaget
     shop=toys: Tag:shop=toys
     shop=travel_agency: Tag:shop=travel agency
+    shop=variety_store: Tag:shop=variety store
     shop=video: Tag:shop=video
     source:ele=barometric: Tag:source:ele=barometric
     source=GURS: Tag:source=GURS
     source=IBGE: Tag:source=IBGE
+    source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
+      1:25000 map (2007)
+    source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
+      aerial imagery (2001)
     sport=9pin: Tag:sport=9pin
     sport=australian_football: Tag:sport=australian football
     sport=boules: Tag:sport=boules
@@ -909,6 +968,7 @@ fr:
     name: FR:Key:name
     noname: FR:Key:noname
     opening_hours: FR:Key:opening hours
+    place: FR:Key:place
     power: FR:Key:power
     sac_scale: FR:Key:sac scale
     shop: FR:Key:shop
@@ -943,11 +1003,13 @@ fr:
     power=generator: FR:Tag:power=generator
     power=line: FR:Tag:power=line
     power=tower: FR:Tag:power=tower
+    railway=station: FR:Tag:railway=station
     railway=subway_entrance: FR:Tag:railway=subway entrance
     shop=bakery: FR:Tag:shop=bakery
     shop=supermarket: FR:Tag:shop=supermarket
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
+    waterway=weir: FR:Tag:waterway=weir
 hr:
   key:
     tracktype: Hr:Key:tracktype
@@ -962,6 +1024,7 @@ it:
     aeroway: IT:Key:aeroway
     amenity: IT:Key:amenity
     barrier: IT:Key:barrier
+    basin: IT:Key:basin
     boundary: IT:Key:boundary
     bridge: IT:Key:bridge
     building: IT:Key:building
@@ -1150,6 +1213,7 @@ pl:
     oneway: Pl:Key:oneway
 pt-br:
   key:
+    abutters: Pt-br:Key:abutters
     access: Pt-br:Key:access
     addr: Pt-br:Key:addr
     aeroway: Pt-br:Key:aeroway
@@ -1163,16 +1227,21 @@ pt-br:
     building: Pt-br:Key:building
     cep: Pt-br:Key:cep
     construction: Pt-br:Key:construction
+    cycleway: Pt-br:Key:cycleway
     ele: Pt-br:Key:ele
     emergency: Pt-br:Key:emergency
     fenced: Pt-br:Key:fenced
     foot: Pt-br:Key:foot
+    geological: Pt-br:Key:geological
     hgv: Pt-br:Key:hgv
     highway: Pt-br:Key:highway
+    historic: Pt-br:Key:historic
     horse: Pt-br:Key:horse
+    internet_access: Pt-br:Key:internet access
     landuse: Pt-br:Key:landuse
     lanes: Pt-br:Key:lanes
     leisure: Pt-br:Key:leisure
+    lit: Pt-br:Key:lit
     man_made: Pt-br:Key:man made
     maxdraught: Pt-br:Key:maxdraught
     maxheight: Pt-br:Key:maxheight
@@ -1191,13 +1260,19 @@ pt-br:
     oneway: Pt-br:Key:oneway
     operator: Pt-br:Key:operator
     psv: Pt-br:Key:psv
+    railway: Pt-br:Key:railway
     religion: Pt-br:Key:religion
+    route: Pt-br:Key:route
     seamark: Pt-br:Key:seamark
+    service: Pt-br:Key:service
     shop: Pt-br:Key:shop
     ski: Pt-br:Key:ski
     source: Pt-br:Key:source
     sport: Pt-br:Key:sport
     surface: Pt-br:Key:surface
+    tourism: Pt-br:Key:tourism
+    tracktype: Pt-br:Key:tracktype
+    traffic_calming: Pt-br:Key:traffic calming
     type: Pt-br:Key:type
     waterway: Pt-br:Key:waterway
   tag:
@@ -1209,11 +1284,16 @@ pt-br:
     amenity=place_of_worship: Pt-br:Tag:amenity=place of worship
     amenity=stripclub: Pt-br:Tag:amenity=stripclub
     boundary=maritime: Pt-br:Tag:boundary=maritime
+    highway=motorway: Pt-br:Tag:highway=motorway
+    highway=motorway_junction: Pt-br:Tag:highway=motorway junction
+    highway=motorway_link: Pt-br:Tag:highway=motorway link
     highway=road: Pt-br:Tag:highway=road
     highway=stop: Pt-br:Tag:highway=stop
     highway=unclassified: Pt-br:Tag:highway=unclassified
     landuse=cemetery: Pt-br:Tag:landuse=cemetery
+    landuse=meadow: Pt-br:Tag:landuse=meadow
     man_made=survey_point: Pt-br:Tag:man made=survey point
+    natural=beach: Pt-br:Tag:natural=beach
     natural=wetland: Pt-br:Tag:natural=wetland
     railway=rail: Pt-br:Tag:railway=rail
     shop=mall: Pt-br:Tag:shop=mall
@@ -1328,6 +1408,7 @@ ru:
     amenity=crematorium: RU:Tag:amenity=crematorium
     amenity=fast_food: RU:Tag:amenity=fast food
     amenity=fire_station: RU:Tag:amenity=fire station
+    amenity=fountain: RU:Tag:amenity=fountain
     amenity=fuel: RU:Tag:amenity=fuel
     amenity=grave_yard: RU:Tag:amenity=grave yard
     amenity=nightclub: RU:Tag:amenity=nightclub
@@ -1407,6 +1488,7 @@ ru:
     natural=water: RU:Tag:natural=water
     natural=wetland: RU:Tag:natural=wetland
     natural=wood: RU:Tag:natural=wood
+    office=lawyer: RU:Tag:office=lawyer
     opening_hours=24/7: RU:Tag:opening hours=24/7
     place=island: RU:Tag:place=island
     place=town: RU:Tag:place=town