diff --git a/build.js b/build.js index ba3a77cd1..04074cb8c 100644 --- a/build.js +++ b/build.js @@ -14,11 +14,11 @@ function rp(f) { return r('presets/' + f); } -var forms = {}; -glob.sync(__dirname + '/data/presets/forms/*.json').forEach(function(file) { - forms[path.basename(file, '.json')] = read(file); +var fields = {}; +glob.sync(__dirname + '/data/presets/fields/*.json').forEach(function(file) { + fields[path.basename(file, '.json')] = read(file); }); -fs.writeFileSync('data/presets/forms.json', JSON.stringify(forms)); +fs.writeFileSync('data/presets/fields.json', JSON.stringify(fields)); fs.writeFileSync('data/presets/presets.json', JSON.stringify( glob.sync(__dirname + '/data/presets/presets/**/*.json').map(function(file) { @@ -34,6 +34,6 @@ fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({ presets: rp('presets.json'), defaults: rp('defaults.json'), categories: rp('categories.json'), - forms: rp('forms.json') + fields: rp('fields.json') } }, null, 4) + ';'); diff --git a/css/app.css b/css/app.css index 9b576ec15..06fd064b5 100644 --- a/css/app.css +++ b/css/app.css @@ -702,7 +702,7 @@ input[type=number] { right: 50%; } -button.preset-add-form { +button.preset-add-field { width: 40px; height: 40px; margin-right: 10px; diff --git a/data/data_dev.js b/data/data_dev.js index e5f1fb069..3445f943a 100644 --- a/data/data_dev.js +++ b/data/data_dev.js @@ -12,7 +12,7 @@ iD.data = { path + 'data/presets/presets.json', path + 'data/presets/defaults.json', path + 'data/presets/categories.json', - path + 'data/presets/forms.json'], d3.json, function (err, data) { + path + 'data/presets/fields.json'], d3.json, function (err, data) { iD.data = { deprecated: data[0], @@ -23,7 +23,7 @@ iD.data = { presets: data[4], defaults: data[5], categories: data[6], - forms: data[7] + fields: data[7] } }; diff --git a/data/presets/README.md b/data/presets/README.md index 4e9b07b6c..32b6f3580 100644 --- a/data/presets/README.md +++ b/data/presets/README.md @@ -40,17 +40,16 @@ A basic preset is of the form: }, // the icon in iD which represents this feature "icon": "park", - // A form. See the forms documentation for details of what's valid here. - // Forms are arrays of form field types - "form": [ + // An array of field names. See the fields documentation for details of what's valid here. + "fields": [ "address" ] } ``` -## Forms +## Fields -Forms are, like presets, defined in JSON structures. A typical form is +Fields are, like presets, defined in JSON structures. A typical field is ```js { @@ -59,7 +58,7 @@ Forms are, like presets, defined in JSON structures. A typical form is } ``` -In which `type` is the form's type. Valid form types are +In which `type` is the fields's type. Valid field types are * textarea * radio diff --git a/data/presets/forms.json b/data/presets/fields.json similarity index 100% rename from data/presets/forms.json rename to data/presets/fields.json diff --git a/data/presets/forms/access.json b/data/presets/fields/access.json similarity index 100% rename from data/presets/forms/access.json rename to data/presets/fields/access.json diff --git a/data/presets/forms/address.json b/data/presets/fields/address.json similarity index 100% rename from data/presets/forms/address.json rename to data/presets/fields/address.json diff --git a/data/presets/forms/aeroway.json b/data/presets/fields/aeroway.json similarity index 100% rename from data/presets/forms/aeroway.json rename to data/presets/fields/aeroway.json diff --git a/data/presets/forms/amenity.json b/data/presets/fields/amenity.json similarity index 100% rename from data/presets/forms/amenity.json rename to data/presets/fields/amenity.json diff --git a/data/presets/forms/atm.json b/data/presets/fields/atm.json similarity index 100% rename from data/presets/forms/atm.json rename to data/presets/fields/atm.json diff --git a/data/presets/forms/bicycle_parking.json b/data/presets/fields/bicycle_parking.json similarity index 100% rename from data/presets/forms/bicycle_parking.json rename to data/presets/fields/bicycle_parking.json diff --git a/data/presets/forms/building.json b/data/presets/fields/building.json similarity index 100% rename from data/presets/forms/building.json rename to data/presets/fields/building.json diff --git a/data/presets/forms/building_area.json b/data/presets/fields/building_area.json similarity index 100% rename from data/presets/forms/building_area.json rename to data/presets/fields/building_area.json diff --git a/data/presets/forms/building_yes.json b/data/presets/fields/building_yes.json similarity index 100% rename from data/presets/forms/building_yes.json rename to data/presets/fields/building_yes.json diff --git a/data/presets/forms/capacity.json b/data/presets/fields/capacity.json similarity index 100% rename from data/presets/forms/capacity.json rename to data/presets/fields/capacity.json diff --git a/data/presets/forms/collection_times.json b/data/presets/fields/collection_times.json similarity index 100% rename from data/presets/forms/collection_times.json rename to data/presets/fields/collection_times.json diff --git a/data/presets/forms/construction.json b/data/presets/fields/construction.json similarity index 100% rename from data/presets/forms/construction.json rename to data/presets/fields/construction.json diff --git a/data/presets/forms/crossing.json b/data/presets/fields/crossing.json similarity index 100% rename from data/presets/forms/crossing.json rename to data/presets/fields/crossing.json diff --git a/data/presets/forms/cuisine.json b/data/presets/fields/cuisine.json similarity index 100% rename from data/presets/forms/cuisine.json rename to data/presets/fields/cuisine.json diff --git a/data/presets/forms/denomination.json b/data/presets/fields/denomination.json similarity index 100% rename from data/presets/forms/denomination.json rename to data/presets/fields/denomination.json diff --git a/data/presets/forms/denotation.json b/data/presets/fields/denotation.json similarity index 100% rename from data/presets/forms/denotation.json rename to data/presets/fields/denotation.json diff --git a/data/presets/forms/elevation.json b/data/presets/fields/elevation.json similarity index 100% rename from data/presets/forms/elevation.json rename to data/presets/fields/elevation.json diff --git a/data/presets/forms/emergency.json b/data/presets/fields/emergency.json similarity index 100% rename from data/presets/forms/emergency.json rename to data/presets/fields/emergency.json diff --git a/data/presets/forms/fax.json b/data/presets/fields/fax.json similarity index 100% rename from data/presets/forms/fax.json rename to data/presets/fields/fax.json diff --git a/data/presets/forms/fee.json b/data/presets/fields/fee.json similarity index 100% rename from data/presets/forms/fee.json rename to data/presets/fields/fee.json diff --git a/data/presets/forms/highway.json b/data/presets/fields/highway.json similarity index 100% rename from data/presets/forms/highway.json rename to data/presets/fields/highway.json diff --git a/data/presets/forms/historic.json b/data/presets/fields/historic.json similarity index 100% rename from data/presets/forms/historic.json rename to data/presets/fields/historic.json diff --git a/data/presets/forms/internet_access.json b/data/presets/fields/internet_access.json similarity index 100% rename from data/presets/forms/internet_access.json rename to data/presets/fields/internet_access.json diff --git a/data/presets/forms/landuse.json b/data/presets/fields/landuse.json similarity index 100% rename from data/presets/forms/landuse.json rename to data/presets/fields/landuse.json diff --git a/data/presets/forms/layer.json b/data/presets/fields/layer.json similarity index 100% rename from data/presets/forms/layer.json rename to data/presets/fields/layer.json diff --git a/data/presets/forms/leisure.json b/data/presets/fields/leisure.json similarity index 100% rename from data/presets/forms/leisure.json rename to data/presets/fields/leisure.json diff --git a/data/presets/forms/levels.json b/data/presets/fields/levels.json similarity index 100% rename from data/presets/forms/levels.json rename to data/presets/fields/levels.json diff --git a/data/presets/forms/man_made.json b/data/presets/fields/man_made.json similarity index 100% rename from data/presets/forms/man_made.json rename to data/presets/fields/man_made.json diff --git a/data/presets/forms/maxspeed.json b/data/presets/fields/maxspeed.json similarity index 100% rename from data/presets/forms/maxspeed.json rename to data/presets/fields/maxspeed.json diff --git a/data/presets/forms/natural.json b/data/presets/fields/natural.json similarity index 100% rename from data/presets/forms/natural.json rename to data/presets/fields/natural.json diff --git a/data/presets/forms/network.json b/data/presets/fields/network.json similarity index 100% rename from data/presets/forms/network.json rename to data/presets/fields/network.json diff --git a/data/presets/forms/note.json b/data/presets/fields/note.json similarity index 100% rename from data/presets/forms/note.json rename to data/presets/fields/note.json diff --git a/data/presets/forms/office.json b/data/presets/fields/office.json similarity index 100% rename from data/presets/forms/office.json rename to data/presets/fields/office.json diff --git a/data/presets/forms/oneway.json b/data/presets/fields/oneway.json similarity index 100% rename from data/presets/forms/oneway.json rename to data/presets/fields/oneway.json diff --git a/data/presets/forms/opening_hours.json b/data/presets/fields/opening_hours.json similarity index 100% rename from data/presets/forms/opening_hours.json rename to data/presets/fields/opening_hours.json diff --git a/data/presets/forms/operator.json b/data/presets/fields/operator.json similarity index 100% rename from data/presets/forms/operator.json rename to data/presets/fields/operator.json diff --git a/data/presets/forms/phone.json b/data/presets/fields/phone.json similarity index 100% rename from data/presets/forms/phone.json rename to data/presets/fields/phone.json diff --git a/data/presets/forms/place.json b/data/presets/fields/place.json similarity index 100% rename from data/presets/forms/place.json rename to data/presets/fields/place.json diff --git a/data/presets/forms/railway.json b/data/presets/fields/railway.json similarity index 100% rename from data/presets/forms/railway.json rename to data/presets/fields/railway.json diff --git a/data/presets/forms/religion.json b/data/presets/fields/religion.json similarity index 100% rename from data/presets/forms/religion.json rename to data/presets/fields/religion.json diff --git a/data/presets/forms/roadtype.json b/data/presets/fields/roadtype.json similarity index 100% rename from data/presets/forms/roadtype.json rename to data/presets/fields/roadtype.json diff --git a/data/presets/forms/service.json b/data/presets/fields/service.json similarity index 100% rename from data/presets/forms/service.json rename to data/presets/fields/service.json diff --git a/data/presets/forms/shelter.json b/data/presets/fields/shelter.json similarity index 100% rename from data/presets/forms/shelter.json rename to data/presets/fields/shelter.json diff --git a/data/presets/forms/shop.json b/data/presets/fields/shop.json similarity index 100% rename from data/presets/forms/shop.json rename to data/presets/fields/shop.json diff --git a/data/presets/forms/source.json b/data/presets/fields/source.json similarity index 100% rename from data/presets/forms/source.json rename to data/presets/fields/source.json diff --git a/data/presets/forms/sport.json b/data/presets/fields/sport.json similarity index 100% rename from data/presets/forms/sport.json rename to data/presets/fields/sport.json diff --git a/data/presets/forms/surface.json b/data/presets/fields/surface.json similarity index 100% rename from data/presets/forms/surface.json rename to data/presets/fields/surface.json diff --git a/data/presets/forms/telephone.json b/data/presets/fields/telephone.json similarity index 100% rename from data/presets/forms/telephone.json rename to data/presets/fields/telephone.json diff --git a/data/presets/forms/tourism.json b/data/presets/fields/tourism.json similarity index 100% rename from data/presets/forms/tourism.json rename to data/presets/fields/tourism.json diff --git a/data/presets/forms/water.json b/data/presets/fields/water.json similarity index 100% rename from data/presets/forms/water.json rename to data/presets/fields/water.json diff --git a/data/presets/forms/waterway.json b/data/presets/fields/waterway.json similarity index 100% rename from data/presets/forms/waterway.json rename to data/presets/fields/waterway.json diff --git a/data/presets/forms/website.json b/data/presets/fields/website.json similarity index 100% rename from data/presets/forms/website.json rename to data/presets/fields/website.json diff --git a/data/presets/forms/wetland.json b/data/presets/fields/wetland.json similarity index 100% rename from data/presets/forms/wetland.json rename to data/presets/fields/wetland.json diff --git a/data/presets/forms/wikipedia.json b/data/presets/fields/wikipedia.json similarity index 100% rename from data/presets/forms/wikipedia.json rename to data/presets/fields/wikipedia.json diff --git a/data/presets/forms/wood.json b/data/presets/fields/wood.json similarity index 100% rename from data/presets/forms/wood.json rename to data/presets/fields/wood.json diff --git a/data/presets/presets.json b/data/presets/presets.json index c1622381e..8a5267719 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1 +1 @@ -[{"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 parking","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_parking"}},"icon":"bicycle","form":["bicycle_parking","capacity","operator"]},{"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":["area"],"tags":{"building":"*"},"terms":[]},"icon":"warehouse","form":["building_yes","levels"],"additional":["address","telephone","website","wikipedia","elevation","source"]},{"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","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":"historic","match":{"geometry":["point","area"],"tags":{"historic":"*"}},"form":["historic"]},{"name":"monument","match":{"geometry":["point","area"],"tags":{"historic":"monument"}},"icon":"monument"},{"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 +[{"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 diff --git a/data/presets/presets/aeroway.json b/data/presets/presets/aeroway.json index 46cce271e..ea02fcb32 100644 --- a/data/presets/presets/aeroway.json +++ b/data/presets/presets/aeroway.json @@ -11,7 +11,7 @@ "aeroway": "*" } }, - "form": [ + "fields": [ "aeroway" ] } diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json index 3bf3bdd96..0254e0281 100644 --- a/data/presets/presets/aeroway/aerodrome.json +++ b/data/presets/presets/aeroway/aerodrome.json @@ -15,6 +15,6 @@ } }, "icon": "airport", - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/aeroway/helipad.json b/data/presets/presets/aeroway/helipad.json index 0aa1f5d02..08cc026e5 100644 --- a/data/presets/presets/aeroway/helipad.json +++ b/data/presets/presets/aeroway/helipad.json @@ -15,6 +15,6 @@ } }, "icon": "heliport", - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/amenity.json b/data/presets/presets/amenity.json index 5bd977e9e..9e70ec898 100644 --- a/data/presets/presets/amenity.json +++ b/data/presets/presets/amenity.json @@ -9,7 +9,7 @@ "amenity": "*" } }, - "form": [ + "fields": [ "amenity" ] } diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json index 5fc666799..5f0c5da9f 100644 --- a/data/presets/presets/amenity/bank.json +++ b/data/presets/presets/amenity/bank.json @@ -33,7 +33,7 @@ } }, "icon": "bank", - "form": [ + "fields": [ "atm", "building_area", "address" diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json index 0aead72e1..824c3c11b 100644 --- a/data/presets/presets/amenity/bar.json +++ b/data/presets/presets/amenity/bar.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "bar", - "form": [ + "fields": [ "building_area", "address" ] diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json index ce454600c..93d578c2b 100644 --- a/data/presets/presets/amenity/bicycle_parking.json +++ b/data/presets/presets/amenity/bicycle_parking.json @@ -10,7 +10,7 @@ } }, "icon": "bicycle", - "form": [ + "fields": [ "bicycle_parking", "capacity", "operator" diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json index 49ffab05d..6bdfa68f1 100644 --- a/data/presets/presets/amenity/bicycle_rental.json +++ b/data/presets/presets/amenity/bicycle_rental.json @@ -10,7 +10,7 @@ } }, "icon": "bicycle", - "form": [ + "fields": [ "capacity", "network", "operator" diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json index 0adfc6f77..164c2c9c6 100644 --- a/data/presets/presets/amenity/cafe.json +++ b/data/presets/presets/amenity/cafe.json @@ -15,7 +15,7 @@ } }, "icon": "cafe", - "form": [ + "fields": [ "cuisine", "internet_access", "building_area", diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json index 644a4552f..bd5fcb5c1 100644 --- a/data/presets/presets/amenity/cinema.json +++ b/data/presets/presets/amenity/cinema.json @@ -29,7 +29,7 @@ } }, "icon": "cinema", - "form": [ + "fields": [ "building_area", "address" ] diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json index c20284a2c..0aec1af23 100644 --- a/data/presets/presets/amenity/fast_food.json +++ b/data/presets/presets/amenity/fast_food.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "fast-food", - "form": [ + "fields": [ "cuisine", "building_area", "address" diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json index db24919e9..32e02d32a 100644 --- a/data/presets/presets/amenity/fire_station.json +++ b/data/presets/presets/amenity/fire_station.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "fire-station", - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json index 0ac475e6a..51977b495 100644 --- a/data/presets/presets/amenity/grave_yard.json +++ b/data/presets/presets/amenity/grave_yard.json @@ -10,7 +10,7 @@ } }, "icon": "cemetery", - "form": [ + "fields": [ "religion" ] } \ No newline at end of file diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json index b9b3b3400..669a3c550 100644 --- a/data/presets/presets/amenity/hospital.json +++ b/data/presets/presets/amenity/hospital.json @@ -25,7 +25,7 @@ } }, "icon": "hospital", - "form": [ + "fields": [ "emergency", "building_area", "address" diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json index ecbfc4e68..e8bee590b 100644 --- a/data/presets/presets/amenity/library.json +++ b/data/presets/presets/amenity/library.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "library", - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json index beb1ea4f0..c34f090dc 100644 --- a/data/presets/presets/amenity/parking.json +++ b/data/presets/presets/amenity/parking.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "parking", - "form": [ + "fields": [ "fee", "access", "address" diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json index ea96822a3..be88584c2 100644 --- a/data/presets/presets/amenity/pharmacy.json +++ b/data/presets/presets/amenity/pharmacy.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "pharmacy", - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json index ab6fb6f0b..590309ee6 100644 --- a/data/presets/presets/amenity/place_of_worship.json +++ b/data/presets/presets/amenity/place_of_worship.json @@ -35,7 +35,7 @@ } }, "icon": "place-of-worship", - "form": [ + "fields": [ "religion", "denomination", "building", diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json index 886a8ed58..339c75110 100644 --- a/data/presets/presets/amenity/place_of_worship/christian.json +++ b/data/presets/presets/amenity/place_of_worship/christian.json @@ -35,7 +35,7 @@ } }, "icon": "religious-christian", - "form": [ + "fields": [ "denomination", "building", "address" diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json index 22861c980..390c4f29c 100644 --- a/data/presets/presets/amenity/place_of_worship/jewish.json +++ b/data/presets/presets/amenity/place_of_worship/jewish.json @@ -15,7 +15,7 @@ } }, "icon": "religious-jewish", - "form": [ + "fields": [ "denomination", "building", "address" diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json index 7828e8baa..3bcf093e2 100644 --- a/data/presets/presets/amenity/place_of_worship/muslim.json +++ b/data/presets/presets/amenity/place_of_worship/muslim.json @@ -15,7 +15,7 @@ } }, "icon": "religious-muslim", - "form": [ + "fields": [ "denomination", "building", "address" diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json index 56a2113f3..eece784be 100644 --- a/data/presets/presets/amenity/police.json +++ b/data/presets/presets/amenity/police.json @@ -40,7 +40,7 @@ } }, "icon": "police", - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json index 12b7c5836..d0527c773 100644 --- a/data/presets/presets/amenity/post_box.json +++ b/data/presets/presets/amenity/post_box.json @@ -17,7 +17,7 @@ ] }, "icon": "post", - "form": [ + "fields": [ "operator", "collection_times" ] diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json index 6904678ea..0566b3e69 100644 --- a/data/presets/presets/amenity/pub.json +++ b/data/presets/presets/amenity/pub.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "beer", - "form": [ + "fields": [ "building_area", "address" ] diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json index fc93d926d..9bff3717f 100644 --- a/data/presets/presets/amenity/restaurant.json +++ b/data/presets/presets/amenity/restaurant.json @@ -43,7 +43,7 @@ } }, "icon": "restaurant", - "form": [ + "fields": [ "cuisine", "building_area", "address" diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json index 19746564f..40061dd3b 100644 --- a/data/presets/presets/amenity/school.json +++ b/data/presets/presets/amenity/school.json @@ -28,7 +28,7 @@ } }, "icon": "school", - "form": [ + "fields": [ "operator", "building", "address" diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json index 1f2438658..558bc237b 100644 --- a/data/presets/presets/amenity/toilets.json +++ b/data/presets/presets/amenity/toilets.json @@ -11,7 +11,7 @@ "amenity": "toilets" } }, - "form": [ + "fields": [ "operator", "building" ] diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json index 8b6f87cdc..0ce5737ee 100644 --- a/data/presets/presets/amenity/townhall.json +++ b/data/presets/presets/amenity/townhall.json @@ -17,7 +17,7 @@ } }, "icon": "town-hall", - "form": [ + "fields": [ "building_area", "address" ] diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json index f4508c153..45d63cc09 100644 --- a/data/presets/presets/amenity/university.json +++ b/data/presets/presets/amenity/university.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "college", - "form": [ + "fields": [ "operator", "address" ] diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json index d328558a8..1762fdb48 100644 --- a/data/presets/presets/building.json +++ b/data/presets/presets/building.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "warehouse", - "form": [ + "fields": [ "building_yes", "levels" ], diff --git a/data/presets/presets/highway.json b/data/presets/presets/highway.json index 6bd2429b5..d24422d56 100644 --- a/data/presets/presets/highway.json +++ b/data/presets/presets/highway.json @@ -11,7 +11,7 @@ "highway": "*" } }, - "form": [ + "fields": [ "highway" ] } diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/bus_stop.json index 75a7e88a8..5de1ffcf3 100644 --- a/data/presets/presets/highway/bus_stop.json +++ b/data/presets/presets/highway/bus_stop.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "bus", - "form": [ + "fields": [ "operator", "shelter" ] diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json index a2159e49e..130012fb6 100644 --- a/data/presets/presets/highway/crossing.json +++ b/data/presets/presets/highway/crossing.json @@ -12,7 +12,7 @@ "zebra crossing" ] }, - "form": [ + "fields": [ "crossing" ] } \ No newline at end of file diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json index 45c67b23e..67b9fd9fa 100644 --- a/data/presets/presets/highway/cycleway.json +++ b/data/presets/presets/highway/cycleway.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-cycleway", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json index 0e343c217..dc3895b54 100644 --- a/data/presets/presets/highway/footway.json +++ b/data/presets/presets/highway/footway.json @@ -35,7 +35,7 @@ } }, "icon": "highway-footway", - "form": [ + "fields": [ "access", "surface" ] diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index e31aab447..8c04501b2 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-motorway", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json index e06de5f3d..9a5c0adb7 100644 --- a/data/presets/presets/highway/path.json +++ b/data/presets/presets/highway/path.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-footway", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index 9ebd52c50..cbfcec933 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-primary", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index 67f60cb33..2fe3b58be 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-residential", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index b229af62b..ab7b13333 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-secondary", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index 55e3aa5c0..fe42f8174 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-service", - "form": [ + "fields": [ "service", "oneway", "roadtype", diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json index 31fe8d490..bec430fa5 100644 --- a/data/presets/presets/highway/steps.json +++ b/data/presets/presets/highway/steps.json @@ -12,7 +12,7 @@ "staircase" ] }, - "form": [ + "fields": [ "access", "surface" ] diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index f838a4c90..a173b76be 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-tertiary", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json index a83da1bfe..3f2939623 100644 --- a/data/presets/presets/highway/track.json +++ b/data/presets/presets/highway/track.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-track", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index 7325bd0a9..702b20e34 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway-trunk", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index dde578754..3df32eb09 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -10,7 +10,7 @@ "terms": [] }, "icon": "highway", - "form": [ + "fields": [ "oneway", "roadtype", "access", diff --git a/data/presets/presets/historic.json b/data/presets/presets/historic.json index 949e1b156..fdb437fde 100644 --- a/data/presets/presets/historic.json +++ b/data/presets/presets/historic.json @@ -9,7 +9,7 @@ "historic": "*" } }, - "form": [ + "fields": [ "historic" ] } \ No newline at end of file diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json index 5a6c1117c..4616ce2ce 100644 --- a/data/presets/presets/landuse.json +++ b/data/presets/presets/landuse.json @@ -9,7 +9,7 @@ "landuse": "*" } }, - "form": [ + "fields": [ "landuse" ] } diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json index cb325330a..ba916a3d3 100644 --- a/data/presets/presets/landuse/allotments.json +++ b/data/presets/presets/landuse/allotments.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json index ffdc2a2e7..934d162f7 100644 --- a/data/presets/presets/landuse/cemetery.json +++ b/data/presets/presets/landuse/cemetery.json @@ -11,7 +11,7 @@ "terms": [ ] }, - "form": [ + "fields": [ ], "icon": "cemetery" } \ No newline at end of file diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json index d4d5967c7..10aa53d01 100644 --- a/data/presets/presets/landuse/commercial.json +++ b/data/presets/presets/landuse/commercial.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json index 6fd7ad795..4c99a2675 100644 --- a/data/presets/presets/landuse/construction.json +++ b/data/presets/presets/landuse/construction.json @@ -11,7 +11,7 @@ "terms": [ ] }, - "form": [ + "fields": [ "construction", "operator" ] diff --git a/data/presets/presets/landuse/farm.json b/data/presets/presets/landuse/farm.json index 6c32c9af1..4f018bc3e 100644 --- a/data/presets/presets/landuse/farm.json +++ b/data/presets/presets/landuse/farm.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json index cf982184d..d2f7ac0da 100644 --- a/data/presets/presets/landuse/farmyard.json +++ b/data/presets/presets/landuse/farmyard.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json index e21e4d612..e7c42d6d8 100644 --- a/data/presets/presets/landuse/forest.json +++ b/data/presets/presets/landuse/forest.json @@ -10,7 +10,7 @@ }, "terms": [] }, - "form": [ + "fields": [ "wood" ], "icon": "park2" diff --git a/data/presets/presets/landuse/grass.json b/data/presets/presets/landuse/grass.json index 6fccf2ff6..270327298 100644 --- a/data/presets/presets/landuse/grass.json +++ b/data/presets/presets/landuse/grass.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json index 9d22e13fa..51907e4bb 100644 --- a/data/presets/presets/landuse/industrial.json +++ b/data/presets/presets/landuse/industrial.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/meadow.json b/data/presets/presets/landuse/meadow.json index d92086812..a67afbced 100644 --- a/data/presets/presets/landuse/meadow.json +++ b/data/presets/presets/landuse/meadow.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json index 2066b7ef1..721c279da 100644 --- a/data/presets/presets/landuse/orchard.json +++ b/data/presets/presets/landuse/orchard.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/quarry.json b/data/presets/presets/landuse/quarry.json index 3785d619a..5c35ef138 100644 --- a/data/presets/presets/landuse/quarry.json +++ b/data/presets/presets/landuse/quarry.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json index b2389006d..bd9ab04f8 100644 --- a/data/presets/presets/landuse/residential.json +++ b/data/presets/presets/landuse/residential.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json index c7faf3878..b6d4eb6fd 100644 --- a/data/presets/presets/landuse/vineyard.json +++ b/data/presets/presets/landuse/vineyard.json @@ -11,6 +11,6 @@ "terms": [ ] }, - "form": [ + "fields": [ ] } \ No newline at end of file diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json index 1df5f9176..6bbfa7a16 100644 --- a/data/presets/presets/leisure.json +++ b/data/presets/presets/leisure.json @@ -9,7 +9,7 @@ "leisure": "*" } }, - "form": [ + "fields": [ "leisure" ] } diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json index a26890958..00e2404a9 100644 --- a/data/presets/presets/leisure/golf_course.json +++ b/data/presets/presets/leisure/golf_course.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "golf", - "form": [ + "fields": [ "operator", "address" ] diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json index f4bd03e2f..75a32b2de 100644 --- a/data/presets/presets/leisure/pitch.json +++ b/data/presets/presets/leisure/pitch.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "pitch", - "form": [ + "fields": [ "sport", "surface" ] diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json index 2e4697f40..9bfc31258 100644 --- a/data/presets/presets/leisure/pitch/basketball.json +++ b/data/presets/presets/leisure/pitch/basketball.json @@ -12,7 +12,7 @@ "terms": [] }, "icon": "basketball", - "form": [ + "fields": [ "surface" ] } diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json index 7d09a2728..3452886d6 100644 --- a/data/presets/presets/leisure/pitch/soccer.json +++ b/data/presets/presets/leisure/pitch/soccer.json @@ -12,7 +12,7 @@ "terms": [] }, "icon": "soccer", - "form": [ + "fields": [ "surface" ] } diff --git a/data/presets/presets/leisure/pitch/tennis.json b/data/presets/presets/leisure/pitch/tennis.json index 64e78f666..9ef0eaa68 100644 --- a/data/presets/presets/leisure/pitch/tennis.json +++ b/data/presets/presets/leisure/pitch/tennis.json @@ -12,7 +12,7 @@ "terms": [] }, "icon": "tennis", - "form": [ + "fields": [ "surface" ] } \ No newline at end of file diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json index 2c13b2a08..69dce6ec5 100644 --- a/data/presets/presets/man_made.json +++ b/data/presets/presets/man_made.json @@ -11,7 +11,7 @@ "man_made": "*" } }, - "form": [ + "fields": [ "man_made" ] } \ No newline at end of file diff --git a/data/presets/presets/natural.json b/data/presets/presets/natural.json index 06eac5076..f49fe89fd 100644 --- a/data/presets/presets/natural.json +++ b/data/presets/presets/natural.json @@ -9,7 +9,7 @@ "natural": "*" } }, - "form": [ + "fields": [ "natural" ] } diff --git a/data/presets/presets/natural/beach.json b/data/presets/presets/natural/beach.json index 07248a73a..9fa298717 100644 --- a/data/presets/presets/natural/beach.json +++ b/data/presets/presets/natural/beach.json @@ -11,7 +11,7 @@ "natural": "beach" } }, - "form": [ + "fields": [ "surface" ] } \ No newline at end of file diff --git a/data/presets/presets/natural/peak.json b/data/presets/presets/natural/peak.json index d89cd93b1..3c3b7f275 100644 --- a/data/presets/presets/natural/peak.json +++ b/data/presets/presets/natural/peak.json @@ -25,7 +25,7 @@ ] }, "icon": "triangle", - "form": [ + "fields": [ "elevation" ] } \ No newline at end of file diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index 27bfcae52..c5d3c51fb 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -11,7 +11,7 @@ "natural": "tree" } }, - "form": [ + "fields": [ "denotation" ], "icon": "park" diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json index c9c796142..59795c8ee 100644 --- a/data/presets/presets/natural/water.json +++ b/data/presets/presets/natural/water.json @@ -9,7 +9,7 @@ }, "terms": [] }, - "form": [ + "fields": [ "water" ] } \ No newline at end of file diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json index c1775242d..b861e5d60 100644 --- a/data/presets/presets/natural/wetland.json +++ b/data/presets/presets/natural/wetland.json @@ -10,7 +10,7 @@ }, "terms": [] }, - "form": [ + "fields": [ "wetland" ] } \ No newline at end of file diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json index d91c7f990..7420cd8ed 100644 --- a/data/presets/presets/natural/wood.json +++ b/data/presets/presets/natural/wood.json @@ -10,7 +10,7 @@ }, "terms": [] }, - "form": [ + "fields": [ "wood" ], "icon": "park2" diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json index c7001c201..75424d87e 100644 --- a/data/presets/presets/office.json +++ b/data/presets/presets/office.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "commercial", - "form": [ + "fields": [ "office", "address", "opening_hours" diff --git a/data/presets/presets/place.json b/data/presets/presets/place.json index 2743de36a..772c930e7 100644 --- a/data/presets/presets/place.json +++ b/data/presets/presets/place.json @@ -9,7 +9,7 @@ "place": "*" } }, - "form": [ + "fields": [ "place" ] } diff --git a/data/presets/presets/railway.json b/data/presets/presets/railway.json index e607e2a8f..993c4130e 100644 --- a/data/presets/presets/railway.json +++ b/data/presets/presets/railway.json @@ -11,7 +11,7 @@ "railway": "*" } }, - "form": [ + "fields": [ "railway" ] } diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json index 337e931e3..9bd4cf557 100644 --- a/data/presets/presets/shop.json +++ b/data/presets/presets/shop.json @@ -11,7 +11,7 @@ "terms": [] }, "icon": "shop", - "form": [ + "fields": [ "shop", "address", "opening_hours" diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json index 90cd913ee..437c1f777 100644 --- a/data/presets/presets/shop/supermarket.json +++ b/data/presets/presets/shop/supermarket.json @@ -32,7 +32,7 @@ } }, "icon": "grocery", - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/tourism.json b/data/presets/presets/tourism.json index d8b406e14..3c6f4becd 100644 --- a/data/presets/presets/tourism.json +++ b/data/presets/presets/tourism.json @@ -9,7 +9,7 @@ "tourism": "*" } }, - "form": [ + "fields": [ "tourism" ] } diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json index ecc0e9cde..223732388 100644 --- a/data/presets/presets/tourism/camp_site.json +++ b/data/presets/presets/tourism/camp_site.json @@ -12,7 +12,7 @@ } }, "icon": "campsite", - "form": [ + "fields": [ "operator", "address" ] diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json index 89605810d..35daf2834 100644 --- a/data/presets/presets/tourism/hotel.json +++ b/data/presets/presets/tourism/hotel.json @@ -12,7 +12,7 @@ } }, "icon": "lodging", - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json index d4655c0c8..371d5f56c 100644 --- a/data/presets/presets/tourism/museum.json +++ b/data/presets/presets/tourism/museum.json @@ -25,7 +25,7 @@ } }, "icon": "museum", - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json index 8447647bb..4cf39165f 100644 --- a/data/presets/presets/tourism/picnic_site.json +++ b/data/presets/presets/tourism/picnic_site.json @@ -11,7 +11,7 @@ "tourism": "picnic_site" } }, - "form": [ + "fields": [ "operator", "building_area", "address" diff --git a/data/presets/presets/waterway.json b/data/presets/presets/waterway.json index 4406fe4d1..a16fe69ae 100644 --- a/data/presets/presets/waterway.json +++ b/data/presets/presets/waterway.json @@ -11,7 +11,7 @@ "waterway": "*" } }, - "form": [ + "fields": [ "waterway" ] } diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json index 64104a623..26033de8e 100644 --- a/data/presets/presets/waterway/stream.json +++ b/data/presets/presets/waterway/stream.json @@ -36,7 +36,7 @@ } }, "icon": "waterway-river", - "form": [ + "fields": [ "layer" ] } \ No newline at end of file diff --git a/index.html b/index.html index 6b116c370..2cf30e02c 100644 --- a/index.html +++ b/index.html @@ -167,7 +167,7 @@ - + diff --git a/js/id/presets.js b/js/id/presets.js index 8f6a43bbc..efa29dfd7 100644 --- a/js/id/presets.js +++ b/js/id/presets.js @@ -9,27 +9,26 @@ iD.presets = function(context) { match: { tags: {}, geometry: ['point', 'vertex', 'line', 'area'] - }, - form: [] + } }), all = iD.presets.Collection([iD.presets.Preset(other)]), defaults = { area: all, line: all, point: all, vertex: all }, - forms = {}, + fields = {}, universal = [], recent = iD.presets.Collection([]); all.load = function(d) { - if (d.forms) { - _.forEach(d.forms, function(d, id) { - forms[id] = iD.presets.Form(d, id); - if (d.universal) universal.push(forms[id]); + if (d.fields) { + _.forEach(d.fields, function(d, id) { + fields[id] = iD.presets.Field(d, id); + if (d.universal) universal.push(fields[id]); }); } if (d.presets) { d.presets.forEach(function(d) { - all.collection.push(iD.presets.Preset(d, forms)); + all.collection.push(iD.presets.Preset(d, fields)); }); } diff --git a/js/id/presets/field.js b/js/id/presets/field.js new file mode 100644 index 000000000..993c2ad38 --- /dev/null +++ b/js/id/presets/field.js @@ -0,0 +1,13 @@ +iD.presets.Field = function(field, id) { + field = _.clone(field); + + field.t = function(scope, options) { + return t('presets.fields.' + id + '.' + scope, options); + }; + + field.label = function() { + return field.t('label', {default: field.key}); + }; + + return field; +}; diff --git a/js/id/presets/form.js b/js/id/presets/form.js deleted file mode 100644 index 79135b076..000000000 --- a/js/id/presets/form.js +++ /dev/null @@ -1,13 +0,0 @@ -iD.presets.Form = function(form, id) { - form = _.clone(form); - - form.t = function(scope, options) { - return t('presets.forms.' + id + '.' + scope, options); - }; - - form.label = function() { - return form.t('label', {default: form.key}); - }; - - return form; -}; diff --git a/js/id/presets/preset.js b/js/id/presets/preset.js index ea318d6fc..cf8a30b4c 100644 --- a/js/id/presets/preset.js +++ b/js/id/presets/preset.js @@ -1,13 +1,13 @@ -iD.presets.Preset = function(preset, forms) { +iD.presets.Preset = function(preset, fields) { preset = _.clone(preset); preset.icon = preset.icon || 'marker-stroked'; - preset.form = preset.form ? preset.form.map(getForms) : []; - preset.additional = preset.additional ? preset.additional.map(getForms) : []; + preset.fields = (preset.fields || []).map(getFields); + preset.additional = (preset.additional || []).map(getFields); - function getForms(f) { - return forms[f]; + function getFields(f) { + return fields[f]; } preset.matchGeometry = function(entity, resolver) { @@ -32,8 +32,8 @@ iD.presets.Preset = function(preset, forms) { preset.removeTags = function(tags, geometry) { tags = _.omit(tags, _.keys(preset.match.tags)); - for (var i in preset.form) { - var field = preset.form[i]; + for (var i in preset.fields) { + var field = preset.fields[i]; if (field['default'] && field['default'][geometry] == tags[field.key]) { delete tags[field.key]; } @@ -47,8 +47,8 @@ iD.presets.Preset = function(preset, forms) { if (preset.match.tags[k] !== '*') tags[k] = preset.match.tags[k]; } - for (var f in preset.form) { - f = preset.form[f]; + for (var f in preset.fields) { + f = preset.fields[f]; if (f.key && !tags[f.key] && f['default'] && f['default'][geometry]) { tags[f.key] = f['default'][geometry]; } diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js index 7e58bac7c..9eb118126 100644 --- a/js/id/ui/preset.js +++ b/js/id/ui/preset.js @@ -29,7 +29,7 @@ iD.ui.preset = function(context) { keys = []; formwrap = selection.append('div'); - draw(formwrap, preset.form); + draw(formwrap, preset.fields); var wrap = selection.append('div') .attr('class', 'col12 inspector-inner'); @@ -41,7 +41,7 @@ iD.ui.preset = function(context) { .data(preset.additional) .enter() .append('button') - .attr('class', 'preset-add-form') + .attr('class', 'preset-add-field') .attr('title', function(d) { return d.label(); }) .on('click', addForm) .append('span') @@ -58,19 +58,18 @@ iD.ui.preset = function(context) { return d.key || String(d.keys); } - function draw(selection, form) { - + function draw(selection, fields) { var sections = selection.selectAll('div.preset-section') - .data(form, formKey) + .data(fields, formKey) .enter() .append('div') - .attr('class', 'preset-section fillL inspector-inner col12') + .attr('class', 'preset-section fillL inspector-inner col12'); - sections.append('h4') - .attr('for', function(d) { return 'input-' + d.key; }) - .text(function(d) { return d.label(); }); + sections.append('h4') + .attr('for', function(d) { return 'input-' + d.key; }) + .text(function(d) { return d.label(); }); - sections.each(input); + sections.each(input); } presets.rendered = function() { diff --git a/js/id/ui/preset/address.js b/js/id/ui/preset/address.js index 3989a731f..b3d947fbe 100644 --- a/js/id/ui/preset/address.js +++ b/js/id/ui/preset/address.js @@ -1,4 +1,4 @@ -iD.ui.preset.address = function(form, context) { +iD.ui.preset.address = function(field, context) { var event = d3.dispatch('change', 'close'), housename, @@ -43,7 +43,7 @@ iD.ui.preset.address = function(form, context) { housename = selection.append('input') .property('type', 'text') - .attr('placeholder', form.t('placeholders.housename')) + .attr('placeholder', field.t('placeholders.housename')) .attr('class', 'addr-housename') .on('blur', change) .on('change', change) @@ -51,7 +51,7 @@ iD.ui.preset.address = function(form, context) { housenumber = selection.append('input') .property('type', 'text') - .attr('placeholder', form.t('placeholders.number')) + .attr('placeholder', field.t('placeholders.number')) .attr('class', 'addr-number') .on('blur', change) .on('change', change) @@ -62,14 +62,14 @@ iD.ui.preset.address = function(form, context) { street = streetwrap.append('input') .property('type', 'text') - .attr('placeholder', form.t('placeholders.street')) + .attr('placeholder', field.t('placeholders.street')) .attr('class', 'addr-street') .on('blur', change) .on('change', change); city = selection.append('input') .property('type', 'text') - .attr('placeholder', form.t('placeholders.city')) + .attr('placeholder', field.t('placeholders.city')) .attr('class', 'addr-city') .on('blur', change) .on('change', change) diff --git a/js/id/ui/preset/check.js b/js/id/ui/preset/check.js index ab653ca86..4c46cda91 100644 --- a/js/id/ui/preset/check.js +++ b/js/id/ui/preset/check.js @@ -1,4 +1,4 @@ -iD.ui.preset.check = function(form) { +iD.ui.preset.check = function(field) { var event = d3.dispatch('change', 'close'), values = ['', 'yes', 'no'], @@ -23,7 +23,7 @@ iD.ui.preset.check = function(form) { box.on('click', function() { var t = {}; - t[form.key] = values[(values.indexOf(value) + 1) % 3]; + t[field.key] = values[(values.indexOf(value) + 1) % 3]; check.tags(t); event.change(t); d3.event.stopPropagation(); @@ -31,7 +31,7 @@ iD.ui.preset.check = function(form) { }; check.tags = function(tags) { - value = tags[form.key] || ''; + value = tags[field.key] || ''; box.property('indeterminate', !value); box.property('checked', value === 'yes'); text.text(value || 'unknown'); diff --git a/js/id/ui/preset/combo.js b/js/id/ui/preset/combo.js index 851b993a9..d1d0fe70e 100644 --- a/js/id/ui/preset/combo.js +++ b/js/id/ui/preset/combo.js @@ -1,4 +1,4 @@ -iD.ui.preset.combo = function(form) { +iD.ui.preset.combo = function(field) { var event = d3.dispatch('change', 'close'), wrap, @@ -16,11 +16,11 @@ iD.ui.preset.combo = function(form) { var combobox = d3.combobox(); wrap.call(combobox); - if (form.options) { - options(form.options); + if (field.options) { + options(field.options); } else { iD.taginfo().values({ - key: form.key + key: field.key }, function(err, data) { if (!err) options(_.pluck(data, 'value')); }); @@ -43,12 +43,12 @@ iD.ui.preset.combo = function(form) { function change() { var t = {}; - t[form.key] = input.property('value').replace(' ', '_'); + t[field.key] = input.property('value').replace(' ', '_'); event.change(t); } combo.tags = function(tags) { - input.property('value', tags[form.key] || ''); + input.property('value', tags[field.key] || ''); }; return d3.rebind(combo, event, 'on'); diff --git a/js/id/ui/preset/defaultcheck.js b/js/id/ui/preset/defaultcheck.js index a7c34bfa6..021f0862f 100644 --- a/js/id/ui/preset/defaultcheck.js +++ b/js/id/ui/preset/defaultcheck.js @@ -1,4 +1,4 @@ -iD.ui.preset.defaultcheck = function(form) { +iD.ui.preset.defaultcheck = function(field) { var event = d3.dispatch('change', 'close'), input; @@ -7,16 +7,16 @@ iD.ui.preset.defaultcheck = function(form) { input = selection.append('input') .attr('type', 'checkbox') - .attr('id', 'input-' + form.key) + .attr('id', 'input-' + field.key) .on('change', function() { var t = {}; - t[form.key] = input.property('checked') ? form.value || 'yes' : undefined; + t[field.key] = input.property('checked') ? field.value || 'yes' : undefined; event.change(t); }); }; check.tags = function(tags) { - input.property('checked', !!tags[form.key] && tags[form.key] !== 'no'); + input.property('checked', !!tags[field.key] && tags[field.key] !== 'no'); }; return d3.rebind(check, event, 'on'); diff --git a/js/id/ui/preset/input.js b/js/id/ui/preset/input.js index a9dde9bf1..4bbdc9290 100644 --- a/js/id/ui/preset/input.js +++ b/js/id/ui/preset/input.js @@ -2,15 +2,15 @@ iD.ui.preset.text = iD.ui.preset.number = iD.ui.preset.tel = iD.ui.preset.email = -iD.ui.preset.url = function(form) { +iD.ui.preset.url = function(field) { var event = d3.dispatch('change', 'close'), input; function i(selection) { input = selection.append('input') - .attr('type', form.type) - .attr('placeholder', form.placeholder || '') + .attr('type', field.type) + .attr('placeholder', field.placeholder || '') .on('blur', change) .on('change', change) .call(iD.behavior.accept().on('accept', event.close)); @@ -18,12 +18,12 @@ iD.ui.preset.url = function(form) { function change() { var t = {}; - t[form.key] = input.property('value'); + t[field.key] = input.property('value'); event.change(t); } i.tags = function(tags) { - input.property('value', tags[form.key] || ''); + input.property('value', tags[field.key] || ''); }; return d3.rebind(i, event, 'on'); diff --git a/js/id/ui/preset/radio.js b/js/id/ui/preset/radio.js index 14f9fb4d9..1b645bf36 100644 --- a/js/id/ui/preset/radio.js +++ b/js/id/ui/preset/radio.js @@ -1,4 +1,4 @@ -iD.ui.preset.radio = function(form) { +iD.ui.preset.radio = function(field) { var event = d3.dispatch('change', 'close'), buttons; @@ -9,10 +9,10 @@ iD.ui.preset.radio = function(form) { var buttonwrap = selection.append('div').attr('class','radio-wrap'); buttons = buttonwrap.selectAll('button') - .data(form.options) + .data(field.options) .enter() .append('button') - .text(function(d) { return form.t('options.' + d, {default: d}); }) + .text(function(d) { return field.t('options.' + d, {default: d}); }) .on('click', function() { buttons.classed('active', false); d3.select(this).classed('active', true); diff --git a/js/id/ui/preset/textarea.js b/js/id/ui/preset/textarea.js index 06dc8e755..d27375343 100644 --- a/js/id/ui/preset/textarea.js +++ b/js/id/ui/preset/textarea.js @@ -1,11 +1,11 @@ -iD.ui.preset.textarea = function(form) { +iD.ui.preset.textarea = function(field) { var event = d3.dispatch('change', 'close'), input; function i(selection) { input = selection.append('textarea') - .attr('placeholder', form.placeholder || '') + .attr('placeholder', field.placeholder || '') .attr('maxlength', 255) .on('blur', change) .on('change', change) @@ -14,12 +14,12 @@ iD.ui.preset.textarea = function(form) { function change() { var t = {}; - t[form.key] = input.text(); + t[field.key] = input.text(); event.change(t); } i.tags = function(tags) { - input.text(tags[form.key] || ''); + input.text(tags[field.key] || ''); }; return d3.rebind(i, event, 'on'); diff --git a/locale/en.js b/locale/en.js index 28059831d..3143a13db 100644 --- a/locale/en.js +++ b/locale/en.js @@ -244,7 +244,7 @@ locale.en = { // We expect these to be extracted at some point. "presets": { - "forms": { + "fields": { "access": { "label": "Access" }, diff --git a/locale/vi.js b/locale/vi.js index 9c084b8b8..cca33e502 100644 --- a/locale/vi.js +++ b/locale/vi.js @@ -244,7 +244,7 @@ locale.vi = { // We expect these to be extracted at some point. "presets": { - "forms": { + "fields": { "access": { "label": "Quyền Truy cập" }, diff --git a/test/index.html b/test/index.html index 5aa945bd6..adaa1f34d 100644 --- a/test/index.html +++ b/test/index.html @@ -164,7 +164,7 @@ - + diff --git a/test/spec/presets/preset.js b/test/spec/presets/preset.js index ab5e7c379..57248f55a 100644 --- a/test/spec/presets/preset.js +++ b/test/spec/presets/preset.js @@ -1,6 +1,6 @@ describe('iD.presets.Preset', function() { - var forms = { + var fields = { "building_area": { "key": "building", "type": "check", @@ -52,8 +52,8 @@ describe('iD.presets.Preset', function() { }, geometry: ['point', 'area'] }, - form: ['building_area'] - }, forms) + fields: ['building_area'] + }, fields) }; var w1 = iD.Way({ tags: { highway: 'motorway' @@ -72,8 +72,8 @@ describe('iD.presets.Preset', function() { g = iD.Graph().replace(w1).replace(w2); - it("has an optional form field", function() { - expect(p.other.form).to.eql([]); + it("has optional fields", function() { + expect(p.other.fields).to.eql([]); }); describe('#matchGeometry', function() {