diff --git a/data/presets/forms.json b/data/presets/forms.json index 573e72986..cba8643c2 100644 --- a/data/presets/forms.json +++ b/data/presets/forms.json @@ -1 +1 @@ -{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"universal":true},"atm":{"key":"atm","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number"},"maxspeed":{"key":"maxspeed","type":"combo"},"network":{"key":"network","type":"text"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"shelter":{"key":"shelter","type":"check"},"source":{"key":"source","type":"text","universal":true},"surface":{"key":"surface","type":"combo"},"telephone":{"key":"phone","type":"tel","universal":true},"website":{"key":"website","type":"url","universal":true},"wikipedia":{"key":"wikipedia","type":"text","universal":true}} \ No newline at end of file +{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"universal":true},"aeroway":{"key":"aeroway","type":"combo"},"amenity":{"key":"amenity","type":"combo"},"atm":{"key":"atm","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"collection_times":{"key":"collection_times","type":"text"},"construction":{"key":"construction","type":"combo"},"crossing":{"key":"crossing","type":"combo"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"denotation":{"key":"denotation","type":"combo"},"elevation":{"key":"ele","type":"number","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"highway":{"key":"highway","type":"combo"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"landuse":{"key":"landuse","type":"combo"},"layer":{"key":"layer","type":"combo"},"leisure":{"key":"leisure","type":"combo"},"levels":{"key":"building:levels","type":"number"},"man_made":{"key":"man_made","type":"combo"},"maxspeed":{"key":"maxspeed","type":"combo"},"natural":{"key":"natural","type":"combo"},"network":{"key":"network","type":"text"},"office":{"key":"office","type":"combo"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"place":{"key":"place","type":"combo"},"railway":{"key":"railway","type":"combo"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"service":{"key":"service","type":"combo","options":["parking_aisle","driveway","alley","drive-through","emergency_access"]},"shelter":{"key":"shelter","type":"check"},"shop":{"key":"shop","type":"combo"},"source":{"key":"source","type":"text","universal":true},"sport":{"key":"sport","type":"combo"},"surface":{"key":"surface","type":"combo"},"telephone":{"key":"phone","type":"tel","universal":true},"tourism":{"key":"tourism","type":"combo"},"water":{"key":"water","type":"combo"},"waterway":{"key":"waterway","type":"combo"},"website":{"key":"website","type":"url","universal":true},"wetland":{"key":"wetland","type":"combo"},"wikipedia":{"key":"wikipedia","type":"text","universal":true},"wood":{"key":"wood","type":"combo"}} \ No newline at end of file diff --git a/data/presets/forms/aeroway.json b/data/presets/forms/aeroway.json new file mode 100644 index 000000000..759fed213 --- /dev/null +++ b/data/presets/forms/aeroway.json @@ -0,0 +1,4 @@ +{ + "key": "aeroway", + "type": "combo" +} diff --git a/data/presets/forms/amenity.json b/data/presets/forms/amenity.json new file mode 100644 index 000000000..1ead3431b --- /dev/null +++ b/data/presets/forms/amenity.json @@ -0,0 +1,4 @@ +{ + "key": "amenity", + "type": "combo" +} diff --git a/data/presets/forms/collection_times.json b/data/presets/forms/collection_times.json new file mode 100644 index 000000000..4b094bf9a --- /dev/null +++ b/data/presets/forms/collection_times.json @@ -0,0 +1,4 @@ +{ + "key": "collection_times", + "type": "text" +} \ No newline at end of file diff --git a/data/presets/forms/construction.json b/data/presets/forms/construction.json new file mode 100644 index 000000000..15b1ac099 --- /dev/null +++ b/data/presets/forms/construction.json @@ -0,0 +1,4 @@ +{ + "key": "construction", + "type": "combo" +} \ No newline at end of file diff --git a/data/presets/forms/crossing.json b/data/presets/forms/crossing.json new file mode 100644 index 000000000..bcab9943f --- /dev/null +++ b/data/presets/forms/crossing.json @@ -0,0 +1,4 @@ +{ + "key": "crossing", + "type": "combo" +} diff --git a/data/presets/forms/denotation.json b/data/presets/forms/denotation.json new file mode 100644 index 000000000..fe40efb25 --- /dev/null +++ b/data/presets/forms/denotation.json @@ -0,0 +1,4 @@ +{ + "key": "denotation", + "type": "combo" +} diff --git a/data/presets/forms/highway.json b/data/presets/forms/highway.json new file mode 100644 index 000000000..793b3ec07 --- /dev/null +++ b/data/presets/forms/highway.json @@ -0,0 +1,4 @@ +{ + "key": "highway", + "type": "combo" +} diff --git a/data/presets/forms/landuse.json b/data/presets/forms/landuse.json new file mode 100644 index 000000000..10a4ed623 --- /dev/null +++ b/data/presets/forms/landuse.json @@ -0,0 +1,4 @@ +{ + "key": "landuse", + "type": "combo" +} diff --git a/data/presets/forms/leisure.json b/data/presets/forms/leisure.json new file mode 100644 index 000000000..c13cd02e1 --- /dev/null +++ b/data/presets/forms/leisure.json @@ -0,0 +1,4 @@ +{ + "key": "leisure", + "type": "combo" +} diff --git a/data/presets/forms/man_made.json b/data/presets/forms/man_made.json new file mode 100644 index 000000000..dba446547 --- /dev/null +++ b/data/presets/forms/man_made.json @@ -0,0 +1,4 @@ +{ + "key": "man_made", + "type": "combo" +} diff --git a/data/presets/forms/natural.json b/data/presets/forms/natural.json new file mode 100644 index 000000000..d9431624c --- /dev/null +++ b/data/presets/forms/natural.json @@ -0,0 +1,4 @@ +{ + "key": "natural", + "type": "combo" +} diff --git a/data/presets/forms/office.json b/data/presets/forms/office.json new file mode 100644 index 000000000..8e926713f --- /dev/null +++ b/data/presets/forms/office.json @@ -0,0 +1,4 @@ +{ + "key": "office", + "type": "combo" +} diff --git a/data/presets/forms/place.json b/data/presets/forms/place.json new file mode 100644 index 000000000..94158b057 --- /dev/null +++ b/data/presets/forms/place.json @@ -0,0 +1,4 @@ +{ + "key": "place", + "type": "combo" +} diff --git a/data/presets/forms/railway.json b/data/presets/forms/railway.json new file mode 100644 index 000000000..3ac49417d --- /dev/null +++ b/data/presets/forms/railway.json @@ -0,0 +1,4 @@ +{ + "key": "railway", + "type": "combo" +} diff --git a/data/presets/forms/service.json b/data/presets/forms/service.json new file mode 100644 index 000000000..b21da8b3f --- /dev/null +++ b/data/presets/forms/service.json @@ -0,0 +1,5 @@ +{ + "key": "service", + "type": "combo", + "options": ["parking_aisle", "driveway", "alley", "drive-through", "emergency_access"] +} diff --git a/data/presets/forms/shop.json b/data/presets/forms/shop.json new file mode 100644 index 000000000..c29d4154e --- /dev/null +++ b/data/presets/forms/shop.json @@ -0,0 +1,4 @@ +{ + "key": "shop", + "type": "combo" +} diff --git a/data/presets/forms/sport.json b/data/presets/forms/sport.json new file mode 100644 index 000000000..2acb062e6 --- /dev/null +++ b/data/presets/forms/sport.json @@ -0,0 +1,4 @@ +{ + "key": "sport", + "type": "combo" +} \ No newline at end of file diff --git a/data/presets/forms/tourism.json b/data/presets/forms/tourism.json new file mode 100644 index 000000000..29af88d47 --- /dev/null +++ b/data/presets/forms/tourism.json @@ -0,0 +1,4 @@ +{ + "key": "tourism", + "type": "combo" +} diff --git a/data/presets/forms/water.json b/data/presets/forms/water.json new file mode 100644 index 000000000..1e52dfb4e --- /dev/null +++ b/data/presets/forms/water.json @@ -0,0 +1,4 @@ +{ + "key": "water", + "type": "combo" +} diff --git a/data/presets/forms/waterway.json b/data/presets/forms/waterway.json new file mode 100644 index 000000000..6b6c3dc3a --- /dev/null +++ b/data/presets/forms/waterway.json @@ -0,0 +1,4 @@ +{ + "key": "waterway", + "type": "combo" +} diff --git a/data/presets/forms/wetland.json b/data/presets/forms/wetland.json new file mode 100644 index 000000000..ebe839a1e --- /dev/null +++ b/data/presets/forms/wetland.json @@ -0,0 +1,4 @@ +{ + "key": "wetland", + "type": "combo" +} diff --git a/data/presets/forms/wood.json b/data/presets/forms/wood.json new file mode 100644 index 000000000..cfd5bac29 --- /dev/null +++ b/data/presets/forms/wood.json @@ -0,0 +1,4 @@ +{ + "key": "wood", + "type": "combo" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 9a754a1a2..2bbf8b947 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1 +1 @@ -[{"name":"aeroway","match":{"geometry":["point","vertex","line","area"],"tags":{"aeroway":"*"}},"form":[{"key":"aeroway","type":"combo"}]},{"name":"airport","match":{"geometry":["point","area"],"terms":["airplane","airport","aerodrome"],"tags":{"aeroway":"aerodrome"}},"icon":"airport","form":[]},{"name":"helipad","match":{"geometry":["point","area"],"terms":["helicopter","helipad","heliport"],"tags":{"aeroway":"helipad"}},"icon":"heliport","form":[]},{"name":"amenity","match":{"geometry":["point","area"],"tags":{"amenity":"*"}},"form":[{"key":"amenity","type":"combo"}]},{"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","form":["atm","building_area","address"]},{"name":"bar","match":{"geometry":["point","area"],"tags":{"amenity":"bar"},"terms":[]},"icon":"bar","form":["building_area","address"]},{"name":"bicycle rental","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_rental"}},"icon":"bicycle","form":["capacity","network","operator"]},{"name":"cafe","match":{"geometry":["point","area"],"terms":["coffee","tea","coffee shop"],"tags":{"amenity":"cafe"}},"icon":"cafe","form":["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","form":["building_area","address"]},{"name":"fast food","match":{"geometry":["point","area"],"tags":{"amenity":"fast_food"},"terms":[]},"icon":"fast-food","form":["cuisine","building_area","address"]},{"name":"fire station","match":{"geometry":["point","area"],"tags":{"amenity":"fire_station"},"terms":[]},"icon":"fire-station","form":["operator","building_area","address"]},{"name":"grave yard","match":{"geometry":["point","area"],"tags":{"amenity":"grave_yard"}},"icon":"cemetery","form":["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","form":["emergency","building_area","address"]},{"name":"library","match":{"geometry":["point","area"],"tags":{"amenity":"library"},"terms":[]},"icon":"library","form":["operator","building_area","address"]},{"name":"parking","match":{"geometry":["point","area"],"tags":{"amenity":"parking"},"terms":[]},"icon":"parking","form":["fee","access","address"]},{"name":"pharmacy","match":{"geometry":["point","area"],"tags":{"amenity":"pharmacy"},"terms":[]},"icon":"pharmacy","form":["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","form":["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","form":["denomination","building","address"]},{"name":"synagogue","match":{"geometry":["point","area"],"terms":["jewish","synagogue"],"tags":{"amenity":"place_of_worship","religion":"jewish"}},"icon":"religious-jewish","form":["denomination","building","address"]},{"name":"mosque","match":{"geometry":["point","area"],"terms":["muslim","mosque"],"tags":{"amenity":"place_of_worship","religion":"muslim"}},"icon":"religious-muslim","form":["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","form":["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","form":["operator",{"key":"collection_times","type":"text"}]},{"name":"pub","match":{"geometry":["point","area"],"tags":{"amenity":"pub"},"terms":[]},"icon":"beer","form":["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","form":["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","form":["operator","building","address"]},{"name":"toilets","match":{"geometry":["point","area"],"terms":[],"tags":{"amenity":"toilets"}},"form":["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","form":["building_area","address"]},{"name":"university","match":{"geometry":["point","area"],"tags":{"amenity":"university"},"terms":[]},"icon":"college","form":["operator","address"]},{"name":"building","match":{"geometry":["point","area"],"tags":{"building":"*"},"terms":[]},"icon":"warehouse","form":["building_yes","levels","address"]},{"name":"highway","match":{"geometry":["point","vertex","line","area"],"tags":{"highway":"*"}},"form":[{"key":"highway","type":"combo"}]},{"name":"bus stop","match":{"geometry":["point"],"tags":{"highway":"bus_stop"},"terms":[]},"icon":"bus","form":["operator","shelter"]},{"name":"crossing","match":{"geometry":["vertex"],"tags":{"highway":"crossing"},"terms":["crosswalk","zebra crossing"]},"form":[{"key":"crossing","type":"combo"}]},{"name":"cycle path","match":{"geometry":["line"],"tags":{"highway":"cycleway"},"terms":[]},"icon":"highway-cycleway","form":["oneway","roadtype","access","maxspeed","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","form":["access","surface"]},{"name":"motorway","match":{"geometry":["line"],"tags":{"highway":"motorway"},"terms":[]},"icon":"highway-motorway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"path","match":{"geometry":["line"],"tags":{"highway":"path"},"terms":[]},"icon":"highway-footway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"primary road","match":{"geometry":["line"],"tags":{"highway":"primary"},"terms":[]},"icon":"highway-primary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"residential road","match":{"geometry":["line"],"tags":{"highway":"residential"},"terms":[]},"icon":"highway-residential","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"secondary road","match":{"geometry":["line"],"tags":{"highway":"secondary"},"terms":[]},"icon":"highway-secondary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"service road","match":{"geometry":["line"],"tags":{"highway":"service"},"terms":[]},"icon":"highway-service","form":[{"key":"service","type":"combo","options":["parking_aisle","driveway","alley","drive-through","emergency_access"]},"oneway","roadtype","access","maxspeed","surface"]},{"name":"steps","match":{"geometry":["line"],"tags":{"highway":"steps"},"terms":["stairs","staircase"]},"form":["access","surface"]},{"name":"tertiary road","match":{"geometry":["line"],"tags":{"highway":"tertiary"},"terms":[]},"icon":"highway-tertiary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"track","match":{"geometry":["line"],"tags":{"highway":"track"},"terms":[]},"icon":"highway-track","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"trunk highway","match":{"geometry":["line"],"tags":{"highway":"trunk"},"terms":[]},"icon":"highway-trunk","form":["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","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"landuse","match":{"geometry":["point","area"],"tags":{"landuse":"*"}},"form":[{"key":"landuse","type":"combo"}]},{"name":"allotments","match":{"geometry":["point","area"],"tags":{"landuse":"allotments"},"terms":[]},"form":[]},{"name":"cemetery","match":{"geometry":["point","area"],"tags":{"landuse":"cemetery"},"terms":[]},"form":[],"icon":"cemetery"},{"name":"commercial","match":{"geometry":["point","area"],"tags":{"landuse":"commercial"},"terms":[]},"form":[]},{"name":"construction","match":{"geometry":["point","area"],"tags":{"landuse":"construction"},"terms":[]},"form":[{"key":"construction","type":"combo"},"operator"]},{"name":"farm","match":{"geometry":["point","area"],"tags":{"landuse":"farm"},"terms":[]},"form":[]},{"name":"farmyard","match":{"geometry":["point","area"],"tags":{"landuse":"farmyard"},"terms":[]},"form":[]},{"name":"forest","match":{"geometry":["point","area"],"tags":{"landuse":"forest"},"terms":[]},"form":[{"key":"wood","type":"combo"}],"icon":"park2"},{"name":"grass","match":{"geometry":["point","area"],"tags":{"landuse":"grass"},"terms":[]},"form":[]},{"name":"industrial","match":{"geometry":["point","area"],"tags":{"landuse":"industrial"},"terms":[]},"form":[]},{"name":"meadow","match":{"geometry":["point","area"],"tags":{"landuse":"meadow"},"terms":[]},"form":[]},{"name":"orchard","match":{"geometry":["point","area"],"tags":{"landuse":"orchard"},"terms":[]},"form":[]},{"name":"quarry","match":{"geometry":["point","area"],"tags":{"landuse":"quarry"},"terms":[]},"form":[]},{"name":"residential","match":{"geometry":["point","area"],"tags":{"landuse":"residential"},"terms":[]},"form":[]},{"name":"vineyard","match":{"geometry":["point","area"],"tags":{"landuse":"vineyard"},"terms":[]},"form":[]},{"name":"leisure","match":{"geometry":["point","area"],"tags":{"leisure":"*"}},"form":[{"key":"leisure","type":"combo"}]},{"name":"golf course","match":{"geometry":["point","area"],"tags":{"leisure":"golf_course"},"terms":[]},"icon":"golf","form":["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","form":[{"key":"sport","type":"combo"},"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","form":["surface"]},{"name":"soccer field","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"soccer"},"terms":[]},"icon":"soccer","form":["surface"]},{"name":"tennis court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"tennis"},"terms":[]},"icon":"tennis","form":["surface"]},{"name":"playground","match":{"geometry":["point","area"],"tags":{"leisure":"playground"}}},{"name":"man made","match":{"geometry":["point","vertex","line","area"],"tags":{"man_made":"*"}},"form":[{"key":"man_made","type":"combo"}]},{"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":"*"}},"form":[{"key":"natural","type":"combo"}]},{"name":"bay","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"bay"}}},{"name":"beach","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"beach"}},"form":["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","form":["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"}},"form":[{"key":"denotation","type":"combo"}],"icon":"park"},{"name":"water","match":{"geometry":["area"],"tags":{"natural":"water"},"terms":[]},"form":[{"key":"water","type":"combo"}]},{"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":[]},"form":[{"key":"wetland","type":"combo"}]},{"name":"wood","match":{"geometry":["point","area"],"tags":{"natural":"wood"},"terms":[]},"form":[{"key":"wood","type":"combo"}],"icon":"park2"},{"name":"office","match":{"geometry":["point","area"],"tags":{"office":"*"},"terms":[]},"icon":"commercial","form":[{"key":"office","type":"combo"},"address","opening_hours"]},{"name":"place","match":{"geometry":["point","area"],"tags":{"place":"*"}},"form":[{"key":"place","type":"combo"}]},{"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":"*"}},"form":[{"key":"railway","type":"combo"}]},{"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","form":[{"key":"shop","type":"combo"},"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","form":["operator","building_area","address"]},{"name":"tourism","match":{"geometry":["point","area"],"tags":{"tourism":"*"}},"form":[{"key":"tourism","type":"combo"}]},{"name":"camp site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"camp_site"}},"icon":"campsite","form":["operator","address"]},{"name":"hotel","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"hotel"}},"icon":"lodging","form":["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","form":["operator","building_area","address"]},{"name":"picnic site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"picnic_site"}},"form":["operator","building_area","address"]},{"name":"waterway","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"*"}},"form":[{"key":"waterway","type":"combo"}]},{"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","form":["layer"]},{"name":"weir","match":{"geometry":["vertex","line"],"tags":{"waterway":"weir"}},"icon":"dam"}] \ No newline at end of file +[{"name":"aeroway","match":{"geometry":["point","vertex","line","area"],"tags":{"aeroway":"*"}},"form":["aeroway"]},{"name":"airport","match":{"geometry":["point","area"],"terms":["airplane","airport","aerodrome"],"tags":{"aeroway":"aerodrome"}},"icon":"airport","form":[]},{"name":"helipad","match":{"geometry":["point","area"],"terms":["helicopter","helipad","heliport"],"tags":{"aeroway":"helipad"}},"icon":"heliport","form":[]},{"name":"amenity","match":{"geometry":["point","area"],"tags":{"amenity":"*"}},"form":["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","form":["atm","building_area","address"]},{"name":"bar","match":{"geometry":["point","area"],"tags":{"amenity":"bar"},"terms":[]},"icon":"bar","form":["building_area","address"]},{"name":"bicycle rental","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_rental"}},"icon":"bicycle","form":["capacity","network","operator"]},{"name":"cafe","match":{"geometry":["point","area"],"terms":["coffee","tea","coffee shop"],"tags":{"amenity":"cafe"}},"icon":"cafe","form":["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","form":["building_area","address"]},{"name":"fast food","match":{"geometry":["point","area"],"tags":{"amenity":"fast_food"},"terms":[]},"icon":"fast-food","form":["cuisine","building_area","address"]},{"name":"fire station","match":{"geometry":["point","area"],"tags":{"amenity":"fire_station"},"terms":[]},"icon":"fire-station","form":["operator","building_area","address"]},{"name":"grave yard","match":{"geometry":["point","area"],"tags":{"amenity":"grave_yard"}},"icon":"cemetery","form":["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","form":["emergency","building_area","address"]},{"name":"library","match":{"geometry":["point","area"],"tags":{"amenity":"library"},"terms":[]},"icon":"library","form":["operator","building_area","address"]},{"name":"parking","match":{"geometry":["point","area"],"tags":{"amenity":"parking"},"terms":[]},"icon":"parking","form":["fee","access","address"]},{"name":"pharmacy","match":{"geometry":["point","area"],"tags":{"amenity":"pharmacy"},"terms":[]},"icon":"pharmacy","form":["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","form":["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","form":["denomination","building","address"]},{"name":"synagogue","match":{"geometry":["point","area"],"terms":["jewish","synagogue"],"tags":{"amenity":"place_of_worship","religion":"jewish"}},"icon":"religious-jewish","form":["denomination","building","address"]},{"name":"mosque","match":{"geometry":["point","area"],"terms":["muslim","mosque"],"tags":{"amenity":"place_of_worship","religion":"muslim"}},"icon":"religious-muslim","form":["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","form":["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","form":["operator","collection_times"]},{"name":"pub","match":{"geometry":["point","area"],"tags":{"amenity":"pub"},"terms":[]},"icon":"beer","form":["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","form":["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","form":["operator","building","address"]},{"name":"toilets","match":{"geometry":["point","area"],"terms":[],"tags":{"amenity":"toilets"}},"form":["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","form":["building_area","address"]},{"name":"university","match":{"geometry":["point","area"],"tags":{"amenity":"university"},"terms":[]},"icon":"college","form":["operator","address"]},{"name":"building","match":{"geometry":["point","area"],"tags":{"building":"*"},"terms":[]},"icon":"warehouse","form":["building_yes","levels","address"]},{"name":"highway","match":{"geometry":["point","vertex","line","area"],"tags":{"highway":"*"}},"form":["highway"]},{"name":"bus stop","match":{"geometry":["point"],"tags":{"highway":"bus_stop"},"terms":[]},"icon":"bus","form":["operator","shelter"]},{"name":"crossing","match":{"geometry":["vertex"],"tags":{"highway":"crossing"},"terms":["crosswalk","zebra crossing"]},"form":["crossing"]},{"name":"cycle path","match":{"geometry":["line"],"tags":{"highway":"cycleway"},"terms":[]},"icon":"highway-cycleway","form":["oneway","roadtype","access","maxspeed","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","form":["access","surface"]},{"name":"motorway","match":{"geometry":["line"],"tags":{"highway":"motorway"},"terms":[]},"icon":"highway-motorway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"path","match":{"geometry":["line"],"tags":{"highway":"path"},"terms":[]},"icon":"highway-footway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"primary road","match":{"geometry":["line"],"tags":{"highway":"primary"},"terms":[]},"icon":"highway-primary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"residential road","match":{"geometry":["line"],"tags":{"highway":"residential"},"terms":[]},"icon":"highway-residential","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"secondary road","match":{"geometry":["line"],"tags":{"highway":"secondary"},"terms":[]},"icon":"highway-secondary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"service road","match":{"geometry":["line"],"tags":{"highway":"service"},"terms":[]},"icon":"highway-service","form":["service","oneway","roadtype","access","maxspeed","surface"]},{"name":"steps","match":{"geometry":["line"],"tags":{"highway":"steps"},"terms":["stairs","staircase"]},"form":["access","surface"]},{"name":"tertiary road","match":{"geometry":["line"],"tags":{"highway":"tertiary"},"terms":[]},"icon":"highway-tertiary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"track","match":{"geometry":["line"],"tags":{"highway":"track"},"terms":[]},"icon":"highway-track","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"trunk highway","match":{"geometry":["line"],"tags":{"highway":"trunk"},"terms":[]},"icon":"highway-trunk","form":["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","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"landuse","match":{"geometry":["point","area"],"tags":{"landuse":"*"}},"form":["landuse"]},{"name":"allotments","match":{"geometry":["point","area"],"tags":{"landuse":"allotments"},"terms":[]},"form":[]},{"name":"cemetery","match":{"geometry":["point","area"],"tags":{"landuse":"cemetery"},"terms":[]},"form":[],"icon":"cemetery"},{"name":"commercial","match":{"geometry":["point","area"],"tags":{"landuse":"commercial"},"terms":[]},"form":[]},{"name":"construction","match":{"geometry":["point","area"],"tags":{"landuse":"construction"},"terms":[]},"form":["construction","operator"]},{"name":"farm","match":{"geometry":["point","area"],"tags":{"landuse":"farm"},"terms":[]},"form":[]},{"name":"farmyard","match":{"geometry":["point","area"],"tags":{"landuse":"farmyard"},"terms":[]},"form":[]},{"name":"forest","match":{"geometry":["point","area"],"tags":{"landuse":"forest"},"terms":[]},"form":["wood"],"icon":"park2"},{"name":"grass","match":{"geometry":["point","area"],"tags":{"landuse":"grass"},"terms":[]},"form":[]},{"name":"industrial","match":{"geometry":["point","area"],"tags":{"landuse":"industrial"},"terms":[]},"form":[]},{"name":"meadow","match":{"geometry":["point","area"],"tags":{"landuse":"meadow"},"terms":[]},"form":[]},{"name":"orchard","match":{"geometry":["point","area"],"tags":{"landuse":"orchard"},"terms":[]},"form":[]},{"name":"quarry","match":{"geometry":["point","area"],"tags":{"landuse":"quarry"},"terms":[]},"form":[]},{"name":"residential","match":{"geometry":["point","area"],"tags":{"landuse":"residential"},"terms":[]},"form":[]},{"name":"vineyard","match":{"geometry":["point","area"],"tags":{"landuse":"vineyard"},"terms":[]},"form":[]},{"name":"leisure","match":{"geometry":["point","area"],"tags":{"leisure":"*"}},"form":["leisure"]},{"name":"golf course","match":{"geometry":["point","area"],"tags":{"leisure":"golf_course"},"terms":[]},"icon":"golf","form":["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","form":["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","form":["surface"]},{"name":"soccer field","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"soccer"},"terms":[]},"icon":"soccer","form":["surface"]},{"name":"tennis court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"tennis"},"terms":[]},"icon":"tennis","form":["surface"]},{"name":"playground","match":{"geometry":["point","area"],"tags":{"leisure":"playground"}}},{"name":"man made","match":{"geometry":["point","vertex","line","area"],"tags":{"man_made":"*"}},"form":["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":"*"}},"form":["natural"]},{"name":"bay","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"bay"}}},{"name":"beach","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"beach"}},"form":["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","form":["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"}},"form":["denotation"],"icon":"park"},{"name":"water","match":{"geometry":["area"],"tags":{"natural":"water"},"terms":[]},"form":["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":[]},"form":["wetland"]},{"name":"wood","match":{"geometry":["point","area"],"tags":{"natural":"wood"},"terms":[]},"form":["wood"],"icon":"park2"},{"name":"office","match":{"geometry":["point","area"],"tags":{"office":"*"},"terms":[]},"icon":"commercial","form":["office","address","opening_hours"]},{"name":"place","match":{"geometry":["point","area"],"tags":{"place":"*"}},"form":["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":"*"}},"form":["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","form":["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","form":["operator","building_area","address"]},{"name":"tourism","match":{"geometry":["point","area"],"tags":{"tourism":"*"}},"form":["tourism"]},{"name":"camp site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"camp_site"}},"icon":"campsite","form":["operator","address"]},{"name":"hotel","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"hotel"}},"icon":"lodging","form":["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","form":["operator","building_area","address"]},{"name":"picnic site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"picnic_site"}},"form":["operator","building_area","address"]},{"name":"waterway","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"*"}},"form":["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","form":["layer"]},{"name":"weir","match":{"geometry":["vertex","line"],"tags":{"waterway":"weir"}},"icon":"dam"}] \ No newline at end of file diff --git a/data/presets/presets/aeroway.json b/data/presets/presets/aeroway.json index d3e8c5b4e..46cce271e 100644 --- a/data/presets/presets/aeroway.json +++ b/data/presets/presets/aeroway.json @@ -12,9 +12,6 @@ } }, "form": [ - { - "key": "aeroway", - "type": "combo" - } + "aeroway" ] } diff --git a/data/presets/presets/amenity.json b/data/presets/presets/amenity.json index e55aaae03..5bd977e9e 100644 --- a/data/presets/presets/amenity.json +++ b/data/presets/presets/amenity.json @@ -10,9 +10,6 @@ } }, "form": [ - { - "key": "amenity", - "type": "combo" - } + "amenity" ] } diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json index ccb92bfa8..12b7c5836 100644 --- a/data/presets/presets/amenity/post_box.json +++ b/data/presets/presets/amenity/post_box.json @@ -19,9 +19,6 @@ "icon": "post", "form": [ "operator", - { - "key": "collection_times", - "type": "text" - } + "collection_times" ] } \ No newline at end of file diff --git a/data/presets/presets/highway.json b/data/presets/presets/highway.json index 97ab342dd..6bd2429b5 100644 --- a/data/presets/presets/highway.json +++ b/data/presets/presets/highway.json @@ -12,9 +12,6 @@ } }, "form": [ - { - "key": "highway", - "type": "combo" - } + "highway" ] } diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json index 0409caf9e..a2159e49e 100644 --- a/data/presets/presets/highway/crossing.json +++ b/data/presets/presets/highway/crossing.json @@ -13,9 +13,6 @@ ] }, "form": [ - { - "key": "crossing", - "type": "combo" - } + "crossing" ] } \ No newline at end of file diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index b21c4c259..55e3aa5c0 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -11,11 +11,7 @@ }, "icon": "highway-service", "form": [ - { - "key": "service", - "type": "combo", - "options": ["parking_aisle", "driveway", "alley", "drive-through", "emergency_access"] - }, + "service", "oneway", "roadtype", "access", diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json index 9a0637d8f..5a6c1117c 100644 --- a/data/presets/presets/landuse.json +++ b/data/presets/presets/landuse.json @@ -10,9 +10,6 @@ } }, "form": [ - { - "key": "landuse", - "type": "combo" - } + "landuse" ] } diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json index 3c5ca1b11..6fd7ad795 100644 --- a/data/presets/presets/landuse/construction.json +++ b/data/presets/presets/landuse/construction.json @@ -12,10 +12,7 @@ ] }, "form": [ - { - "key": "construction", - "type": "combo" - }, + "construction", "operator" ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json index c81ecd1d0..e21e4d612 100644 --- a/data/presets/presets/landuse/forest.json +++ b/data/presets/presets/landuse/forest.json @@ -11,10 +11,7 @@ "terms": [] }, "form": [ - { - "key": "wood", - "type": "combo" - } + "wood" ], "icon": "park2" } \ No newline at end of file diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json index b9f39339d..1df5f9176 100644 --- a/data/presets/presets/leisure.json +++ b/data/presets/presets/leisure.json @@ -10,9 +10,6 @@ } }, "form": [ - { - "key": "leisure", - "type": "combo" - } + "leisure" ] } diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json index 05b27a11c..f4bd03e2f 100644 --- a/data/presets/presets/leisure/pitch.json +++ b/data/presets/presets/leisure/pitch.json @@ -12,10 +12,7 @@ }, "icon": "pitch", "form": [ - { - "key": "sport", - "type": "combo" - }, + "sport", "surface" ] } diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json index 1918be887..2c13b2a08 100644 --- a/data/presets/presets/man_made.json +++ b/data/presets/presets/man_made.json @@ -12,9 +12,6 @@ } }, "form": [ - { - "key": "man_made", - "type": "combo" - } + "man_made" ] } \ No newline at end of file diff --git a/data/presets/presets/natural.json b/data/presets/presets/natural.json index ec6915069..06eac5076 100644 --- a/data/presets/presets/natural.json +++ b/data/presets/presets/natural.json @@ -10,9 +10,6 @@ } }, "form": [ - { - "key": "natural", - "type": "combo" - } + "natural" ] } diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index b3b81e048..27bfcae52 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -12,10 +12,7 @@ } }, "form": [ - { - "key": "denotation", - "type": "combo" - } + "denotation" ], "icon": "park" } \ No newline at end of file diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json index 1d2412c62..c9c796142 100644 --- a/data/presets/presets/natural/water.json +++ b/data/presets/presets/natural/water.json @@ -10,9 +10,6 @@ "terms": [] }, "form": [ - { - "key": "water", - "type": "combo" - } + "water" ] } \ No newline at end of file diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json index 5769f4b81..c1775242d 100644 --- a/data/presets/presets/natural/wetland.json +++ b/data/presets/presets/natural/wetland.json @@ -11,9 +11,6 @@ "terms": [] }, "form": [ - { - "key": "wetland", - "type": "combo" - } + "wetland" ] } \ No newline at end of file diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json index e127dde35..d91c7f990 100644 --- a/data/presets/presets/natural/wood.json +++ b/data/presets/presets/natural/wood.json @@ -11,10 +11,7 @@ "terms": [] }, "form": [ - { - "key": "wood", - "type": "combo" - } + "wood" ], "icon": "park2" } \ No newline at end of file diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json index 56c85cfc3..c7001c201 100644 --- a/data/presets/presets/office.json +++ b/data/presets/presets/office.json @@ -12,10 +12,7 @@ }, "icon": "commercial", "form": [ - { - "key": "office", - "type": "combo" - }, + "office", "address", "opening_hours" ] diff --git a/data/presets/presets/place.json b/data/presets/presets/place.json index 87b25e571..2743de36a 100644 --- a/data/presets/presets/place.json +++ b/data/presets/presets/place.json @@ -10,9 +10,6 @@ } }, "form": [ - { - "key": "place", - "type": "combo" - } + "place" ] } diff --git a/data/presets/presets/railway.json b/data/presets/presets/railway.json index f101aac2d..e607e2a8f 100644 --- a/data/presets/presets/railway.json +++ b/data/presets/presets/railway.json @@ -12,9 +12,6 @@ } }, "form": [ - { - "key": "railway", - "type": "combo" - } + "railway" ] } diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json index d7d8bde69..337e931e3 100644 --- a/data/presets/presets/shop.json +++ b/data/presets/presets/shop.json @@ -12,10 +12,7 @@ }, "icon": "shop", "form": [ - { - "key": "shop", - "type": "combo" - }, + "shop", "address", "opening_hours" ] diff --git a/data/presets/presets/tourism.json b/data/presets/presets/tourism.json index 36669d915..d8b406e14 100644 --- a/data/presets/presets/tourism.json +++ b/data/presets/presets/tourism.json @@ -10,9 +10,6 @@ } }, "form": [ - { - "key": "tourism", - "type": "combo" - } + "tourism" ] } diff --git a/data/presets/presets/waterway.json b/data/presets/presets/waterway.json index 075acda7a..4406fe4d1 100644 --- a/data/presets/presets/waterway.json +++ b/data/presets/presets/waterway.json @@ -12,9 +12,6 @@ } }, "form": [ - { - "key": "waterway", - "type": "combo" - } + "waterway" ] } diff --git a/js/id/presets/preset.js b/js/id/presets/preset.js index 79f27b32d..ea318d6fc 100644 --- a/js/id/presets/preset.js +++ b/js/id/presets/preset.js @@ -7,11 +7,7 @@ iD.presets.Preset = function(preset, forms) { preset.additional = preset.additional ? preset.additional.map(getForms) : []; function getForms(f) { - if (typeof f === 'string') { - return forms[f]; - } else { - return iD.presets.Form(f, f.key); - } + return forms[f]; } preset.matchGeometry = function(entity, resolver) { diff --git a/locale/en.js b/locale/en.js index 718007671..bba93e836 100644 --- a/locale/en.js +++ b/locale/en.js @@ -257,6 +257,12 @@ locale.en = { "city": "City" } }, + "aeroway": { + "label": "Type" + }, + "amenity": { + "label": "Type" + }, "atm": { "label": "ATM" }, @@ -272,12 +278,24 @@ locale.en = { "capacity": { "label": "Capacity" }, + "collection_times": { + "label": "Collection Times" + }, + "construction": { + "label": "Type" + }, + "crossing": { + "label": "Type" + }, "cuisine": { "label": "Cuisine" }, "denomination": { "label": "Denomination" }, + "denotation": { + "label": "Denotation" + }, "elevation": { "label": "Elevation" }, @@ -290,6 +308,9 @@ locale.en = { "fee": { "label": "Fee" }, + "highway": { + "label": "Type" + }, "internet_access": { "label": "Internet Access", "options": { @@ -300,18 +321,33 @@ locale.en = { "terminal": "Terminal" } }, + "landuse": { + "label": "Type" + }, "layer": { "label": "Layer" }, + "leisure": { + "label": "Type" + }, "levels": { "label": "Levels" }, + "man_made": { + "label": "Type" + }, "maxspeed": { "label": "Speed Limit" }, + "natural": { + "label": "Natural" + }, "network": { "label": "Network" }, + "office": { + "label": "Type" + }, "oneway": { "label": "One Way" }, @@ -324,6 +360,12 @@ locale.en = { "phone": { "label": "Phone" }, + "place": { + "label": "Type" + }, + "railway": { + "label": "Type" + }, "religion": { "label": "Religion", "options": { @@ -345,14 +387,41 @@ locale.en = { "cutting": "Cutting" } }, + "service": { + "label": "Type" + }, "shelter": { "label": "Shelter" }, + "shop": { + "label": "Type" + }, "source": { "label": "Source" }, + "sport": { + "label": "Sport" + }, "surface": { "label": "Surface" + }, + "tourism": { + "label": "Type" + }, + "wikipedia": { + "label": "Wikipedia" + }, + "water": { + "label": "Type" + }, + "waterway": { + "label": "Type" + }, + "wetland": { + "label": "Type" + }, + "wood": { + "label": "Type" } } }