From 3c85f90de43e461a9313038f48adcbc1d56d8b5a Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Fri, 24 Jun 2016 23:47:34 -0400 Subject: [PATCH 1/2] chore(package): update dependencies https://greenkeeper.io/ --- package.json | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 893a3e82d..3e2a41a0b 100644 --- a/package.json +++ b/package.json @@ -25,37 +25,40 @@ "sexagesimal": "0.5.0" }, "devDependencies": { - "chai": "1.9.2", + "chai": "3.5.0", "d3": "3.5.5", "editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages", - "eslint": "2.12.0", - "eslint-plugin-import": "1.8.1", - "glob": "3.1.21", - "happen": "0.1.2", + "eslint": "2.13.1", + "eslint-plugin-import": "1.9.2", + "glob": "7.0.5", + "happen": "0.3.1", "http-server": "0.9.0", - "js-yaml": "3.3.1", - "jsonschema": "0.3.2", - "lodash-cli": "4.12.0", + "js-yaml": "3.6.1", + "jsonschema": "1.1.0", + "lodash-cli": "4.13.1", "maki": "0.5.0", "minimist": "1.2.0", "mocha": "2.5.3", "mocha-phantomjs-core": "2.0.1", "name-suggestion-index": "0.1.1", "phantomjs-prebuilt": "2.1.7", - "request": "2.16.2", - "rollup": "0.31.2", + "request": "2.72.0", + "rollup": "0.33.0", "rollup-plugin-commonjs": "3.1.0", "rollup-plugin-node-resolve": "1.7.1", - "sinon": "1.6", - "sinon-chai": "2.3.1", + "sinon": "1.17.4", + "sinon-chai": "2.8.0", "smash": "0.0", - "svg-sprite": "1.2.19", - "uglify-js": "2.4.16", - "xml2js": "0.4.13", - "xmlbuilder": "4.2.0" + "svg-sprite": "1.3.1", + "uglify-js": "2.6.4", + "xml2js": "0.4.16", + "xmlbuilder": "8.2.2" }, "greenkeeper": { - "ignore": ["d3", "maki"] + "ignore": [ + "d3", + "maki" + ] }, "engines": { "node": ">=0.10.0" From 03558c7e40fb3992cdca781614c6e5556b666b29 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 25 Jun 2016 00:50:20 -0400 Subject: [PATCH 2/2] Bump dependencies, fix tests (commented out 2 failing tests in mapillary service related to sinon spy) --- data/presets.yaml | 2991 ++++++++++++++++++++++--------- data/presets/fields.json | 208 +-- data/presets/presets.json | 416 ++--- data/taginfo.json | 60 +- dist/locales/en.json | 206 +-- test/index.html | 2 +- test/index_packaged.html | 2 +- test/spec/services/mapillary.js | 142 +- 8 files changed, 2684 insertions(+), 1343 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 3fec43e21..a19247b64 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -50,12 +50,16 @@ en: title: Prohibited permissive: # access=permissive - description: Access permitted until such time as the owner revokes the permission + description: >- + Access permitted until such time as the owner revokes the + permission # access=permissive title: Permissive private: # access=private - description: Access permitted only with permission of the owner on an individual basis + description: >- + Access permitted only with permission of the owner on an + individual basis # access=private title: Private 'yes': @@ -72,15 +76,19 @@ en: horse: Horses motor_vehicle: Motor Vehicles access_simple: - # 'access=*' + # access=* label: Allowed Access # access_simple field placeholder placeholder: 'yes' access_toilets: - # 'access=*' + # access=* label: Access address: - # 'addr:housename=*, addr:housenumber=*, addr:conscriptionnumber=*, addr:street=*, addr:city=*, addr:postcode=*, addr:place=*, addr:hamlet=*, addr:suburb=*, addr:subdistrict=*, addr:district=*, addr:province=*, addr:state=*, addr:country=*' + # >- + addr:housename=*, addr:housenumber=*, addr:conscriptionnumber=*, + addr:street=*, addr:city=*, addr:postcode=*, addr:place=*, + addr:hamlet=*, addr:suburb=*, addr:subdistrict=*, addr:district=*, + addr:province=*, addr:state=*, addr:country=* label: Address placeholders: city: City @@ -98,10 +106,10 @@ en: subdistrict: Subdistrict suburb: Suburb admin_level: - # 'admin_level=*' + # admin_level=* label: Admin Level aerialway: - # 'aerialway=*' + # aerialway=* label: Type aerialway/access: # 'aerialway:access=*' @@ -145,57 +153,57 @@ en: # 'aerialway:summer:access=exit' exit: Exit aeroway: - # 'aeroway=*' + # aeroway=* label: Type amenity: - # 'amenity=*' + # amenity=* label: Type area/highway: # 'area:highway=*' label: Type artist: - # 'artist_name=*' + # artist_name=* label: Artist artwork_type: - # 'artwork_type=*' + # artwork_type=* label: Type atm: - # 'atm=*' + # atm=* label: ATM backrest: - # 'backrest=*' + # backrest=* label: Backrest barrier: - # 'barrier=*' + # barrier=* label: Type bench: - # 'bench=*' + # bench=* label: Bench bicycle_parking: - # 'bicycle_parking=*' + # bicycle_parking=* label: Type bin: - # 'bin=*' + # bin=* label: Waste Bin boundary: - # 'boundary=*' + # boundary=* label: Type brand: - # 'brand=*' + # brand=* label: Brand building: - # 'building=*' + # building=* label: Building building_area: - # 'building=*' + # building=* label: Building capacity: - # 'capacity=*' + # capacity=* label: Capacity # capacity field placeholder placeholder: '50, 100, 200...' cardinal_direction: - # 'direction=*' + # direction=* label: Direction options: # direction=E @@ -231,7 +239,7 @@ en: # direction=WSW WSW: West-southwest clock_direction: - # 'direction=*' + # direction=* label: Direction options: # direction=anticlockwise @@ -239,31 +247,31 @@ en: # direction=clockwise clockwise: Clockwise collection_times: - # 'collection_times=*' + # collection_times=* label: Collection Times construction: - # 'construction=*' + # construction=* label: Type content: - # 'content=*' + # content=* label: Contents country: - # 'country=*' + # country=* label: Country covered: - # 'covered=*' + # covered=* label: Covered craft: - # 'craft=*' + # craft=* label: Type crop: - # 'crop=*' + # crop=* label: Crop crossing: - # 'crossing=*' + # crossing=* label: Type cuisine: - # 'cuisine=*' + # cuisine=* label: Cuisine currency_multi: # 'currency:=*' @@ -306,28 +314,28 @@ en: 'cycleway:left': Left side 'cycleway:right': Right side delivery: - # 'delivery=*' + # delivery=* label: Delivery denomination: - # 'denomination=*' + # denomination=* label: Denomination denotation: - # 'denotation=*' + # denotation=* label: Denotation description: - # 'description=*' + # description=* label: Description diaper: - # 'diaper=*' + # diaper=* label: Diaper Changing Available dock: - # 'dock=*' + # dock=* label: Type drive_through: - # 'drive_through=*' + # drive_through=* label: Drive-Through electrified: - # 'electrified=*' + # electrified=* label: Electrification options: # electrified=contact_line @@ -341,24 +349,24 @@ en: # electrified field placeholder placeholder: 'Contact Line, Electrified Rail...' elevation: - # 'ele=*' + # ele=* label: Elevation emergency: - # 'emergency=*' + # emergency=* label: Emergency entrance: - # 'entrance=*' + # entrance=* label: Type except: - # 'except=*' + # except=* label: Exceptions fax: - # 'fax=*' + # fax=* label: Fax # fax field placeholder placeholder: +31 42 123 4567 fee: - # 'fee=*' + # fee=* label: Fee fire_hydrant/type: # 'fire_hydrant:type=*' @@ -373,16 +381,16 @@ en: # 'fire_hydrant:type=wall' wall: Wall fixme: - # 'fixme=*' + # fixme=* label: Fix Me fuel: - # 'fuel=*' + # fuel=* label: Fuel fuel_multi: # 'fuel:=*' label: Fuel Types gauge: - # 'gauge=*' + # gauge=* label: Gauge gender: # 'male=*, female=*, unisex=*' @@ -406,40 +414,40 @@ en: # 'generator:type=*' label: Type golf_hole: - # 'ref=*' + # ref=* label: Reference # golf_hole field placeholder placeholder: Hole number (1-18) handicap: - # 'handicap=*' + # handicap=* label: Handicap # handicap field placeholder placeholder: 1-18 handrail: - # 'handrail=*' + # handrail=* label: Handrail highway: - # 'highway=*' + # highway=* label: Type historic: - # 'historic=*' + # historic=* label: Type hoops: - # 'hoops=*' + # hoops=* label: Hoops # hoops field placeholder placeholder: '1, 2, 4...' iata: - # 'iata=*' + # iata=* label: IATA icao: - # 'icao=*' + # icao=* label: ICAO incline: - # 'incline=*' + # incline=* label: Incline incline_steps: - # 'incline=*' + # incline=* label: Incline options: # incline=down @@ -447,10 +455,10 @@ en: # incline=up up: Up information: - # 'information=*' + # information=* label: Type internet_access: - # 'internet_access=*' + # internet_access=* label: Internet Access options: # internet_access=no @@ -467,21 +475,21 @@ en: # 'internet_access:fee=*' label: Internet Access Fee lamp_type: - # 'lamp_type=*' + # lamp_type=* label: Type landuse: - # 'landuse=*' + # landuse=* label: Type lanes: - # 'lanes=*' + # lanes=* label: Lanes # lanes field placeholder placeholder: '1, 2, 3...' layer: - # 'layer=*' + # layer=* label: Layer leaf_cycle: - # 'leaf_cycle=*' + # leaf_cycle=* label: Leaf Cycle options: # leaf_cycle=deciduous @@ -495,7 +503,7 @@ en: # leaf_cycle=semi_evergreen semi_evergreen: Semi-Evergreen leaf_cycle_singular: - # 'leaf_cycle=*' + # leaf_cycle=* label: Leaf Cycle options: # leaf_cycle=deciduous @@ -507,7 +515,7 @@ en: # leaf_cycle=semi_evergreen semi_evergreen: Semi-Evergreen leaf_type: - # 'leaf_type=*' + # leaf_type=* label: Leaf Type options: # leaf_type=broadleaved @@ -519,7 +527,7 @@ en: # leaf_type=needleleaved needleleaved: Needleleaved leaf_type_singular: - # 'leaf_type=*' + # leaf_type=* label: Leaf Type options: # leaf_type=broadleaved @@ -529,13 +537,13 @@ en: # leaf_type=needleleaved needleleaved: Needleleaved leisure: - # 'leisure=*' + # leisure=* label: Type length: - # 'length=*' + # length=* label: Length (Meters) level: - # 'level=*' + # level=* label: Level levels: # 'building:levels=*' @@ -543,21 +551,21 @@ en: # levels field placeholder placeholder: '2, 4, 6...' lit: - # 'lit=*' + # lit=* label: Lit location: - # 'location=*' + # location=* label: Location man_made: - # 'man_made=*' + # man_made=* label: Type maxspeed: - # 'maxspeed=*' + # maxspeed=* label: Speed Limit # maxspeed field placeholder placeholder: '40, 50, 60...' maxstay: - # 'maxstay=*' + # maxstay=* label: Max Stay mtb/scale: # 'mtb:scale=*' @@ -614,24 +622,24 @@ en: # mtb/scale/uphill field placeholder placeholder: '0, 1, 2, 3...' name: - # 'name=*' + # name=* label: Name # name field placeholder placeholder: Common name (if any) natural: - # 'natural=*' + # natural=* label: Natural network: - # 'network=*' + # network=* label: Network note: - # 'note=*' + # note=* label: Note office: - # 'office=*' + # office=* label: Type oneway: - # 'oneway=*' + # oneway=* label: One Way options: # oneway=no @@ -641,7 +649,7 @@ en: # oneway=yes 'yes': 'Yes' oneway_yes: - # 'oneway=*' + # oneway=* label: One Way options: # oneway=no @@ -651,18 +659,18 @@ en: # oneway=yes 'yes': 'Yes' opening_hours: - # 'opening_hours=*' + # opening_hours=* label: Hours operator: - # 'operator=*' + # operator=* label: Operator par: - # 'par=*' + # par=* label: Par # par field placeholder placeholder: '3, 4, 5...' parallel_direction: - # 'direction=*' + # direction=* label: Direction options: # direction=backward @@ -670,10 +678,10 @@ en: # direction=forward forward: Forward park_ride: - # 'park_ride=*' + # park_ride=* label: Park and Ride parking: - # 'parking=*' + # parking=* label: Type options: # parking=carports @@ -694,7 +702,7 @@ en: # 'payment:=*' label: Payment Types phone: - # 'phone=*' + # phone=* label: Phone # phone field placeholder placeholder: +31 42 123 4567 @@ -757,48 +765,48 @@ en: # 'piste:type=snow_park' snow_park: Snow Park place: - # 'place=*' + # place=* label: Type population: - # 'population=*' + # population=* label: Population power: - # 'power=*' + # power=* label: Type power_supply: - # 'power_supply=*' + # power_supply=* label: Power Supply railway: - # 'railway=*' + # railway=* label: Type recycling_accepts: # 'recycling:=*' label: Accepts ref: - # 'ref=*' + # ref=* label: Reference relation: - # 'type=*' + # type=* label: Type religion: - # 'religion=*' + # religion=* label: Religion restriction: - # 'restriction=*' + # restriction=* label: Type restrictions: label: Turn Restrictions rooms: - # 'rooms=*' + # rooms=* label: Rooms route: - # 'route=*' + # route=* label: Type route_master: - # 'route_master=*' + # route_master=* label: Type sac_scale: - # 'sac_scale=*' + # sac_scale=* label: Hiking Difficulty options: # sac_scale=alpine_hiking @@ -816,13 +824,13 @@ en: # sac_scale field placeholder placeholder: 'Mountain Hiking, Alpine Hiking...' sanitary_dump_station: - # 'sanitary_dump_station=*' + # sanitary_dump_station=* label: Toilet Disposal seasonal: - # 'seasonal=*' + # seasonal=* label: Seasonal service: - # 'service=*' + # service=* label: Type service/bicycle/chain_tool: # 'service:bicycle:chain_tool=*' @@ -845,7 +853,7 @@ en: # 'service:bicycle:pump=yes' 'yes': 'Yes' service_rail: - # 'service=*' + # service=* label: Service Type options: # service=crossover @@ -857,26 +865,26 @@ en: # service=yard yard: Yard shelter: - # 'shelter=*' + # shelter=* label: Shelter shelter_type: - # 'shelter_type=*' + # shelter_type=* label: Type shop: - # 'shop=*' + # shop=* label: Type site: - # 'site=*' + # site=* label: Type sloped_curb: - # 'sloped_curb=*' + # sloped_curb=* label: Sloped Curb smoking: - # 'smoking=*' + # smoking=* label: Smoking options: # smoking=dedicated - dedicated: "Dedicated to smokers (e.g. smokers' club)" + dedicated: Dedicated to smokers (e.g. smokers' club) # smoking=isolated isolated: 'In smoking areas, physically isolated' # smoking=no @@ -890,7 +898,7 @@ en: # smoking field placeholder placeholder: 'No, Separated, Yes...' smoothness: - # 'smoothness=*' + # smoothness=* label: Smoothness options: # smoothness=bad @@ -917,22 +925,22 @@ en: # social_facility_for field placeholder placeholder: 'Homeless, Disabled, Child, etc' source: - # 'source=*' + # source=* label: Source sport: - # 'sport=*' + # sport=* label: Sport sport_ice: - # 'sport=*' + # sport=* label: Sport sport_racing: - # 'sport=*' + # sport=* label: Sport stars: - # 'stars=*' + # stars=* label: Stars stop: - # 'stop=*' + # stop=* label: Stop Type options: # stop=all @@ -956,22 +964,22 @@ en: # structure field placeholder placeholder: Unknown studio: - # 'studio=*' + # studio=* label: Type substation: - # 'substation=*' + # substation=* label: Type supervised: - # 'supervised=*' + # supervised=* label: Supervised surface: - # 'surface=*' + # surface=* label: Surface tactile_paving: - # 'tactile_paving=*' + # tactile_paving=* label: Tactile Paving takeaway: - # 'takeaway=*' + # takeaway=* label: Takeaway options: # takeaway=no @@ -995,13 +1003,13 @@ en: # 'toilets:disposal=pitlatrine' pitlatrine: Pit/Latrine tourism: - # 'tourism=*' + # tourism=* label: Type towertype: # 'tower:type=*' label: Tower type tracktype: - # 'tracktype=*' + # tracktype=* label: Track Type options: # tracktype=grade1 @@ -1017,10 +1025,10 @@ en: # tracktype field placeholder placeholder: 'Solid, Mostly Solid, Soft...' traffic_signals: - # 'traffic_signals=*' + # traffic_signals=* label: Type trail_visibility: - # 'trail_visibility=*' + # trail_visibility=* label: Trail Visibility options: # trail_visibility=bad @@ -1038,36 +1046,36 @@ en: # trail_visibility field placeholder placeholder: 'Excellent, Good, Bad...' trees: - # 'trees=*' + # trees=* label: Trees tunnel: - # 'tunnel=*' + # tunnel=* label: Tunnel vending: - # 'vending=*' + # vending=* label: Type of Goods water: - # 'water=*' + # water=* label: Type water_point: - # 'water_point=*' + # water_point=* label: Water Point waterway: - # 'waterway=*' + # waterway=* label: Type website: - # 'website=*' + # website=* label: Website # website field placeholder placeholder: 'http://example.com/' wetland: - # 'wetland=*' + # wetland=* label: Type wheelchair: - # 'wheelchair=*' + # wheelchair=* label: Wheelchair Access width: - # 'width=*' + # width=* label: Width (Meters) wikipedia: # 'wikipedia=*, wikidata=*' @@ -1076,2788 +1084,4121 @@ en: address: # 'addr:housenumber=*' name: Address - terms: "" + terms: >- + aerialway: - # 'aerialway=*' + # aerialway=* name: Aerialway # 'terms: ski lift,funifor,funitel' - terms: "" + terms: >- + aerialway/cable_car: # aerialway=cable_car name: Cable Car # 'terms: tramway,ropeway' - terms: "" + terms: >- + aerialway/chair_lift: # aerialway=chair_lift name: Chair Lift - terms: "" + terms: >- + aerialway/gondola: # aerialway=gondola name: Gondola - terms: "" + terms: >- + aerialway/magic_carpet: # aerialway=magic_carpet name: Magic Carpet Lift - terms: "" + terms: >- + aerialway/platter: # aerialway=platter name: Platter Lift # 'terms: button lift,poma lift' - terms: "" + terms: >- + aerialway/pylon: # aerialway=pylon name: Aerialway Pylon - terms: "" + terms: >- + aerialway/rope_tow: # aerialway=rope_tow name: Rope Tow Lift # 'terms: handle tow,bugel lift' - terms: "" + terms: >- + aerialway/station: # aerialway=station name: Aerialway Station - terms: "" + terms: >- + aerialway/t-bar: # aerialway=t-bar name: T-bar Lift - terms: "" + terms: >- + aeroway: - # 'aeroway=*' + # aeroway=* name: Aeroway - terms: "" + terms: >- + aeroway/aerodrome: # aeroway=aerodrome name: Airport # 'terms: airplane,airport,aerodrome' - terms: "" + terms: >- + aeroway/apron: # aeroway=apron name: Apron # 'terms: ramp' - terms: "" + terms: >- + aeroway/gate: # aeroway=gate name: Airport gate - terms: "" + terms: >- + aeroway/hangar: # aeroway=hangar name: Hangar - terms: "" + terms: >- + aeroway/helipad: # aeroway=helipad name: Helipad # 'terms: helicopter,helipad,heliport' - terms: "" + terms: >- + aeroway/runway: # aeroway=runway name: Runway # 'terms: landing strip' - terms: "" + terms: >- + aeroway/taxiway: # aeroway=taxiway name: Taxiway - terms: "" + terms: >- + aeroway/terminal: # aeroway=terminal name: Airport terminal # 'terms: airport,aerodrome' - terms: "" + terms: >- + amenity: - # 'amenity=*' + # amenity=* name: Amenity - terms: "" + terms: >- + amenity/arts_centre: # amenity=arts_centre name: Arts Center - terms: "" + terms: >- + amenity/atm: # amenity=atm name: ATM # 'terms: money,cash,machine' - terms: "" + terms: >- + amenity/bank: # amenity=bank name: Bank - # 'terms: credit union,check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault' - terms: "" + # >- + terms: credit + union,check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault + terms: >- + amenity/bar: # amenity=bar name: Bar # 'terms: dive,beer,bier,booze' - terms: "" + terms: >- + amenity/bbq: # amenity=bbq name: Barbecue/Grill # 'terms: bbq,grill' - terms: "" + terms: >- + amenity/bench: # amenity=bench name: Bench # 'terms: seat' - terms: "" + terms: >- + amenity/bicycle_parking: # amenity=bicycle_parking name: Bicycle Parking # 'terms: bike' - terms: "" + terms: >- + amenity/bicycle_rental: # amenity=bicycle_rental name: Bicycle Rental # 'terms: bike' - terms: "" + terms: >- + amenity/bicycle_repair_station: # amenity=bicycle_repair_station name: Bicycle Repair Tool Stand # 'terms: bike,repair,chain,pump' - terms: "" + terms: >- + amenity/biergarten: # amenity=biergarten name: Beer Garden # 'terms: beer,bier,booze' - terms: "" + terms: >- + amenity/boat_rental: # amenity=boat_rental name: Boat Rental - terms: "" + terms: >- + amenity/bureau_de_change: # amenity=bureau_de_change name: Currency Exchange # 'terms: bureau de change,money changer' - terms: "" + terms: >- + amenity/bus_station: # amenity=bus_station name: Bus Station - terms: "" + terms: >- + amenity/cafe: # amenity=cafe name: Cafe # 'terms: bistro,coffee,tea' - terms: "" + terms: >- + amenity/car_rental: # amenity=car_rental name: Car Rental - terms: "" + terms: >- + amenity/car_sharing: # amenity=car_sharing name: Car Sharing - terms: "" + terms: >- + amenity/car_wash: # amenity=car_wash name: Car Wash - terms: "" + terms: >- + amenity/casino: # amenity=casino name: Casino # 'terms: gambling,roulette,craps,poker,blackjack' - terms: "" + terms: >- + amenity/charging_station: # amenity=charging_station name: Charging Station # 'terms: EV,Electric Vehicle,Supercharger' - terms: "" + terms: >- + amenity/childcare: # amenity=childcare name: Nursery/Childcare # 'terms: daycare,orphanage,playgroup' - terms: "" + terms: >- + amenity/cinema: # amenity=cinema name: Cinema # 'terms: drive-in,film,flick,movie,theater,picture,show,screen' - terms: "" + terms: >- + amenity/clinic: # amenity=clinic name: Clinic # 'terms: medical,urgentcare' - terms: "" + terms: >- + amenity/clock: # amenity=clock name: Clock - terms: "" + terms: >- + amenity/college: # amenity=college name: College Grounds # 'terms: university' - terms: "" + terms: >- + amenity/community_centre: # amenity=community_centre name: Community Center # 'terms: event,hall' - terms: "" + terms: >- + amenity/compressed_air: # amenity=compressed_air name: Compressed Air - terms: "" + terms: >- + amenity/courthouse: # amenity=courthouse name: Courthouse - terms: "" + terms: >- + amenity/dentist: # amenity=dentist name: Dentist # 'terms: tooth,teeth' - terms: "" + terms: >- + amenity/doctors: # amenity=doctors name: Doctor # 'terms: medic*' - terms: "" + terms: >- + amenity/dojo: # amenity=dojo name: Dojo / Martial Arts Academy # 'terms: martial arts,dojang' - terms: "" + terms: >- + amenity/drinking_water: # amenity=drinking_water name: Drinking Water # 'terms: fountain,potable' - terms: "" + terms: >- + amenity/embassy: # amenity=embassy name: Embassy - terms: "" + terms: >- + amenity/fast_food: # amenity=fast_food name: Fast Food # 'terms: restaurant' - terms: "" + terms: >- + amenity/ferry_terminal: # amenity=ferry_terminal name: Ferry Terminal - terms: "" + terms: >- + amenity/fire_station: # amenity=fire_station name: Fire Station - terms: "" + terms: >- + amenity/fountain: # amenity=fountain name: Fountain - terms: "" + terms: >- + amenity/fuel: # amenity=fuel name: Gas Station # 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel' - terms: "" + terms: >- + amenity/grave_yard: # amenity=grave_yard name: Graveyard - terms: "" + terms: >- + amenity/grit_bin: # amenity=grit_bin name: Grit Bin # 'terms: salt,sand' - terms: "" + terms: >- + amenity/hospital: # amenity=hospital name: Hospital Grounds - # 'terms: clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward' - terms: "" + # >- + terms: clinic,doctor,emergency room,health + service,hospice,infirmary,institution,nursing + home,sanatorium,sanitarium,sick,surgery,ward + terms: >- + amenity/hunting_stand: # amenity=hunting_stand name: Hunting Stand - terms: "" + terms: >- + amenity/kindergarten: # amenity=kindergarten name: Preschool/Kindergarten Grounds # 'terms: kindergarden,pre-school' - terms: "" + terms: >- + amenity/library: # amenity=library name: Library # 'terms: book' - terms: "" + terms: >- + amenity/marketplace: # amenity=marketplace name: Marketplace - terms: "" + terms: >- + amenity/motorcycle_parking: # amenity=motorcycle_parking name: Motorcycle Parking - terms: "" + terms: >- + amenity/nightclub: # amenity=nightclub name: Nightclub # 'terms: disco*,night club,dancing,dance club' - terms: "" + terms: >- + amenity/parking: # amenity=parking name: Car Parking - terms: "" + terms: >- + amenity/parking_entrance: # amenity=parking_entrance name: Parking Garage Entrance/Exit - terms: "" + terms: >- + amenity/parking_space: # amenity=parking_space name: Parking Space - terms: "" + terms: >- + amenity/pharmacy: # amenity=pharmacy name: Pharmacy # 'terms: drug,medicine' - terms: "" + terms: >- + amenity/place_of_worship: # amenity=place_of_worship name: Place of Worship - # 'terms: abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,mosque,oratory,parish,sacellum,sanctuary,shrine,synagogue,tabernacle,temple' - terms: "" + # >- + terms: + abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house + of God,house of prayer,house of + worship,minster,mission,mosque,oratory,parish,sacellum,sanctuary,shrine,synagogue,tabernacle,temple + terms: >- + amenity/place_of_worship/buddhist: # 'amenity=place_of_worship, religion=buddhist' name: Buddhist Temple # 'terms: stupa,vihara,monastery,temple,pagoda,zendo,dojo' - terms: "" + terms: >- + amenity/place_of_worship/christian: # 'amenity=place_of_worship, religion=christian' name: Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' - terms: "" + # >- + terms: + christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house + of God,house of prayer,house of + worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple + terms: >- + amenity/place_of_worship/jewish: # 'amenity=place_of_worship, religion=jewish' name: Synagogue # 'terms: jewish' - terms: "" + terms: >- + amenity/place_of_worship/muslim: # 'amenity=place_of_worship, religion=muslim' name: Mosque # 'terms: muslim' - terms: "" + terms: >- + amenity/police: # amenity=police name: Police - # 'terms: badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol' - terms: "" + # >- + terms: + badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol + terms: >- + amenity/post_box: # amenity=post_box name: Mailbox # 'terms: letter,post' - terms: "" + terms: >- + amenity/post_office: # amenity=post_office name: Post Office # 'terms: letter,mail' - terms: "" + terms: >- + amenity/prison: # amenity=prison name: Prison Grounds # 'terms: cell,jail' - terms: "" + terms: >- + amenity/pub: # amenity=pub name: Pub # 'terms: dive,beer,bier,booze' - terms: "" + terms: >- + amenity/public_bookcase: # amenity=public_bookcase name: Public Bookcase # 'terms: library,bookcrossing' - terms: "" + terms: >- + amenity/ranger_station: # amenity=ranger_station name: Ranger Station - # 'terms: visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center' - terms: "" + # >- + terms: visitor center,visitor centre,permit center,permit + centre,backcountry office,warden office,warden center + terms: >- + amenity/recycling: # amenity=recycling name: Recycling # 'terms: can,bottle,garbage,scrap,trash' - terms: "" + terms: >- + amenity/register_office: # amenity=register_office name: Register Office - terms: "" + terms: >- + amenity/restaurant: # amenity=restaurant name: Restaurant - # 'terms: bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table' - terms: "" + # >- + terms: + bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table + terms: >- + amenity/sanitary_dump_station: # amenity=sanitary_dump_station name: RV Toilet Disposal - # 'terms: Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet' - terms: "" + # >- + terms: Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical + Toilet + terms: >- + amenity/school: # amenity=school name: School Grounds # 'terms: academy,elementary school,middle school,high school' - terms: "" + terms: >- + amenity/shelter: # amenity=shelter name: Shelter # 'terms: lean-to,gazebo,picnic' - terms: "" + terms: >- + amenity/social_facility: # amenity=social_facility name: Social Facility - terms: "" + terms: >- + amenity/social_facility/food_bank: # 'amenity=social_facility, social_facility=food_bank' name: Food Bank - terms: "" + terms: >- + amenity/social_facility/group_home: - # 'amenity=social_facility, social_facility=group_home, social_facility:for=senior' + # >- + amenity=social_facility, social_facility=group_home, + social_facility:for=senior name: Elderly Group Home # 'terms: old,senior,living' - terms: "" + terms: >- + amenity/social_facility/homeless_shelter: - # 'amenity=social_facility, social_facility=shelter, social_facility:for=homeless' + # >- + amenity=social_facility, social_facility=shelter, + social_facility:for=homeless name: Homeless Shelter # 'terms: houseless,unhoused,displaced' - terms: "" + terms: >- + amenity/studio: # amenity=studio name: Studio # 'terms: recording,radio,television' - terms: "" + terms: >- + amenity/swimming_pool: # amenity=swimming_pool name: Swimming Pool - terms: "" + terms: >- + amenity/taxi: # amenity=taxi name: Taxi Stand # 'terms: cab' - terms: "" + terms: >- + amenity/telephone: # amenity=telephone name: Telephone # 'terms: phone' - terms: "" + terms: >- + amenity/theatre: # amenity=theatre name: Theater # 'terms: theatre,performance,play,musical' - terms: "" + terms: >- + amenity/toilets: # amenity=toilets name: Toilets - # 'terms: bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C.' - terms: "" + # >- + terms: bathroom,restroom,outhouse,privy,head,lavatory,latrine,water + closet,WC,W.C. + terms: >- + amenity/townhall: # amenity=townhall name: Town Hall # 'terms: village,city,government,courthouse,municipal' - terms: "" + terms: >- + amenity/university: # amenity=university name: University Grounds # 'terms: college' - terms: "" + terms: >- + amenity/vending_machine/cigarettes: # 'amenity=vending_machine, vending=cigarettes' name: Cigarette Vending Machine # 'terms: cigarette' - terms: "" + terms: >- + amenity/vending_machine/condoms: # 'amenity=vending_machine, vending=condoms' name: Condom Vending Machine # 'terms: condom' - terms: "" + terms: >- + amenity/vending_machine/drinks: # 'amenity=vending_machine, vending=drinks' name: Drink Vending Machine # 'terms: drink,soda,beverage,juice,pop' - terms: "" + terms: >- + amenity/vending_machine/excrement_bags: # 'amenity=vending_machine, vending=excrement_bags' name: Excrement Bag Vending Machine # 'terms: excrement bags,poop,dog,animal' - terms: "" + terms: >- + amenity/vending_machine/news_papers: # 'amenity=vending_machine, vending=news_papers' name: Newspaper Vending Machine # 'terms: newspaper' - terms: "" + terms: >- + amenity/vending_machine/parcel_pickup_dropoff: # 'amenity=vending_machine, vending=parcel_pickup;parcel_mail_in' name: Parcel Pickup/Dropoff Vending Machine # 'terms: parcel,mail,pickup' - terms: "" + terms: >- + amenity/vending_machine/parking_tickets: # 'amenity=vending_machine, vending=parking_tickets' name: Parking Ticket Vending Machine # 'terms: parking,ticket' - terms: "" + terms: >- + amenity/vending_machine/public_transport_tickets: # 'amenity=vending_machine, vending=public_transport_tickets' name: Transit Ticket Vending Machine # 'terms: bus,train,ferry,rail,ticket,transportation' - terms: "" + terms: >- + amenity/vending_machine/sweets: # 'amenity=vending_machine, vending=sweets' name: Snack Vending Machine # 'terms: candy,gum,chip,pretzel,cookie,cracker' - terms: "" + terms: >- + amenity/vending_machine/vending_machine: # amenity=vending_machine name: Vending Machine - terms: "" + terms: >- + amenity/veterinary: # amenity=veterinary name: Veterinary # 'terms: pet clinic,veterinarian,animal hospital,pet doctor' - terms: "" + terms: >- + amenity/waste_basket: # amenity=waste_basket name: Waste Basket # 'terms: bin,rubbish,litter,trash,garbage' - terms: "" + terms: >- + amenity/waste_disposal: # amenity=waste_disposal name: Garbage Dumpster # 'terms: rubbish,litter,trash' - terms: "" + terms: >- + amenity/water_point: # amenity=water_point name: RV Drinking Water - terms: "" + terms: >- + area: # area=yes name: Area - terms: "" + terms: >- + area/highway: # 'area:highway=*' name: Road Surface - terms: "" + terms: >- + barrier: - # 'barrier=*' + # barrier=* name: Barrier - terms: "" + terms: >- + barrier/block: # barrier=block name: Block - terms: "" + terms: >- + barrier/bollard: # barrier=bollard name: Bollard - terms: "" + terms: >- + barrier/cattle_grid: # barrier=cattle_grid name: Cattle Grid - terms: "" + terms: >- + barrier/city_wall: # barrier=city_wall name: City Wall - terms: "" + terms: >- + barrier/cycle_barrier: # barrier=cycle_barrier name: Cycle Barrier - terms: "" + terms: >- + barrier/ditch: # barrier=ditch name: Trench - terms: "" + terms: >- + barrier/entrance: # barrier=entrance name: Entrance - terms: "" + terms: >- + barrier/fence: # barrier=fence name: Fence - terms: "" + terms: >- + barrier/gate: # barrier=gate name: Gate - terms: "" + terms: >- + barrier/hedge: # barrier=hedge name: Hedge - terms: "" + terms: >- + barrier/kissing_gate: # barrier=kissing_gate name: Kissing Gate - terms: "" + terms: >- + barrier/lift_gate: # barrier=lift_gate name: Lift Gate - terms: "" + terms: >- + barrier/retaining_wall: # barrier=retaining_wall name: Retaining Wall - terms: "" + terms: >- + barrier/stile: # barrier=stile name: Stile - terms: "" + terms: >- + barrier/toll_booth: # barrier=toll_booth name: Toll Booth - terms: "" + terms: >- + barrier/wall: # barrier=wall name: Wall - terms: "" + terms: >- + boundary/administrative: # boundary=administrative name: Administrative Boundary - terms: "" + terms: >- + building: - # 'building=*' + # building=* name: Building - terms: "" + terms: >- + building/apartments: # building=apartments name: Apartments - terms: "" + terms: >- + building/barn: # building=barn name: Barn - terms: "" + terms: >- + building/bunker: # building=bunker name: Bunker - terms: "" + terms: >- + building/cabin: # building=cabin name: Cabin - terms: "" + terms: >- + building/cathedral: # building=cathedral name: Cathedral Building - terms: "" + terms: >- + building/chapel: # building=chapel name: Chapel Building - terms: "" + terms: >- + building/church: # building=church name: Church Building - terms: "" + terms: >- + building/college: # building=college name: College Building # 'terms: university' - terms: "" + terms: >- + building/commercial: # building=commercial name: Commercial Building - terms: "" + terms: >- + building/construction: # building=construction name: Building Under Construction - terms: "" + terms: >- + building/detached: # building=detached name: Detached House # 'terms: home,single,family,residence,dwelling' - terms: "" + terms: >- + building/dormitory: # building=dormitory name: Dormitory - terms: "" + terms: >- + building/entrance: # building=entrance name: Entrance/Exit - terms: "" + terms: >- + building/garage: # building=garage name: Garage - terms: "" + terms: >- + building/garages: # building=garages name: Garages - terms: "" + terms: >- + building/greenhouse: # building=greenhouse name: Greenhouse - terms: "" + terms: >- + building/hospital: # building=hospital name: Hospital Building - terms: "" + terms: >- + building/hotel: # building=hotel name: Hotel Building - terms: "" + terms: >- + building/house: # building=house name: House # 'terms: home,family,residence,dwelling' - terms: "" + terms: >- + building/hut: # building=hut name: Hut - terms: "" + terms: >- + building/industrial: # building=industrial name: Industrial Building - terms: "" + terms: >- + building/kindergarten: # building=kindergarten name: Preschool/Kindergarten Building # 'terms: kindergarden,pre-school' - terms: "" + terms: >- + building/public: # building=public name: Public Building - terms: "" + terms: >- + building/residential: # building=residential name: Residential Building - terms: "" + terms: >- + building/retail: # building=retail name: Retail Building - terms: "" + terms: >- + building/roof: # building=roof name: Roof - terms: "" + terms: >- + building/school: # building=school name: School Building # 'terms: academy,elementary school,middle school,high school' - terms: "" + terms: >- + building/semidetached_house: # building=semidetached_house name: Semi-Detached House # 'terms: home,double,duplex,twin,family,residence,dwelling' - terms: "" + terms: >- + building/shed: # building=shed name: Shed - terms: "" + terms: >- + building/stable: # building=stable name: Stable - terms: "" + terms: >- + building/static_caravan: # building=static_caravan name: Static Mobile Home - terms: "" + terms: >- + building/terrace: # building=terrace name: Row Houses # 'terms: home,terrace,brownstone,family,residence,dwelling' - terms: "" + terms: >- + building/train_station: # building=train_station name: Train Station - terms: "" + terms: >- + building/university: # building=university name: University Building # 'terms: college' - terms: "" + terms: >- + building/warehouse: # building=warehouse name: Warehouse - terms: "" + terms: >- + craft: - # 'craft=*' + # craft=* name: Craft - terms: "" + terms: >- + craft/basket_maker: # craft=basket_maker name: Basket Maker - terms: "" + terms: >- + craft/beekeeper: # craft=beekeeper name: Beekeeper - terms: "" + terms: >- + craft/blacksmith: # craft=blacksmith name: Blacksmith - terms: "" + terms: >- + craft/boatbuilder: # craft=boatbuilder name: Boat Builder - terms: "" + terms: >- + craft/bookbinder: # craft=bookbinder name: Bookbinder # 'terms: book repair' - terms: "" + terms: >- + craft/brewery: # craft=brewery name: Brewery # 'terms: beer,bier' - terms: "" + terms: >- + craft/carpenter: # craft=carpenter name: Carpenter # 'terms: woodworker' - terms: "" + terms: >- + craft/carpet_layer: # craft=carpet_layer name: Carpet Layer - terms: "" + terms: >- + craft/caterer: # craft=caterer name: Caterer - terms: "" + terms: >- + craft/clockmaker: # craft=clockmaker name: Clockmaker - terms: "" + terms: >- + craft/confectionery: # craft=confectionery name: Confectionery # 'terms: sweets,candy' - terms: "" + terms: >- + craft/dressmaker: # craft=dressmaker name: Dressmaker # 'terms: seamstress' - terms: "" + terms: >- + craft/electrician: # craft=electrician name: Electrician # 'terms: power,wire' - terms: "" + terms: >- + craft/gardener: # craft=gardener name: Gardener # 'terms: landscaper,grounds keeper' - terms: "" + terms: >- + craft/glaziery: # craft=glaziery name: Glaziery # 'terms: glass,stained-glass,window' - terms: "" + terms: >- + craft/handicraft: # craft=handicraft name: Handicraft - terms: "" + terms: >- + craft/hvac: # craft=hvac name: HVAC # 'terms: heat*,vent*,air conditioning' - terms: "" + terms: >- + craft/insulator: # craft=insulation name: Insulator - terms: "" + terms: >- + craft/jeweler: # craft=jeweler name: Jeweler - terms: "" + terms: >- + craft/key_cutter: # craft=key_cutter name: Key Cutter - terms: "" + terms: >- + craft/locksmith: # craft=locksmith name: Locksmith - terms: "" + terms: >- + craft/metal_construction: # craft=metal_construction name: Metal Construction - terms: "" + terms: >- + craft/optician: # craft=optician name: Optician - terms: "" + terms: >- + craft/painter: # craft=painter name: Painter - terms: "" + terms: >- + craft/photographer: # craft=photographer name: Photographer - terms: "" + terms: >- + craft/photographic_laboratory: # craft=photographic_laboratory name: Photographic Laboratory # 'terms: film' - terms: "" + terms: >- + craft/plasterer: # craft=plasterer name: Plasterer - terms: "" + terms: >- + craft/plumber: # craft=plumber name: Plumber # 'terms: pipe' - terms: "" + terms: >- + craft/pottery: # craft=pottery name: Pottery # 'terms: ceramic' - terms: "" + terms: >- + craft/rigger: # craft=rigger name: Rigger - terms: "" + terms: >- + craft/roofer: # craft=roofer name: Roofer - terms: "" + terms: >- + craft/saddler: # craft=saddler name: Saddler - terms: "" + terms: >- + craft/sailmaker: # craft=sailmaker name: Sailmaker - terms: "" + terms: >- + craft/sawmill: # craft=sawmill name: Sawmill # 'terms: lumber' - terms: "" + terms: >- + craft/scaffolder: # craft=scaffolder name: Scaffolder - terms: "" + terms: >- + craft/sculpter: # craft=sculpter name: Sculpter - terms: "" + terms: >- + craft/shoemaker: # craft=shoemaker name: Shoemaker # 'terms: cobbler' - terms: "" + terms: >- + craft/stonemason: # craft=stonemason name: Stonemason # 'terms: masonry' - terms: "" + terms: >- + craft/sweep: # craft=sweep name: Chimney Sweep - terms: "" + terms: >- + craft/tailor: # craft=tailor name: Tailor # 'terms: clothes,suit' - terms: "" + terms: >- + craft/tiler: # craft=tiler name: Tiler - terms: "" + terms: >- + craft/tinsmith: # craft=tinsmith name: Tinsmith - terms: "" + terms: >- + craft/upholsterer: # craft=upholsterer name: Upholsterer - terms: "" + terms: >- + craft/watchmaker: # craft=watchmaker name: Watchmaker - terms: "" + terms: >- + craft/window_construction: # craft=window_construction name: Window Construction # 'terms: glass' - terms: "" + terms: >- + craft/winery: # craft=winery name: Winery - terms: "" + terms: >- + embankment: # embankment=yes name: Embankment - terms: "" + terms: >- + emergency/ambulance_station: # emergency=ambulance_station name: Ambulance Station # 'terms: EMS,EMT,rescue' - terms: "" + terms: >- + emergency/fire_hydrant: # emergency=fire_hydrant name: Fire Hydrant - terms: "" + terms: >- + emergency/phone: # emergency=phone name: Emergency Phone - terms: "" + terms: >- + entrance: - # 'entrance=*' + # entrance=* name: Entrance/Exit - terms: "" + terms: >- + footway/crossing: # 'highway=footway, footway=crossing' name: Street Crossing - terms: "" + terms: >- + footway/crosswalk: # 'highway=footway, footway=crossing, crossing=zebra' name: Pedestrian Crosswalk # 'terms: zebra crossing' - terms: "" + terms: >- + footway/sidewalk: # 'highway=footway, footway=sidewalk' name: Sidewalk - terms: "" + terms: >- + ford: # ford=yes name: Ford - terms: "" + terms: >- + golf/bunker: # 'golf=bunker, natural=sand' name: Sand Trap # 'terms: hazard,bunker' - terms: "" + terms: >- + golf/fairway: # 'golf=fairway, landuse=grass' name: Fairway - terms: "" + terms: >- + golf/green: # 'golf=green, landuse=grass, leisure=pitch, sport=golf' name: Putting Green - terms: "" + terms: >- + golf/hole: # golf=hole name: Golf Hole - terms: "" + terms: >- + golf/lateral_water_hazard: # 'golf=lateral_water_hazard, natural=water' name: Lateral Water Hazard - terms: "" + terms: >- + golf/rough: # 'golf=rough, landuse=grass' name: Rough - terms: "" + terms: >- + golf/tee: # 'golf=tee, landuse=grass' name: Tee Box # 'terms: teeing ground' - terms: "" + terms: >- + golf/water_hazard: # 'golf=water_hazard, natural=water' name: Water Hazard - terms: "" + terms: >- + highway: - # 'highway=*' + # highway=* name: Highway - terms: "" + terms: >- + highway/bridleway: # highway=bridleway name: Bridle Path # 'terms: bridleway,equestrian,horse' - terms: "" + terms: >- + highway/bus_stop: # highway=bus_stop name: Bus Stop - terms: "" + terms: >- + highway/corridor: # highway=corridor name: Indoor Corridor # 'terms: gallery,hall,hallway,indoor,passage,passageway' - terms: "" + terms: >- + highway/crossing: # highway=crossing name: Street Crossing - terms: "" + terms: >- + highway/crosswalk: # 'highway=crossing, crossing=zebra' name: Pedestrian Crosswalk # 'terms: zebra crossing' - terms: "" + terms: >- + highway/cycleway: # highway=cycleway name: Cycle Path # 'terms: bike' - terms: "" + terms: >- + highway/footway: # highway=footway name: Foot Path # 'terms: hike,hiking,trackway,trail,walk' - terms: "" + terms: >- + highway/give_way: # highway=give_way name: Yield Sign # 'terms: give way,yield,sign' - terms: "" + terms: >- + highway/living_street: # highway=living_street name: Living Street - terms: "" + terms: >- + highway/mini_roundabout: # highway=mini_roundabout name: Mini-Roundabout - terms: "" + terms: >- + highway/motorway: # highway=motorway name: Motorway - terms: "" + terms: >- + highway/motorway_junction: # highway=motorway_junction name: Motorway Junction / Exit - terms: "" + terms: >- + highway/motorway_link: # highway=motorway_link name: Motorway Link # 'terms: ramp,on ramp,off ramp' - terms: "" + terms: >- + highway/path: # highway=path name: Path # 'terms: hike,hiking,trackway,trail,walk' - terms: "" + terms: >- + highway/pedestrian: # highway=pedestrian name: Pedestrian Street - terms: "" + terms: >- + highway/primary: # highway=primary name: Primary Road - terms: "" + terms: >- + highway/primary_link: # highway=primary_link name: Primary Link # 'terms: ramp,on ramp,off ramp' - terms: "" + terms: >- + highway/raceway: # highway=raceway name: Motor Raceway # 'terms: auto*,race*,nascar' - terms: "" + terms: >- + highway/residential: # highway=residential name: Residential Road - terms: "" + terms: >- + highway/rest_area: # highway=rest_area name: Rest Area # 'terms: rest stop' - terms: "" + terms: >- + highway/road: # highway=road name: Unknown Road - terms: "" + terms: >- + highway/secondary: # highway=secondary name: Secondary Road - terms: "" + terms: >- + highway/secondary_link: # highway=secondary_link name: Secondary Link # 'terms: ramp,on ramp,off ramp' - terms: "" + terms: >- + highway/service: # highway=service name: Service Road - terms: "" + terms: >- + highway/service/alley: # 'highway=service, service=alley' name: Alley - terms: "" + terms: >- + highway/service/drive-through: # 'highway=service, service=drive-through' name: Drive-Through - terms: "" + terms: >- + highway/service/driveway: # 'highway=service, service=driveway' name: Driveway - terms: "" + terms: >- + highway/service/emergency_access: # 'highway=service, service=emergency_access' name: Emergency Access - terms: "" + terms: >- + highway/service/parking_aisle: # 'highway=service, service=parking_aisle' name: Parking Aisle - terms: "" + terms: >- + highway/services: # highway=services name: Service Area # 'terms: services,travel plaza,service station' - terms: "" + terms: >- + highway/steps: # highway=steps name: Steps # 'terms: stairs,staircase' - terms: "" + terms: >- + highway/stop: # highway=stop name: Stop Sign # 'terms: stop,halt,sign' - terms: "" + terms: >- + highway/street_lamp: # highway=street_lamp name: Street Lamp # 'terms: streetlight,street light,lamp,light,gaslight' - terms: "" + terms: >- + highway/tertiary: # highway=tertiary name: Tertiary Road - terms: "" + terms: >- + highway/tertiary_link: # highway=tertiary_link name: Tertiary Link # 'terms: ramp,on ramp,off ramp' - terms: "" + terms: >- + highway/track: # highway=track name: Unmaintained Track Road - # 'terms: woods road,forest road,logging road,fire road,farm road,agricultural road,ranch road,carriage road,primitive,unmaintained,rut,offroad,4wd,4x4,four wheel drive,atv,quad,jeep,double track,two track' - terms: "" + # >- + terms: woods road,forest road,logging road,fire road,farm + road,agricultural road,ranch road,carriage + road,primitive,unmaintained,rut,offroad,4wd,4x4,four wheel + drive,atv,quad,jeep,double track,two track + terms: >- + highway/traffic_signals: # highway=traffic_signals name: Traffic Signals # 'terms: light,stoplight,traffic light' - terms: "" + terms: >- + highway/trunk: # highway=trunk name: Trunk Road - terms: "" + terms: >- + highway/trunk_link: # highway=trunk_link name: Trunk Link # 'terms: ramp,on ramp,off ramp' - terms: "" + terms: >- + highway/turning_circle: # highway=turning_circle name: Turning Circle # 'terms: cul-de-sac' - terms: "" + terms: >- + highway/unclassified: # highway=unclassified name: Minor/Unclassified Road - terms: "" + terms: >- + historic: - # 'historic=*' + # historic=* name: Historic Site - terms: "" + terms: >- + historic/archaeological_site: # historic=archaeological_site name: Archaeological Site - terms: "" + terms: >- + historic/boundary_stone: # historic=boundary_stone name: Boundary Stone - terms: "" + terms: >- + historic/castle: # historic=castle name: Castle - terms: "" + terms: >- + historic/memorial: # historic=memorial name: Memorial - terms: "" + terms: >- + historic/monument: # historic=monument name: Monument - terms: "" + terms: >- + historic/ruins: # historic=ruins name: Ruins - terms: "" + terms: >- + historic/wayside_cross: # historic=wayside_cross name: Wayside Cross - terms: "" + terms: >- + historic/wayside_shrine: # historic=wayside_shrine name: Wayside Shrine - terms: "" + terms: >- + junction: # junction=yes name: Junction - terms: "" + terms: >- + landuse: - # 'landuse=*' + # landuse=* name: Land Use - terms: "" + terms: >- + landuse/allotments: # landuse=allotments name: Community Garden # 'terms: allotment,garden' - terms: "" + terms: >- + landuse/basin: # landuse=basin name: Basin - terms: "" + terms: >- + landuse/cemetery: # landuse=cemetery name: Cemetery - terms: "" + terms: >- + landuse/churchyard: # landuse=churchyard name: Churchyard - terms: "" + terms: >- + landuse/commercial: # landuse=commercial name: Commercial Area - terms: "" + terms: >- + landuse/construction: # landuse=construction name: Construction - terms: "" + terms: >- + landuse/farm: # landuse=farm name: Farmland - terms: "" + terms: >- + landuse/farmland: # landuse=farmland name: Farmland - terms: "" + terms: >- + landuse/farmyard: # landuse=farmyard name: Farmyard - terms: "" + terms: >- + landuse/forest: # landuse=forest name: Forest # 'terms: tree' - terms: "" + terms: >- + landuse/garages: # landuse=garages name: Garages - terms: "" + terms: >- + landuse/grass: # landuse=grass name: Grass - terms: "" + terms: >- + landuse/industrial: # landuse=industrial name: Industrial Area - terms: "" + terms: >- + landuse/landfill: # landuse=landfill name: Landfill # 'terms: dump' - terms: "" + terms: >- + landuse/meadow: # landuse=meadow name: Meadow - terms: "" + terms: >- + landuse/military: # landuse=military name: Military Area - terms: "" + terms: >- + landuse/orchard: # landuse=orchard name: Orchard - terms: "" + terms: >- + landuse/plant_nursery: # landuse=plant_nursery name: Plant Nursery # 'terms: vivero' - terms: "" + terms: >- + landuse/quarry: # landuse=quarry name: Quarry - terms: "" + terms: >- + landuse/residential: # landuse=residential name: Residential Area - terms: "" + terms: >- + landuse/retail: # landuse=retail name: Retail Area - terms: "" + terms: >- + landuse/vineyard: # landuse=vineyard name: Vineyard - terms: "" + terms: >- + leisure: - # 'leisure=*' + # leisure=* name: Leisure - terms: "" + terms: >- + leisure/adult_gaming_centre: # leisure=adult_gaming_centre name: Adult Gaming Center # 'terms: gambling,slot machine' - terms: "" + terms: >- + leisure/bird_hide: # leisure=bird_hide name: Bird Hide # 'terms: machan,ornithology' - terms: "" + terms: >- + leisure/bowling_alley: # leisure=bowling_alley name: Bowling Alley - terms: "" + terms: >- + leisure/common: # leisure=common name: Common # 'terms: open space' - terms: "" + terms: >- + leisure/dog_park: # leisure=dog_park name: Dog Park - terms: "" + terms: >- + leisure/firepit: # leisure=firepit name: Firepit # 'terms: fireplace,campfire' - terms: "" + terms: >- + leisure/garden: # leisure=garden name: Garden - terms: "" + terms: >- + leisure/golf_course: # leisure=golf_course name: Golf Course # 'terms: links' - terms: "" + terms: >- + leisure/ice_rink: # leisure=ice_rink name: Ice Rink # 'terms: hockey,skating,curling' - terms: "" + terms: >- + leisure/marina: # leisure=marina name: Marina # 'terms: boat' - terms: "" + terms: >- + leisure/nature_reserve: # leisure=nature_reserve name: Nature Reserve # 'terms: protected,wildlife' - terms: "" + terms: >- + leisure/park: # leisure=park name: Park - # 'terms: esplanade,estate,forest,garden,grass,green,grounds,lawn,lot,meadow,parkland,place,playground,plaza,pleasure garden,recreation area,square,tract,village green,woodland' - terms: "" + # >- + terms: + esplanade,estate,forest,garden,grass,green,grounds,lawn,lot,meadow,parkland,place,playground,plaza,pleasure + garden,recreation area,square,tract,village green,woodland + terms: >- + leisure/picnic_table: # leisure=picnic_table name: Picnic Table # 'terms: bench' - terms: "" + terms: >- + leisure/pitch: # leisure=pitch name: Sport Pitch # 'terms: field' - terms: "" + terms: >- + leisure/pitch/american_football: # 'leisure=pitch, sport=american_football' name: American Football Field - terms: "" + terms: >- + leisure/pitch/baseball: # 'leisure=pitch, sport=baseball' name: Baseball Diamond - terms: "" + terms: >- + leisure/pitch/basketball: # 'leisure=pitch, sport=basketball' name: Basketball Court - terms: "" + terms: >- + leisure/pitch/rugby_league: # 'leisure=pitch, sport=rugby_league' name: Rugby League Field - terms: "" + terms: >- + leisure/pitch/rugby_union: # 'leisure=pitch, sport=rugby_union' name: Rugby Union Field - terms: "" + terms: >- + leisure/pitch/skateboard: # 'leisure=pitch, sport=skateboard' name: Skate Park - terms: "" + terms: >- + leisure/pitch/soccer: # 'leisure=pitch, sport=soccer' name: Soccer Field - terms: "" + terms: >- + leisure/pitch/tennis: # 'leisure=pitch, sport=tennis' name: Tennis Court - terms: "" + terms: >- + leisure/pitch/volleyball: # 'leisure=pitch, sport=volleyball' name: Volleyball Court - terms: "" + terms: >- + leisure/playground: # leisure=playground name: Playground # 'terms: jungle gym,play area' - terms: "" + terms: >- + leisure/running_track: # 'leisure=track, sport=running' name: Running Track - terms: "" + terms: >- + leisure/slipway: # leisure=slipway name: Slipway # 'terms: boat launch,boat ramp' - terms: "" + terms: >- + leisure/sports_centre: # leisure=sports_centre name: Sports Center / Gym # 'terms: gym' - terms: "" + terms: >- + leisure/sports_centre/swimming: # 'leisure=sports_centre, sport=swimming' name: Swimming Pool Facility # 'terms: dive,water' - terms: "" + terms: >- + leisure/stadium: # leisure=stadium name: Stadium - terms: "" + terms: >- + leisure/swimming_pool: # leisure=swimming_pool name: Swimming Pool # 'terms: dive,water' - terms: "" + terms: >- + leisure/track: # leisure=track name: Racetrack (non-Motorsport) - terms: "" + terms: >- + leisure/water_park: # leisure=water_park name: Water Park # 'terms: swim,pool,dive' - terms: "" + terms: >- + line: name: Line - terms: "" + terms: >- + man_made: - # 'man_made=*' + # man_made=* name: Man Made - terms: "" + terms: >- + man_made/adit: # man_made=adit name: Adit # 'terms: entrance,underground,mine,cave' - terms: "" + terms: >- + man_made/breakwater: # man_made=breakwater name: Breakwater - terms: "" + terms: >- + man_made/chimney: # man_made=chimney name: Chimney - terms: "" + terms: >- + man_made/cutline: # man_made=cutline name: Cut line - terms: "" + terms: >- + man_made/embankment: # man_made=embankment name: Embankment - terms: "" + terms: >- + man_made/flagpole: # man_made=flagpole name: Flagpole - terms: "" + terms: >- + man_made/gasometer: # man_made=gasometer name: Gasometer # 'terms: gas holder' - terms: "" + terms: >- + man_made/groyne: # man_made=groyne name: Groyne - terms: "" + terms: >- + man_made/lighthouse: # man_made=lighthouse name: Lighthouse - terms: "" + terms: >- + man_made/mast: # man_made=mast name: Radio Mast - # 'terms: broadcast tower,cell phone tower,cell tower,guyed tower,mobile phone tower,radio tower,television tower,transmission mast,transmission tower,tv tower' - terms: "" + # >- + terms: broadcast tower,cell phone tower,cell tower,guyed tower,mobile + phone tower,radio tower,television tower,transmission + mast,transmission tower,tv tower + terms: >- + man_made/observation: # 'man_made=tower, tower:type=observation' name: Observation Tower # 'terms: lookout tower,fire tower' - terms: "" + terms: >- + man_made/petroleum_well: # man_made=petroleum_well name: Oil Well - # 'terms: drilling rig,oil derrick,oil drill,oil horse,oil rig,oil pump,petroleum well,pumpjack' - terms: "" + # >- + terms: drilling rig,oil derrick,oil drill,oil horse,oil rig,oil + pump,petroleum well,pumpjack + terms: >- + man_made/pier: # man_made=pier name: Pier # 'terms: dock' - terms: "" + terms: >- + man_made/pipeline: # man_made=pipeline name: Pipeline - terms: "" + terms: >- + man_made/silo: # man_made=silo name: Silo # 'terms: grain,corn,wheat' - terms: "" + terms: >- + man_made/storage_tank: # man_made=storage_tank name: Storage Tank # 'terms: water,oil,gas,petrol' - terms: "" + terms: >- + man_made/surveillance: # man_made=surveillance name: Surveillance - terms: "" + terms: >- + man_made/survey_point: # man_made=survey_point name: Survey Point - terms: "" + terms: >- + man_made/tower: # man_made=tower name: Tower - terms: "" + terms: >- + man_made/wastewater_plant: # man_made=wastewater_plant name: Wastewater Plant # 'terms: sewage*,water treatment plant,reclamation plant' - terms: "" + terms: >- + man_made/water_tower: # man_made=water_tower name: Water Tower - terms: "" + terms: >- + man_made/water_well: # man_made=water_well name: Water Well - terms: "" + terms: >- + man_made/water_works: # man_made=water_works name: Water Works - terms: "" + terms: >- + man_made/works: # man_made=works name: Works - # 'terms: car assembly plant,aluminium processing plant,brewery,furniture manufacture factory,oil refinery,plastic recycling' - terms: "" + # >- + terms: car assembly plant,aluminium processing plant,brewery,furniture + manufacture factory,oil refinery,plastic recycling + terms: >- + military/airfield: # military=airfield name: Airfield - terms: "" + terms: >- + military/barracks: # military=barracks name: Barracks - terms: "" + terms: >- + military/bunker: # military=bunker name: Bunker - terms: "" + terms: >- + military/checkpoint: # military=checkpoint name: Checkpoint - terms: "" + terms: >- + military/danger_area: # military=danger_area name: Danger Area - terms: "" + terms: >- + military/naval_base: # military=naval_base name: Naval Base - terms: "" + terms: >- + military/obstacle_course: # military=obstacle_course name: Obstacle Course - terms: "" + terms: >- + military/range: # military=range name: Military Range - terms: "" + terms: >- + military/training_area: # military=training_area name: Training area - terms: "" + terms: >- + natural: - # 'natural=*' + # natural=* name: Natural - terms: "" + terms: >- + natural/bay: # natural=bay name: Bay - terms: "" + terms: >- + natural/beach: # natural=beach name: Beach - terms: "" + terms: >- + natural/cave_entrance: # natural=cave_entrance name: Cave Entrance # 'terms: cavern,hollow,grotto,shelter,cavity' - terms: "" + terms: >- + natural/cliff: # natural=cliff name: Cliff - terms: "" + terms: >- + natural/coastline: # natural=coastline name: Coastline # 'terms: shore' - terms: "" + terms: >- + natural/fell: # natural=fell name: Fell - terms: "" + terms: >- + natural/glacier: # natural=glacier name: Glacier - terms: "" + terms: >- + natural/grassland: # natural=grassland name: Grassland - terms: "" + terms: >- + natural/heath: # natural=heath name: Heath - terms: "" + terms: >- + natural/peak: # natural=peak name: Peak - # 'terms: acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top' - terms: "" + # >- + terms: + acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top + terms: >- + natural/saddle: # natural=saddle name: Saddle # 'terms: pass,mountain pass,top' - terms: "" + terms: >- + natural/scree: # natural=scree name: Scree # 'terms: loose rocks' - terms: "" + terms: >- + natural/scrub: # natural=scrub name: Scrub # 'terms: bush,shrubs' - terms: "" + terms: >- + natural/spring: # natural=spring name: Spring - terms: "" + terms: >- + natural/tree: # natural=tree name: Tree - terms: "" + terms: >- + natural/tree_row: # natural=tree_row name: Tree row - terms: "" + terms: >- + natural/volcano: # natural=volcano name: Volcano # 'terms: mountain,crater' - terms: "" + terms: >- + natural/water: # natural=water name: Water - terms: "" + terms: >- + natural/water/lake: # 'natural=water, water=lake' name: Lake # 'terms: lakelet,loch,mere' - terms: "" + terms: >- + natural/water/pond: # 'natural=water, water=pond' name: Pond # 'terms: lakelet,millpond,tarn,pool,mere' - terms: "" + terms: >- + natural/water/reservoir: # 'natural=water, water=reservoir' name: Reservoir - terms: "" + terms: >- + natural/wetland: # natural=wetland name: Wetland - terms: "" + terms: >- + natural/wood: # natural=wood name: Wood # 'terms: tree' - terms: "" + terms: >- + office: - # 'office=*' + # office=* name: Office - terms: "" + terms: >- + office/accountant: # office=accountant name: Accountant - terms: "" + terms: >- + office/administrative: # office=administrative name: Administrative Office - terms: "" + terms: >- + office/architect: # office=architect name: Architect - terms: "" + terms: >- + office/company: # office=company name: Company Office - terms: "" + terms: >- + office/educational_institution: # office=educational_institution name: Educational Institution - terms: "" + terms: >- + office/employment_agency: # office=employment_agency name: Employment Agency # 'terms: job' - terms: "" + terms: >- + office/estate_agent: # office=estate_agent name: Real Estate Office - terms: "" + terms: >- + office/financial: # office=financial name: Financial Office - terms: "" + terms: >- + office/government: # office=government name: Government Office - terms: "" + terms: >- + office/insurance: # office=insurance name: Insurance Office - terms: "" + terms: >- + office/it: # office=it name: IT Office - terms: "" + terms: >- + office/lawyer: # office=lawyer name: Law Office - terms: "" + terms: >- + office/newspaper: # office=newspaper name: Newspaper - terms: "" + terms: >- + office/ngo: # office=ngo name: NGO Office - terms: "" + terms: >- + office/physician: # office=physician name: Physician - terms: "" + terms: >- + office/political_party: # office=political_party name: Political Party - terms: "" + terms: >- + office/research: # office=research name: Research Office - terms: "" + terms: >- + office/telecommunication: # office=telecommunication name: Telecom Office - terms: "" + terms: >- + office/therapist: # office=therapist name: Therapist - terms: "" + terms: >- + office/travel_agent: # office=travel_agent name: Travel Agency - terms: "" + terms: >- + piste: # 'piste:type=*' name: Piste/Ski Trail # 'terms: ski,sled,sleigh,snowboard,nordic,downhill,snowmobile' - terms: "" + terms: >- + place: - # 'place=*' + # place=* name: Place - terms: "" + terms: >- + place/city: # place=city name: City - terms: "" + terms: >- + place/farm: # place=farm name: Farm - terms: "" + terms: >- + place/hamlet: # place=hamlet name: Hamlet - terms: "" + terms: >- + place/island: # place=island name: Island # 'terms: archipelago,atoll,bar,cay,isle,islet,key,reef' - terms: "" + terms: >- + place/isolated_dwelling: # place=isolated_dwelling name: Isolated Dwelling - terms: "" + terms: >- + place/locality: # place=locality name: Locality - terms: "" + terms: >- + place/neighbourhood: # place=neighbourhood name: Neighborhood # 'terms: neighbourhood' - terms: "" + terms: >- + place/suburb: # place=suburb name: Borough # 'terms: Boro,Quarter' - terms: "" + terms: >- + place/town: # place=town name: Town - terms: "" + terms: >- + place/village: # place=village name: Village - terms: "" + terms: >- + point: name: Point - terms: "" + terms: >- + power: - # 'power=*' + # power=* name: Power - terms: "" + terms: >- + power/generator: # power=generator name: Power Generator - terms: "" + terms: >- + power/line: # power=line name: Power Line - terms: "" + terms: >- + power/minor_line: # power=minor_line name: Minor Power Line - terms: "" + terms: >- + power/pole: # power=pole name: Power Pole - terms: "" + terms: >- + power/sub_station: # power=sub_station name: Substation - terms: "" + terms: >- + power/substation: # power=substation name: Substation - terms: "" + terms: >- + power/tower: # power=tower name: High-Voltage Tower - terms: "" + terms: >- + power/transformer: # power=transformer name: Transformer - terms: "" + terms: >- + public_transport/platform: # public_transport=platform name: Platform - terms: "" + terms: >- + public_transport/stop_position: # public_transport=stop_position name: Stop Position - terms: "" + terms: >- + railway: - # 'railway=*' + # railway=* name: Railway - terms: "" + terms: >- + railway/abandoned: # railway=abandoned name: Abandoned Railway - terms: "" + terms: >- + railway/disused: # railway=disused name: Disused Railway - terms: "" + terms: >- + railway/funicular: # railway=funicular name: Funicular - # 'terms: venicular,cliff railway,cable car,cable railway,funicular railway' - terms: "" + # >- + terms: venicular,cliff railway,cable car,cable railway,funicular + railway + terms: >- + railway/halt: # railway=halt name: Railway Halt # 'terms: break,interrupt,rest,wait,interruption' - terms: "" + terms: >- + railway/level_crossing: # railway=level_crossing name: Railway Crossing - # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing' - terms: "" + # >- + terms: crossing,railroad crossing,level crossing,grade crossing,road + through railroad,train crossing + terms: >- + railway/monorail: # railway=monorail name: Monorail - terms: "" + terms: >- + railway/narrow_gauge: # railway=narrow_gauge name: Narrow Gauge Rail # 'terms: narrow gauge railway,narrow gauge railroad' - terms: "" + terms: >- + railway/platform: # railway=platform name: Railway Platform - terms: "" + terms: >- + railway/rail: # railway=rail name: Rail - terms: "" + terms: >- + railway/station: # railway=station name: Railway Station # 'terms: train station,station' - terms: "" + terms: >- + railway/subway: # railway=subway name: Subway - terms: "" + terms: >- + railway/subway_entrance: # railway=subway_entrance name: Subway Entrance - terms: "" + terms: >- + railway/tram: # railway=tram name: Tram # 'terms: streetcar' - terms: "" + terms: >- + relation: name: Relation - terms: "" + terms: >- + roundabout: # junction=roundabout name: Roundabout - terms: "" + terms: >- + route/ferry: # route=ferry name: Ferry Route - terms: "" + terms: >- + shop: - # 'shop=*' + # shop=* name: Shop - terms: "" + terms: >- + shop/alcohol: # shop=alcohol name: Liquor Store # 'terms: alcohol,beer,booze,wine' - terms: "" + terms: >- + shop/anime: # shop=anime name: Anime Shop - terms: "" + terms: >- + shop/antiques: # shop=antiques name: Antiques Shop - terms: "" + terms: >- + shop/art: # shop=art name: Art Store # 'terms: art*,exhibit*,gallery' - terms: "" + terms: >- + shop/baby_goods: # shop=baby_goods name: Baby Goods Store - terms: "" + terms: >- + shop/bag: # shop=bag name: Bag/Luggage Store # 'terms: handbag,purse' - terms: "" + terms: >- + shop/bakery: # shop=bakery name: Bakery - terms: "" + terms: >- + shop/bathroom_furnishing: # shop=bathroom_furnishing name: Bathroom Furnishing Store - terms: "" + terms: >- + shop/beauty: # shop=beauty name: Beauty Shop # 'terms: nail spa,spa,salon,tanning' - terms: "" + terms: >- + shop/bed: # shop=bed name: Bedding/Mattress Store - terms: "" + terms: >- + shop/beverages: # shop=beverages name: Beverage Store - terms: "" + terms: >- + shop/bicycle: # shop=bicycle name: Bicycle Shop # 'terms: bike,repair' - terms: "" + terms: >- + shop/bookmaker: # shop=bookmaker name: Bookmaker - terms: "" + terms: >- + shop/books: # shop=books name: Book Store - terms: "" + terms: >- + shop/boutique: # shop=boutique name: Boutique - terms: "" + terms: >- + shop/butcher: # shop=butcher name: Butcher # 'terms: meat' - terms: "" + terms: >- + shop/candles: # shop=candles name: Candle Shop - terms: "" + terms: >- + shop/car: # shop=car name: Car Dealership # 'terms: auto' - terms: "" + terms: >- + shop/car_parts: # shop=car_parts name: Car Parts Store # 'terms: auto' - terms: "" + terms: >- + shop/car_repair: # shop=car_repair name: Car Repair Shop # 'terms: auto' - terms: "" + terms: >- + shop/carpet: # shop=carpet name: Carpet Store # 'terms: rug' - terms: "" + terms: >- + shop/cheese: # shop=cheese name: Cheese Store - terms: "" + terms: >- + shop/chemist: # shop=chemist name: Chemist - terms: "" + terms: >- + shop/chocolate: # shop=chocolate name: Chocolate Store - terms: "" + terms: >- + shop/clothes: # shop=clothes name: Clothing Store - terms: "" + terms: >- + shop/coffee: # shop=coffee name: Coffee Store - terms: "" + terms: >- + shop/computer: # shop=computer name: Computer Store - terms: "" + terms: >- + shop/confectionery: # shop=confectionery name: Candy Store - terms: "" + terms: >- + shop/convenience: # shop=convenience name: Convenience Store - terms: "" + terms: >- + shop/copyshop: # shop=copyshop name: Copy Store - terms: "" + terms: >- + shop/cosmetics: # shop=cosmetics name: Cosmetics Store - terms: "" + terms: >- + shop/craft: # shop=craft name: Arts and Crafts Store # 'terms: art*,paint*,frame' - terms: "" + terms: >- + shop/curtain: # shop=curtain name: Curtain Store # 'terms: drape*,window' - terms: "" + terms: >- + shop/dairy: # shop=dairy name: Dairy Store # 'terms: milk,egg,cheese' - terms: "" + terms: >- + shop/deli: # shop=deli name: Deli # 'terms: lunch,meat,sandwich' - terms: "" + terms: >- + shop/department_store: # shop=department_store name: Department Store - terms: "" + terms: >- + shop/doityourself: # shop=doityourself name: DIY Store - terms: "" + terms: >- + shop/dry_cleaning: # shop=dry_cleaning name: Dry Cleaner - terms: "" + terms: >- + shop/electronics: # shop=electronics name: Electronics Store # 'terms: appliance,audio,computer,tv' - terms: "" + terms: >- + shop/erotic: # shop=erotic name: Erotic Store # 'terms: sex,porn' - terms: "" + terms: >- + shop/fabric: # shop=fabric name: Fabric Store # 'terms: sew' - terms: "" + terms: >- + shop/farm: # shop=farm name: Produce Stand # 'terms: farm shop,farm stand' - terms: "" + terms: >- + shop/fashion: # shop=fashion name: Fashion Store - terms: "" + terms: >- + shop/fishmonger: # shop=fishmonger name: Fishmonger - terms: "" + terms: >- + shop/florist: # shop=florist name: Florist # 'terms: flower' - terms: "" + terms: >- + shop/frame: # shop=frame name: Framing Shop # 'terms: art*,paint*,photo*,frame' - terms: "" + terms: >- + shop/funeral_directors: # shop=funeral_directors name: Funeral Home # 'terms: undertaker,memorial home' - terms: "" + terms: >- + shop/furnace: # shop=furnace name: Furnace Store # 'terms: oven,stove' - terms: "" + terms: >- + shop/furniture: # shop=furniture name: Furniture Store # 'terms: chair,sofa,table' - terms: "" + terms: >- + shop/garden_centre: # shop=garden_centre name: Garden Center # 'terms: landscape,mulch,shrub,tree' - terms: "" + terms: >- + shop/gift: # shop=gift name: Gift Shop - terms: "" + terms: >- + shop/greengrocer: # shop=greengrocer name: Greengrocer # 'terms: fruit,vegetable' - terms: "" + terms: >- + shop/hairdresser: # shop=hairdresser name: Hairdresser - terms: "" + terms: >- + shop/hardware: # shop=hardware name: Hardware Store - terms: "" + terms: >- + shop/hearing_aids: # shop=hearing_aids name: Hearing Aids Store - terms: "" + terms: >- + shop/herbalist: # shop=herbalist name: Herbalist - terms: "" + terms: >- + shop/hifi: # shop=hifi name: Hifi Store # 'terms: stereo,video' - terms: "" + terms: >- + shop/houseware: # shop=houseware name: Houseware Store # 'terms: home,household' - terms: "" + terms: >- + shop/interior_decoration: # shop=interior_decoration name: Interior Decoration Store - terms: "" + terms: >- + shop/jewelry: # shop=jewelry name: Jeweler # 'terms: diamond,gem,ring' - terms: "" + terms: >- + shop/kiosk: # shop=kiosk name: News Kiosk - terms: "" + terms: >- + shop/kitchen: # shop=kitchen name: Kitchen Design Store - terms: "" + terms: >- + shop/laundry: # shop=laundry name: Laundry - terms: "" + terms: >- + shop/leather: # shop=leather name: Leather Store - terms: "" + terms: >- + shop/locksmith: # shop=locksmith name: Locksmith # 'terms: key,lockpick' - terms: "" + terms: >- + shop/lottery: # shop=lottery name: Lottery Shop - terms: "" + terms: >- + shop/mall: # shop=mall name: Mall - terms: "" + terms: >- + shop/massage: # shop=massage name: Massage Shop - terms: "" + terms: >- + shop/medical_supply: # shop=medical_supply name: Medical Supply Store - terms: "" + terms: >- + shop/mobile_phone: # shop=mobile_phone name: Mobile Phone Store - terms: "" + terms: >- + shop/money_lender: # shop=money_lender name: Money Lender - terms: "" + terms: >- + shop/motorcycle: # shop=motorcycle name: Motorcycle Dealership - terms: "" + terms: >- + shop/music: # shop=music name: Music Store # 'terms: CD,vinyl' - terms: "" + terms: >- + shop/musical_instrument: # shop=musical_instrument name: Musical Instrument Store - terms: "" + terms: >- + shop/newsagent: # shop=newsagent name: Newspaper/Magazine Shop - terms: "" + terms: >- + shop/nutrition_supplements: # shop=nutrition_supplements name: Nutrition Supplements Store - terms: "" + terms: >- + shop/optician: # shop=optician name: Optician # 'terms: eye,glasses' - terms: "" + terms: >- + shop/organic: # 'shop=supermarket, organic=only' name: Organic Goods Store - terms: "" + terms: >- + shop/outdoor: # shop=outdoor name: Outdoors Store # 'terms: camping,climbing,hiking' - terms: "" + terms: >- + shop/paint: # shop=paint name: Paint Store - terms: "" + terms: >- + shop/pawnbroker: # shop=pawnbroker name: Pawn Shop - terms: "" + terms: >- + shop/pet: # shop=pet name: Pet Store # 'terms: cat,dog,fish' - terms: "" + terms: >- + shop/photo: # shop=photo name: Photography Store # 'terms: camera,film' - terms: "" + terms: >- + shop/pyrotechnics: # shop=pyrotechnics name: Fireworks Store - terms: "" + terms: >- + shop/radiotechnics: # shop=radiotechnics name: Radio/Electronic Component Store - terms: "" + terms: >- + shop/religion: # shop=religion name: Religious Store - terms: "" + terms: >- + shop/scuba_diving: # shop=scuba_diving name: Scuba Diving Shop - terms: "" + terms: >- + shop/seafood: # shop=seafood name: Seafood Shop # 'terms: fishmonger' - terms: "" + terms: >- + shop/second_hand: # shop=second_hand name: Consignment/Thrift Store # 'terms: secondhand,second hand,resale,thrift,used' - terms: "" + terms: >- + shop/shoes: # shop=shoes name: Shoe Store - terms: "" + terms: >- + shop/sports: # shop=sports name: Sporting Goods Store - terms: "" + terms: >- + shop/stationery: # shop=stationery name: Stationery Store # 'terms: card,paper' - terms: "" + terms: >- + shop/storage_rental: # shop=storage_rental name: Storage Rental - terms: "" + terms: >- + shop/supermarket: # shop=supermarket name: Supermarket # 'terms: grocery,store,shop' - terms: "" + terms: >- + shop/tailor: # shop=tailor name: Tailor # 'terms: clothes,suit' - terms: "" + terms: >- + shop/tattoo: # shop=tattoo name: Tattoo Parlor - terms: "" + terms: >- + shop/tea: # shop=tea name: Tea Store - terms: "" + terms: >- + shop/ticket: # shop=ticket name: Ticket Seller - terms: "" + terms: >- + shop/tobacco: # shop=tobacco name: Tobacco Shop - terms: "" + terms: >- + shop/toys: # shop=toys name: Toy Store - terms: "" + terms: >- + shop/travel_agency: # shop=travel_agency name: Travel Agency - terms: "" + terms: >- + shop/tyres: # shop=tyres name: Tire Store - terms: "" + terms: >- + shop/vacant: # shop=vacant name: Vacant Shop - terms: "" + terms: >- + shop/vacuum_cleaner: # shop=vacuum_cleaner name: Vacuum Cleaner Store - terms: "" + terms: >- + shop/variety_store: # shop=variety_store name: Variety Store - terms: "" + terms: >- + shop/video: # shop=video name: Video Store # 'terms: DVD' - terms: "" + terms: >- + shop/video_games: # shop=video_games name: Video Game Store - terms: "" + terms: >- + shop/water_sports: # shop=water_sports name: Watersport/Swim Shop - terms: "" + terms: >- + shop/weapons: # shop=weapons name: Weapon Shop # 'terms: ammo,gun,knife,knives' - terms: "" + terms: >- + shop/window_blind: # shop=window_blind name: Window Blind Store - terms: "" + terms: >- + shop/wine: # shop=wine name: Wine Shop - terms: "" + terms: >- + tourism: - # 'tourism=*' + # tourism=* name: Tourism - terms: "" + terms: >- + tourism/alpine_hut: # tourism=alpine_hut name: Alpine Hut - terms: "" + terms: >- + tourism/artwork: # tourism=artwork name: Artwork # 'terms: mural,sculpture,statue' - terms: "" + terms: >- + tourism/attraction: # tourism=attraction name: Tourist Attraction - terms: "" + terms: >- + tourism/camp_site: # tourism=camp_site name: Camp Site # 'terms: Tent' - terms: "" + terms: >- + tourism/caravan_site: # tourism=caravan_site name: RV Park # 'terms: Motor Home,Camper' - terms: "" + terms: >- + tourism/chalet: # tourism=chalet name: Chalet - terms: "" + terms: >- + tourism/gallery: # tourism=gallery name: Art Gallery # 'terms: art*,exhibit*,paint*,photo*,sculpt*' - terms: "" + terms: >- + tourism/guest_house: # tourism=guest_house name: Guest House # 'terms: B&B,Bed and Breakfast' - terms: "" + terms: >- + tourism/hostel: # tourism=hostel name: Hostel - terms: "" + terms: >- + tourism/hotel: # tourism=hotel name: Hotel - terms: "" + terms: >- + tourism/information: # tourism=information name: Information - terms: "" + terms: >- + tourism/motel: # tourism=motel name: Motel - terms: "" + terms: >- + tourism/museum: # tourism=museum name: Museum - # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*' - terms: "" + # >- + terms: + art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt* + terms: >- + tourism/picnic_site: # tourism=picnic_site name: Picnic Site # 'terms: camp' - terms: "" + terms: >- + tourism/theme_park: # tourism=theme_park name: Theme Park - terms: "" + terms: >- + tourism/viewpoint: # tourism=viewpoint name: Viewpoint - terms: "" + terms: >- + tourism/zoo: # tourism=zoo name: Zoo - terms: "" + terms: >- + traffic_calming/bump: # traffic_calming=bump name: Speed Bump # 'terms: speed hump' - terms: "" + terms: >- + traffic_calming/hump: # traffic_calming=hump name: Speed Hump # 'terms: speed bump' - terms: "" + terms: >- + traffic_calming/rumble_strip: # traffic_calming=rumble_strip name: Rumble Strip # 'terms: sleeper lines,audible lines,growlers' - terms: "" + terms: >- + traffic_calming/table: # 'highway=crossing, traffic_calming=table' name: Raised Pedestrian Crossing # 'terms: speed table,flat top hump' - terms: "" + terms: >- + type/boundary: # type=boundary name: Boundary - terms: "" + terms: >- + type/boundary/administrative: # 'type=boundary, boundary=administrative' name: Administrative Boundary - terms: "" + terms: >- + type/multipolygon: # type=multipolygon name: Multipolygon - terms: "" + terms: >- + type/restriction: # type=restriction name: Restriction - terms: "" + terms: >- + type/restriction/no_left_turn: # 'type=restriction, restriction=no_left_turn' name: No Left Turn - terms: "" + terms: >- + type/restriction/no_right_turn: # 'type=restriction, restriction=no_right_turn' name: No Right Turn - terms: "" + terms: >- + type/restriction/no_straight_on: # 'type=restriction, restriction=no_straight_on' name: No Straight On - terms: "" + terms: >- + type/restriction/no_u_turn: # 'type=restriction, restriction=no_u_turn' name: No U-turn - terms: "" + terms: >- + type/restriction/only_left_turn: # 'type=restriction, restriction=only_left_turn' name: Left Turn Only - terms: "" + terms: >- + type/restriction/only_right_turn: # 'type=restriction, restriction=only_right_turn' name: Right Turn Only - terms: "" + terms: >- + type/restriction/only_straight_on: # 'type=restriction, restriction=only_straight_on' name: No Turns - terms: "" + terms: >- + type/route: # type=route name: Route - terms: "" + terms: >- + type/route/bicycle: # 'type=route, route=bicycle' name: Cycle Route - terms: "" + terms: >- + type/route/bus: # 'type=route, route=bus' name: Bus Route - terms: "" + terms: >- + type/route/detour: # 'type=route, route=detour' name: Detour Route - terms: "" + terms: >- + type/route/ferry: # 'type=route, route=ferry' name: Ferry Route - terms: "" + terms: >- + type/route/foot: # 'type=route, route=foot' name: Foot Route - terms: "" + terms: >- + type/route/hiking: # 'type=route, route=hiking' name: Hiking Route - terms: "" + terms: >- + type/route/horse: # 'type=route, route=horse' name: Riding Route - terms: "" + terms: >- + type/route/pipeline: # 'type=route, route=pipeline' name: Pipeline Route - terms: "" + terms: >- + type/route/power: # 'type=route, route=power' name: Power Route - terms: "" + terms: >- + type/route/road: # 'type=route, route=road' name: Road Route - terms: "" + terms: >- + type/route/train: # 'type=route, route=train' name: Train Route - terms: "" + terms: >- + type/route/tram: # 'type=route, route=tram' name: Tram Route - terms: "" + terms: >- + type/route_master: # type=route_master name: Route Master - terms: "" + terms: >- + type/site: # type=site name: Site - terms: "" + terms: >- + vertex: name: Other - terms: "" + terms: >- + waterway: - # 'waterway=*' + # waterway=* name: Waterway - terms: "" + terms: >- + waterway/boatyard: # waterway=boatyard name: Boatyard - terms: "" + terms: >- + waterway/canal: # waterway=canal name: Canal - terms: "" + terms: >- + waterway/dam: # waterway=dam name: Dam - terms: "" + terms: >- + waterway/ditch: # waterway=ditch name: Ditch - terms: "" + terms: >- + waterway/dock: # waterway=dock name: Wet Dock / Dry Dock # 'terms: boat,ship,vessel,marine' - terms: "" + terms: >- + waterway/drain: # waterway=drain name: Drain - terms: "" + terms: >- + waterway/fuel: # waterway=fuel name: Marine Fuel Station # 'terms: petrol,gas,diesel,boat' - terms: "" + terms: >- + waterway/river: # waterway=river name: River - # 'terms: beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse' - terms: "" + # >- + terms: + beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse + terms: >- + waterway/riverbank: # waterway=riverbank name: Riverbank - terms: "" + terms: >- + waterway/sanitary_dump_station: # waterway=sanitary_dump_station name: Marine Toilet Disposal - # 'terms: Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet' - terms: "" + # >- + terms: Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump + out,Elsan,CDP,CTDP,Chemical Toilet + terms: >- + waterway/stream: # waterway=stream name: Stream - # 'terms: beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse' - terms: "" + # >- + terms: + beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse + terms: >- + waterway/water_point: # waterway=water_point name: Marine Drinking Water - terms: "" + terms: >- + waterway/weir: # waterway=weir name: Weir - terms: "" + terms: >- + diff --git a/data/presets/fields.json b/data/presets/fields.json index 79a87367c..bc25238b9 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1,4 +1,27 @@ { + "access_simple": { + "key": "access", + "type": "combo", + "label": "Allowed Access", + "placeholder": "yes", + "options": [ + "permissive", + "private", + "customers", + "no" + ] + }, + "access_toilets": { + "key": "access", + "type": "combo", + "label": "Access", + "options": [ + "yes", + "permissive", + "private", + "customers" + ] + }, "access": { "keys": [ "access", @@ -53,29 +76,6 @@ } } }, - "access_simple": { - "key": "access", - "type": "combo", - "label": "Allowed Access", - "placeholder": "yes", - "options": [ - "permissive", - "private", - "customers", - "no" - ] - }, - "access_toilets": { - "key": "access", - "type": "combo", - "label": "Access", - "options": [ - "yes", - "permissive", - "private", - "customers" - ] - }, "address": { "type": "address", "keys": [ @@ -246,11 +246,6 @@ "type": "text", "label": "Brand" }, - "building": { - "key": "building", - "type": "combo", - "label": "Building" - }, "building_area": { "key": "building", "type": "combo", @@ -258,6 +253,11 @@ "geometry": "area", "label": "Building" }, + "building": { + "key": "building", + "type": "combo", + "label": "Building" + }, "capacity": { "key": "capacity", "type": "number", @@ -510,16 +510,16 @@ "label": "Fix Me", "universal": true }, - "fuel": { - "key": "fuel", - "type": "combo", - "label": "Fuel" - }, "fuel_multi": { "key": "fuel:", "type": "multiCombo", "label": "Fuel Types" }, + "fuel": { + "key": "fuel", + "type": "combo", + "label": "Fuel" + }, "gauge": { "key": "gauge", "type": "combo", @@ -600,11 +600,6 @@ "type": "text", "label": "ICAO" }, - "incline": { - "key": "incline", - "type": "combo", - "label": "Incline" - }, "incline_steps": { "key": "incline", "type": "combo", @@ -616,6 +611,11 @@ } } }, + "incline": { + "key": "incline", + "type": "combo", + "label": "Incline" + }, "information": { "key": "information", "type": "typeCombo", @@ -661,6 +661,19 @@ "type": "combo", "label": "Layer" }, + "leaf_cycle_singular": { + "key": "leaf_cycle", + "type": "combo", + "label": "Leaf Cycle", + "strings": { + "options": { + "evergreen": "Evergreen", + "deciduous": "Deciduous", + "semi_evergreen": "Semi-Evergreen", + "semi_deciduous": "Semi-Deciduous" + } + } + }, "leaf_cycle": { "key": "leaf_cycle", "type": "combo", @@ -675,16 +688,15 @@ } } }, - "leaf_cycle_singular": { - "key": "leaf_cycle", + "leaf_type_singular": { + "key": "leaf_type", "type": "combo", - "label": "Leaf Cycle", + "label": "Leaf Type", "strings": { "options": { - "evergreen": "Evergreen", - "deciduous": "Deciduous", - "semi_evergreen": "Semi-Evergreen", - "semi_deciduous": "Semi-Deciduous" + "broadleaved": "Broadleaved", + "needleleaved": "Needleleaved", + "leafless": "Leafless" } } }, @@ -701,18 +713,6 @@ } } }, - "leaf_type_singular": { - "key": "leaf_type", - "type": "combo", - "label": "Leaf Type", - "strings": { - "options": { - "broadleaved": "Broadleaved", - "needleleaved": "Needleleaved", - "leafless": "Leafless" - } - } - }, "leisure": { "key": "leisure", "type": "typeCombo", @@ -851,18 +851,6 @@ "type": "typeCombo", "label": "Type" }, - "oneway": { - "key": "oneway", - "type": "check", - "label": "One Way", - "strings": { - "options": { - "undefined": "Assumed to be No", - "yes": "Yes", - "no": "No" - } - } - }, "oneway_yes": { "key": "oneway", "type": "check", @@ -875,6 +863,18 @@ } } }, + "oneway": { + "key": "oneway", + "type": "check", + "label": "One Way", + "strings": { + "options": { + "undefined": "Assumed to be No", + "yes": "Yes", + "no": "No" + } + } + }, "opening_hours": { "key": "opening_hours", "type": "text", @@ -996,16 +996,16 @@ "type": "text", "label": "Population" }, - "power": { - "key": "power", - "type": "typeCombo", - "label": "Type" - }, "power_supply": { "key": "power_supply", "type": "check", "label": "Power Supply" }, + "power": { + "key": "power", + "type": "typeCombo", + "label": "Type" + }, "railway": { "key": "railway", "type": "typeCombo", @@ -1050,13 +1050,13 @@ "type": "number", "label": "Rooms" }, - "route": { - "key": "route", + "route_master": { + "key": "route_master", "type": "combo", "label": "Type" }, - "route_master": { - "key": "route_master", + "route": { + "key": "route", "type": "combo", "label": "Type" }, @@ -1086,6 +1086,19 @@ "type": "check", "label": "Seasonal" }, + "service_rail": { + "key": "service", + "type": "combo", + "label": "Service Type", + "strings": { + "options": { + "spur": "Spur", + "yard": "Yard", + "siding": "Siding", + "crossover": "Crossover" + } + } + }, "service": { "key": "service", "type": "combo", @@ -1122,29 +1135,16 @@ } } }, - "service_rail": { - "key": "service", + "shelter_type": { + "key": "shelter_type", "type": "combo", - "label": "Service Type", - "strings": { - "options": { - "spur": "Spur", - "yard": "Yard", - "siding": "Siding", - "crossover": "Crossover" - } - } + "label": "Type" }, "shelter": { "key": "shelter", "type": "check", "label": "Shelter" }, - "shelter_type": { - "key": "shelter_type", - "type": "combo", - "label": "Type" - }, "shop": { "key": "shop", "type": "typeCombo", @@ -1223,11 +1223,6 @@ "universal": true, "label": "Source" }, - "sport": { - "key": "sport", - "type": "combo", - "label": "Sport" - }, "sport_ice": { "key": "sport", "type": "combo", @@ -1254,6 +1249,11 @@ "running" ] }, + "sport": { + "key": "sport", + "type": "combo", + "label": "Sport" + }, "stars": { "key": "stars", "type": "number", @@ -1404,16 +1404,16 @@ "type": "combo", "label": "Type of Goods" }, - "water": { - "key": "water", - "type": "combo", - "label": "Type" - }, "water_point": { "key": "water_point", "type": "check", "label": "Water Point" }, + "water": { + "key": "water", + "type": "combo", + "label": "Type" + }, "waterway": { "key": "waterway", "type": "typeCombo", diff --git a/data/presets/presets.json b/data/presets/presets.json index 560474f92..1f59e0393 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1218,31 +1218,6 @@ ], "name": "Nightclub" }, - "amenity/parking": { - "icon": "parking", - "fields": [ - "operator", - "parking", - "capacity", - "fee", - "access_simple", - "supervised", - "park_ride", - "surface", - "maxstay", - "address" - ], - "geometry": [ - "point", - "vertex", - "area" - ], - "tags": { - "amenity": "parking" - }, - "terms": [], - "name": "Car Parking" - }, "amenity/parking_entrance": { "icon": "entrance", "fields": [ @@ -1272,6 +1247,31 @@ }, "name": "Parking Space" }, + "amenity/parking": { + "icon": "parking", + "fields": [ + "operator", + "parking", + "capacity", + "fee", + "access_simple", + "supervised", + "park_ride", + "surface", + "maxstay", + "address" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "parking" + }, + "terms": [], + "name": "Car Parking" + }, "amenity/pharmacy": { "icon": "pharmacy", "fields": [ @@ -4411,26 +4411,6 @@ ], "name": "Mini-Roundabout" }, - "highway/motorway": { - "icon": "highway-motorway", - "fields": [ - "oneway_yes", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "motorway" - }, - "terms": [], - "name": "Motorway" - }, "highway/motorway_junction": { "geometry": [ "vertex" @@ -4474,6 +4454,26 @@ ], "name": "Motorway Link" }, + "highway/motorway": { + "icon": "highway-motorway", + "fields": [ + "oneway_yes", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "motorway" + }, + "terms": [], + "name": "Motorway" + }, "highway/path": { "icon": "highway-path", "fields": [ @@ -4524,27 +4524,6 @@ "terms": [], "name": "Pedestrian Street" }, - "highway/primary": { - "icon": "highway-primary", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref", - "cycleway" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "primary" - }, - "terms": [], - "name": "Primary Road" - }, "highway/primary_link": { "icon": "highway-primary-link", "fields": [ @@ -4569,6 +4548,27 @@ ], "name": "Primary Link" }, + "highway/primary": { + "icon": "highway-primary", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref", + "cycleway" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "primary" + }, + "terms": [], + "name": "Primary Road" + }, "highway/raceway": { "icon": "highway-unclassified", "fields": [ @@ -4645,27 +4645,6 @@ "terms": [], "name": "Unknown Road" }, - "highway/secondary": { - "icon": "highway-secondary", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref", - "cycleway" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "secondary" - }, - "terms": [], - "name": "Secondary Road" - }, "highway/secondary_link": { "icon": "highway-secondary-link", "fields": [ @@ -4690,6 +4669,27 @@ ], "name": "Secondary Link" }, + "highway/secondary": { + "icon": "highway-secondary", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref", + "cycleway" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "secondary" + }, + "terms": [], + "name": "Secondary Road" + }, "highway/service": { "icon": "highway-service", "fields": [ @@ -4866,27 +4866,6 @@ ], "name": "Street Lamp" }, - "highway/tertiary": { - "icon": "highway-tertiary", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref", - "cycleway" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "tertiary" - }, - "terms": [], - "name": "Tertiary Road" - }, "highway/tertiary_link": { "icon": "highway-tertiary-link", "fields": [ @@ -4911,6 +4890,27 @@ ], "name": "Tertiary Link" }, + "highway/tertiary": { + "icon": "highway-tertiary", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref", + "cycleway" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "tertiary" + }, + "terms": [], + "name": "Tertiary Road" + }, "highway/track": { "icon": "highway-track", "fields": [ @@ -4972,26 +4972,6 @@ ], "name": "Traffic Signals" }, - "highway/trunk": { - "icon": "highway-trunk", - "fields": [ - "oneway", - "maxspeed", - "structure", - "access", - "lanes", - "surface", - "ref" - ], - "geometry": [ - "line" - ], - "tags": { - "highway": "trunk" - }, - "terms": [], - "name": "Trunk Road" - }, "highway/trunk_link": { "icon": "highway-trunk-link", "fields": [ @@ -5015,6 +4995,26 @@ ], "name": "Trunk Link" }, + "highway/trunk": { + "icon": "highway-trunk", + "fields": [ + "oneway", + "maxspeed", + "structure", + "access", + "lanes", + "surface", + "ref" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "trunk" + }, + "terms": [], + "name": "Trunk Road" + }, "highway/turning_circle": { "icon": "circle", "geometry": [ @@ -6712,6 +6712,22 @@ }, "name": "Spring" }, + "natural/tree_row": { + "fields": [ + "leaf_type", + "leaf_cycle", + "denotation" + ], + "icon": "park", + "geometry": [ + "line" + ], + "terms": [], + "tags": { + "natural": "tree_row" + }, + "name": "Tree row" + }, "natural/tree": { "fields": [ "leaf_type_singular", @@ -6729,22 +6745,6 @@ }, "name": "Tree" }, - "natural/tree_row": { - "fields": [ - "leaf_type", - "leaf_cycle", - "denotation" - ], - "icon": "park", - "geometry": [ - "line" - ], - "terms": [], - "tags": { - "natural": "tree_row" - }, - "name": "Tree row" - }, "natural/volcano": { "icon": "triangle", "fields": [ @@ -7773,6 +7773,17 @@ ], "name": "Railway Station" }, + "railway/subway_entrance": { + "icon": "rail-metro", + "geometry": [ + "point" + ], + "tags": { + "railway": "subway_entrance" + }, + "terms": [], + "name": "Subway Entrance" + }, "railway/subway": { "icon": "railway-subway", "geometry": [ @@ -7790,17 +7801,6 @@ "terms": [], "name": "Subway" }, - "railway/subway_entrance": { - "icon": "rail-metro", - "geometry": [ - "point" - ], - "tags": { - "railway": "subway_entrance" - }, - "terms": [], - "name": "Subway Entrance" - }, "railway/tram": { "icon": "railway-light-rail", "geometry": [ @@ -8190,26 +8190,6 @@ }, "name": "Candle Shop" }, - "shop/car": { - "icon": "car", - "fields": [ - "operator", - "address", - "building_area", - "opening_hours" - ], - "geometry": [ - "point", - "area" - ], - "terms": [ - "auto" - ], - "tags": { - "shop": "car" - }, - "name": "Car Dealership" - }, "shop/car_parts": { "icon": "car", "fields": [ @@ -8250,6 +8230,26 @@ }, "name": "Car Repair Shop" }, + "shop/car": { + "icon": "car", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "auto" + ], + "tags": { + "shop": "car" + }, + "name": "Car Dealership" + }, "shop/carpet": { "icon": "shop", "fields": [ @@ -9833,6 +9833,23 @@ }, "name": "Variety Store" }, + "shop/video_games": { + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "video_games" + }, + "name": "Video Game Store" + }, "shop/video": { "icon": "shop", "fields": [ @@ -9853,23 +9870,6 @@ }, "name": "Video Store" }, - "shop/video_games": { - "icon": "shop", - "fields": [ - "operator", - "address", - "building_area", - "opening_hours" - ], - "geometry": [ - "point", - "area" - ], - "tags": { - "shop": "video_games" - }, - "name": "Video Game Store" - }, "shop/water_sports": { "icon": "shop", "fields": [ @@ -10504,6 +10504,22 @@ ], "icon": "restriction-only-straight-on" }, + "type/route_master": { + "geometry": [ + "relation" + ], + "tags": { + "type": "route_master" + }, + "name": "Route Master", + "icon": "route-master", + "fields": [ + "route_master", + "ref", + "operator", + "network" + ] + }, "type/route": { "geometry": [ "relation" @@ -10701,22 +10717,6 @@ "operator" ] }, - "type/route_master": { - "geometry": [ - "relation" - ], - "tags": { - "type": "route_master" - }, - "name": "Route Master", - "icon": "route-master", - "fields": [ - "route_master", - "ref", - "operator", - "network" - ] - }, "type/site": { "geometry": [ "relation" diff --git a/data/taginfo.json b/data/taginfo.json index ac5762cc2..fc4e993b0 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -276,10 +276,6 @@ "key": "amenity", "value": "nightclub" }, - { - "key": "amenity", - "value": "parking" - }, { "key": "amenity", "value": "parking_entrance" @@ -288,6 +284,10 @@ "key": "amenity", "value": "parking_space" }, + { + "key": "amenity", + "value": "parking" + }, { "key": "amenity", "value": "pharmacy" @@ -986,10 +986,6 @@ "key": "highway", "value": "mini_roundabout" }, - { - "key": "highway", - "value": "motorway" - }, { "key": "highway", "value": "motorway_junction" @@ -998,6 +994,10 @@ "key": "highway", "value": "motorway_link" }, + { + "key": "highway", + "value": "motorway" + }, { "key": "highway", "value": "path" @@ -1008,11 +1008,11 @@ }, { "key": "highway", - "value": "primary" + "value": "primary_link" }, { "key": "highway", - "value": "primary_link" + "value": "primary" }, { "key": "highway", @@ -1032,11 +1032,11 @@ }, { "key": "highway", - "value": "secondary" + "value": "secondary_link" }, { "key": "highway", - "value": "secondary_link" + "value": "secondary" }, { "key": "highway", @@ -1080,11 +1080,11 @@ }, { "key": "highway", - "value": "tertiary" + "value": "tertiary_link" }, { "key": "highway", - "value": "tertiary_link" + "value": "tertiary" }, { "key": "highway", @@ -1096,11 +1096,11 @@ }, { "key": "highway", - "value": "trunk" + "value": "trunk_link" }, { "key": "highway", - "value": "trunk_link" + "value": "trunk" }, { "key": "highway", @@ -1567,11 +1567,11 @@ }, { "key": "natural", - "value": "tree" + "value": "tree_row" }, { "key": "natural", - "value": "tree_row" + "value": "tree" }, { "key": "natural", @@ -1818,11 +1818,11 @@ }, { "key": "railway", - "value": "subway" + "value": "subway_entrance" }, { "key": "railway", - "value": "subway_entrance" + "value": "subway" }, { "key": "railway", @@ -1907,10 +1907,6 @@ "key": "shop", "value": "candles" }, - { - "key": "shop", - "value": "car" - }, { "key": "shop", "value": "car_parts" @@ -1919,6 +1915,10 @@ "key": "shop", "value": "car_repair" }, + { + "key": "shop", + "value": "car" + }, { "key": "shop", "value": "carpet" @@ -2261,11 +2261,11 @@ }, { "key": "shop", - "value": "video" + "value": "video_games" }, { "key": "shop", - "value": "video_games" + "value": "video" }, { "key": "shop", @@ -2414,6 +2414,10 @@ "key": "restriction", "value": "only_straight_on" }, + { + "key": "type", + "value": "route_master" + }, { "key": "type", "value": "route" @@ -2466,10 +2470,6 @@ "key": "route", "value": "tram" }, - { - "key": "type", - "value": "route_master" - }, { "key": "type", "value": "site" diff --git a/dist/locales/en.json b/dist/locales/en.json index e8dec12fa..8c4ee4d27 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -648,6 +648,13 @@ } }, "fields": { + "access_simple": { + "label": "Allowed Access", + "placeholder": "yes" + }, + "access_toilets": { + "label": "Access" + }, "access": { "label": "Allowed Access", "placeholder": "Not Specified", @@ -689,13 +696,6 @@ } } }, - "access_simple": { - "label": "Allowed Access", - "placeholder": "yes" - }, - "access_toilets": { - "label": "Access" - }, "address": { "label": "Address", "placeholders": { @@ -794,10 +794,10 @@ "brand": { "label": "Brand" }, - "building": { + "building_area": { "label": "Building" }, - "building_area": { + "building": { "label": "Building" }, "capacity": { @@ -962,12 +962,12 @@ "fixme": { "label": "Fix Me" }, - "fuel": { - "label": "Fuel" - }, "fuel_multi": { "label": "Fuel Types" }, + "fuel": { + "label": "Fuel" + }, "gauge": { "label": "Gauge" }, @@ -1016,9 +1016,6 @@ "icao": { "label": "ICAO" }, - "incline": { - "label": "Incline" - }, "incline_steps": { "label": "Incline", "options": { @@ -1026,6 +1023,9 @@ "down": "Down" } }, + "incline": { + "label": "Incline" + }, "information": { "label": "Type" }, @@ -1055,6 +1055,15 @@ "layer": { "label": "Layer" }, + "leaf_cycle_singular": { + "label": "Leaf Cycle", + "options": { + "evergreen": "Evergreen", + "deciduous": "Deciduous", + "semi_evergreen": "Semi-Evergreen", + "semi_deciduous": "Semi-Deciduous" + } + }, "leaf_cycle": { "label": "Leaf Cycle", "options": { @@ -1065,13 +1074,12 @@ "mixed": "Mixed" } }, - "leaf_cycle_singular": { - "label": "Leaf Cycle", + "leaf_type_singular": { + "label": "Leaf Type", "options": { - "evergreen": "Evergreen", - "deciduous": "Deciduous", - "semi_evergreen": "Semi-Evergreen", - "semi_deciduous": "Semi-Deciduous" + "broadleaved": "Broadleaved", + "needleleaved": "Needleleaved", + "leafless": "Leafless" } }, "leaf_type": { @@ -1083,14 +1091,6 @@ "leafless": "Leafless" } }, - "leaf_type_singular": { - "label": "Leaf Type", - "options": { - "broadleaved": "Broadleaved", - "needleleaved": "Needleleaved", - "leafless": "Leafless" - } - }, "leisure": { "label": "Type" }, @@ -1172,14 +1172,6 @@ "office": { "label": "Type" }, - "oneway": { - "label": "One Way", - "options": { - "undefined": "Assumed to be No", - "yes": "Yes", - "no": "No" - } - }, "oneway_yes": { "label": "One Way", "options": { @@ -1188,6 +1180,14 @@ "no": "No" } }, + "oneway": { + "label": "One Way", + "options": { + "undefined": "Assumed to be No", + "yes": "Yes", + "no": "No" + } + }, "opening_hours": { "label": "Hours" }, @@ -1271,12 +1271,12 @@ "population": { "label": "Population" }, - "power": { - "label": "Type" - }, "power_supply": { "label": "Power Supply" }, + "power": { + "label": "Type" + }, "railway": { "label": "Type" }, @@ -1301,10 +1301,10 @@ "rooms": { "label": "Rooms" }, - "route": { + "route_master": { "label": "Type" }, - "route_master": { + "route": { "label": "Type" }, "sac_scale": { @@ -1325,6 +1325,15 @@ "seasonal": { "label": "Seasonal" }, + "service_rail": { + "label": "Service Type", + "options": { + "spur": "Spur", + "yard": "Yard", + "siding": "Siding", + "crossover": "Crossover" + } + }, "service": { "label": "Type" }, @@ -1344,21 +1353,12 @@ "no": "No" } }, - "service_rail": { - "label": "Service Type", - "options": { - "spur": "Spur", - "yard": "Yard", - "siding": "Siding", - "crossover": "Crossover" - } + "shelter_type": { + "label": "Type" }, "shelter": { "label": "Shelter" }, - "shelter_type": { - "label": "Type" - }, "shop": { "label": "Type" }, @@ -1401,15 +1401,15 @@ "source": { "label": "Source" }, - "sport": { - "label": "Sport" - }, "sport_ice": { "label": "Sport" }, "sport_racing": { "label": "Sport" }, + "sport": { + "label": "Sport" + }, "stars": { "label": "Stars" }, @@ -1505,12 +1505,12 @@ "vending": { "label": "Type of Goods" }, - "water": { - "label": "Type" - }, "water_point": { "label": "Water Point" }, + "water": { + "label": "Type" + }, "waterway": { "label": "Type" }, @@ -1800,10 +1800,6 @@ "name": "Nightclub", "terms": "disco*,night club,dancing,dance club" }, - "amenity/parking": { - "name": "Car Parking", - "terms": "" - }, "amenity/parking_entrance": { "name": "Parking Garage Entrance/Exit", "terms": "" @@ -1812,6 +1808,10 @@ "name": "Parking Space", "terms": "" }, + "amenity/parking": { + "name": "Car Parking", + "terms": "" + }, "amenity/pharmacy": { "name": "Pharmacy", "terms": "drug,medicine" @@ -2516,10 +2516,6 @@ "name": "Mini-Roundabout", "terms": "" }, - "highway/motorway": { - "name": "Motorway", - "terms": "" - }, "highway/motorway_junction": { "name": "Motorway Junction / Exit", "terms": "" @@ -2528,6 +2524,10 @@ "name": "Motorway Link", "terms": "ramp,on ramp,off ramp" }, + "highway/motorway": { + "name": "Motorway", + "terms": "" + }, "highway/path": { "name": "Path", "terms": "hike,hiking,trackway,trail,walk" @@ -2536,14 +2536,14 @@ "name": "Pedestrian Street", "terms": "" }, - "highway/primary": { - "name": "Primary Road", - "terms": "" - }, "highway/primary_link": { "name": "Primary Link", "terms": "ramp,on ramp,off ramp" }, + "highway/primary": { + "name": "Primary Road", + "terms": "" + }, "highway/raceway": { "name": "Motor Raceway", "terms": "auto*,race*,nascar" @@ -2560,14 +2560,14 @@ "name": "Unknown Road", "terms": "" }, - "highway/secondary": { - "name": "Secondary Road", - "terms": "" - }, "highway/secondary_link": { "name": "Secondary Link", "terms": "ramp,on ramp,off ramp" }, + "highway/secondary": { + "name": "Secondary Road", + "terms": "" + }, "highway/service": { "name": "Service Road", "terms": "" @@ -2608,14 +2608,14 @@ "name": "Street Lamp", "terms": "streetlight,street light,lamp,light,gaslight" }, - "highway/tertiary": { - "name": "Tertiary Road", - "terms": "" - }, "highway/tertiary_link": { "name": "Tertiary Link", "terms": "ramp,on ramp,off ramp" }, + "highway/tertiary": { + "name": "Tertiary Road", + "terms": "" + }, "highway/track": { "name": "Unmaintained Track Road", "terms": "woods road,forest road,logging road,fire road,farm road,agricultural road,ranch road,carriage road,primitive,unmaintained,rut,offroad,4wd,4x4,four wheel drive,atv,quad,jeep,double track,two track" @@ -2624,14 +2624,14 @@ "name": "Traffic Signals", "terms": "light,stoplight,traffic light" }, - "highway/trunk": { - "name": "Trunk Road", - "terms": "" - }, "highway/trunk_link": { "name": "Trunk Link", "terms": "ramp,on ramp,off ramp" }, + "highway/trunk": { + "name": "Trunk Road", + "terms": "" + }, "highway/turning_circle": { "name": "Turning Circle", "terms": "cul-de-sac" @@ -3104,14 +3104,14 @@ "name": "Spring", "terms": "" }, - "natural/tree": { - "name": "Tree", - "terms": "" - }, "natural/tree_row": { "name": "Tree row", "terms": "" }, + "natural/tree": { + "name": "Tree", + "terms": "" + }, "natural/volcano": { "name": "Volcano", "terms": "mountain,crater" @@ -3364,14 +3364,14 @@ "name": "Railway Station", "terms": "train station,station" }, - "railway/subway": { - "name": "Subway", - "terms": "" - }, "railway/subway_entrance": { "name": "Subway Entrance", "terms": "" }, + "railway/subway": { + "name": "Subway", + "terms": "" + }, "railway/tram": { "name": "Tram", "terms": "streetcar" @@ -3460,10 +3460,6 @@ "name": "Candle Shop", "terms": "" }, - "shop/car": { - "name": "Car Dealership", - "terms": "auto" - }, "shop/car_parts": { "name": "Car Parts Store", "terms": "auto" @@ -3472,6 +3468,10 @@ "name": "Car Repair Shop", "terms": "auto" }, + "shop/car": { + "name": "Car Dealership", + "terms": "auto" + }, "shop/carpet": { "name": "Carpet Store", "terms": "rug" @@ -3812,14 +3812,14 @@ "name": "Variety Store", "terms": "" }, - "shop/video": { - "name": "Video Store", - "terms": "DVD" - }, "shop/video_games": { "name": "Video Game Store", "terms": "" }, + "shop/video": { + "name": "Video Store", + "terms": "DVD" + }, "shop/water_sports": { "name": "Watersport/Swim Shop", "terms": "" @@ -3968,6 +3968,10 @@ "name": "No Turns", "terms": "" }, + "type/route_master": { + "name": "Route Master", + "terms": "" + }, "type/route": { "name": "Route", "terms": "" @@ -4020,10 +4024,6 @@ "name": "Tram Route", "terms": "" }, - "type/route_master": { - "name": "Route Master", - "terms": "" - }, "type/site": { "name": "Site", "terms": "" diff --git a/test/index.html b/test/index.html index 7b0240de3..4511e0e68 100644 --- a/test/index.html +++ b/test/index.html @@ -13,7 +13,7 @@ - + - +