Merge branch 'develop' into fix-history

.gitignore

@@ -1,25 +1,25 @@
 .DS_Store
 .esm-cache
 .vscode/
-/data/data.js
-/dist/*.js
-/dist/*.css
-/dist/*.map
-/dist/img/*.svg
-/dist/mapillary-js/
-/dist/pannellum-streetside/
 /node_modules/
 /.tx/tmp/
 npm-debug.log
 package-lock.json
+
 the_noun_project.auth
 transifex.auth
 
+/dist/*.js
+/dist/*.css
+/dist/*.map
+/dist/data/
+/dist/img/*.svg
+/dist/mapillary-js/
+/dist/pannellum-streetside/
+
 # autogenerated symlinks
 land.html
 /img
 /css/img
 /test/css
 /test/img
-
-\.vscode/

.npmignore

@@ -1,11 +1,14 @@
 .DS_Store
 .esm-cache
 .vscode/
-.travis.yml
-/.tx/
-/data/data.js
-/docs/
 /node_modules/
-/test/
+/.tx/
 npm-debug.log
+package-lock.json
+
+the_noun_project.auth
 transifex.auth
+.travis.yml
+
+/docs/
+/test/

API.md

@@ -9,7 +9,7 @@ of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters ar
 **in the hash portion of the URL**:
 
 * __`background`__ - The value from a `sourcetag` property in iD's
-  [imagery list](https://github.com/openstreetmap/iD/blob/master/data/imagery.json),
+  [imagery list](https://github.com/openstreetmap/iD/blob/develop/data/imagery.json),
   or a custom tile URL. A custom URL is specified in the format `custom:<url>`,
   where the URL can contain the standard tile URL placeholders `{x}`, `{y}` and
   `{z}`/`{zoom}`, `{ty}` for flipped TMS-style Y coordinates, and `{switch:a,b,c}` for
@@ -33,7 +33,7 @@ of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters ar
   _Example:_ `id=n1207480649`
 * __`locale`__ - A code specifying the localization to use, affecting the language, layout, and keyboard shortcuts. The default locale is set by the browser.<br/>
   _Example:_ `locale=en-US`, `locale=de`<br/>
-  _Available values:_ Any of the [supported locales](https://github.com/openstreetmap/iD/tree/master/dist/locales).
+  _Available values:_ Any of the [supported locales](https://github.com/openstreetmap/iD/tree/develop/dist/locales).
 * __`map`__ - A slash-separated `zoom/latitude/longitude`.<br/>
   _Example:_ `map=20.00/38.90085/-77.02271`
 * __`maprules`__ - A path to a [MapRules](https://github.com/radiant-maxar/maprules) service endpoint for enhanced tag validation.<br/>
@@ -43,9 +43,8 @@ of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters ar
 * __`photo_overlay`__ - The street-level photo overlay layers to enable.<br/>
   _Example:_ `photo_overlay=streetside,mapillary,openstreetcam`<br/>
   _Available values:_ `streetside` (Microsoft Bing), `mapillary`, `mapillary-signs`, `mapillary-map-features`, `openstreetcam`
-* __`presets`__ - A path to an external presets file or a comma-separated list of preset IDs. These will be the only presets the user may select.<br/>
-  _Example:_ `presets=https://path/to/presets.json`
-  _Example 2:_ `presets=building,highway/residential,highway/unclassified`
+* __`presets`__ - A comma-separated list of preset IDs. These will be the only presets the user may select.<br/>
+  _Example:_ `presets=building,highway/residential,highway/unclassified`
 * __`rtl=true`__ - Force iD into right-to-left mode (useful for testing).
 * __`source`__ - Prefills the changeset source. Pass a url encoded string.<br/>
   _Example:_ `source=Bing%3BMapillary`
@@ -82,7 +81,7 @@ vocabulary established by iD, and to the tags present on OSM entities.
 
 ### OSM Data Model classes
 
-An SVG element on the map to which an iD.Entity has been bound as a datum shall
+An SVG element on the map to which an iD.osmEntity has been bound as a datum shall
 have a class with that datum's type, i.e. either `.node` or `.way`. (If and when
 we add visual representations for relations, `.relation` may also be valid.)
 
@@ -124,7 +123,7 @@ have `.area` and `.way` classes.
 Elements also receive classes according to certain of the OSM key-value tags that are
 assigned to them.
 
-Tag classes are prefixed with `tag-` (see [`iD.svgTagClasses`](https://github.com/openstreetmap/iD/blob/master/js/id/svg/tag_classes.js) for details).
+Tag classes are prefixed with `tag-` (see [`iD.svgTagClasses`](https://github.com/openstreetmap/iD/blob/develop/js/id/svg/tag_classes.js) for details).
 
 #### Primary
 
@@ -241,7 +240,7 @@ Optional properties:
 * `best` - If set to `true`, this imagery is considered "better than Bing" and may be chosen by default when iD starts.  Will display with a star in the background imagery list.  Defaults to `false`
 
 For more details about the `iD.data.imagery` structure, see
-[`update_imagery.js`](https://github.com/openstreetmap/iD/blob/master/data/update_imagery.js).
+[`update_imagery.js`](https://github.com/openstreetmap/iD/blob/develop/scripts/update_imagery.js).
 
 
 ### Presets
@@ -250,7 +249,7 @@ iD's preset database is stored in the `iD.data.presets` object and can be overri
 or modified prior to creating the iD context.
 
 The format of the `presets` object is
-[documented here](https://github.com/openstreetmap/iD/tree/master/data/presets#custom-presets).
+[documented here](https://github.com/openstreetmap/iD/tree/develop/data/presets#custom-presets).
 
 To add a new preset to iD's existing preset database.
 ```js

ARCHITECTURE.md

@@ -11,15 +11,15 @@ rendering the map data as well as many sorts of general DOM manipulation tasks
 for which jQuery would often be used.
 
 Notable features of d3 that are used by iD include
-[d3.fetch](https://github.com/d3/d3/blob/master/API.md#fetches-d3-fetch), which is
+[d3.fetch](https://github.com/d3/d3/blob/develop/API.md#fetches-d3-fetch), which is
 used to make the API requests to download data from openstreetmap.org and save changes;
-[d3.dispatch](https://github.com/d3/d3/blob/master/API.md#dispatches-d3-dispatch),
+[d3.dispatch](https://github.com/d3/d3/blob/develop/API.md#dispatches-d3-dispatch),
 which provides a callback-based [Observer
 pattern](http://en.wikipedia.org/wiki/Observer_pattern) between different
 parts of iD;
-[d3.geoPath](https://github.com/d3/d3/blob/master/API.md#paths), which
+[d3.geoPath](https://github.com/d3/d3/blob/develop/API.md#paths), which
 generates SVG paths for lines and areas; and
-[d3.zoom](https://github.com/d3/d3/blob/master/API.md#zooming-d3-zoom),
+[d3.zoom](https://github.com/d3/d3/blob/develop/API.md#zooming-d3-zoom),
 which implements map panning and zooming.
 
 
@@ -233,7 +233,7 @@ of duplicating the code to implement this behavior in all these modes, we
 extract it to `iD.behaviorHover`.
 
 _Behaviors_ take their inspiration from [d3's
-behaviors](https://github.com/d3/d3/blob/master/API.md). Like d3's `zoom`
+behaviors](https://github.com/d3/d3/blob/develop/API.md). Like d3's `zoom`
 and `drag`, each iD behavior is a function that takes as input a d3 selection
 (assumed to consist of a single element) and installs the DOM event bindings
 necessary to implement the behavior. The `Hover` behavior, for example,
@@ -342,7 +342,7 @@ argument is required, a `context`.
 
 The constructor function returns a draw function which accepts a d3 selection.
 Drawing is then accomplished with
-[d3.selection#call](https://github.com/d3/d3-selection/blob/master/README.md#selection_call):
+[d3.selection#call](https://github.com/d3/d3-selection/blob/develop/README.md#selection_call):
 
 ```js
     footer = footer.enter()

CHANGELOG.md

@@ -29,8 +29,17 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@xxxx]: https://github.com/xxxx
 -->
 
+# 2.17.2
+##### 2020-Feb-14
+
+#### :tada: New Features
+* Restore Maxar Imagery layers, using masked iD-specific connection keys ([#7355])
+
+[#7355]: https://github.com/openstreetmap/iD/issues/7355
+
+
 # 2.17.1
-##### Planned: 2020-Jan-13
+##### 2020-Jan-16
 
 #### :boom: Breaking Changes
 * Remove support for Node 8 (Node 10 or higher is now required)
@@ -104,13 +113,14 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 * Add Secondhand Clothing Store preset ([#7164])
 * Add Public Prosecutor's Office preset ([#7225])
 * Add Speed Limit Enforcement preset ([#7234])
-* Add presets: Emergency Exit, Geyser, Used Car Dealership, Wedding Clothes Store, Backcountry Camping Area, Group Camping Area, History Museum
+* Add presets: Emergency Exit, Geyser, Used Car Dealership, Wedding Clothes Store, Backcountry Camping Area, Group Camping Area, History Museum, Wind Farm, Solar Farm, Nuclear Power Plant, Hydroelectric Power Station, Coal-Fired Power Plant, Gas-Fired Power Plant
 * Rename "Anime Shop" to "Anime / Manga Shop" ([#7223])
+* Simplify the names of various Piste presets
 * Update Arts & Crafts Store icon ([#7228])
 * Update Dressmaker icon ([#7229])
 * Update Water Well icon ([#7170])
 * Update Butcher icon ([#7216])
-* Update preset icons: Cathedral Building, Church Building, College Building, Hospital Building, Hotel Building, Preschool / Kindergarten Building, Mosque Building, School Building, University Building, Recently Demolished Building, Residential Area, Apartment Complex, Water Tap, Island, Islet, Kiosk, Fireworks Store, Row Houses, Houseboat, Tailor, Sewing Supply Shop
+* Update preset icons: Cathedral Building, Church Building, College Building, Hospital Building, Hotel Building, Preschool / Kindergarten Building, Mosque Building, School Building, University Building, Recently Demolished Building, Residential Area, Apartment Complex, Water Tap, Island, Islet, Kiosk, Fireworks Store, Row Houses, Houseboat, Tailor, Sewing Supply Shop, Aerialway Pylon, Mixed Lift, Drag Lift, Platter Lift, J-Bar Lift, T-Bar Lift
 * Add Baby Nursing Area field ([#7152])
 * Add Bicycle-Pedestrian Separation field to Cycle & Foot Path ([#7204], thanks [@hikemaniac])
 * Add Wheelchair Access field to Entrance / Exit ([#7214])
@@ -162,7 +172,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 _Find the "Add a bridge" and "Add a tunnel" fixes for each crossing in the Issues inspector._
 * :earth_africa: Selected features now stay visible while zoomed out, plus you can zoom to multiple features together.<br/>
 _Select a few large features and press <kbd>Z</kbd> to view their full extent, no matter how vast._
-* :handshake: iD now has its own [Privacy Policy](https://github.com/openstreetmap/iD/blob/master/PRIVACY.md).<br/>
+* :handshake: iD now has its own [Privacy Policy](https://github.com/openstreetmap/iD/blob/develop/PRIVACY.md).<br/>
 _Press <kbd>P</kbd> to view privacy preferences._
 
 #### :boom: Breaking Changes
@@ -2611,7 +2621,7 @@ _Activate the Bing Streetside layer by opening the Map Data pane (shortcut <kbd>
   * Added support for more icon sets (such as [FontAwesome](https://fontawesome.com/icons?d=gallery)) for presets or other iD icons ([#3025])
   * Extracted many preset icons from the iD sprite into a separate project: [bhousel/temaki](https://github.com/bhousel/temaki)
   * Many presets that previously did not have a suitable icon now have one.
-  * :warning: All icons in iD now use prefixed names. (e.g. `iD-`, `maki-`, etc). See the [preset README](https://github.com/openstreetmap/iD/blob/master/data/presets/README.md#icons) for more details.
+  * :warning: All icons in iD now use prefixed names. (e.g. `iD-`, `maki-`, etc). See the [preset README](https://github.com/openstreetmap/iD/blob/develop/data/presets/README.md#icons) for more details.
 
 [#5050]: https://github.com/openstreetmap/iD/issues/5050
 [#3924]: https://github.com/openstreetmap/iD/issues/3924
@@ -4675,7 +4685,7 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t
   * Many deprecated names are still exported as symbols, e.g. `iD.Context` - we will remove these eventually
 * :warning: Customized iD deployments can manipulate live objects, rather than iD.Context accessors
   * No longer need to call things like `presets()`, `imagery()`, `taginfo()` when creating `iD.Context`
-  * See [API.md](https://github.com/openstreetmap/iD/blob/master/API.md#customized-deployments) for details on customized deployments
+  * See [API.md](https://github.com/openstreetmap/iD/blob/develop/API.md#customized-deployments) for details on customized deployments
 * :warning: iD has upgraded to the latest released versions of d3, lodash, rbush, etc.
   * d3 no longer adds itself to the global namespace, but can now be accessed via `iD.d3`
 * :warning: iD now uses `npm` scripts for all build processes
@@ -5339,8 +5349,8 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t
 ##### 2013-Nov-22
 * Support for loading GPX-files via url parameter (#1965)
 * Update osm-auth (#1904)
-* Update 3rd party dependencies (Lo-Dash, D3, RBush)
-* Build iD.Way.areaKeys from presets
+* Update 3rd party dependencies (Lodash, D3, RBush)
+* Build areaKeys from presets
 * Add public_transport, military, emankment presets
 * Reverse cardinal directions for relation member roles
 * Improved warning visibility (#1973)

CONTRIBUTING.md

@@ -185,7 +185,7 @@ Work in Progress.  Don't start work on these, somebody else already did!
 
 ## Verifying Bug Fixes
 
-To verify a bug fix (or test a new feature), use the [master deployment](http://preview.ideditor.com/master/)
+To verify a bug fix (or test a new feature), use the [develop deployment](http://preview.ideditor.com/master/)
 (http://preview.ideditor.com/master/), which is updated every 10 minutes with the
 latest code and translation strings.
 
@@ -228,7 +228,7 @@ project** button near the bottom of the project page. You can edit your
 getting too many notifications.
 
 Translations are licensed under
-[ISC](https://raw.github.com/openstreetmap/iD/master/LICENSE.md), the same license
+[ISC](https://raw.github.com/openstreetmap/iD/develop/LICENSE.md), the same license
 as iD.
 
 **Why are there so many duplicate "Type" translations?** There are multiple
@@ -245,6 +245,13 @@ These are separate translations for uniformity reasons and because some language
  may translate "type" differently in "type of aeroway" and "type of amenity", for
  example.
 
+**Why can't I find the Osmose QA layer translations?** The Osmose QA strings are
+ pulled in from the external Osmose API. You can contribute to the
+ [Osmose Transifex project](https://www.transifex.com/projects/p/osmose/)
+ and the results will be seen in iD once deployed.
+
+Note that if you want to add/update English translations in Osmose then you will
+ need to head on over to the [Osmose backend source code](https://github.com/osm-fr/osmose-backend).
 
 ## Adding New Strings for Translation or Updating Existing Strings
 
@@ -391,7 +398,7 @@ Additionally here is a step-by-step workflow example for beginners:
 
 4. Clone or download your local copy of iD from your GitHub account using https `git clone https://github.com/<yourgithubaccount>/iD.git` or using ssh `git clone git@github.com:{{yourgithubaccount}}/iD.git`. In your local copy you'll have a "remote" called origin.
 
-5. Switch to the iD directory, create a working branch (choose a descriptive name) and switch to it : `cd iD ; git checkout -b <working-branch-name>`. Never do anything in master branch.
+5. Switch to the iD directory, create a working branch (choose a descriptive name) and switch to it : `cd iD ; git checkout -b <working-branch-name>`. Never do anything in develop branch.
 
 6. Edit file(s) and try your change locally (See above).
 
@@ -412,13 +419,13 @@ you can clean up by deleting the branch from your GitHub-iD-Clone and your local
 
 ### Restart with another PR after some while
 
-If you did not use your copy of iD for some while, other Pull Request gets merged and you don't have the latest version of iD. You can replace your master with whatever is in our master. If you have not done so yet: Add the main repo as an "upstream" remote:
+If you did not use your copy of iD for some while, other Pull Request gets merged and you don't have the latest version of iD. You can replace your develop with whatever is in our develop. If you have not done so yet: Add the main repo as an "upstream" remote:
 
 `git remote add upstream git@github.com:openstreetmap/iD.git`
 
-Then change to the master branch and get everything from upstream (the main repository)
+Then change to the develop branch and get everything from upstream (the main repository)
 
-`git checkout master ; git fetch --all && git reset --hard upstream/master`
+`git checkout develop ; git fetch --all && git reset --hard upstream/develop`
 
 
 ## Submitting directly in the Browser
@@ -435,11 +442,11 @@ Additionally here is a step-by-step workflow example for beginners:
 
 2. Go to the [iD main repository](https://github.com/openstreetmap/iD) and fork iD into your GitHub account (Fork is top right).
 
-3. Create a New Branch by clicking on "Branch: master" and entering the name of a new branch (choose a descriptive name).
+3. Create a New Branch by clicking on "Branch: develop" and entering the name of a new branch (choose a descriptive name).
 
 4. Navigate to the file you want to edit and click on "Edit this file" and apply your changes to the file. Alternatively, you could also "Create a new file".
 
-5. When finished editing the file enter a commit text (the description is optional) and commit directly to the newly created branch. You may repeat 4 and 5 until all required changes are commited.
+5. When finished editing the file enter a commit text (the description is optional) and commit directly to the newly created branch. You may repeat 4 and 5 until all required changes are committed.
 
 6. Navigate back to your "id" project - https://github.com/{{yourgithubaccount}}/iD
 

FAQ.md

@@ -5,7 +5,7 @@ Two syllables: "eye dee".
 
 ## How can I help translate iD into another language or fix a mistranslation?
 
-Please see [CONTRIBUTING.md](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)
+Please see [CONTRIBUTING.md](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating)
 
 
 ## How can I report an issue with background imagery?
@@ -71,7 +71,7 @@ and [configure](https://github.com/openstreetmap/openstreetmap-website/blob/mast
 an instance of the Rails Port, the server that runs the OpenStreetMap website and API.
 
 Once you have the Rails Port running, you may edit as normal using the version of iD that
-is bundled with it. Your changes will be saved to your own database. To use a standalone iD with your own api, you may edit the [osm.js](https://github.com/openstreetmap/iD/blob/master/modules/services/osm.js) file.
+is bundled with it. Your changes will be saved to your own database. To use a standalone iD with your own api, you may edit the [osm.js](https://github.com/openstreetmap/iD/blob/develop/modules/services/osm.js) file.
 
 Depending on your requirements, you may also want to set up [cgimap](https://github.com/openstreetmap/cgimap)
 and/or a tile rendering stack, but neither of these are required for editing with iD.

README.md

@@ -1,9 +1,9 @@
 # iD - friendly JavaScript editor for [OpenStreetMap](https://www.openstreetmap.org/)
 
-[![Build Status](https://travis-ci.org/openstreetmap/iD.svg?branch=master)](https://travis-ci.org/openstreetmap/iD)
-[![Greenkeeper badge](https://badges.greenkeeper.io/openstreetmap/iD.svg)](https://greenkeeper.io/)
+[![Build Status](https://travis-ci.org/openstreetmap/iD.svg?branch=develop)](https://travis-ci.org/openstreetmap/iD)
 
-:warning: _The [`master`](https://github.com/openstreetmap/iD/tree/master) branch is undergoing significant breaking changes for v3 over the next few months. [`2.x`](https://github.com/openstreetmap/iD/tree/2.x) is considerably more stable and is currently the recommended branch for downstream development._
+
+:warning: _We've recently changed our branch names. [`develop`](https://github.com/openstreetmap/iD/tree/develop) is now the default branch, replacing `2.x`. [`v3-prototype`](https://github.com/openstreetmap/iD/tree/v3-prototype) is now the alpha version of iD v3, replacing `master`. [`release`](https://github.com/openstreetmap/iD/tree/release) is still `release`._
 
 [Watch the video](https://2019.stateofthemap.us/program/sat/id-v3.html) from our talk at State of the Map US 2019 to learn more about the current status of iD and our goals for v3.
 
@@ -24,10 +24,11 @@
 * Read up on [Contributing and the code style of iD](CONTRIBUTING.md).
 * See [open issues in the issue tracker](https://github.com/openstreetmap/iD/issues?state=open)
 if you're looking for something to do.
-* [Translate!](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)
+* [Translate!](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating)
 * Test a prerelease version of iD:
   * Stable mirror of `release` branch:  https://preview.ideditor.com/release
-  * Development mirror of `master` branch + latest translations:  https://preview.ideditor.com/master
+  * Development mirror of `develop` branch + latest translations: https://2-x--ideditor.netlify.com
+  * Development mirror of `v3-prototype` branch:  https://preview.ideditor.com/master
 
 Come on in, the water's lovely. More help? Ping `bhousel` or `quincylvania` on:
 * [OpenStreetMap US Slack](https://slack.openstreetmap.us/)
@@ -38,7 +39,7 @@ Come on in, the water's lovely. More help? Ping `bhousel` or `quincylvania` on:
 
 ## Prerequisites
 
-* [Node.js](https://nodejs.org/) version 8 or newer
+* [Node.js](https://nodejs.org/) version 10 or newer
 * [`git`](https://www.atlassian.com/git/tutorials/install-git/) for your platform
   * Note for Windows users:
     * Edit `$HOME\.gitconfig`:<br/>

RELEASING.md

@@ -13,9 +13,9 @@ on the iD project, and then create this file with contents like<br><pre>
 
 ### Update `iD`
 
-#### Update `2.x` branch
+#### Update `develop` branch
 ```bash
-$  git checkout 2.x
+$  git checkout develop
 $  rm -rf node_modules/editor-layer-index/
 $  npm install
 $  npm run imagery
@@ -30,15 +30,15 @@ $  git add . && git commit -m 'npm run translations'
 
 ```bash
 $  git add . && git commit -m 'vA.B.C'
-$  git push origin 2.x
+$  git push origin develop
 ```
 
 #### Update and tag `release` branch
 ```bash
 $  git checkout release
-$  git reset --hard 2.x
+$  git reset --hard develop
 $  npm run all
-$  git add -f dist/*.css dist/*.js dist/img/*.svg dist/mapillary-js/ dist/pannellum-streetside/
+$  git add -f dist/*.css dist/*.js dist/data/* dist/img/*.svg dist/mapillary-js/ dist/pannellum-streetside/
 $  git commit -m 'Check in build'
 $  git tag vA.B.C
 $  git push origin -f release vA.B.C
@@ -54,13 +54,13 @@ $  git remote add osmlab git@github.com:osmlab/openstreetmap-website.git
 $  git remote add upstream git@github.com:openstreetmap/openstreetmap-website.git
 ```
 
-#### Sync master branches
+#### Sync develop branches
 
 ```bash
 $  git fetch --all
-$  git checkout master
-$  git reset --hard upstream/master
-$  git push osmlab master
+$  git checkout develop
+$  git reset --hard upstream/develop
+$  git push osmlab develop
 ```
 
 #### Create and push branch with the new iD version
@@ -72,4 +72,4 @@ $  rm -rf vendor/assets/iD/* && vendorer
 $  git add . && git commit -m 'Update to iD vA.B.C'
 $  git push osmlab
 ```
-- [Open a pull request](https://github.com/openstreetmap/openstreetmap-website/compare/master...osmlab:master) using the [markdown text from the changelog](https://raw.githubusercontent.com/openstreetmap/iD/master/CHANGELOG.md) as the description
+- [Open a pull request](https://github.com/openstreetmap/openstreetmap-website/compare/develop...osmlab:develop) using the [markdown text from the changelog](https://raw.githubusercontent.com/openstreetmap/iD/develop/CHANGELOG.md) as the description

build.js

@@ -1,28 +0,0 @@
-/* eslint-disable no-console */
-const buildData = require('./build_data');
-const buildSrc = require('./build_src');
-const buildCSS = require('./build_css');
-
-let _currBuild = null;
-
-// if called directly, do the thing.
-buildAll();
-
-
-function buildAll() {
-  if (_currBuild) return _currBuild;
-
-  return _currBuild =
-    Promise.resolve()
-    .then(() => buildCSS())
-    .then(() => buildData())
-    .then(() => buildSrc())
-    .then(() => _currBuild = null)
-    .catch((err) => {
-      console.error(err);
-      _currBuild = null;
-      process.exit(1);
-    });
-}
-
-module.exports = buildAll;

build_css.js

@@ -1,56 +0,0 @@
-/* eslint-disable no-console */
-const colors = require('colors/safe');
-const concat = require('concat-files');
-const glob = require('glob');
-
-let _currBuild = null;
-
-
-function buildCSS() {
-  if (_currBuild) return _currBuild;
-
-  const START = '🏗   ' + colors.yellow('Building css...');
-  const END = '👍  ' + colors.green('css built');
-
-  console.log('');
-  console.log(START);
-  console.time(END);
-
-  return _currBuild =
-    Promise.resolve()
-    .then(() => doGlob('css/**/*.css'))
-    .then((files) => doConcat(files, 'dist/iD.css'))
-    .then(() => {
-      console.timeEnd(END);
-      console.log('');
-      _currBuild = null;
-    })
-    .catch((err) => {
-      console.error(err);
-      console.log('');
-      _currBuild = null;
-      process.exit(1);
-    });
-}
-
-
-function doGlob(pattern) {
-  return new Promise((resolve, reject) => {
-    glob(pattern, (err, files) => {
-      if (err) return reject(err);
-      resolve(files);
-    });
-  });
-}
-
-function doConcat(files, output) {
-  return new Promise((resolve, reject) => {
-    concat(files, output, (err) => {
-      if (err) return reject(err);
-      resolve();
-    });
-  });
-}
-
-
-module.exports = buildCSS;

build_src.js

@@ -1,102 +0,0 @@
-/* eslint-disable no-console */
-const buble = require('@rollup/plugin-buble');
-const colors = require('colors/safe');
-const commonjs = require('rollup-plugin-commonjs');
-const includePaths = require('rollup-plugin-includepaths');
-const json = require('rollup-plugin-json');
-const nodeResolve = require('rollup-plugin-node-resolve');
-const rollup = require('rollup');
-const shell = require('shelljs');
-// const visualizer = require('rollup-plugin-visualizer');
-
-let _currBuild = null;
-
-
-function buildSrc() {
-  if (_currBuild) return _currBuild;
-
-  const START = '🏗   ' + colors.yellow('Building source...');
-  const END = '👍  ' + colors.green('source built');
-
-  console.log('');
-  console.log(START);
-  console.time(END);
-
-  return _currBuild =
-    Promise.resolve()
-    .then(() => buildBundle())
-    .then(() => {
-      console.timeEnd(END);
-      console.log('');
-      _currBuild = null;
-    })
-    .catch((err) => {
-      console.error(err);
-      console.log('');
-      _currBuild = null;
-      process.exit(1);
-    });
-}
-
-
-function buildBundle() {
-  console.log('📦    ' + colors.yellow('Bundling JavaScript...'));
-
-  // Start clean
-  shell.rm('-f', [
-    'dist/iD.js',
-    'dist/iD.js.map',
-    // 'docs/statistics.html'
-  ]);
-
-  let prom =
-    rollup.rollup({
-      input: './modules/id.js',
-      onwarn: onWarn,
-      plugins: [
-        includePaths({
-          paths: ['node_modules/d3/node_modules'],  // npm2 or windows
-          include: {
-            'martinez-polygon-clipping': 'node_modules/martinez-polygon-clipping/dist/martinez.umd.js'
-          }
-        }),
-        nodeResolve({
-          mainFields: ['module', 'main'],
-          browser: false,
-          dedupe: ['object-inspect']
-        }),
-        commonjs(),
-        json({ indent: '' }),
-        buble(),
-        // viz causes src build to take about 3x longer; skip
-        // visualizer({
-        //   filename: 'docs/statistics.html',
-        //   sourcemap: true
-        // })
-      ]
-    })
-    .then((bundle) => {
-      return bundle.write({
-        format: 'iife',
-        file: 'dist/iD.js',
-        sourcemap: true,
-        strict: false
-      });
-    });
-
-  return prom;
-}
-
-
-function onWarn(warning, warn) {
-  // skip certain warnings
-  if (warning.code === 'CIRCULAR_DEPENDENCY') return;
-  if (warning.code === 'EVAL') return;
-
-  // Use default for everything else
-  console.log(colors.yellow(warning.code));
-  warn(warning);
-}
-
-
-module.exports = buildSrc;

config/rollup.config.dev.js

@@ -0,0 +1,41 @@
+/* eslint-disable no-console */
+import commonjs from '@rollup/plugin-commonjs';
+import includePaths from 'rollup-plugin-includepaths';
+import json from '@rollup/plugin-json';
+import nodeResolve from '@rollup/plugin-node-resolve';
+import progress from 'rollup-plugin-progress';
+
+
+// The "dev" build includes all modules in a single bundle - for now
+// * Skips transpilation (so it includes ES6 code and must run in a modern browser)
+// * Also generates sourcemaps
+
+export default {
+  input: './modules/id.js',
+  onwarn: onWarn,
+  output: {
+    file: 'dist/iD.js',
+    format: 'iife',
+    sourcemap: true,
+    strict: false
+  },
+  plugins: [
+    progress(),
+    includePaths({
+      paths: ['node_modules/d3/node_modules']  // npm2 or windows
+    }),
+    nodeResolve({ dedupe: ['object-inspect'] }),
+    commonjs(),
+    json({ indent: '' })
+  ]
+};
+
+function onWarn(warning, warn) {
+  // skip certain warnings
+  if (warning.code === 'CIRCULAR_DEPENDENCY') return;
+  if (warning.code === 'EVAL') return;
+
+  // Use default for everything else
+  console.log(warning.code);
+  warn(warning);
+}

config/rollup.config.legacy.js

@@ -0,0 +1,43 @@
+/* eslint-disable no-console */
+import buble from '@rollup/plugin-buble';
+import commonjs from '@rollup/plugin-commonjs';
+import includePaths from 'rollup-plugin-includepaths';
+import json from '@rollup/plugin-json';
+import progress from 'rollup-plugin-progress';
+import nodeResolve from '@rollup/plugin-node-resolve';
+
+
+// The "legacy" build includes all modules in a single bundle:
+// * Runs `buble` to transpile ES6 -> ES5 (needed for IE11 and PhantomJS)
+// * No sourcemaps
+
+export default {
+  input: './modules/id.js',
+  onwarn: onWarn,
+  output: {
+    file: 'dist/iD.legacy.js',
+    format: 'iife',
+    sourcemap: false,
+    strict: false
+  },
+  plugins: [
+    progress(),
+    includePaths({
+      paths: ['node_modules/d3/node_modules']   // npm2 or windows
+    }),
+    nodeResolve({ dedupe: ['object-inspect'] }),
+    commonjs(),
+    json({ indent: '' }),
+    buble()
+  ]
+};
+
+function onWarn(warning, warn) {
+  // skip certain warnings
+  if (warning.code === 'CIRCULAR_DEPENDENCY') return;
+  if (warning.code === 'EVAL') return;
+
+  // Use default for everything else
+  console.log(warning.code);
+  warn(warning);
+}

config/rollup.config.stats.js

@@ -0,0 +1,45 @@
+/* eslint-disable no-console */
+import commonjs from '@rollup/plugin-commonjs';
+import includePaths from 'rollup-plugin-includepaths';
+import json from '@rollup/plugin-json';
+import nodeResolve from '@rollup/plugin-node-resolve';
+import progress from 'rollup-plugin-progress';
+import visualizer from 'rollup-plugin-visualizer';
+
+
+// The "stats" build is just like the "dev" build,
+// but it includes the visualizer plugin to generate a statistics page (slow)
+
+export default {
+  input: './modules/id.js',
+  onwarn: onWarn,
+  output: {
+    file: 'dist/iD.js',
+    format: 'iife',
+    sourcemap: true,
+    strict: false
+  },
+  plugins: [
+    progress(),
+    includePaths({
+      paths: ['node_modules/d3/node_modules']  // npm2 or windows
+    }),
+    nodeResolve({ dedupe: ['object-inspect'] }),
+    commonjs(),
+    json({ indent: '' }),
+    visualizer({
+      filename: 'docs/statistics.html',
+      sourcemap: true
+    })
+  ]
+};
+
+function onWarn(warning, warn) {
+  // skip certain warnings
+  if (warning.code === 'CIRCULAR_DEPENDENCY') return;
+  if (warning.code === 'EVAL') return;
+
+  // Use default for everything else
+  console.log(warning.code);
+  warn(warning);
+}

css/00_reset.css

@@ -3,7 +3,7 @@
    License: none (public domain)
 */
 
-html, body, div, span, applet, object, iframe,
+div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
 del, dfn, em, img, ins, kbd, q, s, samp,
@@ -28,9 +28,6 @@ article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
 	display: block;
 }
-body {
-	line-height: 1;
-}
 ol, ul {
 	list-style: none;
 }
@@ -80,19 +77,17 @@ display: none;
 }
 
 /*
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Corrects inability to style clickable `input` types in iOS.
- * 3. Improves usability and consistency of cursor style between image-type
+ * 1. Corrects inability to style clickable `input` types in iOS.
+ * 2. Improves usability and consistency of cursor style between image-type
  *    `input` and others.
  */
 
 button,
-html input[type="button"], /* 1 */
+input[type="button"],
 input[type="reset"],
 input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
+    -webkit-appearance: button; /* 1 */
+    cursor: pointer; /* 2 */
 }
 
 /*

css/20_map.css

@@ -38,14 +38,14 @@
     pointer-events: none;
 }
 
-.lasso #map {
+.lasso .main-map {
     pointer-events: visibleStroke;
 }
 
 
 /* `.target` objects are interactive */
 /* They can be picked up, clicked, hovered, or things can connect to them */
-.qa_error.target,
+.qaItem.target,
 .note.target,
 .node.target,
 .turn .target {
@@ -83,7 +83,7 @@
 /* points, notes & QA */
 
 /* points, notes, markers */
-g.qa_error .stroke,
+g.qaItem .stroke,
 g.note .stroke {
     stroke: #222;
     stroke-width: 1;
@@ -91,7 +91,7 @@ g.note .stroke {
     opacity: 0.6;
 }
 
-g.qa_error.active .stroke,
+g.qaItem.active .stroke,
 g.note.active .stroke {
     stroke: #222;
     stroke-width: 1;
@@ -106,7 +106,7 @@ g.point .stroke {
 }
 
 
-g.qa_error .shadow,
+g.qaItem .shadow,
 g.point .shadow,
 g.note .shadow {
     fill: none;
@@ -115,14 +115,14 @@ g.note .shadow {
     stroke-opacity: 0;
 }
 
-g.qa_error.hover:not(.selected) .shadow,
+g.qaItem.hover:not(.selected) .shadow,
 g.note.hover:not(.selected) .shadow,
 g.point.related:not(.selected) .shadow,
 g.point.hover:not(.selected) .shadow {
     stroke-opacity: 0.5;
 }
 
-g.qa_error.selected .shadow,
+g.qaItem.selected .shadow,
 g.note.selected .shadow,
 g.point.selected .shadow {
     stroke-opacity: 0.7;
@@ -132,8 +132,8 @@ g.point.selected .shadow {
 g.point ellipse.stroke {
     display: none;
 }
-.mode-drag-note g.note.active ellipse.stroke,
-.mode-drag-node g.point.active ellipse.stroke {
+.ideditor.mode-drag-note g.note.active ellipse.stroke,
+.ideditor.mode-drag-node g.point.active ellipse.stroke {
     display: block;
 }
 

css/35_aeroways.css

@@ -39,11 +39,6 @@ path.line.stroke.tag-taxiway {
     stroke-width: 3;
 }
 
-.preset-icon .icon.tag-aeroway-taxiway,
-.preset-icon .icon.tag-taxiway {
-    color: #ff0;
-    fill: #666;
-}
 path.line.stroke.tag-aeroway-taxiway,
 path.line.stroke.tag-taxiway {
     stroke: #ff0;

css/40_railways.css

@@ -7,7 +7,6 @@
 }
 .preset-icon .icon.tag-railway {
     color: #555;
-    fill: #eee;
 }
 
 /* lines */
@@ -33,7 +32,8 @@ path.line.stroke.tag-railway {
     stroke-width: 2;
     stroke-dasharray: 6,6;
 }
-.preset-icon-container path.line.stroke.tag-railway:not(.tag-status) {
+.preset-icon-container path.line.stroke.tag-railway:not(.tag-status),
+.preset-icon-container path.line.stroke.tag-railway.tag-status-disused {
     stroke-dasharray: 6;
 }
 
@@ -53,19 +53,21 @@ path.line.stroke.tag-railway {
 }
 
 
-.preset-icon .icon.tag-railway-disused,
-.preset-icon .icon.tag-railway-abandoned {
+.preset-icon .icon.tag-railway.tag-status {
     color: #999;
-    fill: #eee;
 }
-path.line.casing.tag-railway-disused,
-path.line.casing.tag-railway-abandoned {
+path.line.casing.tag-railway.tag-status {
     stroke: #999;
 }
-path.line.stroke.tag-railway-disused,
-path.line.stroke.tag-railway-abandoned {
+path.line.stroke.tag-railway.tag-status:not(.tag-service) {
     stroke: #eee;
 }
+.preset-icon .icon.tag-railway.tag-status-disused {
+    color: #808080;
+}
+path.line.casing.tag-railway.tag-status-disused {
+    stroke: #808080;
+}
 
 
 path.line.casing.tag-railway-subway {

css/50_misc.css

@@ -368,17 +368,17 @@ path.line.casing.tag-bridge.tag-unpaved {
 
 
 /* Status (e.g. proposed, abandoned) */
-path.area.stroke.tag-status,
-path.line.stroke.tag-status,
-path.area.casing.tag-status,
-path.line.casing.tag-status {
+path.area.stroke.tag-status:not(.tag-status-disused),
+path.line.stroke.tag-status:not(.tag-status-disused),
+path.area.casing.tag-status:not(.tag-status-disused),
+path.line.casing.tag-status:not(.tag-status-disused) {
     stroke-linecap: butt;
     stroke-dasharray: 7, 3;
 }
-.low-zoom path.area.stroke.tag-status,
-.low-zoom path.line.stroke.tag-status,
-.low-zoom path.area.casing.tag-status,
-.low-zoom path.line.casing.tag-status {
+.low-zoom path.area.stroke.tag-status:not(.tag-status-disused),
+.low-zoom path.line.stroke.tag-status:not(.tag-status-disused),
+.low-zoom path.area.casing.tag-status:not(.tag-status-disused),
+.low-zoom path.line.casing.tag-status:not(.tag-status-disused) {
     stroke-dasharray: 5, 2;
 }
 

css/55_cursors.css

@@ -6,101 +6,101 @@
 }
 
 .map-in-map,
-#map {
+.main-map {
     cursor: auto; /* Opera */
     cursor: url(img/cursor-grab.png) 9 9, auto; /* FF */
 }
 
-.mode-browse .point,
-.mode-select .point {
+.ideditor.mode-browse .point,
+.ideditor.mode-select .point {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-select-point.png), pointer; /* FF */
 }
 
-.mode-select .vertex,
-.mode-browse .vertex {
+.ideditor.mode-select .vertex,
+.ideditor.mode-browse .vertex {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-select-vertex.png), pointer; /* FF */
 }
 
-.mode-browse .line,
-.mode-select .line {
+.ideditor.mode-browse .line,
+.ideditor.mode-select .line {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-select-line.png), pointer; /* FF */
 }
 
-.mode-select .area,
-.mode-browse .area {
+.ideditor.mode-select .area,
+.ideditor.mode-browse .area {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-select-area.png), pointer; /* FF */
 }
 
-.mode-select .midpoint,
-.mode-browse .midpoint {
+.ideditor.mode-select .midpoint,
+.ideditor.mode-browse .midpoint {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-select-split.png), pointer; /* FF */
 }
 
-.mode-select .behavior-multiselect .point,
-.mode-select .behavior-multiselect .vertex,
-.mode-select .behavior-multiselect .line,
-.mode-select .behavior-multiselect .area {
+.ideditor.mode-select .behavior-multiselect .point,
+.ideditor.mode-select .behavior-multiselect .vertex,
+.ideditor.mode-select .behavior-multiselect .line,
+.ideditor.mode-select .behavior-multiselect .area {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-select-add.png), pointer; /* FF */
 }
 
-.mode-select .behavior-multiselect .selected {
+.ideditor.mode-select .behavior-multiselect .selected {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-select-remove.png), pointer; /* FF */
 }
 
-.mode-add-preset #map,
-.mode-draw-line #map,
-.mode-draw-area #map,
-.mode-add-line  #map,
-.mode-add-area  #map,
-.mode-drag-node #map,
-.mode-drag-note #map {
+.ideditor.mode-add-preset .main-map,
+.ideditor.mode-draw-line .main-map,
+.ideditor.mode-draw-area .main-map,
+.ideditor.mode-add-line  .main-map,
+.ideditor.mode-add-area  .main-map,
+.ideditor.mode-drag-node .main-map,
+.ideditor.mode-drag-note .main-map {
     cursor: crosshair; /* Opera */
     cursor: url(img/cursor-draw.png) 9 9, crosshair; /* FF */
 }
 
-.mode-draw-line .way.target,
-.mode-draw-area .way.target,
-.mode-add-line  .way.target,
-.mode-add-area  .way.target,
-.mode-drag-node .way.target {
+.ideditor.mode-draw-line .way.target,
+.ideditor.mode-draw-area .way.target,
+.ideditor.mode-add-line  .way.target,
+.ideditor.mode-add-area  .way.target,
+.ideditor.mode-drag-node .way.target {
     cursor: crosshair; /* Opera */
     cursor: url(img/cursor-draw-connect-line.png) 9 9, crosshair; /* FF */
 }
 
-.mode-draw-line .vertex.target,
-.mode-draw-area .vertex.target,
-.mode-add-line  .vertex.target,
-.mode-add-area  .vertex.target,
-.mode-drag-node .vertex.target {
+.ideditor.mode-draw-line .vertex.target,
+.ideditor.mode-draw-area .vertex.target,
+.ideditor.mode-add-line  .vertex.target,
+.ideditor.mode-add-area  .vertex.target,
+.ideditor.mode-drag-node .vertex.target {
     cursor: crosshair; /* Opera */
     cursor: url(img/cursor-draw-connect-vertex.png) 9 9, crosshair; /* FF */
 }
 
-.mode-add-point #map,
-.mode-add-note #map,
-.mode-browse.lasso #map,
-.mode-browse.lasso .way,
-.mode-browse.lasso .vertex,
-.mode-browse.lasso .midpoint,
-.mode-select.lasso #map,
-.mode-select.lasso .way,
-.mode-select.lasso .vertex,
-.mode-select.lasso .midpoint {
+.ideditor.mode-add-point .main-map,
+.ideditor.mode-add-note .main-map,
+.ideditor.mode-browse.lasso .main-map,
+.ideditor.mode-browse.lasso .way,
+.ideditor.mode-browse.lasso .vertex,
+.ideditor.mode-browse.lasso .midpoint,
+.ideditor.mode-select.lasso .main-map,
+.ideditor.mode-select.lasso .way,
+.ideditor.mode-select.lasso .vertex,
+.ideditor.mode-select.lasso .midpoint {
     cursor: crosshair; /* Opera */
     cursor: url(img/cursor-draw.png) 9 9, crosshair; /* FF */
 }
 
-.mode-browse .note,
-.mode-browse .qa_error,
-.mode-select .note,
-.mode-select .qa_error,
+.ideditor.mode-browse .note,
+.ideditor.mode-browse .qaItem,
+.ideditor.mode-select .note,
+.ideditor.mode-select .qaItem,
 .turn rect,
 .turn circle {
     cursor: pointer;

css/60_photos.css

@@ -1,5 +1,5 @@
 /* photo viewer div */
-#photoviewer {
+.photoviewer {
     position: relative;
     flex-shrink: 0;
     margin-bottom: 10px;
@@ -8,23 +8,23 @@
     padding: 5px;
     background-color: #fff;
 }
-[dir='ltr'] #photoviewer {
+.ideditor[dir='ltr'] .photoviewer {
     margin-left: 10px;
     margin-right: 2px;
 }
-[dir='rtl'] #photoviewer {
+.ideditor[dir='rtl'] .photoviewer {
     margin-right: 10px;
     margin-left: 2px;
 }
 
 @media screen and (min-width: 1600px) {
-    #photoviewer {
+    .photoviewer {
         width: 490px;
         height: 370px;
     }
 }
 
-#photoviewer button.thumb-hide {
+.photoviewer button.thumb-hide {
     border-radius: 0;
     padding: 5px;
     position: absolute;
@@ -33,7 +33,7 @@
     z-index: 50;
 }
 
-#photoviewer button.resize-handle-xy {
+.photoviewer button.resize-handle-xy {
     border-radius: 0;
     position: absolute;
     top: 0;
@@ -44,7 +44,7 @@
     width: 25px;
 }
 
-#photoviewer button.resize-handle-x {
+.photoviewer button.resize-handle-x {
     border-radius: 0;
     position: absolute;
     top: 0;
@@ -56,7 +56,7 @@
     width: 6px;
 }
 
-#photoviewer button.resize-handle-y {
+.photoviewer button.resize-handle-y {
     border-radius: 0;
     position: absolute;
     top: 0;
@@ -99,8 +99,8 @@
 .viewfield-group {
     pointer-events: none;
 }
-.mode-browse .viewfield-group,
-.mode-select .viewfield-group {
+.ideditor.mode-browse .viewfield-group,
+.ideditor.mode-select .viewfield-group {
     pointer-events: visible;
     cursor: pointer;
 }

css/65_data.css

@@ -1,9 +1,10 @@
 
-/* OSM Notes and KeepRight Layers */
+/* OSM Notes and QA Layers */
 
-.error-header-icon .qa_error-fill,
-.layer-keepRight .qa_error .qa_error-fill,
-.layer-improveOSM .qa_error .qa_error-fill {
+.qa-header-icon .qaItem-fill,
+.layer-keepRight .qaItem .qaItem-fill,
+.layer-improveOSM .qaItem .qaItem-fill,
+.layer-osmose .qaItem .qaItem-fill {
     stroke: #333;
     stroke-width: 1.3px;  /* NOTE: likely a better way to scale the icon stroke */
 }
@@ -42,117 +43,114 @@
     height: 15px;
 }
 
-/* adjustment for error icon */
-
-.error-header-icon .preset-icon-28 {
+/* adjustment to center QA icons */
+.qa-header-icon .preset-icon-28 {
     top: auto;
     left: auto;
 }
-
-.error-header-icon {
+.qa-header-icon {
     display: flex;
     align-items: center;
     justify-content: center;
 }
 
-/* Keep Right Errors
+/* Keep Right Issues
 ------------------------------------------------------- */
-.keepRight.error_type-20,     /* multiple nodes on same spot */
-.keepRight.error_type-40,     /* impossible oneways */
-.keepRight.error_type-210,    /* self intersecting ways */
-.keepRight.error_type-270,    /* unusual motorway connection */
-.keepRight.error_type-310,    /* roundabout issues */
-.keepRight.error_type-320,    /* improper _link */
-.keepRight.error_type-350 {   /* improper bridge tag */
+.keepRight.itemType-20,     /* multiple nodes on same spot */
+.keepRight.itemType-40,     /* impossible oneways */
+.keepRight.itemType-210,    /* self intersecting ways */
+.keepRight.itemType-270,    /* unusual motorway connection */
+.keepRight.itemType-310,    /* roundabout issues */
+.keepRight.itemType-320,    /* improper _link */
+.keepRight.itemType-350 {   /* improper bridge tag */
     color: #ff9;
 }
 
-.keepRight.error_type-50 {    /* almost junctions */
+.keepRight.itemType-50 {    /* almost junctions */
     color: #88f;
 }
 
-.keepRight.error_type-60,     /* deprecated tags */
-.keepRight.error_type-70,     /* tagging issues */
-.keepRight.error_type-90,     /* motorway without ref */
-.keepRight.error_type-100,    /* place of worship without religion */
-.keepRight.error_type-110,    /* poi without name */
-.keepRight.error_type-150,    /* railway crossing without tag */
-.keepRight.error_type-220,    /* misspelled tag */
-.keepRight.error_type-380 {   /* non-physical sport tag */
+.keepRight.itemType-60,     /* deprecated tags */
+.keepRight.itemType-70,     /* tagging issues */
+.keepRight.itemType-90,     /* motorway without ref */
+.keepRight.itemType-100,    /* place of worship without religion */
+.keepRight.itemType-110,    /* poi without name */
+.keepRight.itemType-150,    /* railway crossing without tag */
+.keepRight.itemType-220,    /* misspelled tag */
+.keepRight.itemType-380 {   /* non-physical sport tag */
     color: #5d0;
 }
 
-.keepRight.error_type-130 {   /* disconnected ways */
+.keepRight.itemType-130 {   /* disconnected ways */
     color: #fa3;
 }
 
-.keepRight.error_type-170 {   /* FIXME tag */
+.keepRight.itemType-170 {   /* FIXME tag */
     color: #ff0;
 }
 
-.keepRight.error_type-190 {   /* intersection without junction */
+.keepRight.itemType-190 {   /* intersection without junction */
     color: #f33;
 }
 
-.keepRight.error_type-200 {   /* overlapping ways */
+.keepRight.itemType-200 {   /* overlapping ways */
     color: #fdbf6f;
 }
 
-.keepRight.error_type-160,    /* railway layer conflict */
-.keepRight.error_type-230 {   /* layer conflict */
+.keepRight.itemType-160,    /* railway layer conflict */
+.keepRight.itemType-230 {   /* layer conflict */
     color: #b60;
 }
 
-.keepRight.error_type-280 {   /* boundary issues */
+.keepRight.itemType-280 {   /* boundary issues */
     color: #5f47a0;
 }
 
-.keepRight.error_type-180,    /* relation without type */
-.keepRight.error_type-290 {   /* turn restriction issues */
+.keepRight.itemType-180,    /* relation without type */
+.keepRight.itemType-290 {   /* turn restriction issues */
     color: #ace;
 }
 
-.keepRight.error_type-300,    /* missing maxspeed */
-.keepRight.error_type-390 {   /* missing tracktype */
+.keepRight.itemType-300,    /* missing maxspeed */
+.keepRight.itemType-390 {   /* missing tracktype */
     color: #090;
 }
 
-.keepRight.error_type-360,    /* language unknown */
-.keepRight.error_type-370,    /* doubled places */
-.keepRight.error_type-410 {   /* website issues */
+.keepRight.itemType-360,    /* language unknown */
+.keepRight.itemType-370,    /* doubled places */
+.keepRight.itemType-410 {   /* website issues */
     color: #f9b;
 }
 
-.keepRight.error_type-120,    /* way without nodes */
-.keepRight.error_type-400 {   /* geometry / turn angles */
+.keepRight.itemType-120,    /* way without nodes */
+.keepRight.itemType-400 {   /* geometry / turn angles */
     color: #c35;
 }
 
-/* ImproveOSM Errors
+/* ImproveOSM Issues
 ------------------------------------------------------- */
 
-.improveOSM.error_type-ow {   /* missing one way */
+.improveOSM.itemType-ow {   /* missing one way */
     color: #1E90FF;
 }
 
-.improveOSM.error_type-mr-road {   /* missing road */
+.improveOSM.itemType-mr-road {   /* missing road */
     color: #B452CD;
 }
-.improveOSM.error_type-mr-path {   /* missing path */
+.improveOSM.itemType-mr-path {   /* missing path */
     color: #A0522D;
 }
-.improveOSM.error_type-mr-parking {   /* missing parking */
+.improveOSM.itemType-mr-parking {   /* missing parking */
     color: #EEEE00;
 }
-.improveOSM.error_type-mr-both {   /* missing road+parking */
+.improveOSM.itemType-mr-both {   /* missing road+parking */
     color: #FFA500;
 }
 
-.improveOSM.error_type-tr {   /* missing turn restriction */
+.improveOSM.itemType-tr {   /* missing turn restriction */
     color: #EC1C24;
 }
 
-
 /* Custom Map Data (geojson, gpx, kml, vector tile) */
 .layer-mapdata {
     pointer-events: none;
@@ -211,4 +209,4 @@
     stroke: #000;
     stroke-width: 5px;
     stroke-miterlimit: 1;
-}
+}

css/70_fills.css

@@ -46,7 +46,7 @@
 .fill-partial path.area.fill.tag-indoor {
     stroke-width: 20px;
 }
-.mode-browse .fill-partial path.area.fill,
-.mode-select .fill-partial path.area.fill {
+.ideditor.mode-browse .fill-partial path.area.fill,
+.ideditor.mode-select .fill-partial path.area.fill {
     pointer-events: visibleStroke;
 }

data/address-formats.json

@@ -1,184 +0,0 @@
-{
-  "dataAddressFormats": [
-    {
-      "format": [
-        ["housenumber", "street"],
-        ["city", "postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["au"],
-      "format": [
-        ["unit","housenumber", "street"],
-        ["suburb", "state", "postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["gb"],
-      "format": [
-        ["housename"],
-        ["housenumber", "street"],
-        ["city", "postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["ie"],
-      "format": [
-        ["housename"],
-        ["housenumber", "street"],
-        ["city"],
-        ["postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["at", "ch", "de", "si", "pl"],
-      "format": [
-        ["street", "housenumber"],
-        ["postcode", "city"]
-      ]
-    },
-    {
-      "countryCodes": [
-        "ad", "ba", "be", "cz", "dk", "es", "fi", "gr", "hr", "is",
-        "it", "li", "nl", "no", "pt", "se", "sk", "sm", "va"
-      ],
-      "format": [
-        ["street", "housenumber", "unit"],
-        ["postcode", "city"]
-      ]
-    },
-    {
-      "countryCodes": ["fr", "lu", "mo"],
-      "format": [
-        ["housenumber", "street"],
-        ["postcode", "city"]
-      ]
-    },
-    {
-      "countryCodes": ["br"],
-      "format": [
-        ["street"],
-        ["housenumber", "suburb"],
-        ["city", "postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["vn"],
-      "format": [
-        ["housenumber", "street"],
-        ["subdistrict"],
-        ["district"],
-        ["city"],
-        ["province", "postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["ca"],
-      "format": [
-        ["housenumber", "street", "unit"],
-        ["city", "province", "postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["us"],
-      "format": [
-        ["housenumber", "street", "unit"],
-        ["city", "state", "postcode"]
-      ]
-    },
-    {
-      "countryCodes": ["tw"],
-      "format": [
-        ["postcode", "city", "district"],
-        ["place", "street"],
-        ["housenumber", "floor", "unit"]
-      ]
-    },
-    {
-      "countryCodes": ["jp"],
-      "format": [
-        ["postcode", "province", "county"],
-        ["city", "suburb"],
-        ["quarter", "neighbourhood"],
-        ["block_number", "housenumber"]
-      ],
-      "dropdowns": [
-        "postcode", "province", "county", "city", "suburb",
-        "quarter", "neighbourhood", "block_number"
-      ],
-      "widths": {
-        "postcode": 0.3,
-        "province": 0.35,
-        "county": 0.35,
-        "city": 0.65,
-        "suburb": 0.35,
-        "quarter": 0.5,
-        "neighbourhood": 0.5,
-        "block_number": 0.5,
-        "housenumber": 0.5
-      }
-    },
-    {
-      "countryCodes": ["tr"],
-      "format": [
-        ["neighbourhood"],
-        ["street", "housenumber"],
-        ["postcode", "district", "city"]
-      ]
-    },
-    {
-      "countryCodes": ["ua"],
-      "format": [
-        ["housenumber", "postcode"],
-        ["street"]
-      ]
-    },
-    {
-      "countryCodes": ["cn"],
-      "format": [
-        ["postcode", "province"],
-        ["city", "district"],
-        ["street", "housenumber"]
-      ],
-      "widths": {
-        "postcode": 0.3,
-        "province": 0.7,
-        "city": 0.5,
-        "district": 0.5,
-        "street": 0.7,
-        "housenumber": 0.3
-      }
-    },
-    {
-      "countryCodes": ["bo"],
-      "format": [
-        ["street", "housenumber"],
-        ["neighbourhood", "city"]
-      ],
-      "widths": {
-        "street": 0.7,
-        "housenumber": 0.3,
-        "neighbourhood": 0.5,
-        "city": 0.5
-      }
-    },
-    {
-      "countryCodes": ["pe"],
-      "format": [
-        ["street", "housenumber"],
-        ["neighbourhood"],
-        ["city", "state", "postcode"]
-      ],
-      "dropdowns": [
-        "street", "neighbourhood", "city", "state", "postcode"
-      ],
-      "widths": {
-        "street": 0.7,
-        "housenumber": 0.3,
-        "city": 0.4,
-        "state": 0.4,
-        "postcode": 0.2
-      }
-    }
-  ]
-}

data/address_formats.json

@@ -0,0 +1,182 @@
+[
+  {
+    "format": [
+      ["housenumber", "street"],
+      ["city", "postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["au"],
+    "format": [
+      ["unit","housenumber", "street"],
+      ["suburb", "state", "postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["gb"],
+    "format": [
+      ["housename"],
+      ["housenumber", "street"],
+      ["city", "postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["ie"],
+    "format": [
+      ["housename"],
+      ["housenumber", "street"],
+      ["city"],
+      ["postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["at", "ch", "de", "si", "pl"],
+    "format": [
+      ["street", "housenumber"],
+      ["postcode", "city"]
+    ]
+  },
+  {
+    "countryCodes": [
+      "ad", "ba", "be", "cz", "dk", "es", "fi", "gr", "hr", "is",
+      "it", "li", "nl", "no", "pt", "se", "sk", "sm", "va"
+    ],
+    "format": [
+      ["street", "housenumber", "unit"],
+      ["postcode", "city"]
+    ]
+  },
+  {
+    "countryCodes": ["fr", "lu", "mo"],
+    "format": [
+      ["housenumber", "street"],
+      ["postcode", "city"]
+    ]
+  },
+  {
+    "countryCodes": ["br"],
+    "format": [
+      ["street"],
+      ["housenumber", "suburb"],
+      ["city", "postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["vn"],
+    "format": [
+      ["housenumber", "street"],
+      ["subdistrict"],
+      ["district"],
+      ["city"],
+      ["province", "postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["ca"],
+    "format": [
+      ["housenumber", "street", "unit"],
+      ["city", "province", "postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["us"],
+    "format": [
+      ["housenumber", "street", "unit"],
+      ["city", "state", "postcode"]
+    ]
+  },
+  {
+    "countryCodes": ["tw"],
+    "format": [
+      ["postcode", "city", "district"],
+      ["place", "street"],
+      ["housenumber", "floor", "unit"]
+    ]
+  },
+  {
+    "countryCodes": ["jp"],
+    "format": [
+      ["postcode", "province", "county"],
+      ["city", "suburb"],
+      ["quarter", "neighbourhood"],
+      ["block_number", "housenumber"]
+    ],
+    "dropdowns": [
+      "postcode", "province", "county", "city", "suburb",
+      "quarter", "neighbourhood", "block_number"
+    ],
+    "widths": {
+      "postcode": 0.3,
+      "province": 0.35,
+      "county": 0.35,
+      "city": 0.65,
+      "suburb": 0.35,
+      "quarter": 0.5,
+      "neighbourhood": 0.5,
+      "block_number": 0.5,
+      "housenumber": 0.5
+    }
+  },
+  {
+    "countryCodes": ["tr"],
+    "format": [
+      ["neighbourhood"],
+      ["street", "housenumber"],
+      ["postcode", "district", "city"]
+    ]
+  },
+  {
+    "countryCodes": ["ua"],
+    "format": [
+      ["housenumber", "postcode"],
+      ["street"]
+    ]
+  },
+  {
+    "countryCodes": ["cn"],
+    "format": [
+      ["postcode", "province"],
+      ["city", "district"],
+      ["street", "housenumber"]
+    ],
+    "widths": {
+      "postcode": 0.3,
+      "province": 0.7,
+      "city": 0.5,
+      "district": 0.5,
+      "street": 0.7,
+      "housenumber": 0.3
+    }
+  },
+  {
+    "countryCodes": ["bo"],
+    "format": [
+      ["street", "housenumber"],
+      ["neighbourhood", "city"]
+    ],
+    "widths": {
+      "street": 0.7,
+      "housenumber": 0.3,
+      "neighbourhood": 0.5,
+      "city": 0.5
+    }
+  },
+  {
+    "countryCodes": ["pe"],
+    "format": [
+      ["street", "housenumber"],
+      ["neighbourhood"],
+      ["city", "state", "postcode"]
+    ],
+    "dropdowns": [
+      "street", "neighbourhood", "city", "state", "postcode"
+    ],
+    "widths": {
+      "street": 0.7,
+      "housenumber": 0.3,
+      "city": 0.4,
+      "state": 0.4,
+      "postcode": 0.2
+    }
+  }
+]

data/core.yaml

@@ -8,6 +8,9 @@ en:
     copy: copy
     view_on: view on {domain}
     favorite: favorite
+    list: list
+    text: text
+    deselect: deselect
   toolbar:
     inspect: Inspect
     undo_redo: Undo / Redo
@@ -44,14 +47,6 @@ en:
       key: N
     add_preset:
       title: "Add {feature}"
-      point:
-        title: "Add {feature} as a point"
-      line:
-        title: "Add {feature} as a line"
-      area:
-        title: "Add {feature} as an area"
-      building:
-        title: "Add {feature} as a building"
     browse:
       title: Browse
       description: Pan and zoom the map.
@@ -90,17 +85,29 @@ en:
     circularize:
       title: Circularize
       description:
-        line: Make this line circular.
-        area: Make this area circular.
+        single: Make this feature circular.
+        multiple: Make these features circular.
       key: O
       annotation:
-        line: Made a line circular.
-        area: Made an area circular.
-      not_closed: This can't be made circular because it's not a loop.
-      too_large: This can't be made circular because not enough of it is currently visible.
-      connected_to_hidden: This can't be made circular because it is connected to a hidden feature.
-      not_downloaded: This can't be made circular because parts of it have not yet been downloaded.
-      already_circular: This can't be made circular because it's already circular.
+        single: Made a feature circular.
+        multiple: Made features circular.
+      multiple_blockers:
+        multiple: These can't be made circular for multiple reasons.
+      not_closed:
+        single: This can't be made circular because it's not a loop.
+        multiple: These can't be made circular because they aren't loops.
+      too_large:
+        single: This can't be made circular because not enough of it is currently visible.
+        multiple: These can't be made circular because not enough of them are currently visible.
+      connected_to_hidden:
+        single: This can't be made circular because it is connected to a hidden feature.
+        multiple: These can't be made circular because some are connected to hidden features.
+      not_downloaded:
+        single: This can't be made circular because parts of it have not yet been downloaded.
+        multiple: These can't be made circular because parts of them have not yet been downloaded.
+      already_circular:
+        single: This can't be made more circular than it already is.
+        multiple: These can't be made more circular than they already are.
     orthogonalize:
       title: Square
       description:
@@ -449,7 +456,7 @@ en:
     request_review: "I would like someone to review my edits."
     save: Upload
     cancel: Cancel
-    changes: "{count} Changes"
+    changes: "Changes ({count})"
     download_changes: Download osmChange file
     errors: Errors
     warnings: Warnings
@@ -528,23 +535,24 @@ en:
     search: Search worldwide...
     no_results_worldwide: No results found
   geolocate:
+    key: L
     title: Show My Location
     locating: "Locating, please wait..."
+    location_unavailable: Your location is unavailable.
   inspector:
     zoom_to:
       key: Z
-      title: Zoom to this
-      tooltip_feature: "Center and zoom the map to focus on this feature."
-      tooltip_note: "Center and zoom the map to focus on this note."
-      tooltip_data: "Center and zoom the map to focus on this data."
-      tooltip_issue: "Center and zoom the map to focus on this issue."
+      title: Zoom To Selection
     show_more: Show More
     view_on_osm: View on openstreetmap.org
+    view_on_osmose: View on osmose.openstreetmap.fr
     view_on_keepRight: View on keepright.at
-    all_fields: All fields
-    all_tags: All tags
-    all_members: All members
-    all_relations: All relations
+    feature_type: Feature Type
+    fields: Fields
+    tags_count: "Tags ({count})"
+    members_count: "Members ({count})"
+    relations_count: "Relations ({count})"
+    features_count: "Features ({count})"
     add_to_relation: Add to a relation
     new_relation: New relation...
     choose_relation: Choose a parent relation
@@ -555,17 +563,21 @@ en:
     edit_reference: "edit/translate"
     wiki_reference: View documentation
     wiki_en_reference: View documentation in English
+    key_value: "key=value"
+    multiple_values: Multiple Values
+    multiple_types: Multiple Types
+    unshared_value_tooltip: not shared by all features
     hidden_preset:
       manual: "{features} are hidden. Enable them in the Map Data pane."
       zoom: "{features} are hidden. Zoom in to enable them."
-    back_tooltip: Change feature
+    back_tooltip: Change feature type
     remove: Remove
     search: Search
-    multiselect: Selected features
     unknown: Unknown
     incomplete: <not downloaded>
     feature_list: Search features
     edit: Edit feature
+    edit_features: Edit features
     check:
       "yes": "Yes"
       "no": "No"
@@ -583,7 +595,7 @@ en:
     location: Location
     add_fields: "Add field:"
     lock:
-      suggestion: 'The "{label}" field is locked because there is a Wikidata tag. You can delete it or edit the tags in the "All tags" section.'
+      suggestion: 'The "{label}" field is locked because there is a Wikidata tag. You can delete it or edit the tags in the "Tags" section.'
   background:
     title: Background
     description: Background settings
@@ -609,7 +621,7 @@ en:
     panel:
       description: Show Detail Panel
       tooltip: Show advanced background information.
-    fix_misalignment: Adjust imagery offset
+    fix_misalignment: Imagery Offset
     offset: "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters."
   map_data:
     title: Map Data
@@ -624,11 +636,14 @@ en:
         tooltip: Note data from OpenStreetMap
         title: OpenStreetMap notes
       keepRight:
-        tooltip: Automatically detected map issues from keepright.at
+        tooltip: Data issues detected by keepright.at
         title: KeepRight Issues
       improveOSM:
-        tooltip: Missing data automatically detected by improveosm.org
+        tooltip: Missing data detected by improveosm.org
         title: ImproveOSM Issues
+      osmose:
+        tooltip: Data issues detected by osmose.openstreetmap.fr
+        title: Osmose Issues
       custom:
         tooltip: "Drag and drop a data file onto the page, or click the button to setup"
         title: Custom Map Data
@@ -818,11 +833,21 @@ en:
     on_wiki: "{tag} on wiki.osm.org"
     used_with: "used with {type}"
   zoom:
-    in: Zoom in
-    out: Zoom out
+    in: Zoom In
+    out: Zoom Out
   cannot_zoom: "Cannot zoom out further in current mode."
   full_screen: Toggle Full Screen
+  self_intersection:
+    error:
+      lines: Lines cannot cross over themselves.
+      areas: Areas cannot cross over themselves.
   QA:
+    osmose:
+      title: Osmose Issue
+      detail_title: Details
+      elems_title: Features
+      fix_title: Fix Guidelines
+      trap_title: Common Mistakes
     improveOSM:
       title: ImproveOSM Detection
       geometry_types:
@@ -851,16 +876,15 @@ en:
           title: Missing Turn Restriction
           description: '{num_passed} of {num_trips} recorded trips (travelling {travel_direction}) make a turn from {from_way} to {to_way} at {junction}. There may be a missing "{turn_restriction}" restriction.'
     keepRight:
-      title: KeepRight Error
-      detail_title: Error
+      title: KeepRight
       detail_description: Description
       comment: Comment
       comment_placeholder: Enter a comment to share with other users.
-      close: Close (Error Fixed)
-      ignore: Ignore (Not an Error)
+      close: Close (Issue Fixed)
+      ignore: Remove (False Positive)
       save_comment: Save Comment
       close_comment: Close and Comment
-      ignore_comment: Ignore and Comment
+      ignore_comment: Remove and Comment
       error_parts:
         this_node: 'this node'
         this_way: 'this way'
@@ -1187,7 +1211,7 @@ en:
       before_start: "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes."
       open_source_h: "Open Source"
       open_source: "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD)."
-      open_source_help: "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+      open_source_help: "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
     overview:
       title: Overview
       navigation_h: "Navigation"
@@ -1223,11 +1247,11 @@ en:
       type: "You can click on the feature type to change the feature to a different type. Everything that exists in the real world can be added to OpenStreetMap, so there are thousands of feature types to choose from."
       type_picker: "The type picker displays the most common feature types, such as parks, hospitals, restaurants, roads, and buildings. You can search for anything by typing what you're looking for in the search box. You can also click the {inspect} **Info** icon next to the feature type to learn more about it."
       fields_h: "Fields"
-      fields_all_fields: "The \"All fields\" section contains all of the feature's details that you may edit. In OpenStreetMap, all of the fields are optional, and it's OK to leave a field blank if you are unsure."
+      fields_all_fields: "The \"Fields\" section contains all of the feature's details that you may edit. In OpenStreetMap, all of the fields are optional, and it's OK to leave a field blank if you are unsure."
       fields_example: "Each feature type will display different fields. For example, a road may display fields for its surface and speed limit, but a restaurant may display fields for the type of food it serves and the hours it is open."
       fields_add_field: "You can also click the \"Add field\" dropdown to add more fields, such as a description, Wikipedia link, wheelchair access, and more."
       tags_h: "Tags"
-      tags_all_tags: "Below the fields section, you can expand the \"All tags\" section to edit any of the OpenStreetMap *tags* for the selected feature. Each tag consists of a *key* and *value*, data elements that define all of the features stored in OpenStreetMap."
+      tags_all_tags: "Below the fields section, you can expand the \"Tags\" section to edit any of the OpenStreetMap *tags* for the selected feature. Each tag consists of a *key* and *value*, data elements that define all of the features stored in OpenStreetMap."
       tags_resources: "Editing a feature's tags requires intermediate knowledge about OpenStreetMap. You should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) or [Taginfo](https://taginfo.openstreetmap.org/) to learn more about accepted OpenStreetMap tagging practices."
     points:
       title: Points
@@ -1284,8 +1308,8 @@ en:
       title: Relations
       intro: "A *relation* is a special type of feature in OpenStreetMap that groups together other features. The features that belong to a relation are called *members*, and each member can have a *role* in the relation."
       edit_relation_h: "Editing Relations"
-      edit_relation: "At the bottom of the feature editor, you can expand the \"All relations\" section to see if the selected feature is a member of any relations. You can then click on the relation to select and edit it."
-      edit_relation_add: "To add a feature to a relation, select the feature, then click the {plus} add button in the \"All relations\" section of the feature editor. You can choose from a list of nearby relations, or choose the \"New relation...\" option."
+      edit_relation: "At the bottom of the feature editor, you can expand the \"Relations\" section to see if the selected feature is a member of any relations. You can then click on the relation to select and edit it."
+      edit_relation_add: "To add a feature to a relation, select the feature, then click the {plus} add button in the \"Relations\" section of the feature editor. You can choose from a list of nearby relations, or choose the \"New relation...\" option."
       edit_relation_delete: "You can also click the {delete} **Delete** button to remove the selected feature from the relation. If you remove all of the members from a relation, the relation will be deleted automatically."
       maintain_relation_h: "Maintaining Relations"
       maintain_relation: "For the most part, iD will maintain relations automatically as you edit. You should take care when replacing features that might be members of relations. For example if you delete a section of road and draw a new section of road to replace it, you should add the new section to the same relations (routes, turn restrictions, etc.) as the original."
@@ -1300,10 +1324,10 @@ en:
       turn_restriction_editing: "In the \"Turn Restrictions\" field, click to select a \"from\" road, and see whether turns are allowed or restricted to any of the \"to\" roads. You can click on the turn icons to toggle them between allowed and restricted. iD will create relations automatically and set the from, via, and to roles based on your choices."
       route_h: "Routes"
       route: "A *route* relation is a group of one or more line features that together form a route network, like a bus route, train route, or highway route."
-      route_add: "To add a feature to a route relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
+      route_add: "To add a feature to a route relation, select the feature and scroll down to the \"Relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
       boundary_h: "Boundaries"
       boundary: "A *boundary* relation is a group of one or more line features that together form an administrative boundary."
-      boundary_add: "To add a feature to a boundary relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
+      boundary_add: "To add a feature to a boundary relation, select the feature and scroll down to the \"Relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
     notes:
       title: Notes
       intro: "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, click the {data} **Map data** panel to enable the OpenStreetMap notes layer."
@@ -1342,7 +1366,7 @@ en:
       title: Quality Assurance
       intro: "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer."
       tools_h: "Tools"
-      tools: "The following tools are currently supported: [KeepRight](https://www.keepright.at/) and [ImproveOSM](https://improveosm.org/en/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/) and more Q/A tools in the future."
+      tools: "The following tools are currently supported: [KeepRight](https://www.keepright.at/), [ImproveOSM](https://improveosm.org/en/) and [Osmose](https://osmose.openstreetmap.fr/)."
       issues_h: "Handling Issues"
       issues: "Handling Q/A issues is similar to handling notes. Click on a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue."
     field:
@@ -1956,6 +1980,7 @@ en:
         pan_more: "Pan map by one screenful"
         zoom: "Zoom in / Zoom out"
         zoom_more: "Zoom in / Zoom out by a lot"
+        geolocate: "Zoom to my location"
       help:
         title: "Help"
         help: "Show help/documentation"

data/discarded.json

@@ -1,58 +1,56 @@
 {
-  "dataDiscarded": {
-    "created_by": true,
+  "created_by": true,
 
-    "odbl": true,
-    "odbl:note": true,
+  "odbl": true,
+  "odbl:note": true,
 
-    "tiger:upload_uuid": true,
-    "tiger:tlid": true,
-    "tiger:source": true,
-    "tiger:separated": true,
+  "tiger:upload_uuid": true,
+  "tiger:tlid": true,
+  "tiger:source": true,
+  "tiger:separated": true,
 
-    "geobase:datasetName": true,
-    "geobase:uuid": true,
+  "geobase:datasetName": true,
+  "geobase:uuid": true,
 
-    "osmarender:nameDirection": true,
-    "osmarender:renderName": true,
-    "osmarender:renderRef": true,
-    "osmarender:rendernames": true,
+  "osmarender:nameDirection": true,
+  "osmarender:renderName": true,
+  "osmarender:renderRef": true,
+  "osmarender:rendernames": true,
 
-    "sub_sea:type": true,
+  "sub_sea:type": true,
 
-    "KSJ2:ADS": true,
-    "KSJ2:ARE": true,
-    "KSJ2:AdminArea": true,
-    "KSJ2:COP_label": true,
-    "KSJ2:DFD": true,
-    "KSJ2:INT": true,
-    "KSJ2:INT_label": true,
-    "KSJ2:LOC": true,
-    "KSJ2:LPN": true,
-    "KSJ2:OPC": true,
-    "KSJ2:PubFacAdmin": true,
-    "KSJ2:RAC": true,
-    "KSJ2:RAC_label": true,
-    "KSJ2:RIC": true,
-    "KSJ2:RIN": true,
-    "KSJ2:WSC": true,
-    "KSJ2:coordinate": true,
-    "KSJ2:curve_id": true,
-    "KSJ2:curve_type": true,
-    "KSJ2:filename": true,
-    "KSJ2:lake_id": true,
-    "KSJ2:lat": true,
-    "KSJ2:long": true,
-    "KSJ2:river_id": true,
+  "KSJ2:ADS": true,
+  "KSJ2:ARE": true,
+  "KSJ2:AdminArea": true,
+  "KSJ2:COP_label": true,
+  "KSJ2:DFD": true,
+  "KSJ2:INT": true,
+  "KSJ2:INT_label": true,
+  "KSJ2:LOC": true,
+  "KSJ2:LPN": true,
+  "KSJ2:OPC": true,
+  "KSJ2:PubFacAdmin": true,
+  "KSJ2:RAC": true,
+  "KSJ2:RAC_label": true,
+  "KSJ2:RIC": true,
+  "KSJ2:RIN": true,
+  "KSJ2:WSC": true,
+  "KSJ2:coordinate": true,
+  "KSJ2:curve_id": true,
+  "KSJ2:curve_type": true,
+  "KSJ2:filename": true,
+  "KSJ2:lake_id": true,
+  "KSJ2:lat": true,
+  "KSJ2:long": true,
+  "KSJ2:river_id": true,
 
-    "SK53_bulk:load": true,
+  "SK53_bulk:load": true,
 
-    "yh:LINE_NAME": true,
-    "yh:LINE_NUM": true,
-    "yh:STRUCTURE": true,
-    "yh:TOTYUMONO": true,
-    "yh:TYPE": true,
-    "yh:WIDTH": true,
-    "yh:WIDTH_RANK": true
-  }
+  "yh:LINE_NAME": true,
+  "yh:LINE_NUM": true,
+  "yh:STRUCTURE": true,
+  "yh:TOTYUMONO": true,
+  "yh:TYPE": true,
+  "yh:WIDTH": true,
+  "yh:WIDTH_RANK": true
 }

data/index.js

@@ -1,57 +0,0 @@
-export { wikipedia as dataWikipedia } from 'wmf-sitematrix';
-
-export { dataAddressFormats } from './address-formats.json';
-export { dataDeprecated } from './deprecated.json';
-export { dataDiscarded } from './discarded.json';
-export { dataLanguages } from './languages.json';
-export { dataLocales } from './locales.json';
-export { dataPhoneFormats } from './phone-formats.json';
-export { dataShortcuts } from './shortcuts.json';
-export { dataTerritoryLanguages } from './territory-languages.json';
-
-export { en as dataEn } from '../dist/locales/en.json';
-
-import {
-    features as ociFeatures,
-    resources as ociResources
-} from 'osm-community-index';
-
-import { dataImagery } from './imagery.json';
-import { presets } from './presets/presets.json';
-import { defaults } from './presets/defaults.json';
-import { categories } from './presets/categories.json';
-import { fields } from './presets/fields.json';
-
-import { geoArea as d3_geoArea } from 'd3-geo';
-import whichPolygon from 'which-polygon';
-
-
-// index the osm-community-index
-var ociFeatureCollection = Object.values(ociFeatures).map(function(feature) {
-    // workaround for which-polygon: only supports `properties`, not `id`
-    // https://github.com/mapbox/which-polygon/pull/6
-    feature.properties = {
-        id: feature.id,
-        area: d3_geoArea(feature)   // also precompute areas
-    };
-    return feature;
-});
-
-
-export var data = {
-    community: {
-        features: ociFeatures,
-        resources: ociResources,
-        query: whichPolygon({
-            type: 'FeatureCollection',
-            features: ociFeatureCollection
-        })
-    },
-    imagery: dataImagery,  //legacy
-    presets: {
-        presets: presets,
-        defaults: defaults,
-        categories: categories,
-        fields: fields
-    }
-};

data/languages.json

@@ -1,729 +1,235 @@
 {
-    "dataLanguages": {
-        "af": {
-            "nativeName": "Afrikaans"
-        },
-        "agq": {
-            "nativeName": "Aghem"
-        },
-        "ak": {
-            "nativeName": "Akan"
-        },
-        "am": {
-            "nativeName": "አማርኛ"
-        },
-        "ar": {
-            "nativeName": "العربية"
-        },
-        "as": {
-            "nativeName": "অসমীয়া"
-        },
-        "asa": {
-            "nativeName": "Kipare"
-        },
-        "ast": {
-            "nativeName": "asturianu"
-        },
-        "az": {
-            "nativeName": "azərbaycan"
-        },
-        "az-Cyrl": {
-            "base": "az",
-            "script": "Cyrl"
-        },
-        "az-Latn": {
-            "base": "az",
-            "script": "Latn"
-        },
-        "bas": {
-            "nativeName": "Ɓàsàa"
-        },
-        "be": {
-            "nativeName": "беларуская"
-        },
-        "bem": {
-            "nativeName": "Ichibemba"
-        },
-        "bez": {
-            "nativeName": "Hibena"
-        },
-        "bg": {
-            "nativeName": "български"
-        },
-        "bm": {
-            "nativeName": "bamanakan"
-        },
-        "bn": {
-            "nativeName": "বাংলা"
-        },
-        "bo": {
-            "nativeName": "བོད་སྐད་"
-        },
-        "br": {
-            "nativeName": "brezhoneg"
-        },
-        "brx": {
-            "nativeName": "बड़ो"
-        },
-        "bs": {
-            "nativeName": "bosanski"
-        },
-        "bs-Cyrl": {
-            "base": "bs",
-            "script": "Cyrl"
-        },
-        "bs-Latn": {
-            "base": "bs",
-            "script": "Latn"
-        },
-        "ca": {
-            "nativeName": "català"
-        },
-        "ccp": {
-            "nativeName": "𑄌𑄋𑄴𑄟𑄳𑄦"
-        },
-        "ce": {
-            "nativeName": "нохчийн"
-        },
-        "ceb": {
-            "nativeName": "Binisaya"
-        },
-        "cgg": {
-            "nativeName": "Rukiga"
-        },
-        "chr": {
-            "nativeName": "ᏣᎳᎩ"
-        },
-        "ckb": {
-            "nativeName": "کوردیی ناوەندی"
-        },
-        "cs": {
-            "nativeName": "čeština"
-        },
-        "cu": {
-            "nativeName": "cu"
-        },
-        "cy": {
-            "nativeName": "Cymraeg"
-        },
-        "da": {
-            "nativeName": "dansk"
-        },
-        "dav": {
-            "nativeName": "Kitaita"
-        },
-        "de": {
-            "nativeName": "Deutsch"
-        },
-        "dje": {
-            "nativeName": "Zarmaciine"
-        },
-        "dsb": {
-            "nativeName": "dolnoserbšćina"
-        },
-        "dua": {
-            "nativeName": "duálá"
-        },
-        "dyo": {
-            "nativeName": "joola"
-        },
-        "dz": {
-            "nativeName": "རྫོང་ཁ"
-        },
-        "ebu": {
-            "nativeName": "Kĩembu"
-        },
-        "ee": {
-            "nativeName": "Eʋegbe"
-        },
-        "el": {
-            "nativeName": "Ελληνικά"
-        },
-        "en": {
-            "nativeName": "English"
-        },
-        "eo": {
-            "nativeName": "esperanto"
-        },
-        "es": {
-            "nativeName": "español"
-        },
-        "et": {
-            "nativeName": "eesti"
-        },
-        "eu": {
-            "nativeName": "euskara"
-        },
-        "ewo": {
-            "nativeName": "ewondo"
-        },
-        "fa": {
-            "nativeName": "فارسی"
-        },
-        "ff": {
-            "nativeName": "Pulaar"
-        },
-        "ff-Latn": {
-            "base": "ff",
-            "script": "Latn"
-        },
-        "fi": {
-            "nativeName": "suomi"
-        },
-        "fil": {
-            "nativeName": "Filipino"
-        },
-        "fo": {
-            "nativeName": "føroyskt"
-        },
-        "fr": {
-            "nativeName": "français"
-        },
-        "fur": {
-            "nativeName": "furlan"
-        },
-        "fy": {
-            "nativeName": "Frysk"
-        },
-        "ga": {
-            "nativeName": "Gaeilge"
-        },
-        "gd": {
-            "nativeName": "Gàidhlig"
-        },
-        "gl": {
-            "nativeName": "galego"
-        },
-        "gsw": {
-            "nativeName": "Schwiizertüütsch"
-        },
-        "gu": {
-            "nativeName": "ગુજરાતી"
-        },
-        "guz": {
-            "nativeName": "Ekegusii"
-        },
-        "gv": {
-            "nativeName": "Gaelg"
-        },
-        "ha": {
-            "nativeName": "Hausa"
-        },
-        "haw": {
-            "nativeName": "ʻŌlelo Hawaiʻi"
-        },
-        "he": {
-            "nativeName": "עברית"
-        },
-        "hi": {
-            "nativeName": "हिन्दी"
-        },
-        "hr": {
-            "nativeName": "hrvatski"
-        },
-        "hsb": {
-            "nativeName": "hornjoserbšćina"
-        },
-        "hu": {
-            "nativeName": "magyar"
-        },
-        "hy": {
-            "nativeName": "հայերեն"
-        },
-        "ia": {
-            "nativeName": "interlingua"
-        },
-        "id": {
-            "nativeName": "Indonesia"
-        },
-        "ig": {
-            "nativeName": "Asụsụ Igbo"
-        },
-        "ii": {
-            "nativeName": "ꆈꌠꉙ"
-        },
-        "is": {
-            "nativeName": "íslenska"
-        },
-        "it": {
-            "nativeName": "italiano"
-        },
-        "ja": {
-            "nativeName": "日本語"
-        },
-        "ja-Hira": {
-            "base": "ja",
-            "script": "Hira"
-        },
-        "ja-Latn": {
-            "base": "ja",
-            "script": "Latn"
-        },
-        "jgo": {
-            "nativeName": "Ndaꞌa"
-        },
-        "jmc": {
-            "nativeName": "Kimachame"
-        },
-        "jv": {
-            "nativeName": "Jawa"
-        },
-        "ka": {
-            "nativeName": "ქართული"
-        },
-        "kab": {
-            "nativeName": "Taqbaylit"
-        },
-        "kam": {
-            "nativeName": "Kikamba"
-        },
-        "kde": {
-            "nativeName": "Chimakonde"
-        },
-        "kea": {
-            "nativeName": "kabuverdianu"
-        },
-        "khq": {
-            "nativeName": "Koyra ciini"
-        },
-        "ki": {
-            "nativeName": "Gikuyu"
-        },
-        "kk": {
-            "nativeName": "қазақ тілі"
-        },
-        "kkj": {
-            "nativeName": "kakɔ"
-        },
-        "kl": {
-            "nativeName": "kalaallisut"
-        },
-        "kln": {
-            "nativeName": "Kalenjin"
-        },
-        "km": {
-            "nativeName": "ខ្មែរ"
-        },
-        "kn": {
-            "nativeName": "ಕನ್ನಡ"
-        },
-        "ko": {
-            "nativeName": "한국어"
-        },
-        "ko-Latn": {
-            "base": "ko",
-            "script": "Latn"
-        },
-        "kok": {
-            "nativeName": "कोंकणी"
-        },
-        "ks": {
-            "nativeName": "کٲشُر"
-        },
-        "ksb": {
-            "nativeName": "Kishambaa"
-        },
-        "ksf": {
-            "nativeName": "rikpa"
-        },
-        "ksh": {
-            "nativeName": "Kölsch"
-        },
-        "ku": {
-            "nativeName": "kurdî"
-        },
-        "kw": {
-            "nativeName": "kernewek"
-        },
-        "ky": {
-            "nativeName": "кыргызча"
-        },
-        "lag": {
-            "nativeName": "Kɨlaangi"
-        },
-        "lb": {
-            "nativeName": "Lëtzebuergesch"
-        },
-        "lg": {
-            "nativeName": "Luganda"
-        },
-        "lkt": {
-            "nativeName": "Lakȟólʼiyapi"
-        },
-        "ln": {
-            "nativeName": "lingála"
-        },
-        "lo": {
-            "nativeName": "ລາວ"
-        },
-        "lrc": {
-            "nativeName": "لۊری شومالی"
-        },
-        "lt": {
-            "nativeName": "lietuvių"
-        },
-        "lu": {
-            "nativeName": "Tshiluba"
-        },
-        "luo": {
-            "nativeName": "Dholuo"
-        },
-        "luy": {
-            "nativeName": "Luluhia"
-        },
-        "lv": {
-            "nativeName": "latviešu"
-        },
-        "mas": {
-            "nativeName": "Maa"
-        },
-        "mer": {
-            "nativeName": "Kĩmĩrũ"
-        },
-        "mfe": {
-            "nativeName": "kreol morisien"
-        },
-        "mg": {
-            "nativeName": "Malagasy"
-        },
-        "mgh": {
-            "nativeName": "Makua"
-        },
-        "mgo": {
-            "nativeName": "metaʼ"
-        },
-        "mi": {
-            "nativeName": "Māori"
-        },
-        "mk": {
-            "nativeName": "македонски"
-        },
-        "ml": {
-            "nativeName": "മലയാളം"
-        },
-        "mn": {
-            "nativeName": "монгол"
-        },
-        "mr": {
-            "nativeName": "मराठी"
-        },
-        "ms": {
-            "nativeName": "Melayu"
-        },
-        "mt": {
-            "nativeName": "Malti"
-        },
-        "mua": {
-            "nativeName": "MUNDAŊ"
-        },
-        "my": {
-            "nativeName": "မြန်မာ"
-        },
-        "mzn": {
-            "nativeName": "مازرونی"
-        },
-        "naq": {
-            "nativeName": "Khoekhoegowab"
-        },
-        "nb": {
-            "nativeName": "norsk bokmål"
-        },
-        "nd": {
-            "nativeName": "isiNdebele"
-        },
-        "nds": {
-            "nativeName": "nds"
-        },
-        "ne": {
-            "nativeName": "नेपाली"
-        },
-        "nl": {
-            "nativeName": "Nederlands"
-        },
-        "nmg": {
-            "nativeName": "nmg"
-        },
-        "nn": {
-            "nativeName": "nynorsk"
-        },
-        "nnh": {
-            "nativeName": "Shwóŋò ngiembɔɔn"
-        },
-        "nus": {
-            "nativeName": "Thok Nath"
-        },
-        "nyn": {
-            "nativeName": "Runyankore"
-        },
-        "oc": {
-            "nativeName": "Occitan"
-        },
-        "om": {
-            "nativeName": "Oromoo"
-        },
-        "or": {
-            "nativeName": "ଓଡ଼ିଆ"
-        },
-        "os": {
-            "nativeName": "ирон"
-        },
-        "pa": {
-            "nativeName": "ਪੰਜਾਬੀ"
-        },
-        "pa-Arab": {
-            "base": "pa",
-            "script": "Arab"
-        },
-        "pa-Guru": {
-            "base": "pa",
-            "script": "Guru"
-        },
-        "pl": {
-            "nativeName": "polski"
-        },
-        "prg": {
-            "nativeName": "prūsiskan"
-        },
-        "ps": {
-            "nativeName": "پښتو"
-        },
-        "pt": {
-            "nativeName": "português"
-        },
-        "qu": {
-            "nativeName": "Runasimi"
-        },
-        "rm": {
-            "nativeName": "rumantsch"
-        },
-        "rn": {
-            "nativeName": "Ikirundi"
-        },
-        "ro": {
-            "nativeName": "română"
-        },
-        "rof": {
-            "nativeName": "Kihorombo"
-        },
-        "root": {
-            "nativeName": "root"
-        },
-        "ru": {
-            "nativeName": "русский"
-        },
-        "rw": {
-            "nativeName": "Kinyarwanda"
-        },
-        "rwk": {
-            "nativeName": "Kiruwa"
-        },
-        "sah": {
-            "nativeName": "саха тыла"
-        },
-        "saq": {
-            "nativeName": "Kisampur"
-        },
-        "sbp": {
-            "nativeName": "Ishisangu"
-        },
-        "sd": {
-            "nativeName": "سنڌي"
-        },
-        "se": {
-            "nativeName": "davvisámegiella"
-        },
-        "seh": {
-            "nativeName": "sena"
-        },
-        "ses": {
-            "nativeName": "Koyraboro senni"
-        },
-        "sg": {
-            "nativeName": "Sängö"
-        },
-        "shi": {
-            "nativeName": "ⵜⴰⵛⵍⵃⵉⵜ"
-        },
-        "shi-Latn": {
-            "base": "shi",
-            "script": "Latn"
-        },
-        "shi-Tfng": {
-            "base": "shi",
-            "script": "Tfng"
-        },
-        "si": {
-            "nativeName": "සිංහල"
-        },
-        "sk": {
-            "nativeName": "slovenčina"
-        },
-        "sl": {
-            "nativeName": "slovenščina"
-        },
-        "smn": {
-            "nativeName": "anarâškielâ"
-        },
-        "sn": {
-            "nativeName": "chiShona"
-        },
-        "so": {
-            "nativeName": "Soomaali"
-        },
-        "sq": {
-            "nativeName": "shqip"
-        },
-        "sr": {
-            "nativeName": "српски"
-        },
-        "sr-Cyrl": {
-            "base": "sr",
-            "script": "Cyrl"
-        },
-        "sr-Latn": {
-            "base": "sr",
-            "script": "Latn"
-        },
-        "sv": {
-            "nativeName": "svenska"
-        },
-        "sw": {
-            "nativeName": "Kiswahili"
-        },
-        "ta": {
-            "nativeName": "தமிழ்"
-        },
-        "te": {
-            "nativeName": "తెలుగు"
-        },
-        "teo": {
-            "nativeName": "Kiteso"
-        },
-        "tg": {
-            "nativeName": "тоҷикӣ"
-        },
-        "th": {
-            "nativeName": "ไทย"
-        },
-        "ti": {
-            "nativeName": "ትግርኛ"
-        },
-        "tk": {
-            "nativeName": "türkmen dili"
-        },
-        "to": {
-            "nativeName": "lea fakatonga"
-        },
-        "tr": {
-            "nativeName": "Türkçe"
-        },
-        "tt": {
-            "nativeName": "татар"
-        },
-        "twq": {
-            "nativeName": "Tasawaq senni"
-        },
-        "tzm": {
-            "nativeName": "Tamaziɣt n laṭlaṣ"
-        },
-        "ug": {
-            "nativeName": "ئۇيغۇرچە"
-        },
-        "uk": {
-            "nativeName": "українська"
-        },
-        "ur": {
-            "nativeName": "اردو"
-        },
-        "uz": {
-            "nativeName": "o‘zbek"
-        },
-        "uz-Arab": {
-            "base": "uz",
-            "script": "Arab"
-        },
-        "uz-Cyrl": {
-            "base": "uz",
-            "script": "Cyrl"
-        },
-        "uz-Latn": {
-            "base": "uz",
-            "script": "Latn"
-        },
-        "vai": {
-            "nativeName": "ꕙꔤ"
-        },
-        "vai-Latn": {
-            "base": "vai",
-            "script": "Latn"
-        },
-        "vai-Vaii": {
-            "base": "vai",
-            "script": "Vaii"
-        },
-        "vi": {
-            "nativeName": "Tiếng Việt"
-        },
-        "vo": {
-            "nativeName": "vo"
-        },
-        "vun": {
-            "nativeName": "Kyivunjo"
-        },
-        "wae": {
-            "nativeName": "Walser"
-        },
-        "wo": {
-            "nativeName": "Wolof"
-        },
-        "xh": {
-            "nativeName": "isiXhosa"
-        },
-        "xog": {
-            "nativeName": "Olusoga"
-        },
-        "yav": {
-            "nativeName": "nuasue"
-        },
-        "yi": {
-            "nativeName": "ייִדיש"
-        },
-        "yo": {
-            "nativeName": "Èdè Yorùbá"
-        },
-        "yue": {
-            "nativeName": "粵語"
-        },
-        "yue-Hans": {
-            "base": "yue",
-            "script": "Hans"
-        },
-        "yue-Hant": {
-            "base": "yue",
-            "script": "Hant"
-        },
-        "zgh": {
-            "nativeName": "ⵜⴰⵎⴰⵣⵉⵖⵜ"
-        },
-        "zh": {
-            "nativeName": "中文"
-        },
-        "zh-Hans": {
-            "base": "zh",
-            "script": "Hans",
-            "nativeName": "简体中文"
-        },
-        "zh-Hant": {
-            "base": "zh",
-            "script": "Hant",
-            "nativeName": "繁體中文"
-        },
-        "zh_pinyin": {
-            "base": "zh",
-            "script": "Latn"
-        },
-        "zu": {
-            "nativeName": "isiZulu"
-        }
-    }
+  "af": {"nativeName": "Afrikaans"},
+  "agq": {"nativeName": "Aghem"},
+  "ak": {"nativeName": "Akan"},
+  "am": {"nativeName": "አማርኛ"},
+  "ar": {"nativeName": "العربية"},
+  "as": {"nativeName": "অসমীয়া"},
+  "asa": {"nativeName": "Kipare"},
+  "ast": {"nativeName": "asturianu"},
+  "az": {"nativeName": "azərbaycan"},
+  "az-Cyrl": {"base": "az", "script": "Cyrl"},
+  "az-Latn": {"base": "az", "script": "Latn"},
+  "bas": {"nativeName": "Ɓàsàa"},
+  "be": {"nativeName": "беларуская"},
+  "bem": {"nativeName": "Ichibemba"},
+  "bez": {"nativeName": "Hibena"},
+  "bg": {"nativeName": "български"},
+  "bm": {"nativeName": "bamanakan"},
+  "bn": {"nativeName": "বাংলা"},
+  "bo": {"nativeName": "བོད་སྐད་"},
+  "br": {"nativeName": "brezhoneg"},
+  "brx": {"nativeName": "बड़ो"},
+  "bs": {"nativeName": "bosanski"},
+  "bs-Cyrl": {"base": "bs", "script": "Cyrl"},
+  "bs-Latn": {"base": "bs", "script": "Latn"},
+  "ca": {"nativeName": "català"},
+  "ccp": {"nativeName": "𑄌𑄋𑄴𑄟𑄳𑄦"},
+  "ce": {"nativeName": "нохчийн"},
+  "ceb": {"nativeName": "Binisaya"},
+  "cgg": {"nativeName": "Rukiga"},
+  "chr": {"nativeName": "ᏣᎳᎩ"},
+  "ckb": {"nativeName": "کوردیی ناوەندی"},
+  "cs": {"nativeName": "čeština"},
+  "cu": {"nativeName": "cu"},
+  "cy": {"nativeName": "Cymraeg"},
+  "da": {"nativeName": "dansk"},
+  "dav": {"nativeName": "Kitaita"},
+  "de": {"nativeName": "Deutsch"},
+  "dje": {"nativeName": "Zarmaciine"},
+  "dsb": {"nativeName": "dolnoserbšćina"},
+  "dua": {"nativeName": "duálá"},
+  "dyo": {"nativeName": "joola"},
+  "dz": {"nativeName": "རྫོང་ཁ"},
+  "ebu": {"nativeName": "Kĩembu"},
+  "ee": {"nativeName": "Eʋegbe"},
+  "el": {"nativeName": "Ελληνικά"},
+  "en": {"nativeName": "English"},
+  "eo": {"nativeName": "esperanto"},
+  "es": {"nativeName": "español"},
+  "et": {"nativeName": "eesti"},
+  "eu": {"nativeName": "euskara"},
+  "ewo": {"nativeName": "ewondo"},
+  "fa": {"nativeName": "فارسی"},
+  "ff": {"nativeName": "Pulaar"},
+  "ff-Latn": {"base": "ff", "script": "Latn"},
+  "fi": {"nativeName": "suomi"},
+  "fil": {"nativeName": "Filipino"},
+  "fo": {"nativeName": "føroyskt"},
+  "fr": {"nativeName": "français"},
+  "fur": {"nativeName": "furlan"},
+  "fy": {"nativeName": "Frysk"},
+  "ga": {"nativeName": "Gaeilge"},
+  "gd": {"nativeName": "Gàidhlig"},
+  "gl": {"nativeName": "galego"},
+  "gsw": {"nativeName": "Schwiizertüütsch"},
+  "gu": {"nativeName": "ગુજરાતી"},
+  "guz": {"nativeName": "Ekegusii"},
+  "gv": {"nativeName": "Gaelg"},
+  "ha": {"nativeName": "Hausa"},
+  "haw": {"nativeName": "ʻŌlelo Hawaiʻi"},
+  "he": {"nativeName": "עברית"},
+  "hi": {"nativeName": "हिन्दी"},
+  "hr": {"nativeName": "hrvatski"},
+  "hsb": {"nativeName": "hornjoserbšćina"},
+  "hu": {"nativeName": "magyar"},
+  "hy": {"nativeName": "հայերեն"},
+  "ia": {"nativeName": "interlingua"},
+  "id": {"nativeName": "Indonesia"},
+  "ig": {"nativeName": "Asụsụ Igbo"},
+  "ii": {"nativeName": "ꆈꌠꉙ"},
+  "is": {"nativeName": "íslenska"},
+  "it": {"nativeName": "italiano"},
+  "ja": {"nativeName": "日本語"},
+  "ja-Hira": {"base": "ja", "script": "Hira"},
+  "ja-Latn": {"base": "ja", "script": "Latn"},
+  "jgo": {"nativeName": "Ndaꞌa"},
+  "jmc": {"nativeName": "Kimachame"},
+  "jv": {"nativeName": "Jawa"},
+  "ka": {"nativeName": "ქართული"},
+  "kab": {"nativeName": "Taqbaylit"},
+  "kam": {"nativeName": "Kikamba"},
+  "kde": {"nativeName": "Chimakonde"},
+  "kea": {"nativeName": "kabuverdianu"},
+  "khq": {"nativeName": "Koyra ciini"},
+  "ki": {"nativeName": "Gikuyu"},
+  "kk": {"nativeName": "қазақ тілі"},
+  "kkj": {"nativeName": "kakɔ"},
+  "kl": {"nativeName": "kalaallisut"},
+  "kln": {"nativeName": "Kalenjin"},
+  "km": {"nativeName": "ខ្មែរ"},
+  "kn": {"nativeName": "ಕನ್ನಡ"},
+  "ko": {"nativeName": "한국어"},
+  "ko-Latn": {"base": "ko", "script": "Latn"},
+  "kok": {"nativeName": "कोंकणी"},
+  "ks": {"nativeName": "کٲشُر"},
+  "ksb": {"nativeName": "Kishambaa"},
+  "ksf": {"nativeName": "rikpa"},
+  "ksh": {"nativeName": "Kölsch"},
+  "ku": {"nativeName": "kurdî"},
+  "kw": {"nativeName": "kernewek"},
+  "ky": {"nativeName": "кыргызча"},
+  "lag": {"nativeName": "Kɨlaangi"},
+  "lb": {"nativeName": "Lëtzebuergesch"},
+  "lg": {"nativeName": "Luganda"},
+  "lkt": {"nativeName": "Lakȟólʼiyapi"},
+  "ln": {"nativeName": "lingála"},
+  "lo": {"nativeName": "ລາວ"},
+  "lrc": {"nativeName": "لۊری شومالی"},
+  "lt": {"nativeName": "lietuvių"},
+  "lu": {"nativeName": "Tshiluba"},
+  "luo": {"nativeName": "Dholuo"},
+  "luy": {"nativeName": "Luluhia"},
+  "lv": {"nativeName": "latviešu"},
+  "mas": {"nativeName": "Maa"},
+  "mer": {"nativeName": "Kĩmĩrũ"},
+  "mfe": {"nativeName": "kreol morisien"},
+  "mg": {"nativeName": "Malagasy"},
+  "mgh": {"nativeName": "Makua"},
+  "mgo": {"nativeName": "metaʼ"},
+  "mi": {"nativeName": "Māori"},
+  "mk": {"nativeName": "македонски"},
+  "ml": {"nativeName": "മലയാളം"},
+  "mn": {"nativeName": "монгол"},
+  "mr": {"nativeName": "मराठी"},
+  "ms": {"nativeName": "Melayu"},
+  "mt": {"nativeName": "Malti"},
+  "mua": {"nativeName": "MUNDAŊ"},
+  "my": {"nativeName": "မြန်မာ"},
+  "mzn": {"nativeName": "مازرونی"},
+  "naq": {"nativeName": "Khoekhoegowab"},
+  "nb": {"nativeName": "norsk bokmål"},
+  "nd": {"nativeName": "isiNdebele"},
+  "nds": {"nativeName": "nds"},
+  "ne": {"nativeName": "नेपाली"},
+  "nl": {"nativeName": "Nederlands"},
+  "nmg": {"nativeName": "nmg"},
+  "nn": {"nativeName": "nynorsk"},
+  "nnh": {"nativeName": "Shwóŋò ngiembɔɔn"},
+  "nus": {"nativeName": "Thok Nath"},
+  "nyn": {"nativeName": "Runyankore"},
+  "oc": {"nativeName": "Occitan"},
+  "om": {"nativeName": "Oromoo"},
+  "or": {"nativeName": "ଓଡ଼ିଆ"},
+  "os": {"nativeName": "ирон"},
+  "pa": {"nativeName": "ਪੰਜਾਬੀ"},
+  "pa-Arab": {"base": "pa", "script": "Arab"},
+  "pa-Guru": {"base": "pa", "script": "Guru"},
+  "pl": {"nativeName": "polski"},
+  "prg": {"nativeName": "prūsiskan"},
+  "ps": {"nativeName": "پښتو"},
+  "pt": {"nativeName": "português"},
+  "qu": {"nativeName": "Runasimi"},
+  "rm": {"nativeName": "rumantsch"},
+  "rn": {"nativeName": "Ikirundi"},
+  "ro": {"nativeName": "română"},
+  "rof": {"nativeName": "Kihorombo"},
+  "root": {"nativeName": "root"},
+  "ru": {"nativeName": "русский"},
+  "rw": {"nativeName": "Kinyarwanda"},
+  "rwk": {"nativeName": "Kiruwa"},
+  "sah": {"nativeName": "саха тыла"},
+  "saq": {"nativeName": "Kisampur"},
+  "sbp": {"nativeName": "Ishisangu"},
+  "sd": {"nativeName": "سنڌي"},
+  "se": {"nativeName": "davvisámegiella"},
+  "seh": {"nativeName": "sena"},
+  "ses": {"nativeName": "Koyraboro senni"},
+  "sg": {"nativeName": "Sängö"},
+  "shi": {"nativeName": "ⵜⴰⵛⵍⵃⵉⵜ"},
+  "shi-Latn": {"base": "shi", "script": "Latn"},
+  "shi-Tfng": {"base": "shi", "script": "Tfng"},
+  "si": {"nativeName": "සිංහල"},
+  "sk": {"nativeName": "slovenčina"},
+  "sl": {"nativeName": "slovenščina"},
+  "smn": {"nativeName": "anarâškielâ"},
+  "sn": {"nativeName": "chiShona"},
+  "so": {"nativeName": "Soomaali"},
+  "sq": {"nativeName": "shqip"},
+  "sr": {"nativeName": "српски"},
+  "sr-Cyrl": {"base": "sr", "script": "Cyrl"},
+  "sr-Latn": {"base": "sr", "script": "Latn"},
+  "sv": {"nativeName": "svenska"},
+  "sw": {"nativeName": "Kiswahili"},
+  "ta": {"nativeName": "தமிழ்"},
+  "te": {"nativeName": "తెలుగు"},
+  "teo": {"nativeName": "Kiteso"},
+  "tg": {"nativeName": "тоҷикӣ"},
+  "th": {"nativeName": "ไทย"},
+  "ti": {"nativeName": "ትግርኛ"},
+  "tk": {"nativeName": "türkmen dili"},
+  "to": {"nativeName": "lea fakatonga"},
+  "tr": {"nativeName": "Türkçe"},
+  "tt": {"nativeName": "татар"},
+  "twq": {"nativeName": "Tasawaq senni"},
+  "tzm": {"nativeName": "Tamaziɣt n laṭlaṣ"},
+  "ug": {"nativeName": "ئۇيغۇرچە"},
+  "uk": {"nativeName": "українська"},
+  "ur": {"nativeName": "اردو"},
+  "uz": {"nativeName": "o‘zbek"},
+  "uz-Arab": {"base": "uz", "script": "Arab"},
+  "uz-Cyrl": {"base": "uz", "script": "Cyrl"},
+  "uz-Latn": {"base": "uz", "script": "Latn"},
+  "vai": {"nativeName": "ꕙꔤ"},
+  "vai-Latn": {"base": "vai", "script": "Latn"},
+  "vai-Vaii": {"base": "vai", "script": "Vaii"},
+  "vi": {"nativeName": "Tiếng Việt"},
+  "vo": {"nativeName": "vo"},
+  "vun": {"nativeName": "Kyivunjo"},
+  "wae": {"nativeName": "Walser"},
+  "wo": {"nativeName": "Wolof"},
+  "xh": {"nativeName": "isiXhosa"},
+  "xog": {"nativeName": "Olusoga"},
+  "yav": {"nativeName": "nuasue"},
+  "yi": {"nativeName": "ייִדיש"},
+  "yo": {"nativeName": "Èdè Yorùbá"},
+  "yue": {"nativeName": "粵語"},
+  "yue-Hans": {"base": "yue", "script": "Hans"},
+  "yue-Hant": {"base": "yue", "script": "Hant"},
+  "zgh": {"nativeName": "ⵜⴰⵎⴰⵣⵉⵖⵜ"},
+  "zh": {"nativeName": "中文"},
+  "zh-Hans": {"base": "zh", "script": "Hans", "nativeName": "简体中文"},
+  "zh-Hant": {"base": "zh", "script": "Hant", "nativeName": "繁體中文"},
+  "zh_pinyin": {"base": "zh", "script": "Latn"},
+  "zu": {"nativeName": "isiZulu"}
 }

data/phone-formats.json

@@ -1,65 +0,0 @@
-{
-  "dataPhoneFormats": {
-    "ag": "+1-268-555-1234",
-    "ai": "+1-264-555-1234",
-    "as": "+1-684-555-1234",
-    "at": "+43 1 123 45 67",
-    "au": "+61 1 2345 6789",
-    "bb": "+1-246-555-1234",
-    "bj": "+229 20 12 34 56",
-    "bm": "+1-441-555-1234",
-    "bo": "+591 1 2345678",
-    "br": "+55 11 0982 1098",
-    "bs": "+1-242-555-1234",
-    "ca": "+1-226-555-1234",
-    "ci": "+225 20 12 34 56",
-    "cn": "+86 10 12345678",
-    "de": "+49 89 1234567",
-    "dm": "+1-767-555-1234",
-    "do": "+1-809-555-1234",
-    "es": "+34 989 12 34 56",
-    "fi": "+358 40 123 4567",
-    "fr": "+33 1 23 45 67 89",
-    "gb": "+44 1632 961234",
-    "gd": "+1-473-555-1234",
-    "gg": "+44 1632 961234",
-    "gu": "+1-671-555-1234",
-    "hk": "+852 1234 5678",
-    "hr": "+385 01 123 4567",
-    "hu": "+36 1 123 45 67",
-    "ie": "+353 20 912 3456",
-    "im": "+44 1632 961234",
-    "it": "+39 01 123 456",
-    "je": "+44 1632 961234",
-    "jm": "+1-876-555-1234",
-    "kn": "+1-869-555-1234",
-    "ky": "+1-345-555-1234",
-    "kz": "+7 495 1234567",
-    "lc": "+1-758-555-1234",
-    "mp": "+1-670-555-1234",
-    "ms": "+1-664-555-1234",
-    "nl": "+31 42 123 4567",
-    "no": "+47 22 12 34 56",
-    "pe": "+51 1 1234567",
-    "pl": "+48 42 123 4567",
-    "pr": "+1-787-555-1234",
-    "pt": "+351 211 123456",
-    "ru": "+7 495 1234567",
-    "se": "+46 31 123 4567",
-    "si": "+386 31 123 4567",
-    "sj": "+47 22 12 34 56",
-    "sx": "+1-721-555-1234",
-    "tc": "+1-649-555-1234",
-    "tr": "+90 312 123 4567",
-    "tt": "+1-868-555-1234",
-    "tw": "+886 1 2345 6789",
-    "ua": "+380 44 123 4567",
-    "us": "+1-202-555-1234",
-    "va": "+39 01 123 456",
-    "vc": "+1-784-555-1234",
-    "vg": "+1-284-555-1234",
-    "vi": "+1-340-555-1234",
-    "vn": "+84 1 234 5678",
-    "za": "+27 11 907 1111"
-  }
-}

data/phone_formats.json

@@ -0,0 +1,64 @@
+{
+  "ag": "+1-268-555-1234",
+  "ai": "+1-264-555-1234",
+  "as": "+1-684-555-1234",
+  "at": "+43 1 123 45 67",
+  "au": "+61 1 2345 6789",
+  "bb": "+1-246-555-1234",
+  "bj": "+229 20 12 34 56",
+  "bm": "+1-441-555-1234",
+  "bo": "+591 1 2345678",
+  "br": "+55 11 0982 1098",
+  "bs": "+1-242-555-1234",
+  "ca": "+1-226-555-1234",
+  "ci": "+225 20 12 34 56",
+  "cn": "+86 10 12345678",
+  "de": "+49 89 1234567",
+  "dm": "+1-767-555-1234",
+  "do": "+1-809-555-1234",
+  "es": "+34 989 12 34 56",
+  "fi": "+358 40 123 4567",
+  "fr": "+33 1 23 45 67 89",
+  "gb": "+44 1632 961234",
+  "gd": "+1-473-555-1234",
+  "gg": "+44 1632 961234",
+  "gu": "+1-671-555-1234",
+  "hk": "+852 1234 5678",
+  "hr": "+385 01 123 4567",
+  "hu": "+36 1 123 45 67",
+  "ie": "+353 20 912 3456",
+  "im": "+44 1632 961234",
+  "it": "+39 01 123 456",
+  "je": "+44 1632 961234",
+  "jm": "+1-876-555-1234",
+  "jp": "+81-3-1234-5678",
+  "kn": "+1-869-555-1234",
+  "ky": "+1-345-555-1234",
+  "kz": "+7 495 1234567",
+  "lc": "+1-758-555-1234",
+  "mp": "+1-670-555-1234",
+  "ms": "+1-664-555-1234",
+  "nl": "+31 42 123 4567",
+  "no": "+47 22 12 34 56",
+  "pe": "+51 1 1234567",
+  "pl": "+48 42 123 4567",
+  "pr": "+1-787-555-1234",
+  "pt": "+351 211 123456",
+  "ru": "+7 495 1234567",
+  "se": "+46 31 123 4567",
+  "si": "+386 31 123 4567",
+  "sj": "+47 22 12 34 56",
+  "sx": "+1-721-555-1234",
+  "tc": "+1-649-555-1234",
+  "tr": "+90 312 123 4567",
+  "tt": "+1-868-555-1234",
+  "tw": "+886 1 2345 6789",
+  "ua": "+380 44 123 4567",
+  "us": "+1-202-555-1234",
+  "va": "+39 01 123 456",
+  "vc": "+1-784-555-1234",
+  "vg": "+1-284-555-1234",
+  "vi": "+1-340-555-1234",
+  "vn": "+84 1 234 5678",
+  "za": "+27 11 907 1111"
+}

data/presets.yaml

@@ -285,7 +285,7 @@ en:
           onsen: Japanese Onsen
       beauty:
         # beauty=*
-        label: Beauty Specialty
+        label: Services
       bench:
         # bench=*
         label: Bench
@@ -446,6 +446,14 @@ en:
       check_date:
         # check_date=*
         label: Last Checked Date
+        # check_date field placeholder
+        placeholder: YYYY-MM-DD
+      circumference:
+        # circumference=*
+        label: Circumference
+        # circumference field placeholder
+        placeholder: '1 m, 20 cm, 30 in…'
+        terms: '[translate with synonyms or related terms for ''Circumference'', separated by commas]'
       clothes:
         # clothes=*
         label: Clothes
@@ -623,6 +631,9 @@ en:
           timetable: Timetable
           # departures_board=yes
           'yes': 'Yes'
+      depth:
+        # depth=*
+        label: Depth (Meters)
       description:
         # description=*
         label: Description
@@ -667,6 +678,7 @@ en:
         label: Direction (Degrees Clockwise)
         # direction field placeholder
         placeholder: '45, 90, 180, 270'
+        terms: '[translate with synonyms or related terms for ''Direction (Degrees Clockwise)'', separated by commas]'
       direction_cardinal:
         # direction=*
         label: Direction
@@ -733,6 +745,9 @@ en:
       disused/railway:
         # 'disused:railway=*'
         label: Type
+      disused/shop:
+        # 'disused:shop=*'
+        label: Type
       dock:
         # dock=*
         label: Type
@@ -786,6 +801,8 @@ en:
           'yes': Yes (unspecified)
         # electrified field placeholder
         placeholder: 'Contact Line, Electrified Rail...'
+        # 'terms: contact line,powered,third rail'
+        terms: '[translate with synonyms or related terms for ''Electrification'', separated by commas]'
       elevation:
         # ele=*
         label: Elevation
@@ -1116,7 +1133,7 @@ en:
         label: Intermittent
       internet_access:
         # internet_access=*
-        label: Internet Access
+        label: Internet Connection
         options:
           # internet_access=no
           'no': 'No'
@@ -1129,12 +1146,19 @@ en:
           # internet_access=yes
           'yes': 'Yes'
         # 'terms: wifi,wlan'
-        terms: '[translate with synonyms or related terms for ''Internet Access'', separated by commas]'
+        terms: '[translate with synonyms or related terms for ''Internet Connection'', separated by commas]'
       internet_access/fee:
         # 'internet_access:fee=*'
-        label: Internet Access Fee
+        label: Internet Access
+        options:
+          # 'internet_access:fee=customers'
+          customers: Customers Only
+          # 'internet_access:fee=no'
+          'no': Free
+          # 'internet_access:fee=yes'
+          'yes': Paid
         # 'terms: wifi fee'
-        terms: '[translate with synonyms or related terms for ''Internet Access Fee'', separated by commas]'
+        terms: '[translate with synonyms or related terms for ''Internet Access'', separated by commas]'
       internet_access/ssid:
         # 'internet_access:ssid=*'
         label: Wifi Network Name
@@ -1165,6 +1189,9 @@ en:
       kerb/height:
         # 'kerb:height=*'
         label: Height
+      kneipp_water_cure_multi:
+        # 'kneipp_water_cure:=*'
+        label: Basin Types
       label:
         # label=*
         label: Label
@@ -1355,6 +1382,11 @@ en:
         label: Microbrewery
         # 'terms: brewpub,craft beer'
         terms: '[translate with synonyms or related terms for ''Microbrewery'', separated by commas]'
+      mimics:
+        # mimics=*
+        label: Mimics
+        # 'terms: camoflauged,disguised,looks like,tree'
+        terms: '[translate with synonyms or related terms for ''Mimics'', separated by commas]'
       min_age:
         # min_age=*
         label: Minimum Age
@@ -1544,6 +1576,8 @@ en:
       opening_date:
         # opening_date=*
         label: Expected Opening Date
+        # opening_date field placeholder
+        placeholder: YYYY-MM-DD
       opening_hours:
         # opening_hours=*
         label: Hours
@@ -1762,11 +1796,17 @@ en:
       plant:
         # plant=*
         label: Plant
+      plant/method:
+        # 'plant:method=*'
+        label: Generation Method
       plant/output/electricity:
         # 'plant:output:electricity=*'
         label: Power Output
         # plant/output/electricity field placeholder
         placeholder: '500 MW, 1000 MW, 2000 MW...'
+      plant/source:
+        # 'plant:source=*'
+        label: Energy Source
       playground:
         # playground=*
         label: Type
@@ -2271,6 +2311,8 @@ en:
       start_date:
         # start_date=*
         label: Start Date
+        # start_date field placeholder
+        placeholder: YYYY-MM-DD
         # 'terms: inception'
         terms: '[translate with synonyms or related terms for ''Start Date'', separated by commas]'
       step_count:
@@ -2405,6 +2447,9 @@ en:
       target:
         # target=*
         label: Target
+      telecom/medium:
+        # 'telecom:medium=*'
+        label: Medium
       tidal:
         # tidal=*
         label: Tidal
@@ -2746,6 +2791,7 @@ en:
       advertising/board:
         # advertising=board
         name: Notice Board
+        # 'terms: advertising,announcements,blackboard,bulletin board,bulletinboard,cork board,corkboard,fliers,flyers,noticeboard,pin board,pinboard,sign,whiteboard'
         terms: '<translate with synonyms or related terms for ''Notice Board'', separated by commas>'
       advertising/column:
         # advertising=column
@@ -2761,59 +2807,66 @@ en:
         terms: '<translate with synonyms or related terms for ''Advertising Totem'', separated by commas>'
       aerialway:
         # aerialway=*
-        name: Aerialway
+        name: Aerialway Feature
       aerialway/cable_car:
         # aerialway=cable_car
         name: Cable Car
-        # 'terms: tramway,ropeway'
+        # 'terms: aerial cable,lift,ropeway,skiing,snowboarding,tramway'
         terms: '<translate with synonyms or related terms for ''Cable Car'', separated by commas>'
       aerialway/chair_lift:
         # aerialway=chair_lift
         name: Chair Lift
+        # 'terms: aerial cable,skiing,snowboarding'
         terms: '<translate with synonyms or related terms for ''Chair Lift'', separated by commas>'
       aerialway/drag_lift:
         # aerialway=drag_lift
         name: Drag Lift
+        # 'terms: skiing,snowboarding,surface cable'
         terms: '<translate with synonyms or related terms for ''Drag Lift'', separated by commas>'
       aerialway/gondola:
         # aerialway=gondola
         name: Gondola
+        # 'terms: aerial cable,lift,skiing,snowboarding'
         terms: '<translate with synonyms or related terms for ''Gondola'', separated by commas>'
       aerialway/goods:
         # aerialway=goods
         name: Goods Aerialway
+        # 'terms: aerial cable'
         terms: '<translate with synonyms or related terms for ''Goods Aerialway'', separated by commas>'
       aerialway/j-bar:
         # aerialway=j-bar
         name: J-Bar Lift
-        # 'terms: jbar'
+        # 'terms: drag lift,skiing,snowboarding,surface cable,jaybar,jbar'
         terms: '<translate with synonyms or related terms for ''J-Bar Lift'', separated by commas>'
       aerialway/magic_carpet:
         # aerialway=magic_carpet
         name: Magic Carpet Lift
+        # 'terms: conveyor belt,skiing,snowboarding,surface lift'
         terms: '<translate with synonyms or related terms for ''Magic Carpet Lift'', separated by commas>'
       aerialway/mixed_lift:
         # aerialway=mixed_lift
         name: Mixed Lift
+        # 'terms: aerial cable,skiing,snowboarding'
         terms: '<translate with synonyms or related terms for ''Mixed Lift'', separated by commas>'
       aerialway/platter:
         # aerialway=platter
         name: Platter Lift
-        # 'terms: button lift,poma lift'
+        # 'terms: button lift,disc lift,drag lift,poma lift,skiing,snowboarding,surface cable'
         terms: '<translate with synonyms or related terms for ''Platter Lift'', separated by commas>'
       aerialway/pylon:
         # aerialway=pylon
         name: Aerialway Pylon
+        # 'terms: chair lift pole,skiing,snowboarding,lift tower'
         terms: '<translate with synonyms or related terms for ''Aerialway Pylon'', separated by commas>'
       aerialway/rope_tow:
         # aerialway=rope_tow
         name: Rope Tow Lift
-        # 'terms: handle tow,bugel lift'
+        # 'terms: bugel lift,drag lift,handle tow,skiing,snowboarding,surface cable'
         terms: '<translate with synonyms or related terms for ''Rope Tow Lift'', separated by commas>'
       aerialway/t-bar:
         # aerialway=t-bar
         name: T-Bar Lift
-        # 'terms: tbar'
+        # 'terms: drag lift,skiing,surface cable,tbar'
         terms: '<translate with synonyms or related terms for ''T-Bar Lift'', separated by commas>'
       aerialway/zip_line:
         # aerialway=zip_line
@@ -2822,7 +2875,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Zip Line'', separated by commas>'
       aeroway:
         # aeroway=*
-        name: Aeroway
+        name: Aeroway Feature
       aeroway/aerodrome:
         # aeroway=aerodrome
         name: Airport
@@ -3129,6 +3182,11 @@ en:
         name: Events Venue
         # 'terms: banquet hall,baptism,Bar Mitzvah,Bat Mitzvah,birthdays,celebrations,conferences,confirmation,meetings,parties,party,quinceañera,reunions,weddings'
         terms: '<translate with synonyms or related terms for ''Events Venue'', separated by commas>'
+      amenity/exhibition_centre:
+        # amenity=exhibition_centre
+        name: Exposition Center
+        # 'terms: exhibition center,fair,exhibition,exposition,trade fair,trade show,trade exhibition,expo,tradeshow'
+        terms: '<translate with synonyms or related terms for ''Exposition Center'', separated by commas>'
       amenity/fast_food:
         # amenity=fast_food
         name: Fast Food
@@ -3249,11 +3307,20 @@ en:
         name: Preschool / Kindergarten Grounds
         # 'terms: kindergarden,pre-school'
         terms: '<translate with synonyms or related terms for ''Preschool / Kindergarten Grounds'', separated by commas>'
+      amenity/kneipp_water_cure:
+        # amenity=kneipp_water_cure
+        name: Kneipp Water Cure
+        terms: '<translate with synonyms or related terms for ''Kneipp Water Cure'', separated by commas>'
       amenity/language_school:
         # amenity=language_school
         name: Language School
         # 'terms: esl'
         terms: '<translate with synonyms or related terms for ''Language School'', separated by commas>'
+      amenity/lavoir:
+        # amenity=lavoir
+        name: Lavoir
+        # 'terms: clothing,laundry,washing'
+        terms: '<translate with synonyms or related terms for ''Lavoir'', separated by commas>'
       amenity/letter_box:
         # amenity=letter_box
         name: Letter Box
@@ -4053,6 +4120,7 @@ en:
       barrier/border_control:
         # barrier=border_control
         name: Border Control
+        # 'terms: checkpoint,customs,international boundary,passport check,port of entry,visa'
         terms: '<translate with synonyms or related terms for ''Border Control'', separated by commas>'
       barrier/cattle_grid:
         # barrier=cattle_grid
@@ -4145,6 +4213,11 @@ en:
         name: Sally Port
         # 'terms: Postern,castle side gate'
         terms: '<translate with synonyms or related terms for ''Sally Port'', separated by commas>'
+      barrier/spikes:
+        # barrier=spikes
+        name: Spike Strip
+        # 'terms: one-way traffic treadles,stingers,stop sticks,tire deflation device,tire shredders,traffic spikes'
+        terms: '<translate with synonyms or related terms for ''Spike Strip'', separated by commas>'
       barrier/stile:
         # barrier=stile
         name: Stile
@@ -4267,6 +4340,7 @@ en:
       building/farm_auxiliary:
         # building=farm_auxiliary
         name: Farm Building
+        # 'terms: agriculture,auxilary,chicken coop,farm auxiliary,pigsty,sty'
         terms: '<translate with synonyms or related terms for ''Farm Building'', separated by commas>'
       building/garage:
         # building=garage
@@ -4340,6 +4414,7 @@ en:
       building/retail:
         # building=retail
         name: Retail Building
+        # 'terms: shop building,store building'
         terms: '<translate with synonyms or related terms for ''Retail Building'', separated by commas>'
       building/roof:
         # building=roof
@@ -4379,6 +4454,7 @@ en:
       building/static_caravan:
         # building=static_caravan
         name: Static Mobile Home
+        # 'terms: house trailer,manufactured home,mobile home,prefabricated home,residential caravan,static caravan,trailer home'
         terms: '<translate with synonyms or related terms for ''Static Mobile Home'', separated by commas>'
       building/temple:
         # building=temple
@@ -4662,6 +4738,9 @@ en:
       disused/railway:
         # 'disused:railway=*'
         name: Disused Railway Feature
+      disused/shop:
+        # 'disused:shop=*'
+        name: Disused Shop
       embankment:
         # embankment=yes
         name: Embankment
@@ -4721,6 +4800,11 @@ en:
         name: Lifeguard
         # 'terms: CPR,rescue'
         terms: '<translate with synonyms or related terms for ''Lifeguard'', separated by commas>'
+      emergency/mountain_rescue:
+        # emergency=mountain_rescue
+        name: Mountain Rescue
+        # 'terms: EMS,EMT,rescue'
+        terms: '<translate with synonyms or related terms for ''Mountain Rescue'', separated by commas>'
       emergency/no:
         # emergency=no
         name: Emergency Access No
@@ -4960,13 +5044,18 @@ en:
       highway/cycleway/crossing:
         # cycleway=crossing
         name: Cycle Crossing
+      highway/cycleway/crossing/bicycle_foot:
+        # 'highway=cycleway, cycleway=crossing, foot=designated'
+        name: Cycle & Foot Crossing
+        # 'terms: bicycle and foot crosswalk,bike and pedestrian crossing,cycleway,cycling,cyclist'
+        terms: '<translate with synonyms or related terms for ''Cycle & Foot Crossing'', separated by commas>'
       highway/cycleway/crossing/marked:
-        # 'cycleway=crossing, crossing=marked'
+        # 'highway=cycleway, cycleway=crossing, crossing=marked'
         name: Marked Cycle Crossing
         # 'terms: cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
         terms: '<translate with synonyms or related terms for ''Marked Cycle Crossing'', separated by commas>'
       highway/cycleway/crossing/unmarked:
-        # 'cycleway=crossing, crossing=unmarked'
+        # 'highway=cycleway, cycleway=crossing, crossing=unmarked'
         name: Unmarked Cycle Crossing
         # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
         terms: '<translate with synonyms or related terms for ''Unmarked Cycle Crossing'', separated by commas>'
@@ -5311,6 +5400,11 @@ en:
         # historic=monument
         name: Monument
         terms: '<translate with synonyms or related terms for ''Monument'', separated by commas>'
+      historic/pillory:
+        # historic=pillory
+        name: Historic Pillory
+        # 'terms: attraction'
+        terms: '<translate with synonyms or related terms for ''Historic Pillory'', separated by commas>'
       historic/ruins:
         # historic=ruins
         name: Ruins
@@ -5515,9 +5609,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Naval Base'', separated by commas>'
       landuse/military/obstacle_course:
         # military=obstacle_course
-        name: Obstacle Course
+        name: Military Obstacle Course
         # 'terms: army,base,force,guard,marine,navy,troop,war'
-        terms: '<translate with synonyms or related terms for ''Obstacle Course'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Military Obstacle Course'', separated by commas>'
       landuse/military/range:
         # military=range
         name: Military Range
@@ -5525,9 +5619,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Military Range'', separated by commas>'
       landuse/military/training_area:
         # military=training_area
-        name: Training Area
+        name: Military Training Area
         # 'terms: air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war'
-        terms: '<translate with synonyms or related terms for ''Training Area'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Military Training Area'', separated by commas>'
       landuse/orchard:
         # landuse=orchard
         name: Orchard
@@ -5961,31 +6055,16 @@ en:
         name: Cycling Track
         # 'terms: bicycle track,bicycling track,cycle racetrack,velodrome'
         terms: '<translate with synonyms or related terms for ''Cycling Track'', separated by commas>'
-      leisure/track/cycling_point:
-        # 'leisure=track, sport=cycling'
-        name: Cycling Track
-        # 'terms: bicycle track,bicycling track,cycle racetrack,velodrome'
-        terms: '<translate with synonyms or related terms for ''Cycling Track'', separated by commas>'
       leisure/track/horse_racing:
         # 'leisure=track, sport=horse_racing'
         name: Horse Racing Track
         # 'terms: equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack'
         terms: '<translate with synonyms or related terms for ''Horse Racing Track'', separated by commas>'
-      leisure/track/horse_racing_point:
-        # 'leisure=track, sport=horse_racing'
-        name: Horse Racing Track
-        # 'terms: equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack'
-        terms: '<translate with synonyms or related terms for ''Horse Racing Track'', separated by commas>'
       leisure/track/running:
         # 'leisure=track, sport=running'
         name: Running Track
         # 'terms: athletics track,decathlon,foot race,long distance running,marathon,middle distance running,racetrack,running,sprint,track,walking'
         terms: '<translate with synonyms or related terms for ''Running Track'', separated by commas>'
-      leisure/track/running_point:
-        # 'leisure=track, sport=running'
-        name: Running Track
-        # 'terms: athletics track,decathlon,foot race,long distance running,marathon,middle distance running,racetrack,running,sprint,track,walking'
-        terms: '<translate with synonyms or related terms for ''Running Track'', separated by commas>'
       leisure/water_park:
         # leisure=water_park
         name: Water Park
@@ -6076,8 +6155,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Gasometer'', separated by commas>'
       man_made/groyne:
         # man_made=groyne
-        name: Groyne
-        terms: '<translate with synonyms or related terms for ''Groyne'', separated by commas>'
+        name: Groin
+        terms: '<translate with synonyms or related terms for ''Groin'', separated by commas>'
       man_made/lighthouse:
         # man_made=lighthouse
         name: Lighthouse
@@ -6333,9 +6412,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Military Bunker'', separated by commas>'
       military/checkpoint:
         # military=checkpoint
-        name: Checkpoint
+        name: Military Checkpoint
         # 'terms: air force,army,base,force,guard,marine,navy,troop,war'
-        terms: '<translate with synonyms or related terms for ''Checkpoint'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Military Checkpoint'', separated by commas>'
       military/nuclear_explosion_site:
         # military=nuclear_explosion_site
         name: Nuclear Explosion Site
@@ -6745,7 +6824,7 @@ en:
       office/research:
         # office=research
         name: Research Office
-        # 'terms: R and D,research and development,research lab'
+        # 'terms: R and D,research and development,research lab,r&d,rnd'
         terms: '<translate with synonyms or related terms for ''Research Office'', separated by commas>'
       office/surveyor:
         # office=surveyor
@@ -6776,34 +6855,34 @@ en:
         terms: '<translate with synonyms or related terms for ''Water Utility Office'', separated by commas>'
       piste/downhill:
         # 'piste:type=downhill'
-        name: Downhill Piste/Ski Run
-        # 'terms: ski,alpine,snowboard,downhill,piste'
-        terms: '<translate with synonyms or related terms for ''Downhill Piste/Ski Run'', separated by commas>'
+        name: Downhill Ski Run
+        # 'terms: alpine skiing,piste,ski hill,skiing,snowboarding'
+        terms: '<translate with synonyms or related terms for ''Downhill Ski Run'', separated by commas>'
       piste/downhill/halfpipe:
         # 'piste:type=downhill, man_made=piste:halfpipe'
-        name: Halfpipe
+        name: Snowsports Half-Pipe
         # 'terms: ski,alpine,halfpipe,half pipe,snowboard,downhill,piste'
-        terms: '<translate with synonyms or related terms for ''Halfpipe'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Snowsports Half-Pipe'', separated by commas>'
       piste/hike:
         # 'piste:type=hike'
-        name: Snowshoeing or Winter Hiking Trail
-        # 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski'
-        terms: '<translate with synonyms or related terms for ''Snowshoeing or Winter Hiking Trail'', separated by commas>'
+        name: Snowshoeing / Winter Hiking Trail
+        # 'terms: hike,nordic walking,piste,show shoeing,snowshoe,snowshoeing'
+        terms: '<translate with synonyms or related terms for ''Snowshoeing / Winter Hiking Trail'', separated by commas>'
       piste/ice_skate:
         # 'piste:type=ice_skate'
-        name: Ice Skating Piste
-        # 'terms: ice,skating,ski,piste'
-        terms: '<translate with synonyms or related terms for ''Ice Skating Piste'', separated by commas>'
+        name: Ice Skating Trail
+        # 'terms: ice rink,ice track,iceskating,piste,skates'
+        terms: '<translate with synonyms or related terms for ''Ice Skating Trail'', separated by commas>'
       piste/nordic:
         # 'piste:type=nordic'
-        name: Nordic or Crosscountry Piste/Ski Trail
-        # 'terms: ski,nordic,crosscountry,skating,piste'
-        terms: '<translate with synonyms or related terms for ''Nordic or Crosscountry Piste/Ski Trail'', separated by commas>'
+        name: Cross-Country Ski Trail
+        # 'terms: crosscountry,nordic skiing,piste,skate skiing,skiing,xc'
+        terms: '<translate with synonyms or related terms for ''Cross-Country Ski Trail'', separated by commas>'
       piste/piste:
         # 'piste:type=*'
-        name: Winter Sport Trails
+        name: Snowsports Trail / Piste
         # 'terms: ski,nordic,crosscountry,downhill,alpine,snowboard,skitour,ski touring,sled,luge,sleigh,sledge,ski-joring,husky,horse,winter hiking,snowshoe,snowshoeing,ice,skating'
-        terms: '<translate with synonyms or related terms for ''Winter Sport Trails'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Snowsports Trail / Piste'', separated by commas>'
       piste/skitour:
         # 'piste:type=skitour'
         name: Ski Touring Trail
@@ -6811,14 +6890,14 @@ en:
         terms: '<translate with synonyms or related terms for ''Ski Touring Trail'', separated by commas>'
       piste/sled:
         # 'piste:type=sled'
-        name: Sled Piste
-        # 'terms: ski,sled,luge,sleigh,sledge,piste'
-        terms: '<translate with synonyms or related terms for ''Sled Piste'', separated by commas>'
+        name: Sled Run
+        # 'terms: bobsled,luge,piste,skeleton,sledge,sleigh,toboggan'
+        terms: '<translate with synonyms or related terms for ''Sled Run'', separated by commas>'
       piste/sleigh:
         # 'piste:type=sleigh'
-        name: Sleigh Piste
-        # 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse'
-        terms: '<translate with synonyms or related terms for ''Sleigh Piste'', separated by commas>'
+        name: Sleigh Trail
+        # 'terms: dogsledding,husky,horse,piste,sled,sledge,ski-joring,skijoring'
+        terms: '<translate with synonyms or related terms for ''Sleigh Trail'', separated by commas>'
       place:
         # place=*
         name: Place
@@ -6964,6 +7043,9 @@ en:
       power:
         # power=*
         name: Power Feature
+      power/cable:
+        # power=cable
+        name: Power Cable
       power/cable/underground:
         # 'power=cable, location=underground'
         name: Underground Power Cable
@@ -7007,13 +7089,40 @@ en:
         name: Power Station Grounds
         # 'terms: coal,gas,generat*,hydro,nuclear,power,station'
         terms: '<translate with synonyms or related terms for ''Power Station Grounds'', separated by commas>'
+      power/plant/source/coal:
+        # 'power=plant, plant:source=coal'
+        name: Coal-Fired Power Plant
+        # 'terms: carbon,combustion,fossil fuel,coalfired,power station'
+        terms: '<translate with synonyms or related terms for ''Coal-Fired Power Plant'', separated by commas>'
+      power/plant/source/gas:
+        # 'power=plant, plant:source=gas'
+        name: Gas-Fired Power Plant
+        # 'terms: carbon,combustion,fossil fuel,gasfired,power station,natural gas'
+        terms: '<translate with synonyms or related terms for ''Gas-Fired Power Plant'', separated by commas>'
+      power/plant/source/hydro:
+        # 'power=plant, plant:source=hydro'
+        name: Hydroelectric Power Station
+        # 'terms: dam,power plant,run-of-the-river,tidal,water turbine'
+        terms: '<translate with synonyms or related terms for ''Hydroelectric Power Station'', separated by commas>'
+      power/plant/source/nuclear:
+        # 'power=plant, plant:source=nuclear'
+        name: Nuclear Power Plant
+        # 'terms: atomic,fission,power station,nuclear reactor'
+        terms: '<translate with synonyms or related terms for ''Nuclear Power Plant'', separated by commas>'
+      power/plant/source/solar:
+        # 'power=plant, plant:source=solar'
+        name: Solar Farm
+        # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar'
+        terms: '<translate with synonyms or related terms for ''Solar Farm'', separated by commas>'
+      power/plant/source/wind:
+        # 'power=plant, plant:source=wind'
+        name: Wind Farm
+        # 'terms: offshore wind,wind park,wind power plant,wind power station,wind turbines,windmills'
+        terms: '<translate with synonyms or related terms for ''Wind Farm'', separated by commas>'
       power/pole:
         # power=pole
         name: Power Pole
         terms: '<translate with synonyms or related terms for ''Power Pole'', separated by commas>'
-      power/sub_station:
-        # power=sub_station
-        name: Substation
       power/substation:
         # power=substation
         name: Substation
@@ -7260,9 +7369,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Disused Railway'', separated by commas>'
       railway/funicular:
         # railway=funicular
-        name: Funicular
+        name: Funicular Track
         # 'terms: venicular,cliff railway,cable car,cable railway,funicular railway'
-        terms: '<translate with synonyms or related terms for ''Funicular'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Funicular Track'', separated by commas>'
       railway/halt:
         # railway=halt
         name: Train Station (Halt / Request)
@@ -7273,9 +7382,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
       railway/light_rail:
         # railway=light_rail
-        name: Light Rail
+        name: Light Rail Track
         # 'terms: light rail,streetcar,trolley'
-        terms: '<translate with synonyms or related terms for ''Light Rail'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Light Rail Track'', separated by commas>'
       railway/milestone:
         # railway=milestone
         name: Railway Milestone
@@ -7283,31 +7392,31 @@ en:
         terms: '<translate with synonyms or related terms for ''Railway Milestone'', separated by commas>'
       railway/miniature:
         # railway=miniature
-        name: Miniature Railway
+        name: Miniature Train Track
         # 'terms: rideable miniature railway,narrow gauge railway,minimum gauge railway'
-        terms: '<translate with synonyms or related terms for ''Miniature Railway'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Miniature Train Track'', separated by commas>'
       railway/monorail:
         # railway=monorail
-        name: Monorail
-        terms: '<translate with synonyms or related terms for ''Monorail'', separated by commas>'
+        name: Monorail Track
+        terms: '<translate with synonyms or related terms for ''Monorail Track'', separated by commas>'
       railway/narrow_gauge:
         # railway=narrow_gauge
-        name: Narrow Gauge Rail
+        name: Narrow Gauge Track
         # 'terms: narrow gauge railway,narrow gauge railroad'
-        terms: '<translate with synonyms or related terms for ''Narrow Gauge Rail'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Narrow Gauge Track'', separated by commas>'
       railway/platform:
         # railway=platform
         name: Train Platform
       railway/rail:
         # railway=rail
-        name: Rail
-        # 'terms: rail line,railroad track,train track'
-        terms: '<translate with synonyms or related terms for ''Rail'', separated by commas>'
+        name: Train Track
+        # 'terms: permanent way,rail line,railroad track,railway track,track,train track'
+        terms: '<translate with synonyms or related terms for ''Train Track'', separated by commas>'
       railway/rail/highspeed:
         # 'railway=rail, highspeed=yes'
-        name: High-Speed Rail
+        name: High-Speed Train Track
         # 'terms: bullet train,fast rail,high speed rail,highspeed rail,HSR'
-        terms: '<translate with synonyms or related terms for ''High-Speed Rail'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''High-Speed Train Track'', separated by commas>'
       railway/signal:
         # railway=signal
         name: Railway Signal
@@ -7318,9 +7427,9 @@ en:
         name: Train Station
       railway/subway:
         # railway=subway
-        name: Subway
-        # 'terms: metro,transit'
-        terms: '<translate with synonyms or related terms for ''Subway'', separated by commas>'
+        name: Subway Track
+        # 'terms: metro,transit,underground railway'
+        terms: '<translate with synonyms or related terms for ''Subway Track'', separated by commas>'
       railway/subway_entrance:
         # railway=subway_entrance
         name: Subway Entrance
@@ -7338,9 +7447,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Train Wash'', separated by commas>'
       railway/tram:
         # railway=tram
-        name: Tram
-        # 'terms: light rail,streetcar,tram,trolley'
-        terms: '<translate with synonyms or related terms for ''Tram'', separated by commas>'
+        name: Tram Track
+        # 'terms: electric street railway,light rail,streetcar,tramway,trolley'
+        terms: '<translate with synonyms or related terms for ''Tram Track'', separated by commas>'
       railway/tram_stop:
         # railway=tram_stop
         name: Tram Stopping Position
@@ -7529,7 +7638,7 @@ en:
       shop/car_repair:
         # shop=car_repair
         name: Car Repair Shop
-        # 'terms: automobile,automotive,garage,service'
+        # 'terms: auto mechanic,automechanic,automobile,automotive,garage,inspection,oil change,service'
         terms: '<translate with synonyms or related terms for ''Car Repair Shop'', separated by commas>'
       shop/caravan:
         # shop=caravan
@@ -7725,8 +7834,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Framing Shop'', separated by commas>'
       shop/frozen_food:
         # shop=frozen_food
-        name: Frozen Food
-        terms: '<translate with synonyms or related terms for ''Frozen Food'', separated by commas>'
+        name: Frozen Food Store
+        terms: '<translate with synonyms or related terms for ''Frozen Food Store'', separated by commas>'
       shop/fuel:
         # shop=fuel
         name: Fuel Shop
@@ -8177,6 +8286,11 @@ en:
         name: Data Center
         # 'terms: computer systems storage,information technology,server farm,the cloud,telecommunications'
         terms: '<translate with synonyms or related terms for ''Data Center'', separated by commas>'
+      telecom/exchange:
+        # telecom=exchange
+        name: Telecom Exchange
+        # 'terms: telecommunications,telephone exchange,telephone switch'
+        terms: '<translate with synonyms or related terms for ''Telecom Exchange'', separated by commas>'
       tourism:
         # tourism=*
         name: Tourism Feature

data/presets/README.md

@@ -62,7 +62,7 @@ The complete JSON schema for presets can be found in [`data/presets/schema/prese
 
 The primary name of the feature type in American English.
 
-Upon merging with `master`, this is sent to Transifex for translating to other localizations. Changing the name of an existing preset will require it to be re-translated to all localizations.
+Upon merging with `develop`, this is sent to Transifex for translating to other localizations. Changing the name of an existing preset will require it to be re-translated to all localizations.
 
 This property is required. There is no default.
 
@@ -149,7 +149,7 @@ preset are generally not inherited. E.g. the `shop` field is not inherited by `s
 
 The name of a local SVG icon file. You can use icons from any of the following icon sets. When specifying an icon, use the prefixed version of the name, for example `"icon": "maki-park"` or `"icon": "tnp-2009223"`.
 
-* [iD's spritesheet](https://github.com/openstreetmap/iD/tree/master/svg/iD-sprite/presets) (`iD-`)
+* [iD's spritesheet](https://github.com/openstreetmap/iD/tree/develop/svg/iD-sprite/presets) (`iD-`)
 * [Maki](https://labs.mapbox.com/maki-icons/) (`maki-`), map-specific icons from Mapbox
 * [Temaki](https://ideditor.github.io/temaki/docs/) (`temaki-`), an expansion pack for Maki
     * This is the best place to submit a PR if you want to create a preset icon!
@@ -508,4 +508,4 @@ A "name" field must be included:
     "label": "Name",
     "placeholder": "Common name (if any)"
 }
-```
+```

data/presets/categories.json

@@ -1,226 +1 @@
-{
-  "categories": {
-    "category-barrier": {
-      "icon": "maki-roadblock",
-      "name": "Barrier Features",
-      "members": [
-        "barrier/fence",
-        "barrier/wall",
-        "barrier/ditch",
-        "barrier/gate",
-        "barrier/hedge",
-        "barrier/kerb",
-        "barrier"
-      ]
-    },
-    "category-building": {
-      "icon": "maki-building",
-      "name": "Building Features",
-      "members": [
-        "building",
-        "building/house",
-        "building/apartments",
-        "building/garage",
-        "building/retail",
-        "building/commercial",
-        "building/industrial",
-        "building/residential"
-      ]
-    },
-    "category-golf": {
-      "icon": "maki-golf",
-      "name": "Golf Features",
-      "members": [
-        "golf/fairway",
-        "golf/green",
-        "golf/lateral_water_hazard",
-        "golf/rough",
-        "golf/bunker",
-        "golf/tee",
-        "golf/water_hazard",
-        "golf/driving_range",
-        "golf/hole",
-        "golf/cartpath",
-        "golf/path"
-      ]
-    },
-    "category-landuse": {
-      "icon": "maki-landuse",
-      "name": "Land Use Features",
-      "members": [
-        "landuse/residential",
-        "landuse/industrial",
-        "landuse/commercial",
-        "landuse/retail",
-        "landuse/farmland",
-        "landuse/farmyard",
-        "landuse/forest",
-        "landuse/meadow",
-        "landuse/aquaculture",
-        "landuse/cemetery",
-        "landuse/military",
-        "landuse/religious"
-      ]
-    },
-    "category-natural": {
-      "icon": "maki-natural",
-      "name": "Natural Features",
-      "members": [
-        "natural/water",
-        "natural/wood",
-        "natural/scrub",
-        "natural/wetland",
-        "natural/grassland",
-        "natural/heath",
-        "natural/bare_rock",
-        "natural/beach",
-        "natural/cave_entrance",
-        "natural/glacier",
-        "natural/coastline",
-        "natural/tree_row",
-        "natural/peak",
-        "natural/cliff"
-      ]
-    },
-    "category-path": {
-      "icon": "temaki-pedestrian",
-      "name": "Paths",
-      "members": [
-        "highway/path",
-        "highway/footway",
-        "highway/footway/marked",
-        "highway/footway/sidewalk",
-        "highway/steps",
-        "highway/cycleway",
-        "highway/bridleway",
-        "highway/pedestrian_line"
-      ]
-    },
-    "category-rail": {
-      "icon": "iD-railway-rail",
-      "name": "Rails",
-      "members": [
-        "railway/rail",
-        "railway/disused",
-        "railway/tram",
-        "railway/subway",
-        "railway/narrow_gauge",
-        "railway/light_rail",
-        "railway/monorail",
-        "railway/funicular"
-      ]
-    },
-    "category-restriction": {
-      "icon": "iD-restriction",
-      "name": "Restriction Features",
-      "members": [
-        "type/restriction/no_left_turn",
-        "type/restriction/no_right_turn",
-        "type/restriction/no_straight_on",
-        "type/restriction/no_u_turn",
-        "type/restriction/only_left_turn",
-        "type/restriction/only_right_turn",
-        "type/restriction/only_straight_on",
-        "type/restriction/only_u_turn",
-        "type/restriction"
-      ]
-    },
-    "category-road_major": {
-      "icon": "iD-highway-unclassified",
-      "name": "Major Roads",
-      "members": [
-        "highway/motorway",
-        "highway/trunk",
-        "highway/primary",
-        "highway/secondary",
-        "highway/tertiary",
-        "highway/motorway_link",
-        "highway/trunk_link",
-        "highway/primary_link",
-        "highway/secondary_link",
-        "highway/tertiary_link"
-      ]
-    },
-    "category-road_minor": {
-      "icon": "iD-highway-unclassified",
-      "name": "Minor Roads",
-      "members": [
-        "highway/unclassified",
-        "highway/residential",
-        "highway/living_street",
-        "highway/service",
-        "highway/track"
-      ]
-    },
-    "category-road_service": {
-      "icon": "iD-highway-service",
-      "name": "Service Roads",
-      "members": [
-        "highway/service",
-        "highway/service/parking_aisle",
-        "highway/service/driveway",
-        "highway/service/alley",
-        "highway/service/emergency_access",
-        "highway/service/drive-through"
-      ]
-    },
-    "category-route": {
-      "icon": "iD-route",
-      "name": "Route Features",
-      "members": [
-        "type/route/road",
-        "type/route/bicycle",
-        "type/route/foot",
-        "type/route/hiking",
-        "type/route/horse",
-        "type/route/piste",
-        "type/route/bus",
-        "type/route/train",
-        "type/route/light_rail",
-        "type/route/tram",
-        "type/route/subway",
-        "type/route/ferry",
-        "type/route/power",
-        "type/route/pipeline",
-        "type/route/detour",
-        "type/route_master",
-        "type/route"
-      ]
-    },
-    "category-utility": {
-      "icon": "iD-power-line",
-      "name": "Utility Features",
-      "members": [
-        "power/line",
-        "power/minor_line",
-        "man_made/pipeline",
-        "power/cable/underground"
-      ]
-    },
-    "category-water": {
-      "icon": "maki-water",
-      "name": "Water Bodies",
-      "members": [
-        "natural/water",
-        "natural/water/pond",
-        "natural/water/basin",
-        "natural/water/lake",
-        "natural/water/reservoir"
-      ]
-    },
-    "category-waterway": {
-      "icon": "iD-waterway-stream",
-      "name": "Waterways",
-      "members": [
-        "waterway/stream",
-        "waterway/drain",
-        "waterway/river",
-        "waterway/canal",
-        "waterway/ditch",
-        "natural/water/stream",
-        "natural/water/river",
-        "natural/water/canal"
-      ]
-    }
-  }
-}
+{"category-barrier": {"icon": "maki-roadblock", "name": "Barrier Features", "members": ["barrier/fence", "barrier/wall", "barrier/ditch", "barrier/gate", "barrier/hedge", "barrier/kerb", "barrier"]}, "category-building": {"icon": "maki-building", "name": "Building Features", "members": ["building", "building/house", "building/apartments", "building/garage", "building/retail", "building/commercial", "building/industrial", "building/residential"]}, "category-golf": {"icon": "maki-golf", "name": "Golf Features", "members": ["golf/fairway", "golf/green", "golf/lateral_water_hazard", "golf/rough", "golf/bunker", "golf/tee", "golf/water_hazard", "golf/driving_range", "golf/hole", "golf/cartpath", "golf/path"]}, "category-landuse": {"icon": "maki-landuse", "name": "Land Use Features", "members": ["landuse/residential", "landuse/industrial", "landuse/commercial", "landuse/retail", "landuse/farmland", "landuse/farmyard", "landuse/forest", "landuse/meadow", "landuse/aquaculture", "landuse/cemetery", "landuse/military", "landuse/religious"]}, "category-natural": {"icon": "maki-natural", "name": "Natural Features", "members": ["natural/water", "natural/wood", "natural/scrub", "natural/wetland", "natural/grassland", "natural/heath", "natural/bare_rock", "natural/beach", "natural/cave_entrance", "natural/glacier", "natural/coastline", "natural/tree_row", "natural/peak", "natural/cliff"]}, "category-path": {"icon": "temaki-pedestrian", "name": "Paths", "members": ["highway/path", "highway/footway", "highway/footway/marked", "highway/footway/sidewalk", "highway/steps", "highway/cycleway", "highway/bridleway", "highway/pedestrian_line"]}, "category-rail": {"icon": "temaki-railway_track", "name": "Rails", "members": ["railway/rail", "railway/disused", "railway/tram", "railway/subway", "railway/narrow_gauge", "railway/light_rail", "railway/monorail", "railway/funicular"]}, "category-restriction": {"icon": "iD-restriction", "name": "Restriction Features", "members": ["type/restriction/no_left_turn", "type/restriction/no_right_turn", "type/restriction/no_straight_on", "type/restriction/no_u_turn", "type/restriction/only_left_turn", "type/restriction/only_right_turn", "type/restriction/only_straight_on", "type/restriction/only_u_turn", "type/restriction"]}, "category-road_major": {"icon": "iD-highway-unclassified", "name": "Major Roads", "members": ["highway/motorway", "highway/trunk", "highway/primary", "highway/secondary", "highway/tertiary", "highway/motorway_link", "highway/trunk_link", "highway/primary_link", "highway/secondary_link", "highway/tertiary_link"]}, "category-road_minor": {"icon": "iD-highway-unclassified", "name": "Minor Roads", "members": ["highway/unclassified", "highway/residential", "highway/living_street", "highway/service", "highway/track"]}, "category-road_service": {"icon": "iD-highway-service", "name": "Service Roads", "members": ["highway/service", "highway/service/parking_aisle", "highway/service/driveway", "highway/service/alley", "highway/service/emergency_access", "highway/service/drive-through"]}, "category-route": {"icon": "iD-route", "name": "Route Features", "members": ["type/route/road", "type/route/bicycle", "type/route/foot", "type/route/hiking", "type/route/horse", "type/route/piste", "type/route/bus", "type/route/train", "type/route/light_rail", "type/route/tram", "type/route/subway", "type/route/ferry", "type/route/power", "type/route/pipeline", "type/route/detour", "type/route_master", "type/route"]}, "category-utility": {"icon": "iD-power-line", "name": "Utility Features", "members": ["power/line", "power/minor_line", "man_made/pipeline", "power/cable/underground"]}, "category-water": {"icon": "maki-water", "name": "Water Bodies", "members": ["natural/water", "natural/water/pond", "natural/water/basin", "natural/water/lake", "natural/water/reservoir"]}, "category-waterway": {"icon": "iD-waterway-stream", "name": "Waterways", "members": ["waterway/stream", "waterway/drain", "waterway/river", "waterway/canal", "waterway/ditch", "natural/water/stream", "natural/water/river", "natural/water/canal"]}}

data/presets/categories/rail.json

@@ -1,5 +1,5 @@
 {
-    "icon": "iD-railway-rail",
+    "icon": "temaki-railway_track",
     "name": "Rails",
     "members": [
         "railway/rail",

data/presets/defaults.json

@@ -1,63 +1,61 @@
 {
-  "defaults": {
-    "area": [
-      "category-landuse",
-      "category-building",
-      "category-water",
-      "category-natural",
-      "leisure/park",
-      "amenity/hospital",
-      "amenity/place_of_worship",
-      "amenity/cafe",
-      "amenity/restaurant",
-      "area"
-    ],
-    "line": [
-      "category-road_major",
-      "category-road_minor",
-      "category-rail",
-      "category-path",
-      "category-waterway",
-      "category-barrier",
-      "category-natural",
-      "category-utility",
-      "line"
-    ],
-    "point": [
-      "category-natural",
-      "leisure/park",
-      "amenity/hospital",
-      "amenity/place_of_worship",
-      "amenity/cafe",
-      "amenity/restaurant",
-      "amenity/fast_food",
-      "amenity/bar",
-      "amenity/bank",
-      "shop/supermarket",
-      "point"
-    ],
-    "vertex": [
-      "highway/crossing/marked",
-      "highway/crossing/unmarked",
-      "railway/level_crossing",
-      "highway/traffic_signals",
-      "highway/turning_circle",
-      "highway/turning_loop",
-      "traffic_calming",
-      "highway/mini_roundabout",
-      "highway/motorway_junction",
-      "point"
-    ],
-    "relation": [
-      "category-route",
-      "category-restriction",
-      "public_transport/stop_area",
-      "type/boundary",
-      "type/waterway",
-      "type/multipolygon",
-      "type/enforcement",
-      "type/site",
-      "relation"
-    ]
-  }
+  "area": [
+    "category-landuse",
+    "category-building",
+    "category-water",
+    "category-natural",
+    "leisure/park",
+    "amenity/hospital",
+    "amenity/place_of_worship",
+    "amenity/cafe",
+    "amenity/restaurant",
+    "area"
+  ],
+  "line": [
+    "category-road_major",
+    "category-road_minor",
+    "category-rail",
+    "category-path",
+    "category-waterway",
+    "category-barrier",
+    "category-natural",
+    "category-utility",
+    "line"
+  ],
+  "point": [
+    "category-natural",
+    "leisure/park",
+    "amenity/hospital",
+    "amenity/place_of_worship",
+    "amenity/cafe",
+    "amenity/restaurant",
+    "amenity/fast_food",
+    "amenity/bar",
+    "amenity/bank",
+    "shop/supermarket",
+    "point"
+  ],
+  "vertex": [
+    "highway/crossing/marked",
+    "highway/crossing/unmarked",
+    "railway/level_crossing",
+    "highway/traffic_signals",
+    "highway/turning_circle",
+    "highway/turning_loop",
+    "traffic_calming",
+    "highway/mini_roundabout",
+    "highway/motorway_junction",
+    "point"
+  ],
+  "relation": [
+    "category-route",
+    "category-restriction",
+    "public_transport/stop_area",
+    "type/boundary",
+    "type/waterway",
+    "type/multipolygon",
+    "type/enforcement",
+    "type/site",
+    "relation"
+  ]
 }

data/presets/fields.json

@@ -1,477 +1,483 @@
 {
-  "fields": {
-    "access_aisle": {"key": "access_aisle", "type": "combo", "label": "Type"},
-    "access_simple": {"key": "access", "type": "combo", "label": "Allowed Access", "options": ["yes", "permissive", "private", "customers", "permit", "no"], "terms": ["permitted", "private", "public"]},
-    "access": {"keys": ["access", "foot", "motor_vehicle", "bicycle", "horse"], "reference": {"key": "access"}, "type": "access", "label": "Allowed Access", "placeholder": "Not Specified", "strings": {"types": {"access": "All", "foot": "Foot", "motor_vehicle": "Motor Vehicles", "bicycle": "Bicycles", "horse": "Horses"}, "options": {"yes": {"title": "Allowed", "description": "Access allowed by law; a right of way"}, "no": {"title": "Prohibited", "description": "Access not allowed to the general public"}, "permissive": {"title": "Permissive", "description": "Access allowed until such time as the owner revokes the permission"}, "private": {"title": "Private", "description": "Access allowed only with permission of the owner on an individual basis"}, "designated": {"title": "Designated", "description": "Access allowed according to signs or specific local laws"}, "destination": {"title": "Destination", "description": "Access allowed only to reach a destination"}, "dismount": {"title": "Dismount", "description": "Access allowed but rider must dismount"}, "permit": {"title": "Permit", "description": "Access allowed only with a valid permit or license"}}}},
-    "addr/interpolation": {"key": "addr:interpolation", "type": "combo", "label": "Type", "strings": {"options": {"all": "All", "even": "Even", "odd": "Odd", "alphabetic": "Alphabetic"}}},
-    "address": {"type": "address", "key": "addr", "keys": ["addr:block_number", "addr:city", "addr:block_number", "addr:conscriptionnumber", "addr:county", "addr:country", "addr:county", "addr:district", "addr:floor", "addr:hamlet", "addr:housename", "addr:housenumber", "addr:neighbourhood", "addr:place", "addr:postcode", "addr:province", "addr:quarter", "addr:state", "addr:street", "addr:subdistrict", "addr:suburb", "addr:unit"], "icon": "address", "label": "Address", "strings": {"placeholders": {"block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", "city!cn": "City/Prefecture/League", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", "country": "Country", "county": "County", "county!jp": "District", "district": "District", "district!cn": "District/County/Banner", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", "housename": "Housename", "housenumber": "123", "housenumber!jp": "Building No./Lot No.", "neighbourhood": "Neighbourhood", "neighbourhood!jp": "Chōme/Aza/Koaza", "place": "Place", "postcode": "Postcode", "province": "Province", "province!cn": "Province/Municipality/AR/SAR", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi", "state": "State", "street": "Street", "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", "suburb!jp": "Ward", "unit": "Unit"}}, "terms": ["location"]},
-    "admin_level": {"key": "admin_level", "type": "number", "minValue": 1, "label": "Admin Level"},
-    "aerialway": {"key": "aerialway", "type": "typeCombo", "label": "Type"},
-    "aerialway/access": {"key": "aerialway:access", "type": "combo", "label": "Access", "strings": {"options": {"entry": "Entry", "exit": "Exit", "both": "Both"}}},
-    "aerialway/bubble": {"key": "aerialway:bubble", "type": "check", "label": "Bubble"},
-    "aerialway/capacity": {"key": "aerialway:capacity", "type": "number", "minValue": 0, "label": "Capacity (per hour)", "placeholder": "500, 2500, 5000..."},
-    "aerialway/duration": {"key": "aerialway:duration", "type": "number", "minValue": 0, "label": "Duration (minutes)", "placeholder": "1, 2, 3..."},
-    "aerialway/heating": {"key": "aerialway:heating", "type": "check", "label": "Heated"},
-    "aerialway/occupancy": {"key": "aerialway:occupancy", "type": "number", "minValue": 0, "label": "Occupancy", "placeholder": "2, 4, 8..."},
-    "aerialway/summer/access": {"key": "aerialway:summer:access", "type": "combo", "label": "Access (summer)", "strings": {"options": {"entry": "Entry", "exit": "Exit", "both": "Both"}}},
-    "aeroway": {"key": "aeroway", "type": "typeCombo", "label": "Type"},
-    "agrarian": {"key": "agrarian", "type": "semiCombo", "label": "Products"},
-    "air_conditioning": {"key": "air_conditioning", "type": "check", "label": "Air Conditioning", "terms": ["cooling system", "refrigeration"]},
-    "amenity": {"key": "amenity", "type": "typeCombo", "label": "Type"},
-    "animal_boarding": {"key": "animal_boarding", "type": "semiCombo", "label": "For Animals"},
-    "animal_breeding": {"key": "animal_breeding", "type": "semiCombo", "label": "For Animals"},
-    "animal_shelter": {"key": "animal_shelter", "type": "semiCombo", "label": "For Animals"},
-    "architect": {"key": "architect", "type": "text", "label": "Architect", "terms": ["building designer"]},
-    "area/highway": {"key": "area:highway", "type": "typeCombo", "label": "Type"},
-    "artist": {"key": "artist_name", "type": "text", "label": "Artist"},
-    "artwork_type": {"key": "artwork_type", "type": "combo", "label": "Type"},
-    "atm": {"key": "atm", "type": "check", "label": "ATM"},
-    "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"},
-    "baby_feeding": {"key": "baby_feeding", "type": "combo", "label": "Baby Nursing Area", "strings": {"options": {"room": "Dedicated Room", "yes": "Marked Space", "no": "None"}}, "terms": ["baby feeding", "breastfeeding", "lactation", "mothers", "nursing"]},
-    "baby_seat": {"key": "baby", "type": "check", "label": "Baby Seat"},
-    "backcountry": {"key": "backcountry", "type": "check", "label": "Backcountry"},
-    "backrest": {"key": "backrest", "type": "check", "label": "Backrest"},
-    "bar": {"key": "bar", "type": "check", "label": "Bar"},
-    "barrier": {"key": "barrier", "type": "typeCombo", "label": "Type"},
-    "basin": {"key": "basin", "type": "combo", "label": "Type"},
-    "bath/open_air": {"key": "bath:open_air", "label": "Open Air", "type": "check"},
-    "bath/sand_bath": {"key": "bath:sand_bath", "label": "Sand Bath", "type": "check"},
-    "bath/type": {"key": "bath:type", "type": "combo", "label": "Specialty", "strings": {"options": {"onsen": "Japanese Onsen", "foot_bath": "Foot Bath", "hot_spring": "Hot Spring"}}},
-    "beauty": {"key": "beauty", "type": "combo", "label": "Beauty Specialty"},
-    "bench": {"key": "bench", "type": "check", "label": "Bench", "terms": ["seating"]},
-    "bicycle_parking": {"key": "bicycle_parking", "type": "combo", "label": "Type"},
-    "bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]},
-    "blind": {"key": "blind", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Blind Person Access", "terms": ["sight impairment", "vision impairment"]},
-    "blood_components": {"key": "blood:", "type": "multiCombo", "label": "Blood Components", "strings": {"options": {"whole": "whole blood", "plasma": "plasma", "platelets": "platelets", "stemcells": "stem cell samples"}}},
-    "board_type": {"key": "board_type", "type": "typeCombo", "label": "Type"},
-    "bollard": {"key": "bollard", "type": "combo", "label": "Type"},
-    "booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true},
-    "bottle": {"key": "bottle", "type": "check", "label": "Bottle Filling"},
-    "boules": {"key": "boules", "type": "typeCombo", "label": "Type"},
-    "boundary": {"key": "boundary", "type": "combo", "label": "Type"},
-    "brand": {"key": "brand", "type": "text", "label": "Brand"},
-    "brewery": {"key": "brewery", "type": "semiCombo", "label": "Draft Beers", "terms": ["on tap"]},
-    "bridge": {"key": "bridge", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
-    "bridge/support": {"key": "bridge:support", "type": "combo", "label": "Type"},
-    "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": "area", "label": "Building"},
-    "building": {"key": "building", "type": "combo", "label": "Building", "terms": ["structure"]},
-    "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
-    "building/levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
-    "building/levels/underground": {"key": "building:levels:underground", "type": "number", "minValue": 0, "label": "Underground Levels", "placeholder": "2, 4, 6...", "terms": ["basement levels"]},
-    "building/material": {"key": "building:material", "type": "combo", "label": "Material"},
-    "bunker_type": {"key": "bunker_type", "type": "combo", "label": "Type"},
-    "cables": {"key": "cables", "type": "number", "minValue": 1, "label": "Cables", "placeholder": "1, 2, 3..."},
-    "camera/direction": {"key": "camera:direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"},
-    "camera/mount": {"key": "camera:mount", "type": "combo", "label": "Camera Mount"},
-    "camera/type": {"key": "camera:type", "type": "combo", "label": "Camera Type", "strings": {"options": {"fixed": "Fixed", "panning": "Panning", "dome": "Dome"}}},
-    "capacity": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity", "placeholder": "50, 100, 200..."},
-    "cash_in": {"key": "cash_in", "type": "check", "label": "Cash In"},
-    "castle_type": {"key": "castle_type", "type": "combo", "label": "Type"},
-    "changing_table": {"key": "changing_table", "type": "check", "label": "Diaper Changing Table"},
-    "charge_fee": {"key": "charge", "type": "text", "label": "Fee Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
-    "charge_toll": {"key": "charge", "type": "text", "label": "Toll Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "toll", "valueNot": "no"}},
-    "check_date": {"key": "check_date", "type": "text", "label": "Last Checked Date"},
-    "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
-    "club": {"key": "club", "type": "typeCombo", "label": "Type"},
-    "collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"},
-    "colour": {"key": "colour", "type": "text", "label": "Color"},
-    "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
-    "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
-    "connectivity": {"key": "connectivity", "type": "text", "label": "Connectivity"},
-    "construction": {"key": "construction", "type": "combo", "label": "Type"},
-    "consulate": {"key": "consulate", "type": "combo", "label": "Type"},
-    "consulting": {"key": "consulting", "type": "semiCombo", "label": "Expertise"},
-    "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
-    "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
-    "conveying_escalator": {"key": "conveying", "type": "check", "label": "Escalator"},
-    "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
-    "country_flag": {"key": "country", "type": "combo", "label": "Flag Country", "prerequisiteTag": {"key": "flag:type", "value": "national"}},
-    "country": {"key": "country", "type": "combo", "label": "Country"},
-    "couplings": {"key": "couplings", "type": "number", "minValue": 1, "label": "Couplings", "placeholder": "1, 2, 3..."},
-    "covered": {"key": "covered", "type": "check", "label": "Covered"},
-    "craft": {"key": "craft", "type": "typeCombo", "label": "Type"},
-    "crane/type": {"key": "crane:type", "type": "combo", "label": "Crane Type", "strings": {"options": {"portal_crane": "Portal Crane", "floor-mounted_crane": "Floor-mounted Crane", "travel_lift": "Travel Lift"}}},
-    "crop": {"key": "crop", "type": "semiCombo", "label": "Crops"},
-    "crossing": {"key": "crossing", "type": "combo", "label": "Type"},
-    "crossing/island": {"key": "crossing:island", "type": "check", "label": "Refuge Island"},
-    "cuisine": {"key": "cuisine", "type": "semiCombo", "label": "Cuisines", "terms": ["fare", "food types"]},
-    "currency_multi": {"key": "currency:", "type": "multiCombo", "label": "Currency Types", "terms": ["bills", "cash", "coins", "money"]},
-    "cutting": {"key": "cutting", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
-    "cycle_network": {"key": "cycle_network", "type": "networkCombo", "label": "Network"},
-    "cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}},
-    "dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"},
-    "date": {"key": "date", "type": "check", "label": "Date"},
-    "delivery": {"key": "delivery", "type": "check", "label": "Delivery"},
-    "denomination": {"key": "denomination", "type": "combo", "label": "Denomination", "prerequisiteTag": {"key": "religion", "valueNot": "none"}},
-    "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"},
-    "departures_board": {"key": "departures_board", "type": "combo", "label": "Departures Board", "strings": {"options": {"yes": "Yes", "timetable": "Timetable", "realtime": "Realtime", "no": "None"}}},
-    "description": {"key": "description", "type": "textarea", "label": "Description", "universal": true, "terms": ["summary"]},
-    "design": {"key": "design", "type": "combo", "label": "Design"},
-    "destination_oneway": {"key": "destination", "type": "semiCombo", "label": "Destinations", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
-    "destination/ref_oneway": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
-    "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
-    "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
-    "diameter": {"key": "diameter", "type": "combo", "label": "Diameter", "snake_case": false, "placeholder": "5 mm, 10 cm, 15 in…"},
-    "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types", "terms": ["gluten free", "fruitarian", "halal", "kosher", "lactose free", "meat", "pescatarian", "raw", "vegan", "vegetarian"]},
-    "diplomatic": {"key": "diplomatic", "type": "combo", "label": "Type"},
-    "diplomatic/services": {"key": "diplomatic:services:", "type": "multiCombo", "label": "Services"},
-    "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}},
-    "direction_clock": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"clockwise": "Clockwise", "anticlockwise": "Counterclockwise"}}},
-    "direction_vertex": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
-    "direction": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"},
-    "dispensing": {"key": "dispensing", "type": "check", "label": "Dispenses Prescriptions", "default": "yes"},
-    "display": {"key": "display", "type": "combo", "label": "Display", "options": ["analog", "digital", "sundial", "unorthodox"]},
-    "distance": {"key": "distance", "type": "text", "label": "Distance"},
-    "disused/railway": {"key": "disused:railway", "type": "typeCombo", "label": "Type"},
-    "dock": {"key": "dock", "type": "combo", "label": "Type"},
-    "dog": {"key": "dog", "type": "combo", "label": "Dogs", "strings": {"options": {"yes": "Allowed", "leashed": "Leashed Only", "no": "Not Allowed"}}, "terms": ["animals", "pets"]},
-    "door_type": {"key": "door", "type": "typeCombo", "label": "Type"},
-    "door": {"key": "door", "type": "combo", "label": "Door"},
-    "drink_multi": {"key": "drink:", "type": "multiCombo", "label": "Drinks"},
-    "drinking_water": {"key": "drinking_water", "type": "check", "label": "Drinkable", "terms": ["drinkworthy", "potable"]},
-    "drive_through": {"key": "drive_through", "type": "check", "label": "Drive-Through"},
-    "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"},
-    "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}},
-    "elevation": {"key": "ele", "type": "number", "icon": "elevation", "universal": true, "label": "Elevation", "terms": ["altitude"]},
-    "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "label": "Email"},
-    "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
-    "embassy": {"key": "embassy", "type": "combo", "label": "Type"},
-    "emergency_combo": {"key": "emergency", "type": "combo", "label": "Type"},
-    "emergency": {"key": "emergency", "type": "check", "label": "Emergency"},
-    "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"},
-    "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"},
-    "except": {"key": "except", "type": "combo", "label": "Exceptions"},
-    "expected_rcn_route_relations": {"key": "expected_rcn_route_relations", "type": "number", "label": "Adjacent Cycling Nodes"},
-    "expected_rwn_route_relations": {"key": "expected_rwn_route_relations", "type": "number", "label": "Adjacent Walking Nodes"},
-    "faces": {"key": "faces", "type": "number", "minValue": 0, "label": "Faces"},
-    "fax": {"key": "fax", "type": "tel", "label": "Fax", "placeholder": "+31 42 123 4567"},
-    "fee": {"key": "fee", "type": "check", "label": "Fee"},
-    "fence_type": {"key": "fence_type", "type": "combo", "label": "Type"},
-    "fire_hydrant/diameter": {"key": "fire_hydrant:diameter", "type": "combo", "label": "Diameter (mm, in, or letters)", "snake_case": false},
-    "fire_hydrant/pressure": {"key": "fire_hydrant:pressure", "type": "combo", "label": "Pressure (bar)", "snake_case": false},
-    "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "Shape", "strings": {"options": {"pillar": "Pillar/Aboveground", "underground": "Underground", "wall": "Wall", "pipe": "Capped Pipe"}}},
-    "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
-    "fishing": {"key": "fishing", "type": "combo", "label": "Fishing"},
-    "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
-    "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true, "terms": ["help request"]},
-    "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
-    "floating": {"key": "floating", "type": "check", "label": "Floating"},
-    "flood_prone": {"key": "flood_prone", "type": "check", "label": "Flood Prone"},
-    "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
-    "fountain": {"key": "fountain", "type": "combo", "label": "Type"},
-    "frequency_electrified": {"key": "frequency", "type": "combo", "label": "Operating Frequency", "prerequisiteTag": {"key": "electrified", "valueNot": "no"}},
-    "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
-    "from": {"key": "from", "type": "text", "label": "From"},
-    "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
-    "fuel": {"key": "fuel", "type": "combo", "label": "Fuel"},
-    "gambling": {"key": "gambling", "type": "semiCombo", "label": "Games"},
-    "gauge": {"key": "gauge", "type": "combo", "label": "Gauge"},
-    "gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}, "terms": ["access", "female", "male", "unisex"]},
-    "generator/method": {"key": "generator:method", "type": "combo", "label": "Method"},
-    "generator/output/electricity": {"key": "generator:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW...", "snake_case": false},
-    "generator/source": {"key": "generator:source", "type": "combo", "label": "Source"},
-    "generator/type": {"key": "generator:type", "type": "combo", "label": "Type"},
-    "geyser/height": {"key": "geyser:height", "type": "text", "label": "Eruption Height"},
-    "gnis/feature_id": {"key": "gnis:feature_id", "type": "identifier", "label": "GNIS Feature ID", "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}", "pattern": "^[0-9]{1,}$", "countryCodes": ["us"], "terms": ["Federal Geographic Names Information Service", "United States Board on Geographic Names", "USA"]},
-    "government": {"key": "government", "type": "typeCombo", "label": "Type"},
-    "grape_variety": {"key": "grape_variety", "type": "semiCombo", "label": "Grape Varieties"},
-    "group_only": {"key": "group_only", "type": "check", "label": "Groups Only"},
-    "guest_house": {"key": "guest_house", "type": "combo", "label": "Type"},
-    "handicap": {"key": "handicap", "type": "number", "label": "Handicap", "placeholder": "1-18"},
-    "handrail": {"key": "handrail", "type": "check", "label": "Handrail"},
-    "hashtags": {"key": "hashtags", "type": "semiCombo", "label": "Hashtags", "placeholder": "#example"},
-    "healthcare": {"key": "healthcare", "type": "typeCombo", "label": "Type"},
-    "healthcare/speciality": {"key": "healthcare:speciality", "type": "semiCombo", "reference": {"key": "healthcare"}, "label": "Specialties"},
-    "height_building": {"key": "height", "minValue": 0, "type": "number", "label": "Building Height (Meters)", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
-    "height": {"key": "height", "minValue": 0, "type": "number", "label": "Height (Meters)"},
-    "highspeed": {"key": "highspeed", "type": "check", "label": "High-Speed"},
-    "highway": {"key": "highway", "type": "typeCombo", "label": "Type"},
-    "historic": {"key": "historic", "type": "typeCombo", "label": "Type"},
-    "historic/civilization": {"key": "historic:civilization", "type": "combo", "label": "Historic Civilization"},
-    "historic/wreck/date_sunk": {"key": "wreck:date_sunk", "type": "text", "label": "Date Sunk"},
-    "historic/wreck/visible_at_high_tide": {"key": "wreck:visible_at_high_tide", "type": "check", "label": "Visible At High Tide"},
-    "historic/wreck/visible_at_low_tide": {"key": "wreck:visible_at_low_tide", "type": "check", "label": "Visible At Low Tide"},
-    "hoops": {"key": "hoops", "type": "number", "minValue": 0, "label": "Hoops", "placeholder": "1, 2, 4..."},
-    "horse_dressage": {"key": "sport", "type": "check", "label": "Dressage Riding", "strings": {"options": {"undefined": "No", "equestrian": "Yes"}}, "reference": {"key": "sport", "value": "equestrian"}},
-    "horse_riding": {"key": "leisure", "type": "check", "label": "Horseback Riding", "strings": {"options": {"undefined": "No", "horse_riding": "Yes"}}, "reference": {"key": "leisure", "value": "horse_riding"}},
-    "horse_scale": {"key": "horse_scale", "type": "combo", "label": "Horseback Riding Difficulty", "placeholder": "Difficult, Dangerous...", "strings": {"options": {"common": "Easy: No problems or difficulties. (default)", "demanding": "Use with caution: Uneven way, occasional difficult passages.", "difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.", "critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.", "dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.", "impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."}}},
-    "horse_stables": {"key": "amenity", "type": "check", "label": "Riding Stable", "strings": {"options": {"undefined": "No", "stables": "Yes"}}, "reference": {"key": "amenity", "value": "stables"}},
-    "hot_water": {"key": "hot_water", "type": "check", "label": "Hot Water"},
-    "iata": {"key": "iata", "type": "text", "label": "IATA Airport Code"},
-    "icao": {"key": "icao", "type": "text", "label": "ICAO Airport Code"},
-    "incline_steps": {"key": "incline", "type": "combo", "label": "Incline", "strings": {"options": {"up": "Up", "down": "Down"}}},
-    "incline": {"key": "incline", "type": "combo", "label": "Incline"},
-    "indoor_type": {"key": "indoor", "type": "typeCombo", "label": "Type"},
-    "indoor": {"key": "indoor", "type": "check", "label": "Indoor"},
-    "industrial": {"key": "industrial", "type": "combo", "label": "Type"},
-    "informal": {"key": "informal", "type": "check", "label": "Informal"},
-    "information": {"key": "information", "type": "typeCombo", "label": "Type"},
-    "inscription": {"key": "inscription", "type": "textarea", "label": "Inscription"},
-    "intermittent_yes": {"key": "intermittent", "type": "check", "label": "Intermittent", "default": "yes"},
-    "intermittent": {"key": "intermittent", "type": "check", "label": "Intermittent"},
-    "internet_access": {"key": "internet_access", "type": "combo", "label": "Internet Access", "strings": {"options": {"yes": "Yes", "no": "No", "wlan": "Wifi", "wired": "Wired", "terminal": "Terminal"}}, "terms": ["wifi", "wlan"]},
-    "internet_access/fee": {"key": "internet_access:fee", "type": "check", "label": "Internet Access Fee", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}, "terms": ["wifi fee"]},
-    "internet_access/ssid": {"key": "internet_access:ssid", "type": "text", "label": "Wifi Network Name", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}, "terms": ["ssid"]},
-    "interval": {"key": "interval", "type": "text", "label": "Interval"},
-    "junction_line": {"key": "junction", "type": "combo", "label": "Junction", "strings": {"options": {"roundabout": "Roundabout", "circular": "Traffic Circle", "jughandle": "Jughandle"}}},
-    "junction/ref_oneway": {"key": "junction:ref", "type": "text", "label": "Junction Number", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
-    "kerb": {"key": "kerb", "type": "combo", "label": "Curb"},
-    "kerb/height": {"key": "kerb:height", "type": "combo", "snake_case": false, "label": "Height"},
-    "label": {"key": "label", "type": "textarea", "label": "Label"},
-    "lamp_type": {"key": "lamp_type", "type": "combo", "label": "Type"},
-    "landuse": {"key": "landuse", "type": "typeCombo", "label": "Type"},
-    "lanes": {"key": "lanes", "type": "number", "minValue": 0, "label": "Lanes", "placeholder": "1, 2, 3..."},
-    "language_multi": {"key": "language:", "type": "multiCombo", "label": "Languages"},
-    "layer": {"key": "layer", "type": "number", "label": "Layer", "placeholder": "0"},
-    "leaf_cycle_singular": {"key": "leaf_cycle", "type": "combo", "label": "Leaf Cycle", "strings": {"options": {"evergreen": "Evergreen", "deciduous": "Deciduous", "semi_evergreen": "Semi-Evergreen", "semi_deciduous": "Semi-Deciduous"}}},
-    "leaf_cycle": {"key": "leaf_cycle", "type": "combo", "label": "Leaf Cycle", "strings": {"options": {"evergreen": "Evergreen", "deciduous": "Deciduous", "semi_evergreen": "Semi-Evergreen", "semi_deciduous": "Semi-Deciduous", "mixed": "Mixed"}}},
-    "leaf_type_singular": {"key": "leaf_type", "type": "combo", "label": "Leaf Type", "strings": {"options": {"broadleaved": "Broadleaved", "needleleaved": "Needleleaved", "leafless": "Leafless"}}},
-    "leaf_type": {"key": "leaf_type", "type": "combo", "label": "Leaf Type", "strings": {"options": {"broadleaved": "Broadleaved", "needleleaved": "Needleleaved", "mixed": "Mixed", "leafless": "Leafless"}}},
-    "leisure": {"key": "leisure", "type": "typeCombo", "label": "Type"},
-    "length": {"key": "length", "type": "number", "minValue": 0, "label": "Length (Meters)"},
-    "level_semi": {"key": "level", "type": "semiCombo", "label": "Levels", "terms": ["building floors", "decks", "stories", "storeys", "storys"]},
-    "level": {"key": "level", "type": "combo", "label": "Level", "terms": ["building floor", "deck", "storey", "story"], "prerequisiteTag": {"keyNot": "building"}},
-    "liaison": {"key": "liaison", "type": "combo", "label": "Type"},
-    "line_attachment": {"key": "line_attachment", "type": "combo", "label": "Line Attachment"},
-    "lit": {"key": "lit", "type": "check", "label": "Lit", "terms": ["lamp", "lighting"]},
-    "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
-    "location": {"key": "location", "type": "combo", "label": "Location"},
-    "lock": {"key": "lock", "type": "check", "label": "Lock"},
-    "lockable": {"key": "lockable", "type": "check", "label": "Lockable"},
-    "man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
-    "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
-    "manufacturer": {"key": "manufacturer", "type": "combo", "snake_case": false, "caseSensitive": true, "label": "Manufacturer"},
-    "map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
-    "map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"},
-    "mapillary": {"key": "mapillary", "type": "identifier", "label": "Mapillary Image ID", "urlFormat": "https://mapillary.com/app/?focus=photo&pKey={value}", "pattern": "^[a-zA-Z0-9-_]{1,}$", "universal": true},
-    "marker": {"key": "marker", "type": "typeCombo", "label": "Type"},
-    "material": {"key": "material", "type": "combo", "label": "Material"},
-    "max_age": {"key": "max_age", "type": "number", "minValue": 0, "label": "Maximum Age", "terms": ["upper age limit"]},
-    "maxheight": {"key": "maxheight", "type": "combo", "label": "Max Height", "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"", "snake_case": false},
-    "maxspeed": {"key": "maxspeed", "type": "maxspeed", "label": "Speed Limit", "placeholder": "40, 50, 60..."},
-    "maxspeed/advisory": {"key": "maxspeed:advisory", "type": "maxspeed", "label": "Advisory Speed Limit", "placeholder": "40, 50, 60..."},
-    "maxstay": {"key": "maxstay", "type": "combo", "label": "Max Stay", "options": ["15 min", "30 min", "45 min", "1 hr", "1.5 hr", "2 hr", "2.5 hr", "3 hr", "4 hr", "1 day", "2 day"], "snake_case": false},
-    "maxweight_bridge": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false, "prerequisiteTag": {"key": "bridge", "valueNot": "no"}},
-    "maxweight": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false},
-    "memorial": {"key": "memorial", "type": "typeCombo", "label": "Type"},
-    "microbrewery": {"key": "microbrewery", "type": "check", "label": "Microbrewery", "terms": ["brewpub", "craft beer"]},
-    "min_age": {"key": "min_age", "type": "number", "minValue": 0, "label": "Minimum Age", "terms": ["lower age limit"]},
-    "minspeed": {"key": "minspeed", "type": "maxspeed", "label": "Minimum Speed Limit", "placeholder": "20, 30, 40..."},
-    "monitoring_multi": {"key": "monitoring:", "type": "multiCombo", "label": "Monitoring"},
-    "mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}},
-    "mtb/scale/imba": {"key": "mtb:scale:imba", "type": "combo", "label": "IMBA Trail Difficulty", "placeholder": "Easy, Medium, Difficult...", "strings": {"options": {"0": "Easiest (white circle)", "1": "Easy (green circle)", "2": "Medium (blue square)", "3": "Difficult (black diamond)", "4": "Extremely Difficult (double black diamond)"}}},
-    "mtb/scale/uphill": {"key": "mtb:scale:uphill", "type": "combo", "label": "Mountain Biking Uphill Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", "4": "4: Avg. incline <30%, poor condition, big rocks/branches", "5": "5: Very steep, bike generally needs to be pushed or carried"}}},
-    "museum": {"key": "museum", "type": "combo", "label": "Type"},
-    "name": {"key": "name", "type": "localized", "label": "Name", "universal": true, "placeholder": "Common name (if any)", "terms": ["label", "title"]},
-    "natural": {"key": "natural", "type": "typeCombo", "label": "Natural"},
-    "network_bicycle": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}},
-    "network_foot": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lwn": "Local", "rwn": "Regional", "nwn": "National", "iwn": "International"}}},
-    "network_horse": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lhn": "Local", "rhn": "Regional", "nhn": "National", "ihn": "International"}}},
-    "network_road": {"key": "network", "type": "networkCombo", "label": "Network"},
-    "network": {"key": "network", "type": "text", "label": "Network"},
-    "network/type": {"key": "network:type", "type": "combo", "label": "Network Type", "prerequisiteTag": {"key": "network"}},
-    "not/name": {"key": "not:name", "type": "semiCombo", "label": "Incorrect Names", "terms": ["common mistake names", "wrong names"]},
-    "note": {"key": "note", "type": "textarea", "universal": true, "icon": "note", "label": "Note", "terms": ["comment"]},
-    "office": {"key": "office", "type": "typeCombo", "label": "Type"},
-    "oneway_yes": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be Yes", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
-    "oneway": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be No", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
-    "oneway/bicycle": {"key": "oneway:bicycle", "type": "check", "label": "One Way (Bicycles)", "prerequisiteTag": {"key": "oneway"}},
-    "openfire": {"key": "openfire", "type": "check", "label": "Open Fires Allowed"},
-    "opening_date": {"key": "opening_date", "type": "text", "label": "Expected Opening Date"},
-    "opening_hours": {"key": "opening_hours", "type": "combo", "label": "Hours", "placeholder": "Unknown", "snake_case": false},
-    "operator": {"key": "operator", "type": "text", "label": "Operator"},
-    "operator/type": {"key": "operator:type", "type": "combo", "label": "Operator Type", "prerequisiteTag": {"key": "operator"}},
-    "outdoor_seating": {"key": "outdoor_seating", "type": "check", "label": "Outdoor Seating"},
-    "par": {"key": "par", "type": "number", "minValue": 1, "label": "Par", "placeholder": "3, 4, 5..."},
-    "park_ride": {"key": "park_ride", "type": "check", "label": "Park and Ride"},
-    "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "multi-storey": "Multilevel", "underground": "Underground", "sheds": "Sheds", "carports": "Carports", "garage_boxes": "Garage Boxes", "lane": "Roadside Lane"}}},
-    "payment_multi_fee": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
-    "payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types"},
-    "phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
-    "phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "label": "Telephone", "placeholder": "+31 42 123 4567", "terms": ["phone number"]},
-    "piste/difficulty_downhill": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
-    "piste/difficulty_nordic": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - Flat, no effort needed", "easy": "Easy - Soft hills, short steep section", "intermediate": "Intermediate - Steep section", "advanced": "Advanced - Narrow, steep or icy section, sharp turn", "expert": "Expert - Dangerous terrain around"}}},
-    "piste/difficulty_skitour": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - L: <30° incline", "easy": "Easy - WS: 30-35° incline", "intermediate": "Intermediate - ZS: 35-40° incline", "advanced": "Advanced - S: 40-45° incline", "expert": "Expert - SS: 45–50° incline", "freeride": "Freeride - AS: 50–55° incline", "extreme": "Extreme - EX: >55° incline"}}},
-    "piste/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice", "easy": "Easy", "intermediate": "Intermediate", "advanced": "Advanced", "expert": "Expert", "freeride": "Freeride", "extreme": "Extreme"}}},
-    "piste/grooming_downhill": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry - no grooming"}}},
-    "piste/grooming_hike": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - Winter Hiking", "backcountry": "Backcountry - Snowshoeing"}}},
-    "piste/grooming_nordic": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
-    "piste/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
-    "piste/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "nordic": "Nordic", "skitour": "Skitour", "sled": "Sled", "hike": "Hike", "sleigh": "Sleigh", "ice_skate": "Ice Skate", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection"}}},
-    "place": {"key": "place", "type": "typeCombo", "label": "Type"},
-    "plant": {"key": "plant", "type": "combo", "label": "Plant"},
-    "plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."},
-    "playground": {"key": "playground", "type": "combo", "label": "Type"},
-    "playground/theme": {"key": "playground:theme", "type": "combo", "label": "Theme"},
-    "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
-    "population": {"key": "population", "type": "text", "label": "Population"},
-    "post": {"type": "address", "key": "post", "keys": ["post:block_number", "post:city", "post:block_number", "post:conscriptionnumber", "post:county", "post:country", "post:county", "post:district", "post:floor", "post:hamlet", "post:housename", "post:housenumber", "post:neighbourhood", "post:place", "post:postcode", "post:province", "post:quarter", "post:state", "post:street", "post:subdistrict", "post:suburb", "post:unit"], "label": "Delivery Address"},
-    "power_supply": {"key": "power_supply", "type": "check", "label": "Power Supply"},
-    "power": {"key": "power", "type": "typeCombo", "label": "Type"},
-    "preschool": {"key": "preschool", "type": "check", "label": "Preschool"},
-    "produce": {"key": "produce", "type": "semiCombo", "label": "Produce"},
-    "product": {"key": "product", "type": "semiCombo", "label": "Products"},
-    "public_bookcase/type": {"key": "public_bookcase:type", "type": "combo", "label": "Type"},
-    "pump": {"key": "pump", "type": "combo", "label": "Pump", "strings": {"options": {"yes": "Yes", "manual": "Manual Hand Pump", "powered": "Machine-Powered Pump", "no": "None"}}},
-    "railway": {"key": "railway", "type": "typeCombo", "label": "Type"},
-    "railway/position": {"key": "railway:position", "type": "text", "placeholder": "Distance to one decimal (123.4)", "label": "Milestone Position"},
-    "railway/signal/direction": {"key": "railway:signal:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
-    "rating": {"key": "rating", "type": "combo", "label": "Power Rating", "snake_case": false},
-    "rcn_ref": {"key": "rcn_ref", "type": "text", "label": "Cycling Code"},
-    "recycling_accepts": {"key": "recycling:", "type": "multiCombo", "label": "Accepts"},
-    "recycling_type": {"key": "recycling_type", "type": "combo", "label": "Type", "placeholder": "Container, Center", "strings": {"options": {"container": "Container", "centre": "Center"}}},
-    "ref_aeroway_gate": {"key": "ref", "type": "text", "label": "Gate Number"},
-    "ref_golf_hole": {"key": "ref", "type": "text", "label": "Hole Number", "placeholder": "1-18"},
-    "ref_highway_junction": {"key": "ref", "type": "text", "label": "Junction Number"},
-    "ref_platform": {"key": "ref", "type": "text", "label": "Platform Number"},
-    "ref_road_number": {"key": "ref", "type": "text", "label": "Road Number"},
-    "ref_room_number": {"key": "ref", "type": "text", "label": "Room Number"},
-    "ref_route": {"key": "ref", "type": "text", "label": "Route Number"},
-    "ref_runway": {"key": "ref", "type": "text", "label": "Runway Number", "placeholder": "e.g. 01L/19R"},
-    "ref_stop_position": {"key": "ref", "type": "text", "label": "Stop Number"},
-    "ref_taxiway": {"key": "ref", "type": "text", "label": "Taxiway Name", "placeholder": "e.g. A5"},
-    "ref": {"key": "ref", "type": "text", "label": "Reference Code"},
-    "ref/isil": {"key": "ref:isil", "type": "text", "label": "ISIL Code"},
-    "ref/vatin": {"key": "ref:vatin", "type": "identifier", "label": "VAT ID Number", "notCountryCodes": ["ao", "ai", "bm", "bt", "io", "vg", "bn", "ky", "km", "cu", "dj", "er", "fk", "gi", "gg", "hk", "iq", "ki", "xk", "kw", "lr", "ly", "mo", "mv", "mh", "fm", "ms", "mm", "nr", "kp", "om", "pw", "pn", "qa", "sh", "sm", "st", "sb", "so", "gs", "ss", "sr", "sz", "sy", "tl", "tc", "tv", "us", "va", "ye"], "terms": ["value added tax identification number", "vatin"]},
-    "relation": {"key": "type", "type": "combo", "label": "Type"},
-    "religion": {"key": "religion", "type": "combo", "label": "Religion"},
-    "reservation": {"key": "reservation", "type": "combo", "label": "Reservations", "strings": {"options": {"yes": "Accepted", "no": "Not Accepted", "required": "Required", "recommended": "Recommended"}}},
-    "residential": {"key": "residential", "type": "combo", "label": "Type"},
-    "resort": {"key": "resort", "type": "combo", "label": "Type"},
-    "resource": {"key": "resource", "type": "semiCombo", "label": "Resources"},
-    "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
-    "restrictions": {"type": "restrictions", "geometry": "vertex", "icon": "iD-restrictions", "reference": {"rtype": "restriction"}, "label": "Turn Restrictions"},
-    "roof/colour": {"key": "roof:colour", "type": "combo", "label": "Roof Color"},
-    "room": {"key": "room", "type": "combo", "label": "Type"},
-    "rooms": {"key": "rooms", "type": "number", "minValue": 0, "label": "Rooms"},
-    "route_master": {"key": "route_master", "type": "combo", "label": "Type"},
-    "route": {"key": "route", "type": "combo", "label": "Type"},
-    "rwn_ref": {"key": "rwn_ref", "type": "text", "label": "Walking Code"},
-    "sac_scale": {"key": "sac_scale", "type": "combo", "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": {"options": {"hiking": "T1: Hiking", "mountain_hiking": "T2: Mountain Hiking", "demanding_mountain_hiking": "T3: Demanding Mountain Hiking", "alpine_hiking": "T4: Alpine Hiking", "demanding_alpine_hiking": "T5: Demanding Alpine Hiking", "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"}}},
-    "salt": {"key": "salt", "type": "check", "label": "Salt", "terms": ["saline", "salinated"]},
-    "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"},
-    "screen": {"key": "screen", "type": "number", "label": "Screens", "placeholder": "1, 4, 8…", "minValue": 0},
-    "scuba_diving": {"key": "scuba_diving:", "type": "multiCombo", "label": "Services", "options": ["repair", "courses", "rental", "filling", "air_filling", "nitrox_filling", "trimix_filling", "oxygen_filling"]},
-    "seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"},
-    "seamark/beacon_lateral/category": {"key": "seamark:beacon_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right"}}},
-    "seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}},
-    "seamark/beacon_lateral/shape": {"key": "seamark:beacon_lateral:shape", "type": "combo", "label": "Shape"},
-    "seamark/beacon_lateral/system": {"key": "seamark:beacon_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
-    "seamark/buoy_lateral/category": {"key": "seamark:buoy_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "channel_left": "Channel Left", "channel_right": "Channel Right", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right", "preferred_channel_port": "Preferred Channel Port", "preferred_channel_starboard": "Preferred Channel Starboard"}}},
-    "seamark/buoy_lateral/colour": {"key": "seamark:buoy_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "red;white;red;white": "Red-White-Red-White", "green;white;green;white": "Green-White-Green-White", "red;green;red": "Red-Green-Red", "green;red;green": "Green-Red-Green", "white": "White", "yellow": "Yellow"}}},
-    "seamark/buoy_lateral/shape": {"key": "seamark:buoy_lateral:shape", "type": "combo", "label": "Shape"},
-    "seamark/buoy_lateral/system": {"key": "seamark:buoy_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
-    "seamark/mooring/category": {"key": "seamark:mooring:category", "type": "combo", "label": "Category"},
-    "seamark/type": {"key": "seamark:type", "type": "combo", "label": "Seamark", "terms": ["marine"]},
-    "seamark/wreck/category": {"key": "seamark:wreck:category", "type": "combo", "label": "Category"},
-    "seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"},
-    "seats": {"key": "seats", "type": "number", "minValue": 0, "label": "Seats", "placeholder": "2, 4, 6..."},
-    "second_hand": {"key": "second_hand", "type": "combo", "label": "Sells Used", "placeholder": "Yes, No, Only", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Only"}}},
-    "segregated": {"key": "segregated", "type": "check", "label": "Bicycle-Pedestrian Separation"},
-    "self_service": {"key": "self_service", "type": "check", "label": "Self-Service"},
-    "service_rail": {"key": "service", "type": "combo", "label": "Service Type", "strings": {"options": {"spur": "Spur", "yard": "Yard", "siding": "Siding", "crossover": "Crossover"}}},
-    "service_times": {"key": "service_times", "type": "text", "label": "Service Times"},
-    "service": {"key": "service", "type": "combo", "label": "Type", "options": ["parking_aisle", "driveway", "alley", "emergency_access", "drive-through"]},
-    "service/bicycle": {"key": "service:bicycle:", "type": "multiCombo", "label": "Services"},
-    "service/vehicle": {"key": "service:vehicle:", "type": "multiCombo", "label": "Services"},
-    "shelter_type": {"key": "shelter_type", "type": "combo", "label": "Type"},
-    "shelter": {"key": "shelter", "type": "check", "label": "Shelter"},
-    "shop": {"key": "shop", "type": "typeCombo", "label": "Type"},
-    "shower": {"key": "shower", "type": "check", "label": "Showers"},
-    "siren/purpose": {"key": "siren:purpose", "type": "combo", "label": "Purpose"},
-    "siren/type": {"key": "siren:type", "type": "combo", "label": "Type", "strings": {"options": {"pneumatic": "Pneumatic", "electronic": "Electronic", "other": "Other"}}},
-    "site_type": {"key": "site_type", "type": "combo", "label": "Site Type"},
-    "site": {"key": "site", "type": "combo", "label": "Type"},
-    "smoking": {"key": "smoking", "type": "combo", "label": "Smoking", "placeholder": "No, Separated, Yes...", "strings": {"options": {"no": "No smoking anywhere", "separated": "In smoking areas, not physically isolated", "isolated": "In smoking areas, physically isolated", "outside": "Allowed outside", "yes": "Allowed everywhere", "dedicated": "Dedicated to smokers (e.g. smokers' club)"}}},
-    "smoothness": {"key": "smoothness", "type": "combo", "label": "Smoothness", "placeholder": "Thin Rollers, Wheels, Off-Road...", "strings": {"options": {"excellent": "Thin Rollers: rollerblade, skateboard", "good": "Thin Wheels: racing bike", "intermediate": "Wheels: city bike, wheelchair, scooter", "bad": "Robust Wheels: trekking bike, car, rickshaw", "very_bad": "High Clearance: light duty off-road vehicle", "horrible": "Off-Road: heavy duty off-road vehicle", "very_horrible": "Specialized off-road: tractor, ATV", "impassable": "Impassable / No wheeled vehicle"}}},
-    "sms": {"key": "sms", "type": "check", "label": "SMS"},
-    "social_facility_for": {"key": "social_facility:for", "type": "combo", "label": "People Served"},
-    "social_facility": {"key": "social_facility", "type": "combo", "label": "Type"},
-    "source": {"key": "source", "type": "semiCombo", "icon": "source", "universal": true, "label": "Sources", "snake_case": false, "caseSensitive": true, "options": ["survey", "local knowledge", "gps", "aerial imagery", "streetlevel imagery"], "terms": ["reference"]},
-    "species/wikidata": {"key": "species:wikidata", "keys": ["species:wikidata", "species:wikipedia"], "type": "wikidata", "label": "Species Wikidata"},
-    "sport_ice": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["ice_skating", "ice_hockey", "multi", "curling", "ice_stock"]},
-    "sport_racing_motor": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["motor", "karting", "motocross"]},
-    "sport_racing_nonmotor": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["bmx", "cycling", "dog_racing", "horse_racing", "running"]},
-    "sport": {"key": "sport", "type": "semiCombo", "label": "Sports"},
-    "stars": {"key": "stars", "type": "combo", "label": "Stars", "terms": ["rating"]},
-    "start_date": {"key": "start_date", "type": "text", "universal": true, "label": "Start Date", "terms": ["inception"]},
-    "step_count": {"key": "step_count", "type": "number", "minValue": 0, "label": "Number of Steps"},
-    "stile": {"key": "stile", "type": "combo", "label": "Type"},
-    "stop": {"key": "stop", "type": "combo", "label": "Stop Type", "strings": {"options": {"all": "All Ways", "minor": "Minor Road"}}},
-    "street_cabinet": {"key": "street_cabinet", "type": "combo", "label": "Type"},
-    "stroller": {"key": "stroller", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Stroller Access", "terms": ["baby carriage", "perambulator", "pram", "pushchair"]},
-    "structure_waterway": {"type": "structureRadio", "keys": ["tunnel"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"tunnel": "Tunnel"}}},
-    "structure": {"type": "structureRadio", "keys": ["bridge", "tunnel", "embankment", "cutting", "ford"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"bridge": "Bridge", "tunnel": "Tunnel", "embankment": "Embankment", "cutting": "Cutting", "ford": "Ford"}}},
-    "studio": {"key": "studio", "type": "combo", "label": "Type"},
-    "substance": {"key": "substance", "type": "combo", "label": "Substance"},
-    "substation": {"key": "substation", "type": "typeCombo", "label": "Type"},
-    "supervised": {"key": "supervised", "type": "check", "label": "Supervised", "terms": ["guarded", "manned"]},
-    "support": {"key": "support", "type": "combo", "label": "Support"},
-    "surface": {"key": "surface", "type": "combo", "label": "Surface"},
-    "surveillance": {"key": "surveillance", "type": "combo", "label": "Surveillance Kind"},
-    "surveillance/type": {"key": "surveillance:type", "type": "combo", "label": "Surveillance Type", "strings": {"options": {"camera": "Camera", "guard": "Guard", "ALPR": "Automatic License Plate Reader"}}},
-    "surveillance/zone": {"key": "surveillance:zone", "type": "combo", "label": "Surveillance Zone"},
-    "survey/date": {"key": "survey:date", "type": "text", "label": "Last Survey Date"},
-    "swimming_pool": {"key": "swimming_pool", "type": "combo", "label": "Type"},
-    "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}},
-    "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
-    "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}, "terms": ["take out", "takeout"]},
-    "target": {"key": "target", "type": "combo", "label": "Target"},
-    "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
-    "to": {"key": "to", "type": "text", "label": "To"},
-    "toilets": {"key": "toilets", "type": "check", "label": "Toilets"},
-    "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
-    "toilets/handwashing": {"key": "toilets:handwashing", "type": "check", "label": "Handwashing"},
-    "toilets/position": {"key": "toilets:position", "type": "semiCombo", "label": "Positions"},
-    "toll": {"key": "toll", "type": "check", "label": "Toll"},
-    "tomb": {"key": "tomb", "type": "typeCombo", "label": "Type"},
-    "tourism": {"key": "tourism", "type": "typeCombo", "label": "Type"},
-    "tower/construction": {"key": "tower:construction", "type": "combo", "label": "Construction", "placeholder": "Guyed, Lattice, Concealed, ..."},
-    "tower/type": {"key": "tower:type", "type": "combo", "label": "Type"},
-    "townhall/type": {"key": "townhall:type", "type": "combo", "label": "Type"},
-    "tracktype": {"key": "tracktype", "type": "combo", "label": "Track Type", "placeholder": "Solid, Mostly Solid, Soft...", "strings": {"options": {"grade1": "Solid: paved or heavily compacted hardcore surface", "grade2": "Mostly Solid: gravel/rock with some soft material mixed in", "grade3": "Even mixture of hard and soft materials", "grade4": "Mostly Soft: soil/sand/grass with some hard material mixed in", "grade5": "Soft: soil/sand/grass"}}},
-    "trade": {"key": "trade", "type": "typeCombo", "label": "Type"},
-    "traffic_calming": {"key": "traffic_calming", "type": "typeCombo", "label": "Type"},
-    "traffic_sign": {"key": "traffic_sign", "type": "typeCombo", "label": "Traffic Sign"},
-    "traffic_sign/direction": {"key": "traffic_sign:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
-    "traffic_signals": {"key": "traffic_signals", "type": "combo", "label": "Type", "default": "signal"},
-    "traffic_signals/direction": {"key": "traffic_signals:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
-    "trail_visibility": {"key": "trail_visibility", "type": "combo", "label": "Trail Visibility", "placeholder": "Excellent, Good, Bad...", "strings": {"options": {"excellent": "Excellent: unambiguous path or markers everywhere", "good": "Good: markers visible, sometimes require searching", "intermediate": "Intermediate: few markers, path mostly visible", "bad": "Bad: no markers, path sometimes invisible/pathless", "horrible": "Horrible: often pathless, some orientation skills required", "no": "No: pathless, excellent orientation skills required"}}},
-    "transformer": {"key": "transformer", "type": "combo", "label": "Type", "strings": {"options": {"distribution": "Distribution", "generator": "Generator", "converter": "Converter", "traction": "Traction", "auto": "Autotransformer", "phase_angle_regulator": "Phase Angle Regulator", "auxiliary": "Auxiliary", "yes": "Unknown"}}},
-    "trees": {"key": "trees", "type": "semiCombo", "label": "Trees"},
-    "trench": {"key": "trench", "type": "combo", "label": "Type"},
-    "trolley_wire": {"key": "trolley_wire", "type": "check", "label": "Overhead Trolley Wires"},
-    "tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
-    "usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}},
-    "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"},
-    "utility": {"key": "utility", "type": "typeCombo", "label": "Utility"},
-    "valve": {"key": "valve", "type": "combo", "label": "Type"},
-    "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"},
-    "video_calls": {"key": "video", "type": "check", "label": "Video Calls"},
-    "visibility": {"key": "visibility", "type": "combo", "label": "Visibility", "strings": {"options": {"house": "Up to 5m (16ft)", "street": "5 to 20m (16 to 65ft)", "area": "Over 20m (65ft)"}}},
-    "volcano/status": {"key": "volcano:status", "type": "combo", "label": "Volcano Status", "strings": {"options": {"active": "Active", "dormant": "Dormant", "extinct": "Extinct"}}},
-    "volcano/type": {"key": "volcano:type", "type": "combo", "label": "Volcano Type", "strings": {"options": {"stratovolcano": "Stratovolcano", "shield": "Shield", "scoria": "Scoria"}}},
-    "voltage_electrified": {"key": "voltage", "type": "combo", "label": "Voltage", "prerequisiteTag": {"key": "electrified", "valueNot": "no"}},
-    "voltage": {"key": "voltage", "type": "combo", "label": "Voltage"},
-    "voltage/primary": {"key": "voltage:primary", "type": "combo", "label": "Primary Voltage"},
-    "voltage/secondary": {"key": "voltage:secondary", "type": "combo", "label": "Secondary Voltage"},
-    "voltage/tertiary": {"key": "voltage:tertiary", "type": "combo", "label": "Tertiary Voltage"},
-    "wall": {"key": "wall", "type": "combo", "label": "Type"},
-    "waste": {"key": "waste", "type": "semiCombo", "label": "Waste"},
-    "water_point": {"key": "water_point", "type": "check", "label": "Water Point"},
-    "water_source": {"key": "water_source", "default": "main", "type": "combo", "label": "Water Source"},
-    "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (m³)", "snake_case": false},
-    "water": {"key": "water", "type": "combo", "label": "Type"},
-    "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
-    "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "https://example.com", "label": "Website", "terms": ["internet presence", "uri", "url", "webpage"]},
-    "wetland": {"key": "wetland", "type": "combo", "label": "Type"},
-    "wheelchair": {"key": "wheelchair", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": ["handicap access"]},
-    "wholesale": {"key": "wholesale", "type": "typeCombo", "label": "Wholesale"},
-    "width": {"key": "width", "type": "number", "minValue": 0, "label": "Width (Meters)"},
-    "wikidata": {"key": "wikidata", "keys": ["wikidata", "wikipedia"], "type": "wikidata", "icon": "wikipedia", "universal": true, "label": "Wikidata"},
-    "wikimedia_commons": {"key": "wikimedia_commons", "type": "identifier", "label": "Wikimedia Commons Page", "placeholder": "File:Example.jpg", "urlFormat": "https://commons.wikimedia.org/wiki/{value}", "pattern": "^(?:File|Category):.{1,}", "universal": true},
-    "wikipedia": {"key": "wikipedia", "keys": ["wikipedia", "wikidata"], "type": "wikipedia", "icon": "wikipedia", "universal": true, "label": "Wikipedia"},
-    "windings": {"key": "windings", "type": "number", "minValue": 1, "label": "Windings", "placeholder": "1, 2, 3..."},
-    "windings/configuration": {"key": "windings:configuration", "type": "combo", "label": "Windings Configuration", "strings": {"options": {"star": "Star / Wye", "delta": "Delta", "open-delta": "Open Delta", "zigzag": "Zig Zag", "open": "Open", "scott": "Scott", "leblanc": "Leblanc"}}}
-  }
+  "access_aisle": {"key": "access_aisle", "type": "combo", "label": "Type"},
+  "access_simple": {"key": "access", "type": "combo", "label": "Allowed Access", "options": ["yes", "permissive", "private", "customers", "permit", "no"], "terms": ["permitted", "private", "public"]},
+  "access": {"keys": ["access", "foot", "motor_vehicle", "bicycle", "horse"], "reference": {"key": "access"}, "type": "access", "label": "Allowed Access", "placeholder": "Not Specified", "strings": {"types": {"access": "All", "foot": "Foot", "motor_vehicle": "Motor Vehicles", "bicycle": "Bicycles", "horse": "Horses"}, "options": {"yes": {"title": "Allowed", "description": "Access allowed by law; a right of way"}, "no": {"title": "Prohibited", "description": "Access not allowed to the general public"}, "permissive": {"title": "Permissive", "description": "Access allowed until such time as the owner revokes the permission"}, "private": {"title": "Private", "description": "Access allowed only with permission of the owner on an individual basis"}, "designated": {"title": "Designated", "description": "Access allowed according to signs or specific local laws"}, "destination": {"title": "Destination", "description": "Access allowed only to reach a destination"}, "dismount": {"title": "Dismount", "description": "Access allowed but rider must dismount"}, "permit": {"title": "Permit", "description": "Access allowed only with a valid permit or license"}}}},
+  "addr/interpolation": {"key": "addr:interpolation", "type": "combo", "label": "Type", "strings": {"options": {"all": "All", "even": "Even", "odd": "Odd", "alphabetic": "Alphabetic"}}},
+  "address": {"type": "address", "key": "addr", "keys": ["addr:block_number", "addr:city", "addr:block_number", "addr:conscriptionnumber", "addr:county", "addr:country", "addr:county", "addr:district", "addr:floor", "addr:hamlet", "addr:housename", "addr:housenumber", "addr:neighbourhood", "addr:place", "addr:postcode", "addr:province", "addr:quarter", "addr:state", "addr:street", "addr:subdistrict", "addr:suburb", "addr:unit"], "icon": "address", "label": "Address", "strings": {"placeholders": {"block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", "city!cn": "City/Prefecture/League", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", "country": "Country", "county": "County", "county!jp": "District", "district": "District", "district!cn": "District/County/Banner", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", "housename": "Housename", "housenumber": "123", "housenumber!jp": "Building No./Lot No.", "neighbourhood": "Neighbourhood", "neighbourhood!jp": "Chōme/Aza/Koaza", "place": "Place", "postcode": "Postcode", "province": "Province", "province!cn": "Province/Municipality/AR/SAR", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi", "state": "State", "street": "Street", "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", "suburb!jp": "Ward", "unit": "Unit"}}, "terms": ["location"]},
+  "admin_level": {"key": "admin_level", "type": "number", "minValue": 1, "label": "Admin Level"},
+  "aerialway": {"key": "aerialway", "type": "typeCombo", "label": "Type"},
+  "aerialway/access": {"key": "aerialway:access", "type": "combo", "label": "Access", "strings": {"options": {"entry": "Entry", "exit": "Exit", "both": "Both"}}},
+  "aerialway/bubble": {"key": "aerialway:bubble", "type": "check", "label": "Bubble"},
+  "aerialway/capacity": {"key": "aerialway:capacity", "type": "number", "minValue": 0, "label": "Capacity (per hour)", "placeholder": "500, 2500, 5000..."},
+  "aerialway/duration": {"key": "aerialway:duration", "type": "number", "minValue": 0, "label": "Duration (minutes)", "placeholder": "1, 2, 3..."},
+  "aerialway/heating": {"key": "aerialway:heating", "type": "check", "label": "Heated"},
+  "aerialway/occupancy": {"key": "aerialway:occupancy", "type": "number", "minValue": 0, "label": "Occupancy", "placeholder": "2, 4, 8..."},
+  "aerialway/summer/access": {"key": "aerialway:summer:access", "type": "combo", "label": "Access (summer)", "strings": {"options": {"entry": "Entry", "exit": "Exit", "both": "Both"}}},
+  "aeroway": {"key": "aeroway", "type": "typeCombo", "label": "Type"},
+  "agrarian": {"key": "agrarian", "type": "semiCombo", "label": "Products"},
+  "air_conditioning": {"key": "air_conditioning", "type": "check", "label": "Air Conditioning", "terms": ["cooling system", "refrigeration"]},
+  "amenity": {"key": "amenity", "type": "typeCombo", "label": "Type"},
+  "animal_boarding": {"key": "animal_boarding", "type": "semiCombo", "label": "For Animals"},
+  "animal_breeding": {"key": "animal_breeding", "type": "semiCombo", "label": "For Animals"},
+  "animal_shelter": {"key": "animal_shelter", "type": "semiCombo", "label": "For Animals"},
+  "architect": {"key": "architect", "type": "text", "label": "Architect", "terms": ["building designer"]},
+  "area/highway": {"key": "area:highway", "type": "typeCombo", "label": "Type"},
+  "artist": {"key": "artist_name", "type": "text", "label": "Artist"},
+  "artwork_type": {"key": "artwork_type", "type": "combo", "label": "Type"},
+  "atm": {"key": "atm", "type": "check", "label": "ATM"},
+  "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"},
+  "baby_feeding": {"key": "baby_feeding", "type": "combo", "label": "Baby Nursing Area", "strings": {"options": {"room": "Dedicated Room", "yes": "Marked Space", "no": "None"}}, "terms": ["baby feeding", "breastfeeding", "lactation", "mothers", "nursing"]},
+  "baby_seat": {"key": "baby", "type": "check", "label": "Baby Seat"},
+  "backcountry": {"key": "backcountry", "type": "check", "label": "Backcountry"},
+  "backrest": {"key": "backrest", "type": "check", "label": "Backrest"},
+  "bar": {"key": "bar", "type": "check", "label": "Bar"},
+  "barrier": {"key": "barrier", "type": "typeCombo", "label": "Type"},
+  "basin": {"key": "basin", "type": "combo", "label": "Type"},
+  "bath/open_air": {"key": "bath:open_air", "label": "Open Air", "type": "check"},
+  "bath/sand_bath": {"key": "bath:sand_bath", "label": "Sand Bath", "type": "check"},
+  "bath/type": {"key": "bath:type", "type": "combo", "label": "Specialty", "strings": {"options": {"onsen": "Japanese Onsen", "foot_bath": "Foot Bath", "hot_spring": "Hot Spring"}}},
+  "beauty": {"key": "beauty", "type": "semiCombo", "label": "Services"},
+  "bench": {"key": "bench", "type": "check", "label": "Bench", "terms": ["seating"]},
+  "bicycle_parking": {"key": "bicycle_parking", "type": "combo", "label": "Type"},
+  "bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]},
+  "blind": {"key": "blind", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Blind Person Access", "terms": ["sight impairment", "vision impairment"]},
+  "blood_components": {"key": "blood:", "type": "multiCombo", "label": "Blood Components", "strings": {"options": {"whole": "whole blood", "plasma": "plasma", "platelets": "platelets", "stemcells": "stem cell samples"}}},
+  "board_type": {"key": "board_type", "type": "combo", "label": "Type"},
+  "bollard": {"key": "bollard", "type": "combo", "label": "Type"},
+  "booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true},
+  "bottle": {"key": "bottle", "type": "check", "label": "Bottle Filling"},
+  "boules": {"key": "boules", "type": "typeCombo", "label": "Type"},
+  "boundary": {"key": "boundary", "type": "combo", "label": "Type"},
+  "brand": {"key": "brand", "type": "text", "label": "Brand"},
+  "brewery": {"key": "brewery", "type": "semiCombo", "label": "Draft Beers", "terms": ["on tap"]},
+  "bridge": {"key": "bridge", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+  "bridge/support": {"key": "bridge:support", "type": "typeCombo", "label": "Type"},
+  "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": "area", "label": "Building"},
+  "building": {"key": "building", "type": "combo", "label": "Building", "terms": ["structure"]},
+  "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
+  "building/levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
+  "building/levels/underground": {"key": "building:levels:underground", "type": "number", "minValue": 0, "label": "Underground Levels", "placeholder": "2, 4, 6...", "terms": ["basement levels"]},
+  "building/material": {"key": "building:material", "type": "combo", "label": "Material"},
+  "bunker_type": {"key": "bunker_type", "type": "combo", "label": "Type"},
+  "cables": {"key": "cables", "type": "number", "minValue": 1, "label": "Cables", "placeholder": "1, 2, 3..."},
+  "camera/direction": {"key": "camera:direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"},
+  "camera/mount": {"key": "camera:mount", "type": "combo", "label": "Camera Mount"},
+  "camera/type": {"key": "camera:type", "type": "combo", "label": "Camera Type", "strings": {"options": {"fixed": "Fixed", "panning": "Panning", "dome": "Dome"}}},
+  "capacity": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity", "placeholder": "50, 100, 200..."},
+  "cash_in": {"key": "cash_in", "type": "check", "label": "Cash In"},
+  "castle_type": {"key": "castle_type", "type": "combo", "label": "Type"},
+  "changing_table": {"key": "changing_table", "type": "check", "label": "Diaper Changing Table"},
+  "charge_fee": {"key": "charge", "type": "text", "label": "Fee Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
+  "charge_toll": {"key": "charge", "type": "text", "label": "Toll Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "toll", "valueNot": "no"}},
+  "check_date": {"key": "check_date", "type": "text", "label": "Last Checked Date", "placeholder": "YYYY-MM-DD"},
+  "circumference": {"key": "circumference", "type": "combo", "label": "Circumference", "snake_case": false, "placeholder": "1 m, 20 cm, 30 in…"},
+  "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
+  "club": {"key": "club", "type": "typeCombo", "label": "Type"},
+  "collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"},
+  "colour": {"key": "colour", "type": "text", "label": "Color"},
+  "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
+  "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
+  "connectivity": {"key": "connectivity", "type": "text", "label": "Connectivity"},
+  "construction": {"key": "construction", "type": "combo", "label": "Type"},
+  "consulate": {"key": "consulate", "type": "combo", "label": "Type"},
+  "consulting": {"key": "consulting", "type": "semiCombo", "label": "Expertise"},
+  "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
+  "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
+  "conveying_escalator": {"key": "conveying", "type": "check", "label": "Escalator"},
+  "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
+  "country_flag": {"key": "country", "type": "combo", "label": "Flag Country", "prerequisiteTag": {"key": "flag:type", "value": "national"}},
+  "country": {"key": "country", "type": "combo", "label": "Country"},
+  "couplings": {"key": "couplings", "type": "number", "minValue": 1, "label": "Couplings", "placeholder": "1, 2, 3..."},
+  "covered": {"key": "covered", "type": "check", "label": "Covered"},
+  "craft": {"key": "craft", "type": "typeCombo", "label": "Type"},
+  "crane/type": {"key": "crane:type", "type": "combo", "label": "Crane Type", "strings": {"options": {"portal_crane": "Portal Crane", "floor-mounted_crane": "Floor-mounted Crane", "travel_lift": "Travel Lift"}}},
+  "crop": {"key": "crop", "type": "semiCombo", "label": "Crops"},
+  "crossing": {"key": "crossing", "type": "combo", "label": "Type"},
+  "crossing/island": {"key": "crossing:island", "type": "check", "label": "Refuge Island"},
+  "cuisine": {"key": "cuisine", "type": "semiCombo", "label": "Cuisines", "terms": ["fare", "food types"]},
+  "currency_multi": {"key": "currency:", "type": "multiCombo", "label": "Currency Types", "terms": ["bills", "cash", "coins", "money"]},
+  "cutting": {"key": "cutting", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+  "cycle_network": {"key": "cycle_network", "type": "networkCombo", "label": "Network"},
+  "cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}},
+  "dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"},
+  "date": {"key": "date", "type": "check", "label": "Date"},
+  "delivery": {"key": "delivery", "type": "check", "label": "Delivery"},
+  "denomination": {"key": "denomination", "type": "combo", "label": "Denomination", "prerequisiteTag": {"key": "religion", "valueNot": "none"}},
+  "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"},
+  "departures_board": {"key": "departures_board", "type": "combo", "label": "Departures Board", "strings": {"options": {"yes": "Yes", "timetable": "Timetable", "realtime": "Realtime", "no": "None"}}},
+  "depth": {"key": "depth", "minValue": 0, "type": "number", "label": "Depth (Meters)"},
+  "description": {"key": "description", "type": "textarea", "label": "Description", "universal": true, "terms": ["summary"]},
+  "design": {"key": "design", "type": "combo", "label": "Design"},
+  "destination_oneway": {"key": "destination", "type": "semiCombo", "label": "Destinations", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
+  "destination/ref_oneway": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
+  "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
+  "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
+  "diameter": {"key": "diameter", "type": "combo", "label": "Diameter", "snake_case": false, "placeholder": "5 mm, 10 cm, 15 in…"},
+  "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types", "terms": ["gluten free", "fruitarian", "halal", "kosher", "lactose free", "meat", "pescatarian", "raw", "vegan", "vegetarian"]},
+  "diplomatic": {"key": "diplomatic", "type": "combo", "label": "Type"},
+  "diplomatic/services": {"key": "diplomatic:services:", "type": "multiCombo", "label": "Services"},
+  "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}},
+  "direction_clock": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"clockwise": "Clockwise", "anticlockwise": "Counterclockwise"}}},
+  "direction_vertex": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
+  "direction": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"},
+  "dispensing": {"key": "dispensing", "type": "check", "label": "Dispenses Prescriptions", "default": "yes"},
+  "display": {"key": "display", "type": "combo", "label": "Display", "options": ["analog", "digital", "sundial", "unorthodox"]},
+  "distance": {"key": "distance", "type": "text", "label": "Distance"},
+  "disused/railway": {"key": "disused:railway", "type": "typeCombo", "label": "Type"},
+  "disused/shop": {"key": "disused:shop", "type": "typeCombo", "label": "Type"},
+  "dock": {"key": "dock", "type": "combo", "label": "Type"},
+  "dog": {"key": "dog", "type": "combo", "label": "Dogs", "strings": {"options": {"yes": "Allowed", "leashed": "Leashed Only", "no": "Not Allowed"}}, "terms": ["animals", "pets"]},
+  "door_type": {"key": "door", "type": "typeCombo", "label": "Type"},
+  "door": {"key": "door", "type": "combo", "label": "Door"},
+  "drink_multi": {"key": "drink:", "type": "multiCombo", "label": "Drinks"},
+  "drinking_water": {"key": "drinking_water", "type": "check", "label": "Drinkable", "terms": ["drinkworthy", "potable"]},
+  "drive_through": {"key": "drive_through", "type": "check", "label": "Drive-Through"},
+  "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"},
+  "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}, "terms": ["contact line", "powered", "third rail"]},
+  "elevation": {"key": "ele", "type": "number", "icon": "elevation", "universal": true, "label": "Elevation", "terms": ["altitude"]},
+  "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "label": "Email"},
+  "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+  "embassy": {"key": "embassy", "type": "combo", "label": "Type"},
+  "emergency_combo": {"key": "emergency", "type": "combo", "label": "Type"},
+  "emergency": {"key": "emergency", "type": "check", "label": "Emergency"},
+  "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"},
+  "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"},
+  "except": {"key": "except", "type": "combo", "label": "Exceptions"},
+  "expected_rcn_route_relations": {"key": "expected_rcn_route_relations", "type": "number", "label": "Adjacent Cycling Nodes"},
+  "expected_rwn_route_relations": {"key": "expected_rwn_route_relations", "type": "number", "label": "Adjacent Walking Nodes"},
+  "faces": {"key": "faces", "type": "number", "minValue": 0, "label": "Faces"},
+  "fax": {"key": "fax", "type": "tel", "label": "Fax", "placeholder": "+31 42 123 4567"},
+  "fee": {"key": "fee", "type": "check", "label": "Fee"},
+  "fence_type": {"key": "fence_type", "type": "combo", "label": "Type"},
+  "fire_hydrant/diameter": {"key": "fire_hydrant:diameter", "type": "combo", "label": "Diameter (mm, in, or letters)", "snake_case": false},
+  "fire_hydrant/pressure": {"key": "fire_hydrant:pressure", "type": "combo", "label": "Pressure (bar)", "snake_case": false},
+  "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "Shape", "strings": {"options": {"pillar": "Pillar/Aboveground", "underground": "Underground", "wall": "Wall", "pipe": "Capped Pipe"}}},
+  "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
+  "fishing": {"key": "fishing", "type": "combo", "label": "Fishing"},
+  "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
+  "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true, "terms": ["help request"]},
+  "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
+  "floating": {"key": "floating", "type": "check", "label": "Floating"},
+  "flood_prone": {"key": "flood_prone", "type": "check", "label": "Flood Prone"},
+  "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+  "fountain": {"key": "fountain", "type": "combo", "label": "Type"},
+  "frequency_electrified": {"key": "frequency", "type": "combo", "label": "Operating Frequency", "prerequisiteTag": {"key": "electrified", "valueNot": "no"}},
+  "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
+  "from": {"key": "from", "type": "text", "label": "From"},
+  "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
+  "fuel": {"key": "fuel", "type": "combo", "label": "Fuel"},
+  "gambling": {"key": "gambling", "type": "semiCombo", "label": "Games"},
+  "gauge": {"key": "gauge", "type": "combo", "label": "Gauge"},
+  "gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}, "terms": ["access", "female", "male", "unisex"]},
+  "generator/method": {"key": "generator:method", "type": "combo", "label": "Method"},
+  "generator/output/electricity": {"key": "generator:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW...", "snake_case": false},
+  "generator/source": {"key": "generator:source", "type": "combo", "label": "Source"},
+  "generator/type": {"key": "generator:type", "type": "combo", "label": "Type"},
+  "geyser/height": {"key": "geyser:height", "type": "text", "label": "Eruption Height"},
+  "gnis/feature_id": {"key": "gnis:feature_id", "type": "identifier", "label": "GNIS Feature ID", "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}", "pattern": "^[0-9]{1,}$", "countryCodes": ["us"], "terms": ["Federal Geographic Names Information Service", "United States Board on Geographic Names", "USA"]},
+  "government": {"key": "government", "type": "typeCombo", "label": "Type"},
+  "grape_variety": {"key": "grape_variety", "type": "semiCombo", "label": "Grape Varieties"},
+  "group_only": {"key": "group_only", "type": "check", "label": "Groups Only"},
+  "guest_house": {"key": "guest_house", "type": "combo", "label": "Type"},
+  "handicap": {"key": "handicap", "type": "number", "label": "Handicap", "placeholder": "1-18"},
+  "handrail": {"key": "handrail", "type": "check", "label": "Handrail"},
+  "hashtags": {"key": "hashtags", "type": "semiCombo", "label": "Hashtags", "placeholder": "#example"},
+  "healthcare": {"key": "healthcare", "type": "typeCombo", "label": "Type"},
+  "healthcare/speciality": {"key": "healthcare:speciality", "type": "semiCombo", "reference": {"key": "healthcare"}, "label": "Specialties"},
+  "height_building": {"key": "height", "minValue": 0, "type": "number", "label": "Building Height (Meters)", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
+  "height": {"key": "height", "minValue": 0, "type": "number", "label": "Height (Meters)"},
+  "highspeed": {"key": "highspeed", "type": "check", "label": "High-Speed"},
+  "highway": {"key": "highway", "type": "typeCombo", "label": "Type"},
+  "historic": {"key": "historic", "type": "typeCombo", "label": "Type"},
+  "historic/civilization": {"key": "historic:civilization", "type": "combo", "label": "Historic Civilization"},
+  "historic/wreck/date_sunk": {"key": "wreck:date_sunk", "type": "text", "label": "Date Sunk"},
+  "historic/wreck/visible_at_high_tide": {"key": "wreck:visible_at_high_tide", "type": "check", "label": "Visible At High Tide"},
+  "historic/wreck/visible_at_low_tide": {"key": "wreck:visible_at_low_tide", "type": "check", "label": "Visible At Low Tide"},
+  "hoops": {"key": "hoops", "type": "number", "minValue": 0, "label": "Hoops", "placeholder": "1, 2, 4..."},
+  "horse_dressage": {"key": "sport", "type": "check", "label": "Dressage Riding", "strings": {"options": {"undefined": "No", "equestrian": "Yes"}}, "reference": {"key": "sport", "value": "equestrian"}},
+  "horse_riding": {"key": "leisure", "type": "check", "label": "Horseback Riding", "strings": {"options": {"undefined": "No", "horse_riding": "Yes"}}, "reference": {"key": "leisure", "value": "horse_riding"}},
+  "horse_scale": {"key": "horse_scale", "type": "combo", "label": "Horseback Riding Difficulty", "placeholder": "Difficult, Dangerous...", "strings": {"options": {"common": "Easy: No problems or difficulties. (default)", "demanding": "Use with caution: Uneven way, occasional difficult passages.", "difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.", "critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.", "dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.", "impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."}}},
+  "horse_stables": {"key": "amenity", "type": "check", "label": "Riding Stable", "strings": {"options": {"undefined": "No", "stables": "Yes"}}, "reference": {"key": "amenity", "value": "stables"}},
+  "hot_water": {"key": "hot_water", "type": "check", "label": "Hot Water"},
+  "iata": {"key": "iata", "type": "text", "label": "IATA Airport Code"},
+  "icao": {"key": "icao", "type": "text", "label": "ICAO Airport Code"},
+  "incline_steps": {"key": "incline", "type": "combo", "label": "Incline", "strings": {"options": {"up": "Up", "down": "Down"}}},
+  "incline": {"key": "incline", "type": "combo", "label": "Incline"},
+  "indoor_type": {"key": "indoor", "type": "typeCombo", "label": "Type"},
+  "indoor": {"key": "indoor", "type": "check", "label": "Indoor"},
+  "industrial": {"key": "industrial", "type": "combo", "label": "Type"},
+  "informal": {"key": "informal", "type": "check", "label": "Informal"},
+  "information": {"key": "information", "type": "typeCombo", "label": "Type"},
+  "inscription": {"key": "inscription", "type": "textarea", "label": "Inscription"},
+  "intermittent_yes": {"key": "intermittent", "type": "check", "label": "Intermittent", "default": "yes"},
+  "intermittent": {"key": "intermittent", "type": "check", "label": "Intermittent"},
+  "internet_access": {"key": "internet_access", "type": "combo", "label": "Internet Connection", "strings": {"options": {"yes": "Yes", "no": "No", "wlan": "Wifi", "wired": "Wired", "terminal": "Terminal"}}, "terms": ["wifi", "wlan"]},
+  "internet_access/fee": {"key": "internet_access:fee", "type": "combo", "label": "Internet Access", "strings": {"options": {"no": "Free", "yes": "Paid", "customers": "Customers Only"}}, "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}, "terms": ["wifi fee"]},
+  "internet_access/ssid": {"key": "internet_access:ssid", "type": "text", "label": "Wifi Network Name", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}, "terms": ["ssid"]},
+  "interval": {"key": "interval", "type": "text", "label": "Interval"},
+  "junction_line": {"key": "junction", "type": "combo", "label": "Junction", "strings": {"options": {"roundabout": "Roundabout", "circular": "Traffic Circle", "jughandle": "Jughandle"}}},
+  "junction/ref_oneway": {"key": "junction:ref", "type": "text", "label": "Junction Number", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
+  "kerb": {"key": "kerb", "type": "combo", "label": "Curb"},
+  "kerb/height": {"key": "kerb:height", "type": "combo", "snake_case": false, "label": "Height"},
+  "kneipp_water_cure_multi": {"key": "kneipp_water_cure:", "type": "multiCombo", "label": "Basin Types"},
+  "label": {"key": "label", "type": "textarea", "label": "Label"},
+  "lamp_type": {"key": "lamp_type", "type": "combo", "label": "Type"},
+  "landuse": {"key": "landuse", "type": "typeCombo", "label": "Type"},
+  "lanes": {"key": "lanes", "type": "number", "minValue": 0, "label": "Lanes", "placeholder": "1, 2, 3..."},
+  "language_multi": {"key": "language:", "type": "multiCombo", "label": "Languages"},
+  "layer": {"key": "layer", "type": "number", "label": "Layer", "placeholder": "0"},
+  "leaf_cycle_singular": {"key": "leaf_cycle", "type": "combo", "label": "Leaf Cycle", "strings": {"options": {"evergreen": "Evergreen", "deciduous": "Deciduous", "semi_evergreen": "Semi-Evergreen", "semi_deciduous": "Semi-Deciduous"}}},
+  "leaf_cycle": {"key": "leaf_cycle", "type": "combo", "label": "Leaf Cycle", "strings": {"options": {"evergreen": "Evergreen", "deciduous": "Deciduous", "semi_evergreen": "Semi-Evergreen", "semi_deciduous": "Semi-Deciduous", "mixed": "Mixed"}}},
+  "leaf_type_singular": {"key": "leaf_type", "type": "combo", "label": "Leaf Type", "strings": {"options": {"broadleaved": "Broadleaved", "needleleaved": "Needleleaved", "leafless": "Leafless"}}},
+  "leaf_type": {"key": "leaf_type", "type": "combo", "label": "Leaf Type", "strings": {"options": {"broadleaved": "Broadleaved", "needleleaved": "Needleleaved", "mixed": "Mixed", "leafless": "Leafless"}}},
+  "leisure": {"key": "leisure", "type": "typeCombo", "label": "Type"},
+  "length": {"key": "length", "type": "number", "minValue": 0, "label": "Length (Meters)"},
+  "level_semi": {"key": "level", "type": "semiCombo", "label": "Levels", "terms": ["building floors", "decks", "stories", "storeys", "storys"]},
+  "level": {"key": "level", "type": "combo", "label": "Level", "terms": ["building floor", "deck", "storey", "story"], "prerequisiteTag": {"keyNot": "building"}},
+  "liaison": {"key": "liaison", "type": "combo", "label": "Type"},
+  "line_attachment": {"key": "line_attachment", "type": "combo", "label": "Line Attachment"},
+  "lit": {"key": "lit", "type": "check", "label": "Lit", "terms": ["lamp", "lighting"]},
+  "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
+  "location": {"key": "location", "type": "combo", "label": "Location"},
+  "lock": {"key": "lock", "type": "check", "label": "Lock"},
+  "lockable": {"key": "lockable", "type": "check", "label": "Lockable"},
+  "man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
+  "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
+  "manufacturer": {"key": "manufacturer", "type": "combo", "snake_case": false, "caseSensitive": true, "label": "Manufacturer"},
+  "map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
+  "map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"},
+  "mapillary": {"key": "mapillary", "type": "identifier", "label": "Mapillary Image ID", "urlFormat": "https://mapillary.com/app/?focus=photo&pKey={value}", "pattern": "^[a-zA-Z0-9-_]{1,}$", "universal": true},
+  "marker": {"key": "marker", "type": "typeCombo", "label": "Type"},
+  "material": {"key": "material", "type": "combo", "label": "Material"},
+  "max_age": {"key": "max_age", "type": "number", "minValue": 0, "label": "Maximum Age", "terms": ["upper age limit"]},
+  "maxheight": {"key": "maxheight", "type": "combo", "label": "Max Height", "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"", "snake_case": false},
+  "maxspeed": {"key": "maxspeed", "type": "maxspeed", "label": "Speed Limit", "placeholder": "40, 50, 60..."},
+  "maxspeed/advisory": {"key": "maxspeed:advisory", "type": "maxspeed", "label": "Advisory Speed Limit", "placeholder": "40, 50, 60..."},
+  "maxstay": {"key": "maxstay", "type": "combo", "label": "Max Stay", "options": ["15 min", "30 min", "45 min", "1 hr", "1.5 hr", "2 hr", "2.5 hr", "3 hr", "4 hr", "1 day", "2 day"], "snake_case": false},
+  "maxweight_bridge": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false, "prerequisiteTag": {"key": "bridge", "valueNot": "no"}},
+  "maxweight": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false},
+  "memorial": {"key": "memorial", "type": "typeCombo", "label": "Type"},
+  "microbrewery": {"key": "microbrewery", "type": "check", "label": "Microbrewery", "terms": ["brewpub", "craft beer"]},
+  "mimics": {"key": "mimics", "type": "combo", "label": "Mimics", "terms": ["camoflauged", "disguised", "looks like", "tree"]},
+  "min_age": {"key": "min_age", "type": "number", "minValue": 0, "label": "Minimum Age", "terms": ["lower age limit"]},
+  "minspeed": {"key": "minspeed", "type": "maxspeed", "label": "Minimum Speed Limit", "placeholder": "20, 30, 40..."},
+  "monitoring_multi": {"key": "monitoring:", "type": "multiCombo", "label": "Monitoring"},
+  "mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}},
+  "mtb/scale/imba": {"key": "mtb:scale:imba", "type": "combo", "label": "IMBA Trail Difficulty", "placeholder": "Easy, Medium, Difficult...", "strings": {"options": {"0": "Easiest (white circle)", "1": "Easy (green circle)", "2": "Medium (blue square)", "3": "Difficult (black diamond)", "4": "Extremely Difficult (double black diamond)"}}},
+  "mtb/scale/uphill": {"key": "mtb:scale:uphill", "type": "combo", "label": "Mountain Biking Uphill Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", "4": "4: Avg. incline <30%, poor condition, big rocks/branches", "5": "5: Very steep, bike generally needs to be pushed or carried"}}},
+  "museum": {"key": "museum", "type": "combo", "label": "Type"},
+  "name": {"key": "name", "type": "localized", "label": "Name", "universal": true, "placeholder": "Common name (if any)", "terms": ["label", "title"]},
+  "natural": {"key": "natural", "type": "typeCombo", "label": "Natural"},
+  "network_bicycle": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}},
+  "network_foot": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lwn": "Local", "rwn": "Regional", "nwn": "National", "iwn": "International"}}},
+  "network_horse": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lhn": "Local", "rhn": "Regional", "nhn": "National", "ihn": "International"}}},
+  "network_road": {"key": "network", "type": "networkCombo", "label": "Network"},
+  "network": {"key": "network", "type": "text", "label": "Network"},
+  "network/type": {"key": "network:type", "type": "combo", "label": "Network Type", "prerequisiteTag": {"key": "network"}},
+  "not/name": {"key": "not:name", "type": "semiCombo", "label": "Incorrect Names", "terms": ["common mistake names", "wrong names"]},
+  "note": {"key": "note", "type": "textarea", "universal": true, "icon": "note", "label": "Note", "terms": ["comment"]},
+  "office": {"key": "office", "type": "typeCombo", "label": "Type"},
+  "oneway_yes": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be Yes", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
+  "oneway": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be No", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
+  "oneway/bicycle": {"key": "oneway:bicycle", "type": "check", "label": "One Way (Bicycles)", "prerequisiteTag": {"key": "oneway"}},
+  "openfire": {"key": "openfire", "type": "check", "label": "Open Fires Allowed"},
+  "opening_date": {"key": "opening_date", "type": "text", "label": "Expected Opening Date", "placeholder": "YYYY-MM-DD"},
+  "opening_hours": {"key": "opening_hours", "type": "combo", "label": "Hours", "placeholder": "Unknown", "snake_case": false},
+  "operator": {"key": "operator", "type": "text", "label": "Operator"},
+  "operator/type": {"key": "operator:type", "type": "combo", "label": "Operator Type", "prerequisiteTag": {"key": "operator"}},
+  "outdoor_seating": {"key": "outdoor_seating", "type": "check", "label": "Outdoor Seating"},
+  "par": {"key": "par", "type": "number", "minValue": 1, "label": "Par", "placeholder": "3, 4, 5..."},
+  "park_ride": {"key": "park_ride", "type": "check", "label": "Park and Ride"},
+  "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "multi-storey": "Multilevel", "underground": "Underground", "sheds": "Sheds", "carports": "Carports", "garage_boxes": "Garage Boxes", "lane": "Roadside Lane"}}},
+  "payment_multi_fee": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
+  "payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types"},
+  "phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
+  "phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "label": "Telephone", "placeholder": "+31 42 123 4567", "terms": ["phone number"]},
+  "piste/difficulty_downhill": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
+  "piste/difficulty_nordic": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - Flat, no effort needed", "easy": "Easy - Soft hills, short steep section", "intermediate": "Intermediate - Steep section", "advanced": "Advanced - Narrow, steep or icy section, sharp turn", "expert": "Expert - Dangerous terrain around"}}},
+  "piste/difficulty_skitour": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - L: <30° incline", "easy": "Easy - WS: 30-35° incline", "intermediate": "Intermediate - ZS: 35-40° incline", "advanced": "Advanced - S: 40-45° incline", "expert": "Expert - SS: 45–50° incline", "freeride": "Freeride - AS: 50–55° incline", "extreme": "Extreme - EX: >55° incline"}}},
+  "piste/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice", "easy": "Easy", "intermediate": "Intermediate", "advanced": "Advanced", "expert": "Expert", "freeride": "Freeride", "extreme": "Extreme"}}},
+  "piste/grooming_downhill": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry - no grooming"}}},
+  "piste/grooming_hike": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - Winter Hiking", "backcountry": "Backcountry - Snowshoeing"}}},
+  "piste/grooming_nordic": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
+  "piste/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
+  "piste/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "nordic": "Nordic", "skitour": "Skitour", "sled": "Sled", "hike": "Hike", "sleigh": "Sleigh", "ice_skate": "Ice Skate", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection"}}},
+  "place": {"key": "place", "type": "typeCombo", "label": "Type"},
+  "plant": {"key": "plant", "type": "combo", "label": "Plant"},
+  "plant/method": {"key": "plant:method", "type": "combo", "label": "Generation Method"},
+  "plant/output/electricity": {"key": "plant:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW...", "snake_case": false},
+  "plant/source": {"key": "plant:source", "type": "combo", "label": "Energy Source"},
+  "playground": {"key": "playground", "type": "combo", "label": "Type"},
+  "playground/theme": {"key": "playground:theme", "type": "combo", "label": "Theme"},
+  "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
+  "population": {"key": "population", "type": "text", "label": "Population"},
+  "post": {"type": "address", "key": "post", "keys": ["post:block_number", "post:city", "post:block_number", "post:conscriptionnumber", "post:county", "post:country", "post:county", "post:district", "post:floor", "post:hamlet", "post:housename", "post:housenumber", "post:neighbourhood", "post:place", "post:postcode", "post:province", "post:quarter", "post:state", "post:street", "post:subdistrict", "post:suburb", "post:unit"], "label": "Delivery Address"},
+  "power_supply": {"key": "power_supply", "type": "check", "label": "Power Supply"},
+  "power": {"key": "power", "type": "typeCombo", "label": "Type"},
+  "preschool": {"key": "preschool", "type": "check", "label": "Preschool"},
+  "produce": {"key": "produce", "type": "semiCombo", "label": "Produce"},
+  "product": {"key": "product", "type": "semiCombo", "label": "Products"},
+  "public_bookcase/type": {"key": "public_bookcase:type", "type": "combo", "label": "Type"},
+  "pump": {"key": "pump", "type": "combo", "label": "Pump", "strings": {"options": {"yes": "Yes", "manual": "Manual Hand Pump", "powered": "Machine-Powered Pump", "no": "None"}}},
+  "railway": {"key": "railway", "type": "typeCombo", "label": "Type"},
+  "railway/position": {"key": "railway:position", "type": "text", "placeholder": "Distance to one decimal (123.4)", "label": "Milestone Position"},
+  "railway/signal/direction": {"key": "railway:signal:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
+  "rating": {"key": "rating", "type": "combo", "label": "Power Rating", "snake_case": false},
+  "rcn_ref": {"key": "rcn_ref", "type": "text", "label": "Cycling Code"},
+  "recycling_accepts": {"key": "recycling:", "type": "multiCombo", "label": "Accepts"},
+  "recycling_type": {"key": "recycling_type", "type": "combo", "label": "Type", "placeholder": "Container, Center", "strings": {"options": {"container": "Container", "centre": "Center"}}},
+  "ref_aeroway_gate": {"key": "ref", "type": "text", "label": "Gate Number"},
+  "ref_golf_hole": {"key": "ref", "type": "text", "label": "Hole Number", "placeholder": "1-18"},
+  "ref_highway_junction": {"key": "ref", "type": "text", "label": "Junction Number"},
+  "ref_platform": {"key": "ref", "type": "text", "label": "Platform Number"},
+  "ref_road_number": {"key": "ref", "type": "text", "label": "Road Number"},
+  "ref_room_number": {"key": "ref", "type": "text", "label": "Room Number"},
+  "ref_route": {"key": "ref", "type": "text", "label": "Route Number"},
+  "ref_runway": {"key": "ref", "type": "text", "label": "Runway Number", "placeholder": "e.g. 01L/19R"},
+  "ref_stop_position": {"key": "ref", "type": "text", "label": "Stop Number"},
+  "ref_taxiway": {"key": "ref", "type": "text", "label": "Taxiway Name", "placeholder": "e.g. A5"},
+  "ref": {"key": "ref", "type": "text", "label": "Reference Code"},
+  "ref/isil": {"key": "ref:isil", "type": "text", "label": "ISIL Code"},
+  "ref/vatin": {"key": "ref:vatin", "type": "identifier", "label": "VAT ID Number", "notCountryCodes": ["ao", "ai", "bm", "bt", "io", "vg", "bn", "ky", "km", "cu", "dj", "er", "fk", "gi", "gg", "hk", "iq", "ki", "xk", "kw", "lr", "ly", "mo", "mv", "mh", "fm", "ms", "mm", "nr", "kp", "om", "pw", "pn", "qa", "sh", "sm", "st", "sb", "so", "gs", "ss", "sr", "sz", "sy", "tl", "tc", "tv", "us", "va", "ye"], "terms": ["value added tax identification number", "vatin"]},
+  "relation": {"key": "type", "type": "combo", "label": "Type"},
+  "religion": {"key": "religion", "type": "combo", "label": "Religion"},
+  "reservation": {"key": "reservation", "type": "combo", "label": "Reservations", "strings": {"options": {"yes": "Accepted", "no": "Not Accepted", "required": "Required", "recommended": "Recommended"}}},
+  "residential": {"key": "residential", "type": "combo", "label": "Type"},
+  "resort": {"key": "resort", "type": "combo", "label": "Type"},
+  "resource": {"key": "resource", "type": "semiCombo", "label": "Resources"},
+  "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
+  "restrictions": {"type": "restrictions", "geometry": "vertex", "icon": "iD-restrictions", "reference": {"rtype": "restriction"}, "label": "Turn Restrictions"},
+  "roof/colour": {"key": "roof:colour", "type": "combo", "label": "Roof Color"},
+  "room": {"key": "room", "type": "combo", "label": "Type"},
+  "rooms": {"key": "rooms", "type": "number", "minValue": 0, "label": "Rooms"},
+  "route_master": {"key": "route_master", "type": "combo", "label": "Type"},
+  "route": {"key": "route", "type": "combo", "label": "Type"},
+  "rwn_ref": {"key": "rwn_ref", "type": "text", "label": "Walking Code"},
+  "sac_scale": {"key": "sac_scale", "type": "combo", "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": {"options": {"hiking": "T1: Hiking", "mountain_hiking": "T2: Mountain Hiking", "demanding_mountain_hiking": "T3: Demanding Mountain Hiking", "alpine_hiking": "T4: Alpine Hiking", "demanding_alpine_hiking": "T5: Demanding Alpine Hiking", "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"}}},
+  "salt": {"key": "salt", "type": "check", "label": "Salt", "terms": ["saline", "salinated"]},
+  "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"},
+  "screen": {"key": "screen", "type": "number", "label": "Screens", "placeholder": "1, 4, 8…", "minValue": 0},
+  "scuba_diving": {"key": "scuba_diving:", "type": "multiCombo", "label": "Services", "options": ["repair", "courses", "rental", "filling", "air_filling", "nitrox_filling", "trimix_filling", "oxygen_filling"]},
+  "seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"},
+  "seamark/beacon_lateral/category": {"key": "seamark:beacon_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right"}}},
+  "seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}},
+  "seamark/beacon_lateral/shape": {"key": "seamark:beacon_lateral:shape", "type": "combo", "label": "Shape"},
+  "seamark/beacon_lateral/system": {"key": "seamark:beacon_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
+  "seamark/buoy_lateral/category": {"key": "seamark:buoy_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "channel_left": "Channel Left", "channel_right": "Channel Right", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right", "preferred_channel_port": "Preferred Channel Port", "preferred_channel_starboard": "Preferred Channel Starboard"}}},
+  "seamark/buoy_lateral/colour": {"key": "seamark:buoy_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "red;white;red;white": "Red-White-Red-White", "green;white;green;white": "Green-White-Green-White", "red;green;red": "Red-Green-Red", "green;red;green": "Green-Red-Green", "white": "White", "yellow": "Yellow"}}},
+  "seamark/buoy_lateral/shape": {"key": "seamark:buoy_lateral:shape", "type": "combo", "label": "Shape"},
+  "seamark/buoy_lateral/system": {"key": "seamark:buoy_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
+  "seamark/mooring/category": {"key": "seamark:mooring:category", "type": "combo", "label": "Category"},
+  "seamark/type": {"key": "seamark:type", "type": "combo", "label": "Seamark", "terms": ["marine"]},
+  "seamark/wreck/category": {"key": "seamark:wreck:category", "type": "combo", "label": "Category"},
+  "seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"},
+  "seats": {"key": "seats", "type": "number", "minValue": 0, "label": "Seats", "placeholder": "2, 4, 6..."},
+  "second_hand": {"key": "second_hand", "type": "combo", "label": "Sells Used", "placeholder": "Yes, No, Only", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Only"}}},
+  "segregated": {"key": "segregated", "type": "check", "label": "Bicycle-Pedestrian Separation"},
+  "self_service": {"key": "self_service", "type": "check", "label": "Self-Service"},
+  "service_rail": {"key": "service", "type": "combo", "label": "Service Type", "strings": {"options": {"spur": "Spur", "yard": "Yard", "siding": "Siding", "crossover": "Crossover"}}},
+  "service_times": {"key": "service_times", "type": "text", "label": "Service Times"},
+  "service": {"key": "service", "type": "combo", "label": "Type", "options": ["parking_aisle", "driveway", "alley", "emergency_access", "drive-through"]},
+  "service/bicycle": {"key": "service:bicycle:", "type": "multiCombo", "label": "Services"},
+  "service/vehicle": {"key": "service:vehicle:", "type": "multiCombo", "label": "Services"},
+  "shelter_type": {"key": "shelter_type", "type": "combo", "label": "Type"},
+  "shelter": {"key": "shelter", "type": "check", "label": "Shelter"},
+  "shop": {"key": "shop", "type": "typeCombo", "label": "Type"},
+  "shower": {"key": "shower", "type": "check", "label": "Showers"},
+  "siren/purpose": {"key": "siren:purpose", "type": "combo", "label": "Purpose"},
+  "siren/type": {"key": "siren:type", "type": "combo", "label": "Type", "strings": {"options": {"pneumatic": "Pneumatic", "electronic": "Electronic", "other": "Other"}}},
+  "site_type": {"key": "site_type", "type": "combo", "label": "Site Type"},
+  "site": {"key": "site", "type": "combo", "label": "Type"},
+  "smoking": {"key": "smoking", "type": "combo", "label": "Smoking", "placeholder": "No, Separated, Yes...", "strings": {"options": {"no": "No smoking anywhere", "separated": "In smoking areas, not physically isolated", "isolated": "In smoking areas, physically isolated", "outside": "Allowed outside", "yes": "Allowed everywhere", "dedicated": "Dedicated to smokers (e.g. smokers' club)"}}},
+  "smoothness": {"key": "smoothness", "type": "combo", "label": "Smoothness", "placeholder": "Thin Rollers, Wheels, Off-Road...", "strings": {"options": {"excellent": "Thin Rollers: rollerblade, skateboard", "good": "Thin Wheels: racing bike", "intermediate": "Wheels: city bike, wheelchair, scooter", "bad": "Robust Wheels: trekking bike, car, rickshaw", "very_bad": "High Clearance: light duty off-road vehicle", "horrible": "Off-Road: heavy duty off-road vehicle", "very_horrible": "Specialized off-road: tractor, ATV", "impassable": "Impassable / No wheeled vehicle"}}},
+  "sms": {"key": "sms", "type": "check", "label": "SMS"},
+  "social_facility_for": {"key": "social_facility:for", "type": "combo", "label": "People Served"},
+  "social_facility": {"key": "social_facility", "type": "combo", "label": "Type"},
+  "source": {"key": "source", "type": "semiCombo", "icon": "source", "universal": true, "label": "Sources", "snake_case": false, "caseSensitive": true, "options": ["survey", "local knowledge", "gps", "aerial imagery", "streetlevel imagery"], "terms": ["reference"]},
+  "species/wikidata": {"key": "species:wikidata", "keys": ["species:wikidata", "species:wikipedia"], "type": "wikidata", "label": "Species Wikidata"},
+  "sport_ice": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["ice_skating", "ice_hockey", "multi", "curling", "ice_stock"]},
+  "sport_racing_motor": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["motor", "karting", "motocross"]},
+  "sport_racing_nonmotor": {"key": "sport", "type": "semiCombo", "label": "Sports", "options": ["bmx", "cycling", "dog_racing", "horse_racing", "running"]},
+  "sport": {"key": "sport", "type": "semiCombo", "label": "Sports"},
+  "stars": {"key": "stars", "type": "combo", "label": "Stars", "terms": ["rating"]},
+  "start_date": {"key": "start_date", "type": "text", "universal": true, "label": "Start Date", "placeholder": "YYYY-MM-DD", "terms": ["inception"]},
+  "step_count": {"key": "step_count", "type": "number", "minValue": 0, "label": "Number of Steps"},
+  "stile": {"key": "stile", "type": "combo", "label": "Type"},
+  "stop": {"key": "stop", "type": "combo", "label": "Stop Type", "strings": {"options": {"all": "All Ways", "minor": "Minor Road"}}},
+  "street_cabinet": {"key": "street_cabinet", "type": "combo", "label": "Type"},
+  "stroller": {"key": "stroller", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Stroller Access", "terms": ["baby carriage", "perambulator", "pram", "pushchair"]},
+  "structure_waterway": {"type": "structureRadio", "keys": ["tunnel"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"tunnel": "Tunnel"}}},
+  "structure": {"type": "structureRadio", "keys": ["bridge", "tunnel", "embankment", "cutting", "ford"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"bridge": "Bridge", "tunnel": "Tunnel", "embankment": "Embankment", "cutting": "Cutting", "ford": "Ford"}}},
+  "studio": {"key": "studio", "type": "combo", "label": "Type"},
+  "substance": {"key": "substance", "type": "combo", "label": "Substance"},
+  "substation": {"key": "substation", "type": "typeCombo", "label": "Type"},
+  "supervised": {"key": "supervised", "type": "check", "label": "Supervised", "terms": ["guarded", "manned"]},
+  "support": {"key": "support", "type": "combo", "label": "Support"},
+  "surface": {"key": "surface", "type": "combo", "label": "Surface"},
+  "surveillance": {"key": "surveillance", "type": "combo", "label": "Surveillance Kind"},
+  "surveillance/type": {"key": "surveillance:type", "type": "combo", "label": "Surveillance Type", "strings": {"options": {"camera": "Camera", "guard": "Guard", "ALPR": "Automatic License Plate Reader"}}},
+  "surveillance/zone": {"key": "surveillance:zone", "type": "combo", "label": "Surveillance Zone"},
+  "survey/date": {"key": "survey:date", "type": "text", "label": "Last Survey Date"},
+  "swimming_pool": {"key": "swimming_pool", "type": "combo", "label": "Type"},
+  "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}},
+  "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
+  "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}, "terms": ["take out", "takeout"]},
+  "target": {"key": "target", "type": "combo", "label": "Target"},
+  "telecom/medium": {"key": "telecom:medium", "type": "combo", "label": "Medium"},
+  "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
+  "to": {"key": "to", "type": "text", "label": "To"},
+  "toilets": {"key": "toilets", "type": "check", "label": "Toilets"},
+  "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
+  "toilets/handwashing": {"key": "toilets:handwashing", "type": "check", "label": "Handwashing"},
+  "toilets/position": {"key": "toilets:position", "type": "semiCombo", "label": "Positions"},
+  "toll": {"key": "toll", "type": "check", "label": "Toll"},
+  "tomb": {"key": "tomb", "type": "typeCombo", "label": "Type"},
+  "tourism": {"key": "tourism", "type": "typeCombo", "label": "Type"},
+  "tower/construction": {"key": "tower:construction", "type": "combo", "label": "Construction", "placeholder": "Guyed, Lattice, Concealed, ..."},
+  "tower/type": {"key": "tower:type", "type": "combo", "label": "Type"},
+  "townhall/type": {"key": "townhall:type", "type": "combo", "label": "Type"},
+  "tracktype": {"key": "tracktype", "type": "combo", "label": "Track Type", "placeholder": "Solid, Mostly Solid, Soft...", "strings": {"options": {"grade1": "Solid: paved or heavily compacted hardcore surface", "grade2": "Mostly Solid: gravel/rock with some soft material mixed in", "grade3": "Even mixture of hard and soft materials", "grade4": "Mostly Soft: soil/sand/grass with some hard material mixed in", "grade5": "Soft: soil/sand/grass"}}},
+  "trade": {"key": "trade", "type": "typeCombo", "label": "Type"},
+  "traffic_calming": {"key": "traffic_calming", "type": "typeCombo", "label": "Type"},
+  "traffic_sign": {"key": "traffic_sign", "type": "typeCombo", "label": "Traffic Sign"},
+  "traffic_sign/direction": {"key": "traffic_sign:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
+  "traffic_signals": {"key": "traffic_signals", "type": "combo", "label": "Type", "default": "signal"},
+  "traffic_signals/direction": {"key": "traffic_signals:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
+  "trail_visibility": {"key": "trail_visibility", "type": "combo", "label": "Trail Visibility", "placeholder": "Excellent, Good, Bad...", "strings": {"options": {"excellent": "Excellent: unambiguous path or markers everywhere", "good": "Good: markers visible, sometimes require searching", "intermediate": "Intermediate: few markers, path mostly visible", "bad": "Bad: no markers, path sometimes invisible/pathless", "horrible": "Horrible: often pathless, some orientation skills required", "no": "No: pathless, excellent orientation skills required"}}},
+  "transformer": {"key": "transformer", "type": "combo", "label": "Type", "strings": {"options": {"distribution": "Distribution", "generator": "Generator", "converter": "Converter", "traction": "Traction", "auto": "Autotransformer", "phase_angle_regulator": "Phase Angle Regulator", "auxiliary": "Auxiliary", "yes": "Unknown"}}},
+  "trees": {"key": "trees", "type": "semiCombo", "label": "Trees"},
+  "trench": {"key": "trench", "type": "combo", "label": "Type"},
+  "trolley_wire": {"key": "trolley_wire", "type": "check", "label": "Overhead Trolley Wires"},
+  "tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+  "usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}},
+  "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"},
+  "utility": {"key": "utility", "type": "typeCombo", "label": "Utility"},
+  "valve": {"key": "valve", "type": "combo", "label": "Type"},
+  "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"},
+  "video_calls": {"key": "video", "type": "check", "label": "Video Calls"},
+  "visibility": {"key": "visibility", "type": "combo", "label": "Visibility", "strings": {"options": {"house": "Up to 5m (16ft)", "street": "5 to 20m (16 to 65ft)", "area": "Over 20m (65ft)"}}},
+  "volcano/status": {"key": "volcano:status", "type": "combo", "label": "Volcano Status", "strings": {"options": {"active": "Active", "dormant": "Dormant", "extinct": "Extinct"}}},
+  "volcano/type": {"key": "volcano:type", "type": "combo", "label": "Volcano Type", "strings": {"options": {"stratovolcano": "Stratovolcano", "shield": "Shield", "scoria": "Scoria"}}},
+  "voltage_electrified": {"key": "voltage", "type": "combo", "label": "Voltage", "prerequisiteTag": {"key": "electrified", "valueNot": "no"}},
+  "voltage": {"key": "voltage", "type": "combo", "label": "Voltage"},
+  "voltage/primary": {"key": "voltage:primary", "type": "combo", "label": "Primary Voltage"},
+  "voltage/secondary": {"key": "voltage:secondary", "type": "combo", "label": "Secondary Voltage"},
+  "voltage/tertiary": {"key": "voltage:tertiary", "type": "combo", "label": "Tertiary Voltage"},
+  "wall": {"key": "wall", "type": "combo", "label": "Type"},
+  "waste": {"key": "waste", "type": "semiCombo", "label": "Waste"},
+  "water_point": {"key": "water_point", "type": "check", "label": "Water Point"},
+  "water_source": {"key": "water_source", "default": "main", "type": "combo", "label": "Water Source"},
+  "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (m³)", "snake_case": false},
+  "water": {"key": "water", "type": "combo", "label": "Type"},
+  "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
+  "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "https://example.com", "label": "Website", "terms": ["internet presence", "uri", "url", "webpage"]},
+  "wetland": {"key": "wetland", "type": "combo", "label": "Type"},
+  "wheelchair": {"key": "wheelchair", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": ["handicap access"]},
+  "wholesale": {"key": "wholesale", "type": "typeCombo", "label": "Wholesale"},
+  "width": {"key": "width", "type": "number", "minValue": 0, "label": "Width (Meters)"},
+  "wikidata": {"key": "wikidata", "keys": ["wikidata", "wikipedia"], "type": "wikidata", "icon": "wikipedia", "universal": true, "label": "Wikidata"},
+  "wikimedia_commons": {"key": "wikimedia_commons", "type": "identifier", "label": "Wikimedia Commons Page", "placeholder": "File:Example.jpg", "urlFormat": "https://commons.wikimedia.org/wiki/{value}", "pattern": "^(?:File|Category):.{1,}", "universal": true},
+  "wikipedia": {"key": "wikipedia", "keys": ["wikipedia", "wikidata"], "type": "wikipedia", "icon": "wikipedia", "universal": true, "label": "Wikipedia"},
+  "windings": {"key": "windings", "type": "number", "minValue": 1, "label": "Windings", "placeholder": "1, 2, 3..."},
+  "windings/configuration": {"key": "windings:configuration", "type": "combo", "label": "Windings Configuration", "strings": {"options": {"star": "Star / Wye", "delta": "Delta", "open-delta": "Open Delta", "zigzag": "Zig Zag", "open": "Open", "scott": "Scott", "leblanc": "Leblanc"}}}
 }

data/presets/fields/beauty.json

@@ -1,5 +1,5 @@
 {
     "key": "beauty",
-    "type": "combo",
-    "label": "Beauty Specialty"
+    "type": "semiCombo",
+    "label": "Services"
 }

data/presets/fields/board_type.json

@@ -1,5 +1,5 @@
 {
     "key": "board_type",
-    "type": "typeCombo",
+    "type": "combo",
     "label": "Type"
 }

data/presets/fields/bridge/support.json

@@ -1,5 +1,5 @@
 {
     "key": "bridge:support",
-    "type": "combo",
+    "type": "typeCombo",
     "label": "Type"
 }

data/presets/fields/check_date.json

@@ -1,5 +1,6 @@
 {
     "key": "check_date",
     "type": "text",
-    "label": "Last Checked Date"
+    "label": "Last Checked Date",
+    "placeholder": "YYYY-MM-DD"
 }

data/presets/fields/circumference.json

@@ -0,0 +1,7 @@
+{
+    "key": "circumference",
+    "type": "combo",
+    "label": "Circumference",
+    "snake_case": false,
+    "placeholder": "1 m, 20 cm, 30 in…"
+}

data/presets/fields/depth.json

@@ -0,0 +1,6 @@
+{
+    "key": "depth",
+    "minValue": 0,
+    "type": "number",
+    "label": "Depth (Meters)"
+}

data/presets/fields/disused/shop.json

@@ -0,0 +1,5 @@
+{
+    "key": "disused:shop",
+    "type": "typeCombo",
+    "label": "Type"
+}

data/presets/fields/electrified.json

@@ -10,5 +10,10 @@
             "yes": "Yes (unspecified)",
             "no": "No"
         }
-    }
+    },
+    "terms": [
+        "contact line",
+        "powered",
+        "third rail"
+    ]
 }

data/presets/fields/internet_access.json

@@ -1,7 +1,7 @@
 {
     "key": "internet_access",
     "type": "combo",
-    "label": "Internet Access",
+    "label": "Internet Connection",
     "strings": {
         "options": {
             "yes": "Yes",

data/presets/fields/internet_access/fee.json

@@ -1,7 +1,14 @@
 {
     "key": "internet_access:fee",
-    "type": "check",
-    "label": "Internet Access Fee",
+    "type": "combo",
+    "label": "Internet Access",
+    "strings": {
+        "options": {
+            "no": "Free",
+            "yes": "Paid",
+            "customers": "Customers Only"
+        }
+    },
     "prerequisiteTag": {
         "key": "internet_access",
         "valueNot": "no"

data/presets/fields/kneipp_water_cure_multi.json

@@ -0,0 +1,5 @@
+{
+    "key": "kneipp_water_cure:",
+    "type": "multiCombo",
+    "label": "Basin Types"                 
+}

data/presets/fields/mimics.json

@@ -0,0 +1,11 @@
+{
+    "key": "mimics",
+    "type": "combo",
+    "label": "Mimics",
+    "terms": [
+        "camoflauged",
+        "disguised",
+        "looks like",
+        "tree"
+    ]
+}

data/presets/fields/opening_date.json

@@ -1,5 +1,6 @@
 {
     "key": "opening_date",
     "type": "text",
-    "label": "Expected Opening Date"
+    "label": "Expected Opening Date",
+    "placeholder": "YYYY-MM-DD"
 }

data/presets/fields/plant/method.json

@@ -0,0 +1,5 @@
+{
+    "key": "plant:method",
+    "type": "combo",
+    "label": "Generation Method"
+}

data/presets/fields/plant/output/electricity.json

@@ -1,6 +1,7 @@
 {
     "key": "plant:output:electricity",
-    "type": "text",
+    "type": "typeCombo",
     "label": "Power Output",
-    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+    "placeholder": "500 MW, 1000 MW, 2000 MW...",
+    "snake_case": false
 }

data/presets/fields/plant/source.json

@@ -0,0 +1,5 @@
+{
+    "key": "plant:source",
+    "type": "combo",
+    "label": "Energy Source"
+}

data/presets/fields/start_date.json

@@ -3,6 +3,7 @@
     "type": "text",
     "universal": true,
     "label": "Start Date",
+    "placeholder": "YYYY-MM-DD",
     "terms": [
         "inception"
     ]

data/presets/fields/telecom/medium.json

@@ -0,0 +1,5 @@
+{
+    "key": "telecom:medium",
+    "type": "combo",
+    "label": "Medium"
+}

data/presets/presets/_aerialway.json

@@ -15,5 +15,5 @@
         "aerialway": "*"
     },
     "searchable": false,
-    "name": "Aerialway"
+    "name": "Aerialway Feature"
 }

data/presets/presets/_aeroway.json

@@ -13,5 +13,5 @@
         "aeroway": "*"
     },
     "searchable": false,
-    "name": "Aeroway"
+    "name": "Aeroway Feature"
 }

data/presets/presets/_power.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-power",
     "geometry": [
         "point",
         "vertex",

data/presets/presets/_railway.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-rail_profile",
     "fields": [
         "railway"
     ],

data/presets/presets/advertising/billboard.json

@@ -1,8 +1,15 @@
 {
     "icon": "temaki-billboard",
     "fields": [
+        "operator",
+        "lit",
+        "support",
+        "visibility"
+    ],
+    "moreFields": [
+        "access_simple",
         "direction",
-        "lit"
+        "height"
     ],
     "geometry": [
         "point",
@@ -13,4 +20,4 @@
         "advertising": "billboard"
     },
     "name": "Billboard"
-}
+}

data/presets/presets/advertising/board.json

@@ -1,7 +1,14 @@
 {
+    "icon": "temaki-bulletin_board",
     "fields": [
+        "operator",
         "lit",
         "support",
+        "visibility"
+    ],
+    "moreFields": [
+        "access_simple",
+        "direction",
         "height"
     ],
     "geometry": [
@@ -10,5 +17,21 @@
     "tags": {
         "advertising": "board"
     },
+    "terms": [
+        "advertising",
+        "announcements",
+        "blackboard",
+        "bulletin board",
+        "bulletinboard",
+        "cork board",
+        "corkboard",
+        "fliers",
+        "flyers",
+        "noticeboard",
+        "pin board",
+        "pinboard",
+        "sign",
+        "whiteboard"
+    ],
     "name": "Notice Board"
 }

data/presets/presets/advertising/column.json

@@ -1,7 +1,13 @@
 {
     "icon": "temaki-storage_tank",
     "fields": [
-        "lit"
+        "operator",
+        "lit",
+        "visibility"
+    ],
+    "moreFields": [
+        "access_simple",
+        "height"
     ],
     "geometry": [
         "point",
@@ -11,4 +17,4 @@
         "advertising": "column"
     },
     "name": "Advertising Column"
-}
+}

data/presets/presets/advertising/poster_box.json

@@ -1,6 +1,14 @@
 {
+    "icon": "temaki-poster_box",
     "fields": [
+        "operator",
         "lit",
+        "support",
+        "visibility"
+    ],
+    "moreFields": [
+        "access_simple",
+        "direction",
         "height"
     ],
     "geometry": [

data/presets/presets/advertising/totem.json

@@ -2,7 +2,10 @@
     "fields": [
         "operator",
         "lit",
-        "visibility",
+        "visibility"
+    ],
+    "moreFields": [
+        "access_simple",
         "direction",
         "height"
     ],
@@ -13,4 +16,4 @@
         "advertising": "totem"
     },
     "name": "Advertising Totem"
-}
+}

data/presets/presets/aerialway/cable_car.json

@@ -3,10 +3,6 @@
     "geometry": [
         "line"
     ],
-    "terms": [
-        "tramway",
-        "ropeway"
-    ],
     "fields": [
         "name",
         "aerialway/occupancy",
@@ -17,5 +13,13 @@
     "tags": {
         "aerialway": "cable_car"
     },
+    "terms": [
+        "aerial cable",
+        "lift",
+        "ropeway",
+        "skiing",
+        "snowboarding",
+        "tramway"
+    ],
     "name": "Cable Car"
 }

data/presets/presets/aerialway/chair_lift.json

@@ -15,5 +15,10 @@
     "tags": {
         "aerialway": "chair_lift"
     },
+    "terms": [
+        "aerial cable",
+        "skiing",
+        "snowboarding"
+    ],
     "name": "Chair Lift"
 }

data/presets/presets/aerialway/drag_lift.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-drag_lift",
     "geometry": [
         "line"
     ],
@@ -10,5 +11,10 @@
     "tags": {
         "aerialway": "drag_lift"
     },
+    "terms": [
+        "skiing",
+        "snowboarding",
+        "surface cable"
+    ],
     "name": "Drag Lift"
 }

data/presets/presets/aerialway/gondola.json

@@ -15,5 +15,11 @@
     "tags": {
         "aerialway": "gondola"
     },
+    "terms": [
+        "aerial cable",
+        "lift",
+        "skiing",
+        "snowboarding"
+    ],
     "name": "Gondola"
 }

data/presets/presets/aerialway/goods.json

@@ -10,5 +10,8 @@
     "tags": {
         "aerialway": "goods"
     },
+    "terms": [
+        "aerial cable"
+    ],
     "name": "Goods Aerialway"
 }

data/presets/presets/aerialway/j-bar.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-j_bar_lift",
     "geometry": [
         "line"
     ],
@@ -7,11 +8,16 @@
         "aerialway/capacity",
         "aerialway/duration"
     ],
-    "terms": [
-        "jbar"
-    ],
     "tags": {
         "aerialway": "j-bar"
     },
+    "terms": [
+        "drag lift",
+        "skiing",
+        "snowboarding",
+        "surface cable",
+        "jaybar",
+        "jbar"
+    ],
     "name": "J-Bar Lift"
 }

data/presets/presets/aerialway/magic_carpet.json

@@ -11,5 +11,11 @@
     "tags": {
         "aerialway": "magic_carpet"
     },
+    "terms": [
+        "conveyor belt",
+        "skiing",
+        "snowboarding",
+        "surface lift"
+    ],
     "name": "Magic Carpet Lift"
 }

data/presets/presets/aerialway/mixed_lift.json

@@ -1,4 +1,5 @@
 {
+    "icon": "maki-aerialway",
     "geometry": [
         "line"
     ],
@@ -14,5 +15,10 @@
     "tags": {
         "aerialway": "mixed_lift"
     },
+    "terms": [
+        "aerial cable",
+        "skiing",
+        "snowboarding"
+    ],
     "name": "Mixed Lift"
 }

data/presets/presets/aerialway/platter.json

@@ -1,11 +1,8 @@
 {
+    "icon": "temaki-platter_lift",
     "geometry": [
         "line"
     ],
-    "terms": [
-        "button lift",
-        "poma lift"
-    ],
     "fields": [
         "name",
         "aerialway/capacity",
@@ -14,5 +11,14 @@
     "tags": {
         "aerialway": "platter"
     },
+    "terms": [
+        "button lift",
+        "disc lift",
+        "drag lift",
+        "poma lift",
+        "skiing",
+        "snowboarding",
+        "surface cable"
+    ],
     "name": "Platter Lift"
 }

data/presets/presets/aerialway/pylon.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-aerialway_pole",
     "geometry": [
         "point",
         "vertex"
@@ -9,5 +10,11 @@
     "tags": {
         "aerialway": "pylon"
     },
+    "terms": [
+        "chair lift pole",
+        "skiing",
+        "snowboarding",
+        "lift tower"
+    ],
     "name": "Aerialway Pylon"
 }

data/presets/presets/aerialway/rope_tow.json

@@ -2,10 +2,6 @@
     "geometry": [
         "line"
     ],
-    "terms": [
-        "handle tow",
-        "bugel lift"
-    ],
     "fields": [
         "name",
         "oneway_yes",
@@ -15,5 +11,13 @@
     "tags": {
         "aerialway": "rope_tow"
     },
+    "terms": [
+        "bugel lift",
+        "drag lift",
+        "handle tow",
+        "skiing",
+        "snowboarding",
+        "surface cable"
+    ],
     "name": "Rope Tow Lift"
 }

data/presets/presets/aerialway/t-bar.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-t_bar_lift",
     "geometry": [
         "line"
     ],
@@ -7,11 +8,14 @@
         "aerialway/capacity",
         "aerialway/duration"
     ],
-    "terms": [
-        "tbar"
-    ],
     "tags": {
         "aerialway": "t-bar"
     },
+    "terms": [
+        "drag lift",
+        "skiing",
+        "surface cable",
+        "tbar"
+    ],
     "name": "T-Bar Lift"
 }

data/presets/presets/aerialway/zip_line.json

@@ -9,6 +9,9 @@
         "maxweight",
         "access_simple"
     ],
+    "tags": {
+        "aerialway": "zip_line"
+    },
     "terms": [
         "aerial runway",
         "canopy",
@@ -21,8 +24,5 @@
         "zipline",
         "zipwire"
     ],
-    "tags": {
-        "aerialway": "zip_line"
-    },
     "name": "Zip Line"
 }

data/presets/presets/aeroway/aerodrome.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-airport",
+    "icon": "temaki-airport",
     "geometry": [
         "area",
         "point"

data/presets/presets/aeroway/apron.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-airport",
+    "icon": "temaki-planes",
     "geometry": [
         "area"
     ],

data/presets/presets/aeroway/gate.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-airport",
+    "icon": "fas-plane",
     "geometry": [
         "point"
     ],

data/presets/presets/aeroway/hangar.json

@@ -1,5 +1,5 @@
 {
-    "icon": "fas-warehouse",
+    "icon": "temaki-hangar",
     "geometry": [
         "area"
     ],

data/presets/presets/aeroway/holding_position.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-airport",
+    "icon": "temaki-plane_taxiing",
     "geometry": [
         "vertex"
     ],

data/presets/presets/aeroway/parking_position.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-airport",
+    "icon": "temaki-plane_taxiing",
     "geometry": [
         "vertex",
         "point",

data/presets/presets/aeroway/taxiway.json

@@ -1,5 +1,5 @@
 {
-    "icon": "fas-plane",
+    "icon": "temaki-plane_taxiing",
     "geometry": [
         "line"
     ],

data/presets/presets/aeroway/windsock.json

@@ -1,5 +1,5 @@
 {
-    "icon": "fas-wind",
+    "icon": "temaki-windsock",
     "geometry": [
         "point",
         "vertex"

data/presets/presets/amenity/bank.json

@@ -5,6 +5,7 @@
         "operator",
         "address",
         "building_area",
+        "opening_hours",
         "atm",
         "drive_through"
     ],
@@ -19,7 +20,6 @@
         "internet_access/fee",
         "internet_access/ssid",
         "level",
-        "opening_hours",
         "phone",
         "ref/vatin",
         "website",

data/presets/presets/amenity/bar.json

@@ -4,7 +4,7 @@
         "name",
         "address",
         "building_area",
-        "outdoor_seating",
+        "opening_hours",
         "min_age",
         "brewery"
     ],
@@ -18,8 +18,8 @@
         "internet_access/ssid",
         "level",
         "microbrewery",
-        "opening_hours",
         "operator",
+        "outdoor_seating",
         "payment_multi",
         "phone",
         "ref/vatin",

data/presets/presets/amenity/bicycle_parking/lockers.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-bicycle_box",
+    "icon": "temaki-bicycle_locker",
     "geometry": [
         "point",
         "vertex",

data/presets/presets/amenity/boat_rental.json

@@ -4,11 +4,13 @@
         "name",
         "operator",
         "operator/type",
+        "opening_hours",
         "fee",
         "payment_multi_fee",
         "charge_fee"
     ],
     "moreFields": [
+        "access_simple",
         "address",
         "email",
         "fax",

data/presets/presets/amenity/cafe.json

@@ -5,9 +5,11 @@
         "cuisine",
         "address",
         "building_area",
+        "opening_hours",
         "outdoor_seating",
         "internet_access",
-        "internet_access/fee"
+        "internet_access/fee",
+        "internet_access/ssid"
     ],
     "moreFields": [
         "air_conditioning",
@@ -19,11 +21,9 @@
         "email",
         "fax",
         "gnis/feature_id",
-        "internet_access/ssid",
         "level",
         "min_age",
         "not/name",
-        "opening_hours",
         "payment_multi",
         "phone",
         "ref/vatin",

data/presets/presets/amenity/childcare.json

@@ -6,19 +6,23 @@
         "operator/type",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "website"
     ],
     "moreFields": [
         "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
         "level",
         "max_age",
         "min_age",
+        "not/name",
         "payment_multi",
         "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/college.json

@@ -7,14 +7,15 @@
         "address",
         "website",
         "internet_access",
-        "internet_access/fee"
+        "internet_access/fee",
+        "internet_access/ssid"
     ],
     "moreFields": [
         "denomination",
         "email",
         "fax",
         "gnis/feature_id",
-        "internet_access/ssid",
+        "not/name",
         "phone",
         "religion",
         "wheelchair"

data/presets/presets/amenity/community_centre.json

@@ -3,8 +3,11 @@
     "fields": [
         "name",
         "operator",
+        "operator/type",
         "address",
-        "building_area"
+        "building_area",
+        "opening_hours",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -14,7 +17,6 @@
         "gnis/feature_id",
         "phone",
         "polling_station",
-        "website",
         "wheelchair"
     ],
     "geometry": [