From 41e696a2c56ed861e4a123fde97468521998946e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 13 Mar 2013 12:35:31 -0700 Subject: [PATCH] Flatten presets match properties --- data/presets/README.md | 40 +++++---- data/presets/categories.json | 4 +- data/presets/lint.js | 11 --- data/presets/presets.json | 2 +- data/presets/presets/aeroway.json | 24 +++--- data/presets/presets/aeroway/aerodrome.json | 28 +++---- data/presets/presets/aeroway/helipad.json | 28 +++---- data/presets/presets/amenity.json | 20 ++--- data/presets/presets/amenity/bank.json | 64 +++++++------- data/presets/presets/amenity/bar.json | 20 ++--- .../presets/amenity/bicycle_parking.json | 18 ++-- .../presets/amenity/bicycle_rental.json | 18 ++-- data/presets/presets/amenity/cafe.json | 28 +++---- data/presets/presets/amenity/cinema.json | 56 ++++++------- data/presets/presets/amenity/fast_food.json | 20 ++--- .../presets/presets/amenity/fire_station.json | 20 ++--- data/presets/presets/amenity/grave_yard.json | 18 ++-- data/presets/presets/amenity/hospital.json | 48 +++++------ data/presets/presets/amenity/library.json | 20 ++--- data/presets/presets/amenity/parking.json | 20 ++--- data/presets/presets/amenity/pharmacy.json | 20 ++--- .../presets/amenity/place_of_worship.json | 68 ++++++++------- .../amenity/place_of_worship/christian.json | 68 ++++++++------- .../amenity/place_of_worship/jewish.json | 28 +++---- .../amenity/place_of_worship/muslim.json | 28 +++---- data/presets/presets/amenity/police.json | 78 +++++++++-------- data/presets/presets/amenity/post_box.json | 30 ++++--- data/presets/presets/amenity/pub.json | 20 ++--- data/presets/presets/amenity/restaurant.json | 84 +++++++++---------- data/presets/presets/amenity/school.json | 54 ++++++------ data/presets/presets/amenity/toilets.json | 21 ++--- data/presets/presets/amenity/townhall.json | 32 ++++--- data/presets/presets/amenity/university.json | 20 ++--- data/presets/presets/building.json | 20 ++--- data/presets/presets/highway.json | 24 +++--- data/presets/presets/highway/bus_stop.json | 18 ++-- data/presets/presets/highway/crossing.json | 22 +++-- data/presets/presets/highway/cycleway.json | 20 ++--- data/presets/presets/highway/footway.json | 68 ++++++++------- data/presets/presets/highway/motorway.json | 20 ++--- data/presets/presets/highway/path.json | 18 ++-- data/presets/presets/highway/primary.json | 20 ++--- data/presets/presets/highway/residential.json | 18 ++-- data/presets/presets/highway/secondary.json | 18 ++-- data/presets/presets/highway/service.json | 18 ++-- data/presets/presets/highway/steps.json | 22 +++-- data/presets/presets/highway/tertiary.json | 18 ++-- data/presets/presets/highway/track.json | 18 ++-- data/presets/presets/highway/trunk.json | 18 ++-- .../presets/highway/turning_circle.json | 16 ++-- .../presets/presets/highway/unclassified.json | 18 ++-- data/presets/presets/historic.json | 18 ++-- data/presets/presets/historic/monument.json | 18 ++-- data/presets/presets/landuse.json | 20 ++--- data/presets/presets/landuse/allotments.json | 19 ++--- data/presets/presets/landuse/cemetery.json | 21 ++--- data/presets/presets/landuse/commercial.json | 19 ++--- .../presets/presets/landuse/construction.json | 21 ++--- data/presets/presets/landuse/farm.json | 19 ++--- data/presets/presets/landuse/farmyard.json | 19 ++--- data/presets/presets/landuse/forest.json | 20 ++--- data/presets/presets/landuse/grass.json | 19 ++--- data/presets/presets/landuse/industrial.json | 19 ++--- data/presets/presets/landuse/meadow.json | 19 ++--- data/presets/presets/landuse/orchard.json | 19 ++--- data/presets/presets/landuse/quarry.json | 19 ++--- data/presets/presets/landuse/residential.json | 19 ++--- data/presets/presets/landuse/vineyard.json | 19 ++--- data/presets/presets/leisure.json | 20 ++--- data/presets/presets/leisure/golf_course.json | 20 ++--- data/presets/presets/leisure/park.json | 62 +++++++------- data/presets/presets/leisure/pitch.json | 22 +++-- .../presets/leisure/pitch/baseball.json | 22 +++-- .../presets/leisure/pitch/basketball.json | 24 +++--- .../presets/presets/leisure/pitch/soccer.json | 24 +++--- .../presets/presets/leisure/pitch/tennis.json | 22 +++-- data/presets/presets/leisure/playground.json | 16 ++-- data/presets/presets/man_made.json | 22 +++-- data/presets/presets/man_made/lighthouse.json | 14 ++-- data/presets/presets/man_made/pier.json | 14 ++-- data/presets/presets/natural.json | 20 ++--- data/presets/presets/natural/bay.json | 17 ++-- data/presets/presets/natural/beach.json | 21 ++--- data/presets/presets/natural/cliff.json | 21 ++--- data/presets/presets/natural/coastline.json | 18 ++-- data/presets/presets/natural/glacier.json | 15 ++-- data/presets/presets/natural/grassland.json | 17 ++-- data/presets/presets/natural/heath.json | 15 ++-- data/presets/presets/natural/peak.json | 46 +++++----- data/presets/presets/natural/scrub.json | 16 ++-- data/presets/presets/natural/spring.json | 17 ++-- data/presets/presets/natural/tree.json | 21 ++--- data/presets/presets/natural/water.json | 18 ++-- data/presets/presets/natural/water/lake.json | 26 +++--- data/presets/presets/natural/water/pond.json | 30 ++++--- .../presets/natural/water/reservoir.json | 19 ++--- data/presets/presets/natural/wetland.json | 20 ++--- data/presets/presets/natural/wood.json | 20 ++--- data/presets/presets/office.json | 22 +++-- data/presets/presets/place.json | 20 ++--- data/presets/presets/place/hamlet.json | 18 ++-- data/presets/presets/place/island.json | 34 ++++---- data/presets/presets/place/locality.json | 18 ++-- data/presets/presets/place/village.json | 18 ++-- data/presets/presets/railway.json | 24 +++--- data/presets/presets/railway/rail.json | 16 ++-- data/presets/presets/railway/subway.json | 16 ++-- .../presets/railway/subway_entrance.json | 16 ++-- data/presets/presets/shop.json | 22 +++-- data/presets/presets/shop/supermarket.json | 62 +++++++------- data/presets/presets/tourism.json | 20 ++--- data/presets/presets/tourism/camp_site.json | 21 ++--- data/presets/presets/tourism/hotel.json | 21 ++--- data/presets/presets/tourism/museum.json | 48 +++++------ data/presets/presets/tourism/picnic_site.json | 21 ++--- data/presets/presets/waterway.json | 24 +++--- data/presets/presets/waterway/canal.json | 16 ++-- data/presets/presets/waterway/dam.json | 22 +++-- data/presets/presets/waterway/ditch.json | 16 ++-- data/presets/presets/waterway/drain.json | 16 ++-- data/presets/presets/waterway/river.json | 46 +++++----- data/presets/presets/waterway/riverbank.json | 16 ++-- data/presets/presets/waterway/stream.json | 70 ++++++++-------- data/presets/presets/waterway/weir.json | 18 ++-- js/id/presets.js | 6 +- js/id/presets/category.js | 2 +- js/id/presets/collection.js | 4 +- js/id/presets/preset.js | 10 +-- js/id/ui/preset_grid.js | 10 +-- js/id/ui/tag_editor.js | 2 +- test/spec/presets/category.js | 14 ++-- test/spec/presets/collection.js | 26 +++--- test/spec/presets/preset.js | 46 ++++------ 133 files changed, 1444 insertions(+), 1775 deletions(-) delete mode 100644 data/presets/lint.js diff --git a/data/presets/README.md b/data/presets/README.md index 7a152eef0..698b7af37 100644 --- a/data/presets/README.md +++ b/data/presets/README.md @@ -16,27 +16,25 @@ A basic preset is of the form: ```javascript { "name": "park", - "match": { - // the geometry types for which this preset is valid. - // options are point, area, line, and vertex. - // vertexes are points that are parts of lines, like the nodes - // in a road - // lines are unclosed ways, and areas are closed ways - "geometry": [ - "point", "area" - ], - // terms are synonyms for the preset - these are added to fuel - // the search functionality. searching for 'woodland' will bring - // up this 'park' preset - "terms": [ - "esplanade", - "village green", - "woodland" - ], - // tags that automatically added to the feature when it's selected - "tags": { - "leisure": "park" - } + // the geometry types for which this preset is valid. + // options are point, area, line, and vertex. + // vertexes are points that are parts of lines, like the nodes + // in a road + // lines are unclosed ways, and areas are closed ways + "geometry": [ + "point", "area" + ], + // terms are synonyms for the preset - these are added to fuel + // the search functionality. searching for 'woodland' will bring + // up this 'park' preset + "terms": [ + "esplanade", + "village green", + "woodland" + ], + // tags that automatically added to the feature when it's selected + "tags": { + "leisure": "park" }, // the icon in iD which represents this feature "icon": "park", diff --git a/data/presets/categories.json b/data/presets/categories.json index 0ac205bdb..6663ab326 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -1,7 +1,5 @@ [{ - "match": { - "geometry": "line" - }, + "geometry": "line", "icon": "highway", "name": "roads", "members": [ diff --git a/data/presets/lint.js b/data/presets/lint.js deleted file mode 100644 index 439db0b1a..000000000 --- a/data/presets/lint.js +++ /dev/null @@ -1,11 +0,0 @@ -var fs = require('fs'); -var p = JSON.parse(fs.readFileSync('presets.json', 'utf8')); - -p = p.map(function(preset) { - preset.match.terms = (preset.match.terms || []).map(function(t) { - return t.trim(); - }); - return preset; -}); - -fs.writeFileSync('presets.json', JSON.stringify(p, null, 4)); diff --git a/data/presets/presets.json b/data/presets/presets.json index 8a5267719..401a34f2a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1 +1 @@ -[{"name":"aeroway","match":{"geometry":["point","vertex","line","area"],"tags":{"aeroway":"*"}},"fields":["aeroway"]},{"name":"airport","match":{"geometry":["point","area"],"terms":["airplane","airport","aerodrome"],"tags":{"aeroway":"aerodrome"}},"icon":"airport","fields":[]},{"name":"helipad","match":{"geometry":["point","area"],"terms":["helicopter","helipad","heliport"],"tags":{"aeroway":"helipad"}},"icon":"heliport","fields":[]},{"name":"amenity","match":{"geometry":["point","area"],"tags":{"amenity":"*"}},"fields":["amenity"]},{"name":"bank","match":{"geometry":["point","area"],"terms":["coffer","countinghouse","credit union","depository","exchequer","fund","hoard","investment firm","repository","reserve","reservoir","safe","savings","stock","stockpile","store","storehouse","thrift","treasury","trust company","vault"],"tags":{"amenity":"bank"}},"icon":"bank","fields":["atm","building_area","address"]},{"name":"bar","match":{"geometry":["point","area"],"tags":{"amenity":"bar"},"terms":[]},"icon":"bar","fields":["building_area","address"]},{"name":"bicycle parking","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_parking"}},"icon":"bicycle","fields":["bicycle_parking","capacity","operator"]},{"name":"bicycle rental","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_rental"}},"icon":"bicycle","fields":["capacity","network","operator"]},{"name":"cafe","match":{"geometry":["point","area"],"terms":["coffee","tea","coffee shop"],"tags":{"amenity":"cafe"}},"icon":"cafe","fields":["cuisine","internet_access","building_area","address"]},{"name":"cinema","match":{"geometry":["point","area"],"terms":["big screen","bijou","cine","drive-in","film","flicks","motion pictures","movie house","movie theater","moving pictures","nabes","photoplay","picture show","pictures","playhouse","show","silver screen"],"tags":{"amenity":"cinema"}},"icon":"cinema","fields":["building_area","address"]},{"name":"fast food","match":{"geometry":["point","area"],"tags":{"amenity":"fast_food"},"terms":[]},"icon":"fast-food","fields":["cuisine","building_area","address"]},{"name":"fire station","match":{"geometry":["point","area"],"tags":{"amenity":"fire_station"},"terms":[]},"icon":"fire-station","fields":["operator","building_area","address"]},{"name":"grave yard","match":{"geometry":["point","area"],"tags":{"amenity":"grave_yard"}},"icon":"cemetery","fields":["religion"]},{"name":"hospital","match":{"geometry":["point","area"],"terms":["clinic","emergency room","health service","hospice","infirmary","institution","nursing home","rest home","sanatorium","sanitarium","sick bay","surgery","ward"],"tags":{"amenity":"hospital"}},"icon":"hospital","fields":["emergency","building_area","address"]},{"name":"library","match":{"geometry":["point","area"],"tags":{"amenity":"library"},"terms":[]},"icon":"library","fields":["operator","building_area","address"]},{"name":"parking","match":{"geometry":["point","area"],"tags":{"amenity":"parking"},"terms":[]},"icon":"parking","fields":["fee","access","address"]},{"name":"pharmacy","match":{"geometry":["point","area"],"tags":{"amenity":"pharmacy"},"terms":[]},"icon":"pharmacy","fields":["operator","building_area","address"]},{"name":"place of worship","match":{"geometry":["point","area"],"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"],"tags":{"amenity":"place_of_worship"}},"icon":"place-of-worship","fields":["religion","denomination","building","address"]},{"name":"church","match":{"geometry":["point","area"],"terms":["christian","abbey","basilica","bethel","cathedral","chancel","chantry","chapel","church","fold","house of God","house of prayer","house of worship","minster","mission","oratory","parish","sacellum","sanctuary","shrine","tabernacle","temple"],"tags":{"amenity":"place_of_worship","religion":"christian"}},"icon":"religious-christian","fields":["denomination","building","address"]},{"name":"synagogue","match":{"geometry":["point","area"],"terms":["jewish","synagogue"],"tags":{"amenity":"place_of_worship","religion":"jewish"}},"icon":"religious-jewish","fields":["denomination","building","address"]},{"name":"mosque","match":{"geometry":["point","area"],"terms":["muslim","mosque"],"tags":{"amenity":"place_of_worship","religion":"muslim"}},"icon":"religious-muslim","fields":["denomination","building","address"]},{"name":"police","match":{"geometry":["point","area"],"terms":["badge","bear","blue","bluecoat","bobby","boy scout","bull","constable","constabulary","cop","copper","corps","county mounty","detective","fed","flatfoot","force","fuzz","gendarme","gumshoe","heat","law","law enforcement","man","narc","officers","patrolman","police"],"tags":{"amenity":"police"}},"icon":"police","fields":["operator","building_area","address"]},{"name":"post box","match":{"geometry":["point"],"tags":{"amenity":"post_box"},"terms":["letter drop","letterbox","mail drop","mailbox","pillar box","postbox"]},"icon":"post","fields":["operator","collection_times"]},{"name":"pub","match":{"geometry":["point","area"],"tags":{"amenity":"pub"},"terms":[]},"icon":"beer","fields":["building_area","address"]},{"name":"restaurant","match":{"geometry":["point","area"],"terms":["bar","cafeteria","café","canteen","chophouse","coffee shop","diner","dining room","dive*","doughtnut shop","drive-in","eatery","eating house","eating place","fast-food place","greasy spoon","grill","hamburger stand","hashery","hideaway","hotdog stand","inn","joint*","luncheonette","lunchroom","night club","outlet*","pizzeria","saloon","soda fountain","watering hole"],"tags":{"amenity":"restaurant"}},"icon":"restaurant","fields":["cuisine","building_area","address"]},{"name":"school","match":{"geometry":["point","area"],"terms":["academy","alma mater","blackboard","college","department","discipline","establishment","faculty","hall","halls of ivy","institute","institution","jail*","schoolhouse","seminary","university"],"tags":{"amenity":"school"}},"icon":"school","fields":["operator","building","address"]},{"name":"toilets","match":{"geometry":["point","area"],"terms":[],"tags":{"amenity":"toilets"}},"fields":["operator","building"]},{"name":"town hall","match":{"geometry":["point","areea"],"terms":["village hall","city government","courthouse","municipal building","municipal center"],"tags":{"amenity":"townhall"}},"icon":"town-hall","fields":["building_area","address"]},{"name":"university","match":{"geometry":["point","area"],"tags":{"amenity":"university"},"terms":[]},"icon":"college","fields":["operator","address"]},{"name":"building","match":{"geometry":["area"],"tags":{"building":"*"},"terms":[]},"icon":"warehouse","fields":["building_yes","levels"],"additional":["address","telephone","website","wikipedia","elevation","source"]},{"name":"highway","match":{"geometry":["point","vertex","line","area"],"tags":{"highway":"*"}},"fields":["highway"]},{"name":"bus stop","match":{"geometry":["point"],"tags":{"highway":"bus_stop"},"terms":[]},"icon":"bus","fields":["operator","shelter"]},{"name":"crossing","match":{"geometry":["vertex"],"tags":{"highway":"crossing"},"terms":["crosswalk","zebra crossing"]},"fields":["crossing"]},{"name":"cycle path","match":{"geometry":["line"],"tags":{"highway":"cycleway"},"terms":[]},"icon":"highway-cycleway","fields":["oneway","roadtype","access","surface"]},{"name":"foot path","match":{"geometry":["line"],"terms":["beaten path","boulevard","clearing","course","cut*","drag*","footpath","highway","lane","line","orbit","passage","pathway","rail","rails","road","roadway","route","street","thoroughfare","trackway","trail","trajectory","walk"],"tags":{"highway":"footway"}},"icon":"highway-footway","fields":["access","surface"]},{"name":"motorway","match":{"geometry":["line"],"tags":{"highway":"motorway"},"terms":[]},"icon":"highway-motorway","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"path","match":{"geometry":["line"],"tags":{"highway":"path"},"terms":[]},"icon":"highway-footway","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"primary road","match":{"geometry":["line"],"tags":{"highway":"primary"},"terms":[]},"icon":"highway-primary","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"residential road","match":{"geometry":["line"],"tags":{"highway":"residential"},"terms":[]},"icon":"highway-residential","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"secondary road","match":{"geometry":["line"],"tags":{"highway":"secondary"},"terms":[]},"icon":"highway-secondary","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"service road","match":{"geometry":["line"],"tags":{"highway":"service"},"terms":[]},"icon":"highway-service","fields":["service","oneway","roadtype","access","maxspeed","surface"]},{"name":"steps","match":{"geometry":["line"],"tags":{"highway":"steps"},"terms":["stairs","staircase"]},"fields":["access","surface"]},{"name":"tertiary road","match":{"geometry":["line"],"tags":{"highway":"tertiary"},"terms":[]},"icon":"highway-tertiary","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"track","match":{"geometry":["line"],"tags":{"highway":"track"},"terms":[]},"icon":"highway-track","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"trunk highway","match":{"geometry":["line"],"tags":{"highway":"trunk"},"terms":[]},"icon":"highway-trunk","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"turning circle","match":{"geometry":["vertex"],"tags":{"highway":"turning_circle"},"terms":[]},"icon":"circle"},{"name":"unclassified","match":{"geometry":["line"],"tags":{"highway":"unclassified"},"terms":[]},"icon":"highway","fields":["oneway","roadtype","access","maxspeed","surface"]},{"name":"historic","match":{"geometry":["point","area"],"tags":{"historic":"*"}},"fields":["historic"]},{"name":"monument","match":{"geometry":["point","area"],"tags":{"historic":"monument"}},"icon":"monument"},{"name":"landuse","match":{"geometry":["point","area"],"tags":{"landuse":"*"}},"fields":["landuse"]},{"name":"allotments","match":{"geometry":["point","area"],"tags":{"landuse":"allotments"},"terms":[]},"fields":[]},{"name":"cemetery","match":{"geometry":["point","area"],"tags":{"landuse":"cemetery"},"terms":[]},"fields":[],"icon":"cemetery"},{"name":"commercial","match":{"geometry":["point","area"],"tags":{"landuse":"commercial"},"terms":[]},"fields":[]},{"name":"construction","match":{"geometry":["point","area"],"tags":{"landuse":"construction"},"terms":[]},"fields":["construction","operator"]},{"name":"farm","match":{"geometry":["point","area"],"tags":{"landuse":"farm"},"terms":[]},"fields":[]},{"name":"farmyard","match":{"geometry":["point","area"],"tags":{"landuse":"farmyard"},"terms":[]},"fields":[]},{"name":"forest","match":{"geometry":["point","area"],"tags":{"landuse":"forest"},"terms":[]},"fields":["wood"],"icon":"park2"},{"name":"grass","match":{"geometry":["point","area"],"tags":{"landuse":"grass"},"terms":[]},"fields":[]},{"name":"industrial","match":{"geometry":["point","area"],"tags":{"landuse":"industrial"},"terms":[]},"fields":[]},{"name":"meadow","match":{"geometry":["point","area"],"tags":{"landuse":"meadow"},"terms":[]},"fields":[]},{"name":"orchard","match":{"geometry":["point","area"],"tags":{"landuse":"orchard"},"terms":[]},"fields":[]},{"name":"quarry","match":{"geometry":["point","area"],"tags":{"landuse":"quarry"},"terms":[]},"fields":[]},{"name":"residential","match":{"geometry":["point","area"],"tags":{"landuse":"residential"},"terms":[]},"fields":[]},{"name":"vineyard","match":{"geometry":["point","area"],"tags":{"landuse":"vineyard"},"terms":[]},"fields":[]},{"name":"leisure","match":{"geometry":["point","area"],"tags":{"leisure":"*"}},"fields":["leisure"]},{"name":"golf course","match":{"geometry":["point","area"],"tags":{"leisure":"golf_course"},"terms":[]},"icon":"golf","fields":["operator","address"]},{"name":"park","match":{"geometry":["point","area"],"terms":["esplanade","estate","forest","garden","grass","green","grounds","lawn","lot","meadow","parkland","place","playground","plaza","pleasure garden","recreation area","square","tract","village green","woodland"],"tags":{"leisure":"park"}},"icon":"park"},{"name":"sport pitch","match":{"geometry":["point","area"],"tags":{"leisure":"pitch"},"terms":[]},"icon":"pitch","fields":["sport","surface"]},{"name":"baseball diamond","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"baseball"},"terms":[]},"icon":"baseball"},{"name":"basketball court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"basketball"},"terms":[]},"icon":"basketball","fields":["surface"]},{"name":"soccer field","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"soccer"},"terms":[]},"icon":"soccer","fields":["surface"]},{"name":"tennis court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"tennis"},"terms":[]},"icon":"tennis","fields":["surface"]},{"name":"playground","match":{"geometry":["point","area"],"tags":{"leisure":"playground"}}},{"name":"man made","match":{"geometry":["point","vertex","line","area"],"tags":{"man_made":"*"}},"fields":["man_made"]},{"name":"lighthouse","match":{"geometry":["point","area"],"tags":{"man_made":"lighthouse"}}},{"name":"pier","match":{"geometry":["line","area"],"tags":{"man_made":"pier"}}},{"name":"natural","match":{"geometry":["point","area"],"tags":{"natural":"*"}},"fields":["natural"]},{"name":"bay","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"bay"}}},{"name":"beach","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"beach"}},"fields":["surface"]},{"name":"cliff","match":{"geometry":["point","vertex","line","area"],"terms":[],"tags":{"natural":"cliff"}}},{"name":"coastline","match":{"geometry":["line"],"terms":["shore"],"tags":{"natural":"coastline"}}},{"name":"glacier","match":{"geometry":["area"],"terms":[],"tags":{"natural":"glacier"}}},{"name":"grassland","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"grassland"}}},{"name":"heath","match":{"geometry":["area"],"terms":[],"tags":{"natural":"heath"}}},{"name":"peak","match":{"geometry":["point","vertex"],"tags":{"natural":"peak"},"terms":["acme","aiguille","alp","climax","crest","crown","hill","mount","mountain","pinnacle","summit","tip","top"]},"icon":"triangle","fields":["elevation"]},{"name":"scrub","match":{"geometry":["area"],"tags":{"natural":"scrub"},"terms":[]}},{"name":"spring","match":{"geometry":["point","vertex"],"terms":[],"tags":{"natural":"spring"}}},{"name":"tree","match":{"geometry":["point","vertex"],"terms":[],"tags":{"natural":"tree"}},"fields":["denotation"],"icon":"park"},{"name":"water","match":{"geometry":["area"],"tags":{"natural":"water"},"terms":[]},"fields":["water"]},{"name":"lake","match":{"geometry":["area"],"tags":{"natural":"water","water":"lake"},"terms":["lakelet","loch","mere"]}},{"name":"pond","match":{"geometry":["area"],"tags":{"natural":"water","water":"pond"},"terms":["lakelet","millpond","tarn","pool","mere"]}},{"name":"reservoir","match":{"geometry":["area"],"tags":{"natural":"water","water":"reservoir"},"terms":[]}},{"name":"wetland","match":{"geometry":["point","area"],"tags":{"natural":"wetland"},"terms":[]},"fields":["wetland"]},{"name":"wood","match":{"geometry":["point","area"],"tags":{"natural":"wood"},"terms":[]},"fields":["wood"],"icon":"park2"},{"name":"office","match":{"geometry":["point","area"],"tags":{"office":"*"},"terms":[]},"icon":"commercial","fields":["office","address","opening_hours"]},{"name":"place","match":{"geometry":["point","area"],"tags":{"place":"*"}},"fields":["place"]},{"name":"hamlet","match":{"geometry":["point","area"],"tags":{"place":"hamlet"}},"icon":"triangle-stroked"},{"name":"island","match":{"geometry":["point","area"],"terms":["archipelago","atoll","bar","cay","isle","islet","key","reef"],"tags":{"place":"island"}}},{"name":"locality","match":{"geometry":["point","area"],"tags":{"place":"locality"}},"icon":"marker"},{"name":"village","match":{"geometry":["point","area"],"tags":{"place":"village"}},"icon":"square-stroked"},{"name":"railway","match":{"geometry":["point","vertex","line","area"],"tags":{"railway":"*"}},"fields":["railway"]},{"name":"rail","match":{"geometry":["line"],"tags":{"railway":"rail"},"terms":[]},"icon":"railway-rail"},{"name":"subway","match":{"geometry":["line"],"tags":{"railway":"subway"},"terms":[]},"icon":"railway-rail"},{"name":"subway entrance","match":{"geometry":["point"],"tags":{"railway":"subway_entrance"},"terms":[]},"icon":"rail-underground"},{"name":"shop","match":{"geometry":["point","area"],"tags":{"shop":"*"},"terms":[]},"icon":"shop","fields":["shop","address","opening_hours"]},{"name":"supermarket","match":{"geometry":["point","area"],"terms":["bazaar","boutique","chain","co-op","cut-rate store","discount store","five-and-dime","flea market","galleria","mall","mart","outlet","outlet store","shop","shopping center","shopping plaza","stand","store","supermarket","thrift shop"],"tags":{"shop":"supermarket"}},"icon":"grocery","fields":["operator","building_area","address"]},{"name":"tourism","match":{"geometry":["point","area"],"tags":{"tourism":"*"}},"fields":["tourism"]},{"name":"camp site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"camp_site"}},"icon":"campsite","fields":["operator","address"]},{"name":"hotel","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"hotel"}},"icon":"lodging","fields":["operator","building_area","address"]},{"name":"museum","match":{"geometry":["point","area"],"terms":["exhibition","exhibits archive","foundation","gallery","hall","institution","library","menagerie","repository","salon","storehouse","treasury","vault"],"tags":{"tourism":"museum"}},"icon":"museum","fields":["operator","building_area","address"]},{"name":"picnic site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"picnic_site"}},"fields":["operator","building_area","address"]},{"name":"waterway","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"*"}},"fields":["waterway"]},{"name":"canal","match":{"geometry":["line"],"tags":{"waterway":"canal"}},"icon":"waterway-river"},{"name":"dam","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"dam"}},"icon":"dam"},{"name":"ditch","match":{"geometry":["line"],"tags":{"waterway":"ditch"}},"icon":"waterway-river"},{"name":"drain","match":{"geometry":["line"],"tags":{"waterway":"drain"}},"icon":"waterway-river"},{"name":"river","match":{"geometry":["line"],"terms":["beck","branch","brook","course","creek","estuary","rill","rivulet","run","runnel","stream","tributary","watercourse"],"tags":{"waterway":"river"}},"icon":"waterway-river"},{"name":"riverbank","match":{"geometry":["area"],"tags":{"waterway":"riverbank"}},"icon":"water"},{"name":"stream","match":{"geometry":["line"],"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"],"tags":{"waterway":"stream"}},"icon":"waterway-river","fields":["layer"]},{"name":"weir","match":{"geometry":["vertex","line"],"tags":{"waterway":"weir"}},"icon":"dam"}] \ No newline at end of file +[{"name":"aeroway","fields":["aeroway"],"geometry":["point","vertex","line","area"],"tags":{"aeroway":"*"}},{"name":"airport","icon":"airport","geometry":["point","area"],"terms":["airplane","airport","aerodrome"],"tags":{"aeroway":"aerodrome"}},{"name":"helipad","icon":"heliport","geometry":["point","area"],"terms":["helicopter","helipad","heliport"],"tags":{"aeroway":"helipad"}},{"name":"amenity","fields":["amenity"],"geometry":["point","area"],"tags":{"amenity":"*"}},{"name":"bank","icon":"bank","fields":["atm","building_area","address"],"geometry":["point","area"],"terms":["coffer","countinghouse","credit union","depository","exchequer","fund","hoard","investment firm","repository","reserve","reservoir","safe","savings","stock","stockpile","store","storehouse","thrift","treasury","trust company","vault"],"tags":{"amenity":"bank"}},{"name":"bar","icon":"bar","fields":["building_area","address"],"geometry":["point","area"],"tags":{"amenity":"bar"},"terms":[]},{"name":"bicycle parking","icon":"bicycle","fields":["bicycle_parking","capacity","operator"],"geometry":["point","area"],"tags":{"amenity":"bicycle_parking"}},{"name":"bicycle rental","icon":"bicycle","fields":["capacity","network","operator"],"geometry":["point","area"],"tags":{"amenity":"bicycle_rental"}},{"name":"cafe","icon":"cafe","fields":["cuisine","internet_access","building_area","address"],"geometry":["point","area"],"terms":["coffee","tea","coffee shop"],"tags":{"amenity":"cafe"}},{"name":"cinema","icon":"cinema","fields":["building_area","address"],"geometry":["point","area"],"terms":["big screen","bijou","cine","drive-in","film","flicks","motion pictures","movie house","movie theater","moving pictures","nabes","photoplay","picture show","pictures","playhouse","show","silver screen"],"tags":{"amenity":"cinema"}},{"name":"fast food","icon":"fast-food","fields":["cuisine","building_area","address"],"geometry":["point","area"],"tags":{"amenity":"fast_food"},"terms":[]},{"name":"fire station","icon":"fire-station","fields":["operator","building_area","address"],"geometry":["point","area"],"tags":{"amenity":"fire_station"},"terms":[]},{"name":"grave yard","icon":"cemetery","fields":["religion"],"geometry":["point","area"],"tags":{"amenity":"grave_yard"}},{"name":"hospital","icon":"hospital","fields":["emergency","building_area","address"],"geometry":["point","area"],"terms":["clinic","emergency room","health service","hospice","infirmary","institution","nursing home","rest home","sanatorium","sanitarium","sick bay","surgery","ward"],"tags":{"amenity":"hospital"}},{"name":"library","icon":"library","fields":["operator","building_area","address"],"geometry":["point","area"],"tags":{"amenity":"library"},"terms":[]},{"name":"parking","icon":"parking","fields":["fee","access","address"],"geometry":["point","area"],"tags":{"amenity":"parking"},"terms":[]},{"name":"pharmacy","icon":"pharmacy","fields":["operator","building_area","address"],"geometry":["point","area"],"tags":{"amenity":"pharmacy"},"terms":[]},{"name":"place of worship","icon":"place-of-worship","fields":["religion","denomination","building","address"],"geometry":["point","area"],"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"],"tags":{"amenity":"place_of_worship"}},{"name":"church","icon":"religious-christian","fields":["denomination","building","address"],"geometry":["point","area"],"terms":["christian","abbey","basilica","bethel","cathedral","chancel","chantry","chapel","church","fold","house of God","house of prayer","house of worship","minster","mission","oratory","parish","sacellum","sanctuary","shrine","tabernacle","temple"],"tags":{"amenity":"place_of_worship","religion":"christian"}},{"name":"synagogue","icon":"religious-jewish","fields":["denomination","building","address"],"geometry":["point","area"],"terms":["jewish","synagogue"],"tags":{"amenity":"place_of_worship","religion":"jewish"}},{"name":"mosque","icon":"religious-muslim","fields":["denomination","building","address"],"geometry":["point","area"],"terms":["muslim","mosque"],"tags":{"amenity":"place_of_worship","religion":"muslim"}},{"name":"police","icon":"police","fields":["operator","building_area","address"],"geometry":["point","area"],"terms":["badge","bear","blue","bluecoat","bobby","boy scout","bull","constable","constabulary","cop","copper","corps","county mounty","detective","fed","flatfoot","force","fuzz","gendarme","gumshoe","heat","law","law enforcement","man","narc","officers","patrolman","police"],"tags":{"amenity":"police"}},{"name":"post box","icon":"post","fields":["operator","collection_times"],"geometry":["point"],"tags":{"amenity":"post_box"},"terms":["letter drop","letterbox","mail drop","mailbox","pillar box","postbox"]},{"name":"pub","icon":"beer","fields":["building_area","address"],"geometry":["point","area"],"tags":{"amenity":"pub"},"terms":[]},{"name":"restaurant","icon":"restaurant","fields":["cuisine","building_area","address"],"geometry":["point","area"],"terms":["bar","cafeteria","café","canteen","chophouse","coffee shop","diner","dining room","dive*","doughtnut shop","drive-in","eatery","eating house","eating place","fast-food place","greasy spoon","grill","hamburger stand","hashery","hideaway","hotdog stand","inn","joint*","luncheonette","lunchroom","night club","outlet*","pizzeria","saloon","soda fountain","watering hole"],"tags":{"amenity":"restaurant"}},{"name":"school","icon":"school","fields":["operator","building","address"],"geometry":["point","area"],"terms":["academy","alma mater","blackboard","college","department","discipline","establishment","faculty","hall","halls of ivy","institute","institution","jail*","schoolhouse","seminary","university"],"tags":{"amenity":"school"}},{"name":"toilets","fields":["operator","building"],"geometry":["point","area"],"terms":[],"tags":{"amenity":"toilets"}},{"name":"town hall","icon":"town-hall","fields":["building_area","address"],"geometry":["point","areea"],"terms":["village hall","city government","courthouse","municipal building","municipal center"],"tags":{"amenity":"townhall"}},{"name":"university","icon":"college","fields":["operator","address"],"geometry":["point","area"],"tags":{"amenity":"university"},"terms":[]},{"name":"building","icon":"warehouse","fields":["building_yes","levels"],"additional":["address","telephone","website","wikipedia","elevation","source"],"geometry":["area"],"tags":{"building":"*"},"terms":[]},{"name":"highway","fields":["highway"],"geometry":["point","vertex","line","area"],"tags":{"highway":"*"}},{"name":"bus stop","icon":"bus","fields":["operator","shelter"],"geometry":["point"],"tags":{"highway":"bus_stop"},"terms":[]},{"name":"crossing","fields":["crossing"],"geometry":["vertex"],"tags":{"highway":"crossing"},"terms":["crosswalk","zebra crossing"]},{"name":"cycle path","icon":"highway-cycleway","fields":["oneway","roadtype","access","surface"],"geometry":["line"],"tags":{"highway":"cycleway"},"terms":[]},{"name":"foot path","icon":"highway-footway","fields":["access","surface"],"geometry":["line"],"terms":["beaten path","boulevard","clearing","course","cut*","drag*","footpath","highway","lane","line","orbit","passage","pathway","rail","rails","road","roadway","route","street","thoroughfare","trackway","trail","trajectory","walk"],"tags":{"highway":"footway"}},{"name":"motorway","icon":"highway-motorway","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"motorway"},"terms":[]},{"name":"path","icon":"highway-footway","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"path"},"terms":[]},{"name":"primary road","icon":"highway-primary","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"primary"},"terms":[]},{"name":"residential road","icon":"highway-residential","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"residential"},"terms":[]},{"name":"secondary road","icon":"highway-secondary","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"secondary"},"terms":[]},{"name":"service road","icon":"highway-service","fields":["service","oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"service"},"terms":[]},{"name":"steps","fields":["access","surface"],"geometry":["line"],"tags":{"highway":"steps"},"terms":["stairs","staircase"]},{"name":"tertiary road","icon":"highway-tertiary","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"tertiary"},"terms":[]},{"name":"track","icon":"highway-track","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"track"},"terms":[]},{"name":"trunk highway","icon":"highway-trunk","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"trunk"},"terms":[]},{"name":"turning circle","icon":"circle","geometry":["vertex"],"tags":{"highway":"turning_circle"},"terms":[]},{"name":"unclassified","icon":"highway","fields":["oneway","roadtype","access","maxspeed","surface"],"geometry":["line"],"tags":{"highway":"unclassified"},"terms":[]},{"name":"historic","fields":["historic"],"geometry":["point","area"],"tags":{"historic":"*"}},{"name":"monument","icon":"monument","geometry":["point","area"],"tags":{"historic":"monument"}},{"name":"landuse","fields":["landuse"],"geometry":["point","area"],"tags":{"landuse":"*"}},{"name":"allotments","geometry":["point","area"],"tags":{"landuse":"allotments"},"terms":[]},{"name":"cemetery","icon":"cemetery","geometry":["point","area"],"tags":{"landuse":"cemetery"},"terms":[]},{"name":"commercial","geometry":["point","area"],"tags":{"landuse":"commercial"},"terms":[]},{"name":"construction","fields":["construction","operator"],"geometry":["point","area"],"tags":{"landuse":"construction"},"terms":[]},{"name":"farm","geometry":["point","area"],"tags":{"landuse":"farm"},"terms":[]},{"name":"farmyard","geometry":["point","area"],"tags":{"landuse":"farmyard"},"terms":[]},{"name":"forest","fields":["wood"],"icon":"park2","geometry":["point","area"],"tags":{"landuse":"forest"},"terms":[]},{"name":"grass","geometry":["point","area"],"tags":{"landuse":"grass"},"terms":[]},{"name":"industrial","geometry":["point","area"],"tags":{"landuse":"industrial"},"terms":[]},{"name":"meadow","geometry":["point","area"],"tags":{"landuse":"meadow"},"terms":[]},{"name":"orchard","geometry":["point","area"],"tags":{"landuse":"orchard"},"terms":[]},{"name":"quarry","geometry":["point","area"],"tags":{"landuse":"quarry"},"terms":[]},{"name":"residential","geometry":["point","area"],"tags":{"landuse":"residential"},"terms":[]},{"name":"vineyard","geometry":["point","area"],"tags":{"landuse":"vineyard"},"terms":[]},{"name":"leisure","fields":["leisure"],"geometry":["point","area"],"tags":{"leisure":"*"}},{"name":"golf course","icon":"golf","fields":["operator","address"],"geometry":["point","area"],"tags":{"leisure":"golf_course"},"terms":[]},{"name":"park","icon":"park","geometry":["point","area"],"terms":["esplanade","estate","forest","garden","grass","green","grounds","lawn","lot","meadow","parkland","place","playground","plaza","pleasure garden","recreation area","square","tract","village green","woodland"],"tags":{"leisure":"park"}},{"name":"sport pitch","icon":"pitch","fields":["sport","surface"],"geometry":["point","area"],"tags":{"leisure":"pitch"},"terms":[]},{"name":"baseball diamond","icon":"baseball","geometry":["point","area"],"tags":{"leisure":"pitch","sport":"baseball"},"terms":[]},{"name":"basketball court","icon":"basketball","fields":["surface"],"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"basketball"},"terms":[]},{"name":"soccer field","icon":"soccer","fields":["surface"],"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"soccer"},"terms":[]},{"name":"tennis court","icon":"tennis","fields":["surface"],"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"tennis"},"terms":[]},{"name":"playground","geometry":["point","area"],"tags":{"leisure":"playground"}},{"name":"man made","fields":["man_made"],"geometry":["point","vertex","line","area"],"tags":{"man_made":"*"}},{"name":"lighthouse","geometry":["point","area"],"tags":{"man_made":"lighthouse"}},{"name":"pier","geometry":["line","area"],"tags":{"man_made":"pier"}},{"name":"natural","fields":["natural"],"geometry":["point","area"],"tags":{"natural":"*"}},{"name":"bay","geometry":["point","area"],"terms":[],"tags":{"natural":"bay"}},{"name":"beach","fields":["surface"],"geometry":["point","area"],"terms":[],"tags":{"natural":"beach"}},{"name":"cliff","geometry":["point","vertex","line","area"],"terms":[],"tags":{"natural":"cliff"}},{"name":"coastline","geometry":["line"],"terms":["shore"],"tags":{"natural":"coastline"}},{"name":"glacier","geometry":["area"],"terms":[],"tags":{"natural":"glacier"}},{"name":"grassland","geometry":["point","area"],"terms":[],"tags":{"natural":"grassland"}},{"name":"heath","geometry":["area"],"terms":[],"tags":{"natural":"heath"}},{"name":"peak","icon":"triangle","fields":["elevation"],"geometry":["point","vertex"],"tags":{"natural":"peak"},"terms":["acme","aiguille","alp","climax","crest","crown","hill","mount","mountain","pinnacle","summit","tip","top"]},{"name":"scrub","geometry":["area"],"tags":{"natural":"scrub"},"terms":[]},{"name":"spring","geometry":["point","vertex"],"terms":[],"tags":{"natural":"spring"}},{"name":"tree","fields":["denotation"],"icon":"park","geometry":["point","vertex"],"terms":[],"tags":{"natural":"tree"}},{"name":"water","fields":["water"],"geometry":["area"],"tags":{"natural":"water"},"terms":[]},{"name":"lake","geometry":["area"],"tags":{"natural":"water","water":"lake"},"terms":["lakelet","loch","mere"]},{"name":"pond","geometry":["area"],"tags":{"natural":"water","water":"pond"},"terms":["lakelet","millpond","tarn","pool","mere"]},{"name":"reservoir","geometry":["area"],"tags":{"natural":"water","water":"reservoir"},"terms":[]},{"name":"wetland","fields":["wetland"],"geometry":["point","area"],"tags":{"natural":"wetland"},"terms":[]},{"name":"wood","fields":["wood"],"icon":"park2","geometry":["point","area"],"tags":{"natural":"wood"},"terms":[]},{"name":"office","icon":"commercial","fields":["office","address","opening_hours"],"geometry":["point","area"],"tags":{"office":"*"},"terms":[]},{"name":"place","fields":["place"],"geometry":["point","area"],"tags":{"place":"*"}},{"name":"hamlet","icon":"triangle-stroked","geometry":["point","area"],"tags":{"place":"hamlet"}},{"name":"island","geometry":["point","area"],"terms":["archipelago","atoll","bar","cay","isle","islet","key","reef"],"tags":{"place":"island"}},{"name":"locality","icon":"marker","geometry":["point","area"],"tags":{"place":"locality"}},{"name":"village","icon":"square-stroked","geometry":["point","area"],"tags":{"place":"village"}},{"name":"railway","fields":["railway"],"geometry":["point","vertex","line","area"],"tags":{"railway":"*"}},{"name":"rail","icon":"railway-rail","geometry":["line"],"tags":{"railway":"rail"},"terms":[]},{"name":"subway","icon":"railway-rail","geometry":["line"],"tags":{"railway":"subway"},"terms":[]},{"name":"subway entrance","icon":"rail-underground","geometry":["point"],"tags":{"railway":"subway_entrance"},"terms":[]},{"name":"shop","icon":"shop","fields":["shop","address","opening_hours"],"geometry":["point","area"],"tags":{"shop":"*"},"terms":[]},{"name":"supermarket","icon":"grocery","fields":["operator","building_area","address"],"geometry":["point","area"],"terms":["bazaar","boutique","chain","co-op","cut-rate store","discount store","five-and-dime","flea market","galleria","mall","mart","outlet","outlet store","shop","shopping center","shopping plaza","stand","store","supermarket","thrift shop"],"tags":{"shop":"supermarket"}},{"name":"tourism","fields":["tourism"],"geometry":["point","area"],"tags":{"tourism":"*"}},{"name":"camp site","icon":"campsite","fields":["operator","address"],"geometry":["point","area"],"terms":[],"tags":{"tourism":"camp_site"}},{"name":"hotel","icon":"lodging","fields":["operator","building_area","address"],"geometry":["point","area"],"terms":[],"tags":{"tourism":"hotel"}},{"name":"museum","icon":"museum","fields":["operator","building_area","address"],"geometry":["point","area"],"terms":["exhibition","exhibits archive","foundation","gallery","hall","institution","library","menagerie","repository","salon","storehouse","treasury","vault"],"tags":{"tourism":"museum"}},{"name":"picnic site","fields":["operator","building_area","address"],"geometry":["point","area"],"terms":[],"tags":{"tourism":"picnic_site"}},{"name":"waterway","fields":["waterway"],"geometry":["point","vertex","line","area"],"tags":{"waterway":"*"}},{"name":"canal","icon":"waterway-river","geometry":["line"],"tags":{"waterway":"canal"}},{"name":"dam","icon":"dam","geometry":["point","vertex","line","area"],"tags":{"waterway":"dam"}},{"name":"ditch","icon":"waterway-river","geometry":["line"],"tags":{"waterway":"ditch"}},{"name":"drain","icon":"waterway-river","geometry":["line"],"tags":{"waterway":"drain"}},{"name":"river","icon":"waterway-river","geometry":["line"],"terms":["beck","branch","brook","course","creek","estuary","rill","rivulet","run","runnel","stream","tributary","watercourse"],"tags":{"waterway":"river"}},{"name":"riverbank","icon":"water","geometry":["area"],"tags":{"waterway":"riverbank"}},{"name":"stream","icon":"waterway-river","fields":["layer"],"geometry":["line"],"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"],"tags":{"waterway":"stream"}},{"name":"weir","icon":"dam","geometry":["vertex","line"],"tags":{"waterway":"weir"}}] \ No newline at end of file diff --git a/data/presets/presets/aeroway.json b/data/presets/presets/aeroway.json index ea02fcb32..63477d282 100644 --- a/data/presets/presets/aeroway.json +++ b/data/presets/presets/aeroway.json @@ -1,17 +1,15 @@ { "name": "aeroway", - "match": { - "geometry": [ - "point", - "vertex", - "line", - "area" - ], - "tags": { - "aeroway": "*" - } - }, "fields": [ "aeroway" - ] -} + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "aeroway": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json index 0254e0281..bdb38a8d3 100644 --- a/data/presets/presets/aeroway/aerodrome.json +++ b/data/presets/presets/aeroway/aerodrome.json @@ -1,20 +1,16 @@ { "name": "airport", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "airplane", - "airport", - "aerodrome" - ], - "tags": { - "aeroway": "aerodrome" - } - }, "icon": "airport", - "fields": [ - ] + "geometry": [ + "point", + "area" + ], + "terms": [ + "airplane", + "airport", + "aerodrome" + ], + "tags": { + "aeroway": "aerodrome" + } } \ No newline at end of file diff --git a/data/presets/presets/aeroway/helipad.json b/data/presets/presets/aeroway/helipad.json index 08cc026e5..2cae4b1b3 100644 --- a/data/presets/presets/aeroway/helipad.json +++ b/data/presets/presets/aeroway/helipad.json @@ -1,20 +1,16 @@ { "name": "helipad", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "helicopter", - "helipad", - "heliport" - ], - "tags": { - "aeroway": "helipad" - } - }, "icon": "heliport", - "fields": [ - ] + "geometry": [ + "point", + "area" + ], + "terms": [ + "helicopter", + "helipad", + "heliport" + ], + "tags": { + "aeroway": "helipad" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity.json b/data/presets/presets/amenity.json index 9e70ec898..56a0044aa 100644 --- a/data/presets/presets/amenity.json +++ b/data/presets/presets/amenity.json @@ -1,15 +1,13 @@ { "name": "amenity", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "*" - } - }, "fields": [ "amenity" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json index 5f0c5da9f..ceafb1c8d 100644 --- a/data/presets/presets/amenity/bank.json +++ b/data/presets/presets/amenity/bank.json @@ -1,41 +1,39 @@ { "name": "bank", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "coffer", - "countinghouse", - "credit union", - "depository", - "exchequer", - "fund", - "hoard", - "investment firm", - "repository", - "reserve", - "reservoir", - "safe", - "savings", - "stock", - "stockpile", - "store", - "storehouse", - "thrift", - "treasury", - "trust company", - "vault" - ], - "tags": { - "amenity": "bank" - } - }, "icon": "bank", "fields": [ "atm", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "coffer", + "countinghouse", + "credit union", + "depository", + "exchequer", + "fund", + "hoard", + "investment firm", + "repository", + "reserve", + "reservoir", + "safe", + "savings", + "stock", + "stockpile", + "store", + "storehouse", + "thrift", + "treasury", + "trust company", + "vault" + ], + "tags": { + "amenity": "bank" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json index 824c3c11b..9c31e39dc 100644 --- a/data/presets/presets/amenity/bar.json +++ b/data/presets/presets/amenity/bar.json @@ -1,18 +1,16 @@ { "name": "bar", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "bar" - }, - "terms": [] - }, "icon": "bar", "fields": [ "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "bar" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json index 93d578c2b..51e861ee0 100644 --- a/data/presets/presets/amenity/bicycle_parking.json +++ b/data/presets/presets/amenity/bicycle_parking.json @@ -1,18 +1,16 @@ { "name": "bicycle parking", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "bicycle_parking" - } - }, "icon": "bicycle", "fields": [ "bicycle_parking", "capacity", "operator" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "bicycle_parking" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json index 6bdfa68f1..c8f567739 100644 --- a/data/presets/presets/amenity/bicycle_rental.json +++ b/data/presets/presets/amenity/bicycle_rental.json @@ -1,18 +1,16 @@ { "name": "bicycle rental", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "bicycle_rental" - } - }, "icon": "bicycle", "fields": [ "capacity", "network", "operator" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "bicycle_rental" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json index 164c2c9c6..d9d45159c 100644 --- a/data/presets/presets/amenity/cafe.json +++ b/data/presets/presets/amenity/cafe.json @@ -1,24 +1,22 @@ { "name": "cafe", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "coffee", - "tea", - "coffee shop" - ], - "tags": { - "amenity": "cafe" - } - }, "icon": "cafe", "fields": [ "cuisine", "internet_access", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "coffee", + "tea", + "coffee shop" + ], + "tags": { + "amenity": "cafe" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json index bd5fcb5c1..370839707 100644 --- a/data/presets/presets/amenity/cinema.json +++ b/data/presets/presets/amenity/cinema.json @@ -1,36 +1,34 @@ { "name": "cinema", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "big screen", - "bijou", - "cine", - "drive-in", - "film", - "flicks", - "motion pictures", - "movie house", - "movie theater", - "moving pictures", - "nabes", - "photoplay", - "picture show", - "pictures", - "playhouse", - "show", - "silver screen" - ], - "tags": { - "amenity": "cinema" - } - }, "icon": "cinema", "fields": [ "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "big screen", + "bijou", + "cine", + "drive-in", + "film", + "flicks", + "motion pictures", + "movie house", + "movie theater", + "moving pictures", + "nabes", + "photoplay", + "picture show", + "pictures", + "playhouse", + "show", + "silver screen" + ], + "tags": { + "amenity": "cinema" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json index 0aec1af23..aa0987091 100644 --- a/data/presets/presets/amenity/fast_food.json +++ b/data/presets/presets/amenity/fast_food.json @@ -1,19 +1,17 @@ { "name": "fast food", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "fast_food" - }, - "terms": [] - }, "icon": "fast-food", "fields": [ "cuisine", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "fast_food" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json index 32e02d32a..dfb44165e 100644 --- a/data/presets/presets/amenity/fire_station.json +++ b/data/presets/presets/amenity/fire_station.json @@ -1,19 +1,17 @@ { "name": "fire station", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "fire_station" - }, - "terms": [] - }, "icon": "fire-station", "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "fire_station" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json index 51977b495..914ad026f 100644 --- a/data/presets/presets/amenity/grave_yard.json +++ b/data/presets/presets/amenity/grave_yard.json @@ -1,16 +1,14 @@ { "name": "grave yard", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "grave_yard" - } - }, "icon": "cemetery", "fields": [ "religion" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "grave_yard" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json index 669a3c550..74de576f2 100644 --- a/data/presets/presets/amenity/hospital.json +++ b/data/presets/presets/amenity/hospital.json @@ -1,33 +1,31 @@ { "name": "hospital", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "clinic", - "emergency room", - "health service", - "hospice", - "infirmary", - "institution", - "nursing home", - "rest home", - "sanatorium", - "sanitarium", - "sick bay", - "surgery", - "ward" - ], - "tags": { - "amenity": "hospital" - } - }, "icon": "hospital", "fields": [ "emergency", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "clinic", + "emergency room", + "health service", + "hospice", + "infirmary", + "institution", + "nursing home", + "rest home", + "sanatorium", + "sanitarium", + "sick bay", + "surgery", + "ward" + ], + "tags": { + "amenity": "hospital" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json index e8bee590b..e4f693749 100644 --- a/data/presets/presets/amenity/library.json +++ b/data/presets/presets/amenity/library.json @@ -1,19 +1,17 @@ { "name": "library", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "library" - }, - "terms": [] - }, "icon": "library", "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "library" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json index c34f090dc..182a67a00 100644 --- a/data/presets/presets/amenity/parking.json +++ b/data/presets/presets/amenity/parking.json @@ -1,19 +1,17 @@ { "name": "parking", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "parking" - }, - "terms": [] - }, "icon": "parking", "fields": [ "fee", "access", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "parking" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json index be88584c2..39cd03865 100644 --- a/data/presets/presets/amenity/pharmacy.json +++ b/data/presets/presets/amenity/pharmacy.json @@ -1,19 +1,17 @@ { "name": "pharmacy", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "pharmacy" - }, - "terms": [] - }, "icon": "pharmacy", "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "pharmacy" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json index 590309ee6..3a9fa8372 100644 --- a/data/presets/presets/amenity/place_of_worship.json +++ b/data/presets/presets/amenity/place_of_worship.json @@ -1,44 +1,42 @@ { "name": "place of worship", - "match": { - "geometry": [ - "point", - "area" - ], - "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" - ], - "tags": { - "amenity": "place_of_worship" - } - }, "icon": "place-of-worship", "fields": [ "religion", "denomination", "building", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "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" + ], + "tags": { + "amenity": "place_of_worship" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json index 339c75110..378b817ba 100644 --- a/data/presets/presets/amenity/place_of_worship/christian.json +++ b/data/presets/presets/amenity/place_of_worship/christian.json @@ -1,43 +1,41 @@ { "name": "church", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "church", - "fold", - "house of God", - "house of prayer", - "house of worship", - "minster", - "mission", - "oratory", - "parish", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "christian" - } - }, "icon": "religious-christian", "fields": [ "denomination", "building", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "christian", + "abbey", + "basilica", + "bethel", + "cathedral", + "chancel", + "chantry", + "chapel", + "church", + "fold", + "house of God", + "house of prayer", + "house of worship", + "minster", + "mission", + "oratory", + "parish", + "sacellum", + "sanctuary", + "shrine", + "tabernacle", + "temple" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "christian" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json index 390c4f29c..f8bcecaa5 100644 --- a/data/presets/presets/amenity/place_of_worship/jewish.json +++ b/data/presets/presets/amenity/place_of_worship/jewish.json @@ -1,23 +1,21 @@ { "name": "synagogue", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "jewish", - "synagogue" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "jewish" - } - }, "icon": "religious-jewish", "fields": [ "denomination", "building", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "jewish", + "synagogue" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "jewish" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json index 3bcf093e2..26fc18fbd 100644 --- a/data/presets/presets/amenity/place_of_worship/muslim.json +++ b/data/presets/presets/amenity/place_of_worship/muslim.json @@ -1,23 +1,21 @@ { "name": "mosque", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "muslim", - "mosque" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "muslim" - } - }, "icon": "religious-muslim", "fields": [ "denomination", "building", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "muslim", + "mosque" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "muslim" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json index eece784be..ac1da6a12 100644 --- a/data/presets/presets/amenity/police.json +++ b/data/presets/presets/amenity/police.json @@ -1,48 +1,46 @@ { "name": "police", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "badge", - "bear", - "blue", - "bluecoat", - "bobby", - "boy scout", - "bull", - "constable", - "constabulary", - "cop", - "copper", - "corps", - "county mounty", - "detective", - "fed", - "flatfoot", - "force", - "fuzz", - "gendarme", - "gumshoe", - "heat", - "law", - "law enforcement", - "man", - "narc", - "officers", - "patrolman", - "police" - ], - "tags": { - "amenity": "police" - } - }, "icon": "police", "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "badge", + "bear", + "blue", + "bluecoat", + "bobby", + "boy scout", + "bull", + "constable", + "constabulary", + "cop", + "copper", + "corps", + "county mounty", + "detective", + "fed", + "flatfoot", + "force", + "fuzz", + "gendarme", + "gumshoe", + "heat", + "law", + "law enforcement", + "man", + "narc", + "officers", + "patrolman", + "police" + ], + "tags": { + "amenity": "police" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json index d0527c773..92b172e8c 100644 --- a/data/presets/presets/amenity/post_box.json +++ b/data/presets/presets/amenity/post_box.json @@ -1,24 +1,22 @@ { "name": "post box", - "match": { - "geometry": [ - "point" - ], - "tags": { - "amenity": "post_box" - }, - "terms": [ - "letter drop", - "letterbox", - "mail drop", - "mailbox", - "pillar box", - "postbox" - ] - }, "icon": "post", "fields": [ "operator", "collection_times" + ], + "geometry": [ + "point" + ], + "tags": { + "amenity": "post_box" + }, + "terms": [ + "letter drop", + "letterbox", + "mail drop", + "mailbox", + "pillar box", + "postbox" ] } \ No newline at end of file diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json index 0566b3e69..a33f697a5 100644 --- a/data/presets/presets/amenity/pub.json +++ b/data/presets/presets/amenity/pub.json @@ -1,18 +1,16 @@ { "name": "pub", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "pub" - }, - "terms": [] - }, "icon": "beer", "fields": [ "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "pub" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json index 9bff3717f..df24ec763 100644 --- a/data/presets/presets/amenity/restaurant.json +++ b/data/presets/presets/amenity/restaurant.json @@ -1,51 +1,49 @@ { "name": "restaurant", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "bar", - "cafeteria", - "café", - "canteen", - "chophouse", - "coffee shop", - "diner", - "dining room", - "dive*", - "doughtnut shop", - "drive-in", - "eatery", - "eating house", - "eating place", - "fast-food place", - "greasy spoon", - "grill", - "hamburger stand", - "hashery", - "hideaway", - "hotdog stand", - "inn", - "joint*", - "luncheonette", - "lunchroom", - "night club", - "outlet*", - "pizzeria", - "saloon", - "soda fountain", - "watering hole" - ], - "tags": { - "amenity": "restaurant" - } - }, "icon": "restaurant", "fields": [ "cuisine", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "bar", + "cafeteria", + "café", + "canteen", + "chophouse", + "coffee shop", + "diner", + "dining room", + "dive*", + "doughtnut shop", + "drive-in", + "eatery", + "eating house", + "eating place", + "fast-food place", + "greasy spoon", + "grill", + "hamburger stand", + "hashery", + "hideaway", + "hotdog stand", + "inn", + "joint*", + "luncheonette", + "lunchroom", + "night club", + "outlet*", + "pizzeria", + "saloon", + "soda fountain", + "watering hole" + ], + "tags": { + "amenity": "restaurant" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json index 40061dd3b..8f66fd37f 100644 --- a/data/presets/presets/amenity/school.json +++ b/data/presets/presets/amenity/school.json @@ -1,36 +1,34 @@ { "name": "school", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "academy", - "alma mater", - "blackboard", - "college", - "department", - "discipline", - "establishment", - "faculty", - "hall", - "halls of ivy", - "institute", - "institution", - "jail*", - "schoolhouse", - "seminary", - "university" - ], - "tags": { - "amenity": "school" - } - }, "icon": "school", "fields": [ "operator", "building", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "academy", + "alma mater", + "blackboard", + "college", + "department", + "discipline", + "establishment", + "faculty", + "hall", + "halls of ivy", + "institute", + "institution", + "jail*", + "schoolhouse", + "seminary", + "university" + ], + "tags": { + "amenity": "school" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json index 558bc237b..79599e7f0 100644 --- a/data/presets/presets/amenity/toilets.json +++ b/data/presets/presets/amenity/toilets.json @@ -1,18 +1,15 @@ { "name": "toilets", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - ], - "tags": { - "amenity": "toilets" - } - }, "fields": [ "operator", "building" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "amenity": "toilets" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json index 0ce5737ee..cfa42f342 100644 --- a/data/presets/presets/amenity/townhall.json +++ b/data/presets/presets/amenity/townhall.json @@ -1,24 +1,22 @@ { "name": "town hall", - "match": { - "geometry": [ - "point", - "areea" - ], - "terms": [ - "village hall", - "city government", - "courthouse", - "municipal building", - "municipal center" - ], - "tags": { - "amenity": "townhall" - } - }, "icon": "town-hall", "fields": [ "building_area", "address" - ] + ], + "geometry": [ + "point", + "areea" + ], + "terms": [ + "village hall", + "city government", + "courthouse", + "municipal building", + "municipal center" + ], + "tags": { + "amenity": "townhall" + } } \ No newline at end of file diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json index 45d63cc09..a90290f58 100644 --- a/data/presets/presets/amenity/university.json +++ b/data/presets/presets/amenity/university.json @@ -1,18 +1,16 @@ { "name": "university", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "university" - }, - "terms": [] - }, "icon": "college", "fields": [ "operator", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "university" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json index 1762fdb48..5946fbbec 100644 --- a/data/presets/presets/building.json +++ b/data/presets/presets/building.json @@ -1,14 +1,5 @@ { "name": "building", - "match": { - "geometry": [ - "area" - ], - "tags": { - "building": "*" - }, - "terms": [] - }, "icon": "warehouse", "fields": [ "building_yes", @@ -21,5 +12,12 @@ "wikipedia", "elevation", "source" - ] -} + ], + "geometry": [ + "area" + ], + "tags": { + "building": "*" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/highway.json b/data/presets/presets/highway.json index d24422d56..0aa86bbd9 100644 --- a/data/presets/presets/highway.json +++ b/data/presets/presets/highway.json @@ -1,17 +1,15 @@ { "name": "highway", - "match": { - "geometry": [ - "point", - "vertex", - "line", - "area" - ], - "tags": { - "highway": "*" - } - }, "fields": [ "highway" - ] -} + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "highway": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/bus_stop.json index 5de1ffcf3..19a30c260 100644 --- a/data/presets/presets/highway/bus_stop.json +++ b/data/presets/presets/highway/bus_stop.json @@ -1,17 +1,15 @@ { "name": "bus stop", - "match": { - "geometry": [ - "point" - ], - "tags": { - "highway": "bus_stop" - }, - "terms": [] - }, "icon": "bus", "fields": [ "operator", "shelter" - ] + ], + "geometry": [ + "point" + ], + "tags": { + "highway": "bus_stop" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json index 130012fb6..ee8813d4d 100644 --- a/data/presets/presets/highway/crossing.json +++ b/data/presets/presets/highway/crossing.json @@ -1,18 +1,16 @@ { "name": "crossing", - "match": { - "geometry": [ - "vertex" - ], - "tags": { - "highway": "crossing" - }, - "terms": [ - "crosswalk", - "zebra crossing" - ] - }, "fields": [ "crossing" + ], + "geometry": [ + "vertex" + ], + "tags": { + "highway": "crossing" + }, + "terms": [ + "crosswalk", + "zebra crossing" ] } \ No newline at end of file diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json index 67b9fd9fa..573683ca9 100644 --- a/data/presets/presets/highway/cycleway.json +++ b/data/presets/presets/highway/cycleway.json @@ -1,19 +1,17 @@ { "name": "cycle path", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "cycleway" - }, - "terms": [] - }, "icon": "highway-cycleway", "fields": [ "oneway", "roadtype", "access", "surface" - ] -} + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "cycleway" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json index dc3895b54..914945fe9 100644 --- a/data/presets/presets/highway/footway.json +++ b/data/presets/presets/highway/footway.json @@ -1,42 +1,40 @@ { "name": "foot path", - "match": { - "geometry": [ - "line" - ], - "terms": [ - "beaten path", - "boulevard", - "clearing", - "course", - "cut*", - "drag*", - "footpath", - "highway", - "lane", - "line", - "orbit", - "passage", - "pathway", - "rail", - "rails", - "road", - "roadway", - "route", - "street", - "thoroughfare", - "trackway", - "trail", - "trajectory", - "walk" - ], - "tags": { - "highway": "footway" - } - }, "icon": "highway-footway", "fields": [ "access", "surface" - ] + ], + "geometry": [ + "line" + ], + "terms": [ + "beaten path", + "boulevard", + "clearing", + "course", + "cut*", + "drag*", + "footpath", + "highway", + "lane", + "line", + "orbit", + "passage", + "pathway", + "rail", + "rails", + "road", + "roadway", + "route", + "street", + "thoroughfare", + "trackway", + "trail", + "trajectory", + "walk" + ], + "tags": { + "highway": "footway" + } } \ No newline at end of file diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index 8c04501b2..0454c62a3 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -1,14 +1,5 @@ { "name": "motorway", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "motorway" - }, - "terms": [] - }, "icon": "highway-motorway", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] -} + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "motorway" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json index 9a5c0adb7..15e85c291 100644 --- a/data/presets/presets/highway/path.json +++ b/data/presets/presets/highway/path.json @@ -1,14 +1,5 @@ { "name": "path", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "path" - }, - "terms": [] - }, "icon": "highway-footway", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index cbfcec933..a5efd1a4c 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -1,14 +1,5 @@ { "name": "primary road", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "primary" - }, - "terms": [] - }, "icon": "highway-primary", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] -} + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "primary" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index 2fe3b58be..23217b00c 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -1,14 +1,5 @@ { "name": "residential road", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "residential" - }, - "terms": [] - }, "icon": "highway-residential", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "residential" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index ab7b13333..4fb5bfd27 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -1,14 +1,5 @@ { "name": "secondary road", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "secondary" - }, - "terms": [] - }, "icon": "highway-secondary", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "secondary" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index fe42f8174..379cf19ad 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -1,14 +1,5 @@ { "name": "service road", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "service" - }, - "terms": [] - }, "icon": "highway-service", "fields": [ "service", @@ -17,5 +8,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "service" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json index bec430fa5..ff6e20dd5 100644 --- a/data/presets/presets/highway/steps.json +++ b/data/presets/presets/highway/steps.json @@ -1,19 +1,17 @@ { "name": "steps", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "steps" - }, - "terms": [ - "stairs", - "staircase" - ] - }, "fields": [ "access", "surface" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "steps" + }, + "terms": [ + "stairs", + "staircase" ] } \ No newline at end of file diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index a173b76be..053865bce 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -1,14 +1,5 @@ { "name": "tertiary road", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "tertiary" - }, - "terms": [] - }, "icon": "highway-tertiary", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "tertiary" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json index 3f2939623..cf112e732 100644 --- a/data/presets/presets/highway/track.json +++ b/data/presets/presets/highway/track.json @@ -1,14 +1,5 @@ { "name": "track", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "track" - }, - "terms": [] - }, "icon": "highway-track", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "track" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index 702b20e34..c36f4b26d 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -1,14 +1,5 @@ { "name": "trunk highway", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "trunk" - }, - "terms": [] - }, "icon": "highway-trunk", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "trunk" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/turning_circle.json b/data/presets/presets/highway/turning_circle.json index 78b40f95c..ae1d5e9cc 100644 --- a/data/presets/presets/highway/turning_circle.json +++ b/data/presets/presets/highway/turning_circle.json @@ -1,13 +1,11 @@ { "name": "turning circle", - "match": { - "geometry": [ - "vertex" - ], - "tags": { - "highway": "turning_circle" - }, - "terms": [] + "icon": "circle", + "geometry": [ + "vertex" + ], + "tags": { + "highway": "turning_circle" }, - "icon": "circle" + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index 3df32eb09..251fe5157 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -1,14 +1,5 @@ { "name": "unclassified", - "match": { - "geometry": [ - "line" - ], - "tags": { - "highway": "unclassified" - }, - "terms": [] - }, "icon": "highway", "fields": [ "oneway", @@ -16,5 +7,12 @@ "access", "maxspeed", "surface" - ] + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "unclassified" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/historic.json b/data/presets/presets/historic.json index fdb437fde..7c8a95042 100644 --- a/data/presets/presets/historic.json +++ b/data/presets/presets/historic.json @@ -1,15 +1,13 @@ { "name": "historic", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "historic": "*" - } - }, "fields": [ "historic" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "historic": "*" + } } \ No newline at end of file diff --git a/data/presets/presets/historic/monument.json b/data/presets/presets/historic/monument.json index ee6dfcfd3..6641734d6 100644 --- a/data/presets/presets/historic/monument.json +++ b/data/presets/presets/historic/monument.json @@ -1,13 +1,11 @@ { "name": "monument", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "historic": "monument" - } - }, - "icon": "monument" + "icon": "monument", + "geometry": [ + "point", + "area" + ], + "tags": { + "historic": "monument" + } } \ No newline at end of file diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json index 4616ce2ce..e99665c93 100644 --- a/data/presets/presets/landuse.json +++ b/data/presets/presets/landuse.json @@ -1,15 +1,13 @@ { "name": "landuse", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "*" - } - }, "fields": [ "landuse" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json index ba916a3d3..2cf168c30 100644 --- a/data/presets/presets/landuse/allotments.json +++ b/data/presets/presets/landuse/allotments.json @@ -1,16 +1,11 @@ { "name": "allotments", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "allotments" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "allotments" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json index 934d162f7..291e8a4de 100644 --- a/data/presets/presets/landuse/cemetery.json +++ b/data/presets/presets/landuse/cemetery.json @@ -1,17 +1,12 @@ { "name": "cemetery", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "cemetery" - }, - "terms": [ - ] - }, - "fields": [ + "icon": "cemetery", + "geometry": [ + "point", + "area" ], - "icon": "cemetery" + "tags": { + "landuse": "cemetery" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json index 10aa53d01..4a35142a2 100644 --- a/data/presets/presets/landuse/commercial.json +++ b/data/presets/presets/landuse/commercial.json @@ -1,16 +1,11 @@ { "name": "commercial", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "commercial" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "commercial" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json index 4c99a2675..1faf666e5 100644 --- a/data/presets/presets/landuse/construction.json +++ b/data/presets/presets/landuse/construction.json @@ -1,18 +1,15 @@ { "name": "construction", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "construction" - }, - "terms": [ - ] - }, "fields": [ "construction", "operator" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "construction" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/farm.json b/data/presets/presets/landuse/farm.json index 4f018bc3e..f96a440ca 100644 --- a/data/presets/presets/landuse/farm.json +++ b/data/presets/presets/landuse/farm.json @@ -1,16 +1,11 @@ { "name": "farm", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "farm" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "farm" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json index d2f7ac0da..dd778e15b 100644 --- a/data/presets/presets/landuse/farmyard.json +++ b/data/presets/presets/landuse/farmyard.json @@ -1,16 +1,11 @@ { "name": "farmyard", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "farmyard" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "farmyard" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json index e7c42d6d8..9e2fc5e65 100644 --- a/data/presets/presets/landuse/forest.json +++ b/data/presets/presets/landuse/forest.json @@ -1,17 +1,15 @@ { "name": "forest", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "forest" - }, - "terms": [] - }, "fields": [ "wood" ], - "icon": "park2" + "icon": "park2", + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "forest" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/grass.json b/data/presets/presets/landuse/grass.json index 270327298..91ed33d79 100644 --- a/data/presets/presets/landuse/grass.json +++ b/data/presets/presets/landuse/grass.json @@ -1,16 +1,11 @@ { "name": "grass", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "grass" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "grass" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json index 51907e4bb..13719a35a 100644 --- a/data/presets/presets/landuse/industrial.json +++ b/data/presets/presets/landuse/industrial.json @@ -1,16 +1,11 @@ { "name": "industrial", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "industrial" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "industrial" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/meadow.json b/data/presets/presets/landuse/meadow.json index a67afbced..7e7adbb71 100644 --- a/data/presets/presets/landuse/meadow.json +++ b/data/presets/presets/landuse/meadow.json @@ -1,16 +1,11 @@ { "name": "meadow", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "meadow" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "meadow" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json index 721c279da..90fe53bcf 100644 --- a/data/presets/presets/landuse/orchard.json +++ b/data/presets/presets/landuse/orchard.json @@ -1,16 +1,11 @@ { "name": "orchard", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "orchard" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "orchard" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/quarry.json b/data/presets/presets/landuse/quarry.json index 5c35ef138..b585c3d84 100644 --- a/data/presets/presets/landuse/quarry.json +++ b/data/presets/presets/landuse/quarry.json @@ -1,16 +1,11 @@ { "name": "quarry", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "quarry" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "quarry" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json index bd9ab04f8..5e2dfb072 100644 --- a/data/presets/presets/landuse/residential.json +++ b/data/presets/presets/landuse/residential.json @@ -1,16 +1,11 @@ { "name": "residential", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "residential" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "residential" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json index b6d4eb6fd..631f97dd0 100644 --- a/data/presets/presets/landuse/vineyard.json +++ b/data/presets/presets/landuse/vineyard.json @@ -1,16 +1,11 @@ { "name": "vineyard", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "landuse": "vineyard" - }, - "terms": [ - ] + "geometry": [ + "point", + "area" + ], + "tags": { + "landuse": "vineyard" }, - "fields": [ - ] + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json index 6bbfa7a16..1f499e6b0 100644 --- a/data/presets/presets/leisure.json +++ b/data/presets/presets/leisure.json @@ -1,15 +1,13 @@ { "name": "leisure", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "*" - } - }, "fields": [ "leisure" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json index 00e2404a9..fffaeac3c 100644 --- a/data/presets/presets/leisure/golf_course.json +++ b/data/presets/presets/leisure/golf_course.json @@ -1,18 +1,16 @@ { "name": "golf course", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "golf_course" - }, - "terms": [] - }, "icon": "golf", "fields": [ "operator", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "golf_course" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/leisure/park.json b/data/presets/presets/leisure/park.json index 3dbea6066..cf9ba84ff 100644 --- a/data/presets/presets/leisure/park.json +++ b/data/presets/presets/leisure/park.json @@ -1,35 +1,33 @@ { "name": "park", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "esplanade", - "estate", - "forest", - "garden", - "grass", - "green", - "grounds", - "lawn", - "lot", - "meadow", - "parkland", - "place", - "playground", - "plaza", - "pleasure garden", - "recreation area", - "square", - "tract", - "village green", - "woodland" - ], - "tags": { - "leisure": "park" - } - }, - "icon": "park" + "icon": "park", + "geometry": [ + "point", + "area" + ], + "terms": [ + "esplanade", + "estate", + "forest", + "garden", + "grass", + "green", + "grounds", + "lawn", + "lot", + "meadow", + "parkland", + "place", + "playground", + "plaza", + "pleasure garden", + "recreation area", + "square", + "tract", + "village green", + "woodland" + ], + "tags": { + "leisure": "park" + } } \ No newline at end of file diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json index 75a32b2de..6d2111361 100644 --- a/data/presets/presets/leisure/pitch.json +++ b/data/presets/presets/leisure/pitch.json @@ -1,18 +1,16 @@ { "name": "sport pitch", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "pitch" - }, - "terms": [] - }, "icon": "pitch", "fields": [ "sport", "surface" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "pitch" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/leisure/pitch/baseball.json b/data/presets/presets/leisure/pitch/baseball.json index 1caf26900..afeeb77ea 100644 --- a/data/presets/presets/leisure/pitch/baseball.json +++ b/data/presets/presets/leisure/pitch/baseball.json @@ -1,15 +1,13 @@ { "name": "baseball diamond", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "pitch", - "sport": "baseball" - }, - "terms": [] + "icon": "baseball", + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "pitch", + "sport": "baseball" }, - "icon": "baseball" -} + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json index 9bfc31258..871e2a761 100644 --- a/data/presets/presets/leisure/pitch/basketball.json +++ b/data/presets/presets/leisure/pitch/basketball.json @@ -1,18 +1,16 @@ { "name": "basketball court", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "pitch", - "sport": "basketball" - }, - "terms": [] - }, "icon": "basketball", "fields": [ "surface" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "pitch", + "sport": "basketball" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json index 3452886d6..657ace993 100644 --- a/data/presets/presets/leisure/pitch/soccer.json +++ b/data/presets/presets/leisure/pitch/soccer.json @@ -1,18 +1,16 @@ { "name": "soccer field", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "pitch", - "sport": "soccer" - }, - "terms": [] - }, "icon": "soccer", "fields": [ "surface" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "pitch", + "sport": "soccer" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/leisure/pitch/tennis.json b/data/presets/presets/leisure/pitch/tennis.json index 9ef0eaa68..f9d0df668 100644 --- a/data/presets/presets/leisure/pitch/tennis.json +++ b/data/presets/presets/leisure/pitch/tennis.json @@ -1,18 +1,16 @@ { "name": "tennis court", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "pitch", - "sport": "tennis" - }, - "terms": [] - }, "icon": "tennis", "fields": [ "surface" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "pitch", + "sport": "tennis" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/leisure/playground.json b/data/presets/presets/leisure/playground.json index 64f70b9e2..904beb4d9 100644 --- a/data/presets/presets/leisure/playground.json +++ b/data/presets/presets/leisure/playground.json @@ -1,12 +1,10 @@ { "name": "playground", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "leisure": "playground" - } + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "playground" } -} +} \ No newline at end of file diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json index 69dce6ec5..b0152e8d5 100644 --- a/data/presets/presets/man_made.json +++ b/data/presets/presets/man_made.json @@ -1,17 +1,15 @@ { "name": "man made", - "match": { - "geometry": [ - "point", - "vertex", - "line", - "area" - ], - "tags": { - "man_made": "*" - } - }, "fields": [ "man_made" - ] + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "man_made": "*" + } } \ No newline at end of file diff --git a/data/presets/presets/man_made/lighthouse.json b/data/presets/presets/man_made/lighthouse.json index 061695853..f9a22f458 100644 --- a/data/presets/presets/man_made/lighthouse.json +++ b/data/presets/presets/man_made/lighthouse.json @@ -1,12 +1,10 @@ { "name": "lighthouse", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "man_made": "lighthouse" - } + "geometry": [ + "point", + "area" + ], + "tags": { + "man_made": "lighthouse" } } \ No newline at end of file diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json index 7a869efe2..2894c9d34 100644 --- a/data/presets/presets/man_made/pier.json +++ b/data/presets/presets/man_made/pier.json @@ -1,12 +1,10 @@ { "name": "pier", - "match": { - "geometry": [ - "line", - "area" - ], - "tags": { - "man_made": "pier" - } + "geometry": [ + "line", + "area" + ], + "tags": { + "man_made": "pier" } } \ No newline at end of file diff --git a/data/presets/presets/natural.json b/data/presets/presets/natural.json index f49fe89fd..ef49f4c10 100644 --- a/data/presets/presets/natural.json +++ b/data/presets/presets/natural.json @@ -1,15 +1,13 @@ { "name": "natural", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "natural": "*" - } - }, "fields": [ "natural" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "natural": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json index ffd6fa1a2..9f20a0c64 100644 --- a/data/presets/presets/natural/bay.json +++ b/data/presets/presets/natural/bay.json @@ -1,14 +1,11 @@ { "name": "bay", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - ], - "tags": { - "natural": "bay" - } + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "natural": "bay" } } \ No newline at end of file diff --git a/data/presets/presets/natural/beach.json b/data/presets/presets/natural/beach.json index 9fa298717..ae8f373ba 100644 --- a/data/presets/presets/natural/beach.json +++ b/data/presets/presets/natural/beach.json @@ -1,17 +1,14 @@ { "name": "beach", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - ], - "tags": { - "natural": "beach" - } - }, "fields": [ "surface" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "natural": "beach" + } } \ No newline at end of file diff --git a/data/presets/presets/natural/cliff.json b/data/presets/presets/natural/cliff.json index c8d9631dc..b77f10cb6 100644 --- a/data/presets/presets/natural/cliff.json +++ b/data/presets/presets/natural/cliff.json @@ -1,16 +1,13 @@ { "name": "cliff", - "match": { - "geometry": [ - "point", - "vertex", - "line", - "area" - ], - "terms": [ - ], - "tags": { - "natural": "cliff" - } + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "terms": [], + "tags": { + "natural": "cliff" } } \ No newline at end of file diff --git a/data/presets/presets/natural/coastline.json b/data/presets/presets/natural/coastline.json index aa0422db9..acf32dc3f 100644 --- a/data/presets/presets/natural/coastline.json +++ b/data/presets/presets/natural/coastline.json @@ -1,14 +1,12 @@ { "name": "coastline", - "match": { - "geometry": [ - "line" - ], - "terms": [ - "shore" - ], - "tags": { - "natural": "coastline" - } + "geometry": [ + "line" + ], + "terms": [ + "shore" + ], + "tags": { + "natural": "coastline" } } \ No newline at end of file diff --git a/data/presets/presets/natural/glacier.json b/data/presets/presets/natural/glacier.json index fe071601e..f4851e64c 100644 --- a/data/presets/presets/natural/glacier.json +++ b/data/presets/presets/natural/glacier.json @@ -1,13 +1,10 @@ { "name": "glacier", - "match": { - "geometry": [ - "area" - ], - "terms": [ - ], - "tags": { - "natural": "glacier" - } + "geometry": [ + "area" + ], + "terms": [], + "tags": { + "natural": "glacier" } } \ No newline at end of file diff --git a/data/presets/presets/natural/grassland.json b/data/presets/presets/natural/grassland.json index 8fd3927a6..cc3603fbf 100644 --- a/data/presets/presets/natural/grassland.json +++ b/data/presets/presets/natural/grassland.json @@ -1,14 +1,11 @@ { "name": "grassland", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - ], - "tags": { - "natural": "grassland" - } + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "natural": "grassland" } } \ No newline at end of file diff --git a/data/presets/presets/natural/heath.json b/data/presets/presets/natural/heath.json index e447a6cde..c0962f7c3 100644 --- a/data/presets/presets/natural/heath.json +++ b/data/presets/presets/natural/heath.json @@ -1,13 +1,10 @@ { "name": "heath", - "match": { - "geometry": [ - "area" - ], - "terms": [ - ], - "tags": { - "natural": "heath" - } + "geometry": [ + "area" + ], + "terms": [], + "tags": { + "natural": "heath" } } \ No newline at end of file diff --git a/data/presets/presets/natural/peak.json b/data/presets/presets/natural/peak.json index 3c3b7f275..55717be3f 100644 --- a/data/presets/presets/natural/peak.json +++ b/data/presets/presets/natural/peak.json @@ -1,31 +1,29 @@ { "name": "peak", - "match": { - "geometry": [ - "point", - "vertex" - ], - "tags": { - "natural": "peak" - }, - "terms": [ - "acme", - "aiguille", - "alp", - "climax", - "crest", - "crown", - "hill", - "mount", - "mountain", - "pinnacle", - "summit", - "tip", - "top" - ] - }, "icon": "triangle", "fields": [ "elevation" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "natural": "peak" + }, + "terms": [ + "acme", + "aiguille", + "alp", + "climax", + "crest", + "crown", + "hill", + "mount", + "mountain", + "pinnacle", + "summit", + "tip", + "top" ] } \ No newline at end of file diff --git a/data/presets/presets/natural/scrub.json b/data/presets/presets/natural/scrub.json index 2fea59fc7..9c5c39e72 100644 --- a/data/presets/presets/natural/scrub.json +++ b/data/presets/presets/natural/scrub.json @@ -1,12 +1,10 @@ { "name": "scrub", - "match": { - "geometry": [ - "area" - ], - "tags": { - "natural": "scrub" - }, - "terms": [] - } + "geometry": [ + "area" + ], + "tags": { + "natural": "scrub" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/natural/spring.json b/data/presets/presets/natural/spring.json index d12c210d2..9bd9b0f10 100644 --- a/data/presets/presets/natural/spring.json +++ b/data/presets/presets/natural/spring.json @@ -1,14 +1,11 @@ { "name": "spring", - "match": { - "geometry": [ - "point", - "vertex" - ], - "terms": [ - ], - "tags": { - "natural": "spring" - } + "geometry": [ + "point", + "vertex" + ], + "terms": [], + "tags": { + "natural": "spring" } } \ No newline at end of file diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index c5d3c51fb..49b5bca58 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -1,18 +1,15 @@ { "name": "tree", - "match": { - "geometry": [ - "point", - "vertex" - ], - "terms": [ - ], - "tags": { - "natural": "tree" - } - }, "fields": [ "denotation" ], - "icon": "park" + "icon": "park", + "geometry": [ + "point", + "vertex" + ], + "terms": [], + "tags": { + "natural": "tree" + } } \ No newline at end of file diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json index 59795c8ee..222ea1058 100644 --- a/data/presets/presets/natural/water.json +++ b/data/presets/presets/natural/water.json @@ -1,15 +1,13 @@ { "name": "water", - "match": { - "geometry": [ - "area" - ], - "tags": { - "natural": "water" - }, - "terms": [] - }, "fields": [ "water" - ] + ], + "geometry": [ + "area" + ], + "tags": { + "natural": "water" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json index 493aa7b27..dda881d6a 100644 --- a/data/presets/presets/natural/water/lake.json +++ b/data/presets/presets/natural/water/lake.json @@ -1,17 +1,15 @@ { "name": "lake", - "match": { - "geometry": [ - "area" - ], - "tags": { - "natural": "water", - "water": "lake" - }, - "terms": [ - "lakelet", - "loch", - "mere" - ] - } + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "lake" + }, + "terms": [ + "lakelet", + "loch", + "mere" + ] } \ No newline at end of file diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json index f1d40311f..d92305135 100644 --- a/data/presets/presets/natural/water/pond.json +++ b/data/presets/presets/natural/water/pond.json @@ -1,19 +1,17 @@ { "name": "pond", - "match": { - "geometry": [ - "area" - ], - "tags": { - "natural": "water", - "water": "pond" - }, - "terms": [ - "lakelet", - "millpond", - "tarn", - "pool", - "mere" - ] - } + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "pond" + }, + "terms": [ + "lakelet", + "millpond", + "tarn", + "pool", + "mere" + ] } \ No newline at end of file diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json index 23c3ae8f6..e50188bf8 100644 --- a/data/presets/presets/natural/water/reservoir.json +++ b/data/presets/presets/natural/water/reservoir.json @@ -1,14 +1,11 @@ { "name": "reservoir", - "match": { - "geometry": [ - "area" - ], - "tags": { - "natural": "water", - "water": "reservoir" - }, - "terms": [ - ] - } + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "reservoir" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json index b861e5d60..d198ff32b 100644 --- a/data/presets/presets/natural/wetland.json +++ b/data/presets/presets/natural/wetland.json @@ -1,16 +1,14 @@ { "name": "wetland", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "natural": "wetland" - }, - "terms": [] - }, "fields": [ "wetland" - ] + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "natural": "wetland" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json index 7420cd8ed..a179b1b71 100644 --- a/data/presets/presets/natural/wood.json +++ b/data/presets/presets/natural/wood.json @@ -1,17 +1,15 @@ { "name": "wood", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "natural": "wood" - }, - "terms": [] - }, "fields": [ "wood" ], - "icon": "park2" + "icon": "park2", + "geometry": [ + "point", + "area" + ], + "tags": { + "natural": "wood" + }, + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json index 75424d87e..5558946c9 100644 --- a/data/presets/presets/office.json +++ b/data/presets/presets/office.json @@ -1,19 +1,17 @@ { "name": "office", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "office": "*" - }, - "terms": [] - }, "icon": "commercial", "fields": [ "office", "address", "opening_hours" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "office": "*" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/place.json b/data/presets/presets/place.json index 772c930e7..4043a2bd8 100644 --- a/data/presets/presets/place.json +++ b/data/presets/presets/place.json @@ -1,15 +1,13 @@ { "name": "place", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "place": "*" - } - }, "fields": [ "place" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/place/hamlet.json b/data/presets/presets/place/hamlet.json index 80aa2cf05..a9a493bc1 100644 --- a/data/presets/presets/place/hamlet.json +++ b/data/presets/presets/place/hamlet.json @@ -1,13 +1,11 @@ { "name": "hamlet", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "place": "hamlet" - } - }, - "icon": "triangle-stroked" + "icon": "triangle-stroked", + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "hamlet" + } } \ No newline at end of file diff --git a/data/presets/presets/place/island.json b/data/presets/presets/place/island.json index a1fc0abae..fe3210c5e 100644 --- a/data/presets/presets/place/island.json +++ b/data/presets/presets/place/island.json @@ -1,22 +1,20 @@ { "name": "island", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "archipelago", - "atoll", - "bar", - "cay", - "isle", - "islet", - "key", - "reef" - ], - "tags": { - "place": "island" - } + "geometry": [ + "point", + "area" + ], + "terms": [ + "archipelago", + "atoll", + "bar", + "cay", + "isle", + "islet", + "key", + "reef" + ], + "tags": { + "place": "island" } } \ No newline at end of file diff --git a/data/presets/presets/place/locality.json b/data/presets/presets/place/locality.json index c6a61b90b..bb731d862 100644 --- a/data/presets/presets/place/locality.json +++ b/data/presets/presets/place/locality.json @@ -1,13 +1,11 @@ { "name": "locality", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "place": "locality" - } - }, - "icon": "marker" + "icon": "marker", + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "locality" + } } \ No newline at end of file diff --git a/data/presets/presets/place/village.json b/data/presets/presets/place/village.json index 8a5447e63..8d71cfc31 100644 --- a/data/presets/presets/place/village.json +++ b/data/presets/presets/place/village.json @@ -1,13 +1,11 @@ { "name": "village", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "place": "village" - } - }, - "icon": "square-stroked" + "icon": "square-stroked", + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "village" + } } \ No newline at end of file diff --git a/data/presets/presets/railway.json b/data/presets/presets/railway.json index 993c4130e..d1bff6d54 100644 --- a/data/presets/presets/railway.json +++ b/data/presets/presets/railway.json @@ -1,17 +1,15 @@ { "name": "railway", - "match": { - "geometry": [ - "point", - "vertex", - "line", - "area" - ], - "tags": { - "railway": "*" - } - }, "fields": [ "railway" - ] -} + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "railway": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json index 81060918c..8fc6d3029 100644 --- a/data/presets/presets/railway/rail.json +++ b/data/presets/presets/railway/rail.json @@ -1,13 +1,11 @@ { "name": "rail", - "match": { - "geometry": [ - "line" - ], - "tags": { - "railway": "rail" - }, - "terms": [] + "icon": "railway-rail", + "geometry": [ + "line" + ], + "tags": { + "railway": "rail" }, - "icon": "railway-rail" + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json index ca2bb966e..f9ba91615 100644 --- a/data/presets/presets/railway/subway.json +++ b/data/presets/presets/railway/subway.json @@ -1,13 +1,11 @@ { "name": "subway", - "match": { - "geometry": [ - "line" - ], - "tags": { - "railway": "subway" - }, - "terms": [] + "icon": "railway-rail", + "geometry": [ + "line" + ], + "tags": { + "railway": "subway" }, - "icon": "railway-rail" + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json index 60b6fa0ac..9d664da15 100644 --- a/data/presets/presets/railway/subway_entrance.json +++ b/data/presets/presets/railway/subway_entrance.json @@ -1,13 +1,11 @@ { "name": "subway entrance", - "match": { - "geometry": [ - "point" - ], - "tags": { - "railway": "subway_entrance" - }, - "terms": [] + "icon": "rail-underground", + "geometry": [ + "point" + ], + "tags": { + "railway": "subway_entrance" }, - "icon": "rail-underground" + "terms": [] } \ No newline at end of file diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json index 9bd4cf557..c2ee5ca68 100644 --- a/data/presets/presets/shop.json +++ b/data/presets/presets/shop.json @@ -1,19 +1,17 @@ { "name": "shop", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "shop": "*" - }, - "terms": [] - }, "icon": "shop", "fields": [ "shop", "address", "opening_hours" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "*" + }, + "terms": [] +} \ No newline at end of file diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json index 437c1f777..ba574f116 100644 --- a/data/presets/presets/shop/supermarket.json +++ b/data/presets/presets/shop/supermarket.json @@ -1,40 +1,38 @@ { "name": "supermarket", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "bazaar", - "boutique", - "chain", - "co-op", - "cut-rate store", - "discount store", - "five-and-dime", - "flea market", - "galleria", - "mall", - "mart", - "outlet", - "outlet store", - "shop", - "shopping center", - "shopping plaza", - "stand", - "store", - "supermarket", - "thrift shop" - ], - "tags": { - "shop": "supermarket" - } - }, "icon": "grocery", "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "bazaar", + "boutique", + "chain", + "co-op", + "cut-rate store", + "discount store", + "five-and-dime", + "flea market", + "galleria", + "mall", + "mart", + "outlet", + "outlet store", + "shop", + "shopping center", + "shopping plaza", + "stand", + "store", + "supermarket", + "thrift shop" + ], + "tags": { + "shop": "supermarket" + } } \ No newline at end of file diff --git a/data/presets/presets/tourism.json b/data/presets/presets/tourism.json index 3c6f4becd..19b78f84e 100644 --- a/data/presets/presets/tourism.json +++ b/data/presets/presets/tourism.json @@ -1,15 +1,13 @@ { "name": "tourism", - "match": { - "geometry": [ - "point", - "area" - ], - "tags": { - "tourism": "*" - } - }, "fields": [ "tourism" - ] -} + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "tourism": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json index 223732388..6e274557b 100644 --- a/data/presets/presets/tourism/camp_site.json +++ b/data/presets/presets/tourism/camp_site.json @@ -1,19 +1,16 @@ { "name": "camp site", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - ], - "tags": { - "tourism": "camp_site" - } - }, "icon": "campsite", "fields": [ "operator", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "tourism": "camp_site" + } } \ No newline at end of file diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json index 35daf2834..185c5a327 100644 --- a/data/presets/presets/tourism/hotel.json +++ b/data/presets/presets/tourism/hotel.json @@ -1,20 +1,17 @@ { "name": "hotel", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - ], - "tags": { - "tourism": "hotel" - } - }, "icon": "lodging", "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "tourism": "hotel" + } } \ No newline at end of file diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json index 371d5f56c..802d9beed 100644 --- a/data/presets/presets/tourism/museum.json +++ b/data/presets/presets/tourism/museum.json @@ -1,33 +1,31 @@ { "name": "museum", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - "exhibition", - "exhibits archive", - "foundation", - "gallery", - "hall", - "institution", - "library", - "menagerie", - "repository", - "salon", - "storehouse", - "treasury", - "vault" - ], - "tags": { - "tourism": "museum" - } - }, "icon": "museum", "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "exhibition", + "exhibits archive", + "foundation", + "gallery", + "hall", + "institution", + "library", + "menagerie", + "repository", + "salon", + "storehouse", + "treasury", + "vault" + ], + "tags": { + "tourism": "museum" + } } \ No newline at end of file diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json index 4cf39165f..6f1a12d5d 100644 --- a/data/presets/presets/tourism/picnic_site.json +++ b/data/presets/presets/tourism/picnic_site.json @@ -1,19 +1,16 @@ { "name": "picnic site", - "match": { - "geometry": [ - "point", - "area" - ], - "terms": [ - ], - "tags": { - "tourism": "picnic_site" - } - }, "fields": [ "operator", "building_area", "address" - ] + ], + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "tourism": "picnic_site" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway.json b/data/presets/presets/waterway.json index a16fe69ae..19c356e96 100644 --- a/data/presets/presets/waterway.json +++ b/data/presets/presets/waterway.json @@ -1,17 +1,15 @@ { "name": "waterway", - "match": { - "geometry": [ - "point", - "vertex", - "line", - "area" - ], - "tags": { - "waterway": "*" - } - }, "fields": [ "waterway" - ] -} + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "waterway": "*" + } +} \ No newline at end of file diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json index a78f6fb66..558cb3e50 100644 --- a/data/presets/presets/waterway/canal.json +++ b/data/presets/presets/waterway/canal.json @@ -1,12 +1,10 @@ { "name": "canal", - "match": { - "geometry": [ - "line" - ], - "tags": { - "waterway": "canal" - } - }, - "icon": "waterway-river" + "icon": "waterway-river", + "geometry": [ + "line" + ], + "tags": { + "waterway": "canal" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway/dam.json b/data/presets/presets/waterway/dam.json index 6477c8734..27f30b27f 100644 --- a/data/presets/presets/waterway/dam.json +++ b/data/presets/presets/waterway/dam.json @@ -1,15 +1,13 @@ { "name": "dam", - "match": { - "geometry": [ - "point", - "vertex", - "line", - "area" - ], - "tags": { - "waterway": "dam" - } - }, - "icon": "dam" + "icon": "dam", + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "waterway": "dam" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway/ditch.json b/data/presets/presets/waterway/ditch.json index 2fb7a7565..d7af73573 100644 --- a/data/presets/presets/waterway/ditch.json +++ b/data/presets/presets/waterway/ditch.json @@ -1,12 +1,10 @@ { "name": "ditch", - "match": { - "geometry": [ - "line" - ], - "tags": { - "waterway": "ditch" - } - }, - "icon": "waterway-river" + "icon": "waterway-river", + "geometry": [ + "line" + ], + "tags": { + "waterway": "ditch" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway/drain.json b/data/presets/presets/waterway/drain.json index ae5e6c219..ca9c7a633 100644 --- a/data/presets/presets/waterway/drain.json +++ b/data/presets/presets/waterway/drain.json @@ -1,12 +1,10 @@ { "name": "drain", - "match": { - "geometry": [ - "line" - ], - "tags": { - "waterway": "drain" - } - }, - "icon": "waterway-river" + "icon": "waterway-river", + "geometry": [ + "line" + ], + "tags": { + "waterway": "drain" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json index 4295b0a86..9a7a4f22b 100644 --- a/data/presets/presets/waterway/river.json +++ b/data/presets/presets/waterway/river.json @@ -1,27 +1,25 @@ { "name": "river", - "match": { - "geometry": [ - "line" - ], - "terms": [ - "beck", - "branch", - "brook", - "course", - "creek", - "estuary", - "rill", - "rivulet", - "run", - "runnel", - "stream", - "tributary", - "watercourse" - ], - "tags": { - "waterway": "river" - } - }, - "icon": "waterway-river" + "icon": "waterway-river", + "geometry": [ + "line" + ], + "terms": [ + "beck", + "branch", + "brook", + "course", + "creek", + "estuary", + "rill", + "rivulet", + "run", + "runnel", + "stream", + "tributary", + "watercourse" + ], + "tags": { + "waterway": "river" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway/riverbank.json b/data/presets/presets/waterway/riverbank.json index b97c2ca57..f100c3879 100644 --- a/data/presets/presets/waterway/riverbank.json +++ b/data/presets/presets/waterway/riverbank.json @@ -1,12 +1,10 @@ { "name": "riverbank", - "match": { - "geometry": [ - "area" - ], - "tags": { - "waterway": "riverbank" - } - }, - "icon": "water" + "icon": "water", + "geometry": [ + "area" + ], + "tags": { + "waterway": "riverbank" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json index 26033de8e..a4b670d29 100644 --- a/data/presets/presets/waterway/stream.json +++ b/data/presets/presets/waterway/stream.json @@ -1,42 +1,40 @@ { "name": "stream", - "match": { - "geometry": [ - "line" - ], - "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" - ], - "tags": { - "waterway": "stream" - } - }, "icon": "waterway-river", "fields": [ "layer" - ] + ], + "geometry": [ + "line" + ], + "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" + ], + "tags": { + "waterway": "stream" + } } \ No newline at end of file diff --git a/data/presets/presets/waterway/weir.json b/data/presets/presets/waterway/weir.json index 897c474d2..857f264f3 100644 --- a/data/presets/presets/waterway/weir.json +++ b/data/presets/presets/waterway/weir.json @@ -1,13 +1,11 @@ { "name": "weir", - "match": { - "geometry": [ - "vertex", - "line" - ], - "tags": { - "waterway": "weir" - } - }, - "icon": "dam" + "icon": "dam", + "geometry": [ + "vertex", + "line" + ], + "tags": { + "waterway": "weir" + } } \ No newline at end of file diff --git a/js/id/presets.js b/js/id/presets.js index efa29dfd7..4c6ca1667 100644 --- a/js/id/presets.js +++ b/js/id/presets.js @@ -6,10 +6,8 @@ iD.presets = function(context) { var other = iD.presets.Preset({ name: 'other', icon: 'marker-stroked', - match: { - tags: {}, - geometry: ['point', 'vertex', 'line', 'area'] - } + tags: {}, + geometry: ['point', 'vertex', 'line', 'area'] }), all = iD.presets.Collection([iD.presets.Preset(other)]), defaults = { area: all, line: all, point: all, vertex: all }, diff --git a/js/id/presets/category.js b/js/id/presets/category.js index e3c9c13ec..612c76204 100644 --- a/js/id/presets/category.js +++ b/js/id/presets/category.js @@ -6,7 +6,7 @@ iD.presets.Category = function(category, all) { })); category.matchGeometry = function(entity, resolver) { - return category.match.geometry.indexOf(entity.geometry(resolver)) >= 0; + return category.geometry.indexOf(entity.geometry(resolver)) >= 0; }; category.matchTags = function() { return false; }; diff --git a/js/id/presets/collection.js b/js/id/presets/collection.js index 2d7d528d0..05832cb00 100644 --- a/js/id/presets/collection.js +++ b/js/id/presets/collection.js @@ -45,7 +45,7 @@ iD.presets.Collection = function(collection) { return leading(a.name); }), leading_terms = _.filter(collection, function(a) { - return _.any(a.match.terms || [], leading); + return _.any(a.terms || [], leading); }); function leading(a) { @@ -66,7 +66,7 @@ iD.presets.Collection = function(collection) { return a.preset; }), leventstein_terms = _.filter(collection, function(a) { - return _.any(a.match.terms || [], function(b) { + return _.any(a.terms || [], function(b) { return iD.util.editDistance(value, b) + Math.min(value.length - b.length, 0) < 3; }); }); diff --git a/js/id/presets/preset.js b/js/id/presets/preset.js index cf8a30b4c..ea5f44383 100644 --- a/js/id/presets/preset.js +++ b/js/id/presets/preset.js @@ -11,11 +11,11 @@ iD.presets.Preset = function(preset, fields) { } preset.matchGeometry = function(entity, resolver) { - return preset.match.geometry.indexOf(entity.geometry(resolver)) >= 0; + return preset.geometry.indexOf(entity.geometry(resolver)) >= 0; }; preset.matchTags = function(entity) { - var tags = preset.match.tags, + var tags = preset.tags, score = 0; for (var t in tags) { if (entity.tags[t] === tags[t]) { @@ -30,7 +30,7 @@ iD.presets.Preset = function(preset, fields) { }; preset.removeTags = function(tags, geometry) { - tags = _.omit(tags, _.keys(preset.match.tags)); + tags = _.omit(tags, _.keys(preset.tags)); for (var i in preset.fields) { var field = preset.fields[i]; @@ -43,8 +43,8 @@ iD.presets.Preset = function(preset, fields) { }; preset.applyTags = function(tags, geometry) { - for (var k in preset.match.tags) { - if (preset.match.tags[k] !== '*') tags[k] = preset.match.tags[k]; + for (var k in preset.tags) { + if (preset.tags[k] !== '*') tags[k] = preset.tags[k]; } for (var f in preset.fields) { diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js index 1bd787b99..d26027c6c 100644 --- a/js/id/ui/preset_grid.js +++ b/js/id/ui/preset_grid.js @@ -104,8 +104,8 @@ iD.ui.PresetGrid = function(context) { if (d.members) { s += 'category'; } else { - for (var i in d.match.tags) { - s += ' tag-' + i + ' tag-' + i + '-' + d.match.tags[i]; + for (var i in d.tags) { + s += ' tag-' + i + ' tag-' + i + '-' + d.tags[i]; } } return s; @@ -154,9 +154,9 @@ iD.ui.PresetGrid = function(context) { var params = {}, locale = iD.detect().locale.split('-')[0] || 'en'; - params.key = Object.keys(d.match.tags)[0]; - if (d.match.tags[params.key] !== '*') { - params.value = d.match.tags[params.key]; + params.key = Object.keys(d.tags)[0]; + if (d.tags[params.key] !== '*') { + params.value = d.tags[params.key]; } taginfo.docs(params, function(err, data) { diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js index 48db95117..4b7da7b2b 100644 --- a/js/id/ui/tag_editor.js +++ b/js/id/ui/tag_editor.js @@ -164,7 +164,7 @@ iD.ui.TagEditor = function(context) { name.property('value', tags.name || ''); presetUI.change(tags); var rendered = ['name'] - .concat(Object.keys(preset.match.tags)) + .concat(Object.keys(preset.tags)) .concat(presetUI.rendered()); tagList.tags(_.omit(tags, rendered)); } diff --git a/test/spec/presets/category.js b/test/spec/presets/category.js index 5ad3799b6..cccda18d4 100644 --- a/test/spec/presets/category.js +++ b/test/spec/presets/category.js @@ -3,9 +3,7 @@ describe("iD.presets.Category", function() { beforeEach(function() { category = { - "match": { - "geometry": "line" - }, + "geometry": "line", "icon": "highway", "name": "roads", "members": [ @@ -14,12 +12,10 @@ describe("iD.presets.Category", function() { }; residential = iD.presets.Preset({ name: 'residential', - match: { - tags: { - highway: 'residential' - }, - geometry: ['line'] - } + tags: { + highway: 'residential' + }, + geometry: ['line'] }); }); diff --git a/test/spec/presets/collection.js b/test/spec/presets/collection.js index a078557cc..d5ee5f59f 100644 --- a/test/spec/presets/collection.js +++ b/test/spec/presets/collection.js @@ -3,28 +3,22 @@ describe("iD.presets.Collection", function() { var p = { other: iD.presets.Preset({ name: 'other', - match: { - tags: {}, - geometry: ['point', 'vertex', 'line', 'area'] - } + tags: {}, + geometry: ['point', 'vertex', 'line', 'area'] }), residential: iD.presets.Preset({ name: 'residential', - match: { - tags: { - highway: 'residential' - }, - geometry: ['line'] - } + tags: { + highway: 'residential' + }, + geometry: ['line'] }), park: iD.presets.Preset({ name: 'park', - match: { - tags: { - leisure: 'park' - }, - geometry: ['point', 'area'] - } + tags: { + leisure: 'park' + }, + geometry: ['point', 'area'] }) }; diff --git a/test/spec/presets/preset.js b/test/spec/presets/preset.js index 57248f55a..db2367742 100644 --- a/test/spec/presets/preset.js +++ b/test/spec/presets/preset.js @@ -11,47 +11,37 @@ describe('iD.presets.Preset', function() { var p = { other: iD.presets.Preset({ name: 'other', - match: { - tags: {}, - geometry: ['point', 'vertex', 'line', 'area'] - } + tags: {}, + geometry: ['point', 'vertex', 'line', 'area'] }), residential: iD.presets.Preset({ name: 'residential', - match: { - tags: { - highway: 'residential' - }, - geometry: ['line'] - } + tags: { + highway: 'residential' + }, + geometry: ['line'] }), tennis: iD.presets.Preset({ name: 'tennis', - match: { - tags: { - leisure: 'pitch', - sport: 'tennis' - }, - geometry: ['area'] - } + tags: { + leisure: 'pitch', + sport: 'tennis' + }, + geometry: ['area'] }), building: iD.presets.Preset({ name: 'building', - match: { - tags: { - building: '*' - }, - geometry: ['area'] - } + tags: { + building: '*' + }, + geometry: ['area'] }), cafe: iD.presets.Preset({ name: 'cafe', - match: { - tags: { - amenity: 'cafe' - }, - geometry: ['point', 'area'] + tags: { + amenity: 'cafe' }, + geometry: ['point', 'area'], fields: ['building_area'] }, fields) };