Fix merge conflicts

2026-05-20 23:44:47 +02:00 · 2020-10-15 18:15:57 +02:00
parent c1746ae09f d4736ef481
commit ca7e44d2f0
502 changed files with 8920 additions and 6324 deletions
@@ -0,0 +1,17 @@
+# GitHub Action to automate the identification of common misspellings in text files.
+# https://github.com/codespell-project/actions-codespell
+# https://github.com/codespell-project/codespell
+name: codespell
+on: [push, pull_request]
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: codespell-project/actions-codespell@master
+        with:
+          check_filenames: true
+          skip: ./.git,./data/territory_languages.json,./data/imagery.json,./data/languages.json,./data/locales.json,./data/address_formats.json,./dist/locales,./docs/img,./dist/img,./data/presets/categories.json,./data/presets/fields.json,./data/presets/presets.json,./data/presets.yaml,./data/taginfo.json,./data/deprecated.json
+          ignore_words_list: "auxilary,casette,cemetary,chancel,childs,extentions,files',froms,generat,guerilla,kindergarden,nd,specialties,vias,visibles,tos"
+          only_warn: 1
@@ -6,7 +6,6 @@
 npm-debug.log
 package-lock.json

-the_noun_project.auth
 transifex.auth

 /dist/*.js
@@ -110,7 +110,7 @@ such as opening the edit menu via long-pressing instead of right-clicking.
 |   | Icon | Input Setup | Notes | Issues |
 |---|---|---|---|---|
 | ✅ | 🖱⌨️ | [Mouse](https://en.wikipedia.org/wiki/Computer_mouse) + [keyboard](https://en.wikipedia.org/wiki/Computer_keyboard) | iD's original input paradigm. Any mouse-like device such as a [trackpad](https://en.wikipedia.org/wiki/Touchpad), [trackball](https://en.wikipedia.org/wiki/Trackball), or [pointing stick](https://en.wikipedia.org/wiki/Pointing_stick) is grouped into "mouse" for this table |
-| ❌ | ⌨️   | Keyboard only | Not all elements can necessarily be keyed to. Key traps may exists. Geometry editing isn't possible | [#7770](https://github.com/openstreetmap/iD/issues/7770) |
+| 🟠 | ⌨️   | Keyboard only | iD hasn't been optimized for keyboard-only navigation, but some is possible. Geometry editing isn't possible | [#8004](https://github.com/openstreetmap/iD/issues/8004) |
 | 🟠 | 🖱  | Mouse only | The primary [mouse button](https://en.wikipedia.org/wiki/Mouse_button) (e.g. left click) alone is sufficient. Multiselection and disabling of node-snapping aren't possible |
 | 🟠 | 🖐  | [Multi-touch](https://en.wikipedia.org/wiki/Multi-touch) on a [touchscreen](https://en.wikipedia.org/wiki/Touchscreen) | Moving and rotating selections isn't possible | [#7599](https://github.com/openstreetmap/iD/issues/7599) |
 | 🟠 | ✍️   | [Stylus](https://en.wikipedia.org/wiki/Stylus_(computing)) on a touchscreen | Moving and rotating selections isn't possible, nor is selecting multiple features |
@@ -163,12 +163,14 @@ for more info.
 |   | Multilingual Feature | Notes | Issues |
 |---|---|---|---|
 | ✅ | Browser language preference | iD tries to use the language set in the browser |
-| ❌ | Base language fallback | E.g. if `pt_BR` is incomplete, `pt` should be tried before `en` |
-| ❌ | Custom fallback language | If the preferred language is incomplete, a user-specified one should be tried before `en` (e.g. `kk` → `ru`) |
-| ❌ | [`lang` HTML attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang) | Helps with text-to-speech, text formatting, and auto-transliteration, particularly when iD mixes strings from different languages |
+| ✅ | Base language fallback | E.g. if `pt_BR` is incomplete, `pt` should be tried before `en` | [#7996](https://github.com/openstreetmap/iD/issues/7996)
+| ✅ | Custom fallback languages | If the preferred language is incomplete, user-specified ones should be tried before `en` (e.g. `kk` → `ru`) | [#7996](https://github.com/openstreetmap/iD/issues/7996)
+| 🟠 | [`lang` HTML attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang) | Helps with text-to-speech, text formatting, and auto-transliteration, particularly when iD mixes strings from different languages | [#7963](https://github.com/openstreetmap/iD/issues/7963)
 | ✅ | Locale URL parameters | `locale` and `rtl` can be used to manually set iD's locale preferences. See the [API](API.md#url-parameters) |
 | ❌ | Language selection in UI | The mapper should be able to view and change iD's language in the interface at any time. Useful for public computers with fixed browser languages | [#3120](https://github.com/openstreetmap/iD/issues/3120) |
 | 🟩 | Right-to-left layouts | The [`dir` HTML attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/dir) is properly set for languages like Hebrew and Arabic |
+| ✅ | [Language-specific plurals](https://docs.transifex.com/localization-tips-workflows/plurals-and-genders#how-pluralized-strings-are-handled-by-transifex) | English has two plural forms, but some languages need more to be grammatically correct | [#597](https://github.com/openstreetmap/iD/issues/597), [#7991](https://github.com/openstreetmap/iD/issues/7991) |
+| 🟠 | [Localized number formats](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat) | Most in-text numbers are localized. Numeric fields are not | [#3615](https://github.com/openstreetmap/iD/issues/3615), [#7993](https://github.com/openstreetmap/iD/issues/7993) |
 | 🟠 | Label icons | Icons should accompany text labels to illustrate the meaning of untranslated terms |

 ### Translatability
@@ -209,7 +211,8 @@ are kept close to 100% coverage, while most languages have less than 50% coverag
 |---|---|---|---|
 | 🤷 | [Screen reader support](https://en.wikipedia.org/wiki/Screen_reader) | | |
 | 🟠 | [Browser zoom](https://support.mozilla.org/en-US/kb/accessibility-features-firefox-make-firefox-and-we#w_page-zoom) | Scrolling-to-pan the map may react oddly on some browsers | |
-| 🟠 | [Text-only browser zoom](https://support.mozilla.org/en-US/kb/accessibility-features-firefox-make-firefox-and-we#w_text-zoom) | Enlarged text can overflow containers that have fixed dimensions | |
+| 🟠 | [Text-only browser zoom](https://support.mozilla.org/en-US/kb/accessibility-features-firefox-make-firefox-and-we#w_text-zoom) | Interface elements scale to compensate larger text sizes. Map labels don't scale | [#7965](https://github.com/openstreetmap/iD/issues/7965) |
+| ✅ | Browser zoom keyboard shortcuts | The <kbd>Cmd</kbd><kbd>+</kbd> and <kbd>Cmd</kbd><kbd>–</kbd> shortcuts used by major browsers are supported | [#7976](https://github.com/openstreetmap/iD/issues/7976) |
 | 🟠 | [Don't rely on color alone](https://www.wuhcag.com/use-of-colour/) | Some classes of map data are indistinguishable except for their colors | |
 | 🤷 | [High-contrast text colors](https://www.wuhcag.com/contrast-enhanced/) | | |
 | ❌ | [Dark mode](https://en.wikipedia.org/wiki/Light-on-dark_color_scheme) | Many people find light-on-dark UIs easier to read under certain conditions | |
@@ -5,7 +5,7 @@ This file documents efforts toward establishing a public API for iD.
 ##### iD Standalone

 iD supports several URL parameters. When constructing a URL to a standalone instance
-of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters are available
+of iD (e.g. `https://ideditor-release.netlify.app`), the following parameters are available
 **in the hash portion of the URL**:

 * __`background`__ - The value from a `sourcetag` property in iD's
@@ -31,8 +31,8 @@ of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters ar
  _Example:_ `hashtags=%23hotosm-task-592,%23MissingMaps`
 * __`id`__ - The character 'n', 'w', or 'r', followed by the OSM ID of a node, way or relation, respectively. Selects the specified entity, and, unless a `map` parameter is also provided, centers the map on it.<br/>
  _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/>
+* __`locale`__ - A code specifying the localization to use, affecting the language, layout, and keyboard shortcuts. Multiple codes may be specified in order of preference. The first valid code will be the locale, while the rest will be used as fallbacks if certain text hasn't been translated. The default locale preferences are set by the browser.<br/>
+  _Example:_ `locale=ja`, `locale=pt-BR`, `locale=nl,fr,de`<br/>
  _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`
@@ -43,6 +43,9 @@ 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`
+* __`photo`__ - The service and ID of the street-level photo to show.<br/>
+  _Example:_ `photo=streetside/718514589`<br/>
+  _Available prefixes:_ `streetside/`, `mapillary/`, `openstreetcam/`
 * __`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).
@@ -177,7 +180,7 @@ iD is written in a modular style and bundled with [rollup.js](http://rollupjs.or
 which makes hot code replacement tricky.  (ES6 module exports are
 [immutable live bindings](http://www.2ality.com/2015/07/es6-module-exports.html)).
 Because of this, the parts of iD which are designed for customization are exported
-as live bound objects that can be overriden at runtime _before initializing the iD context_.
+as live bound objects that can be overridden at runtime _before initializing the iD context_.

 ### Services

@@ -219,7 +222,7 @@ iD.fileFetcher.cache().imagery = [{
 ```

 Each imagery source should have the following properties:
-* `id` - Unique identifier for this source (also used as a url paramater)
+* `id` - Unique identifier for this source (also used as a url parameter)
 * `name` - Display name for the source
 * `type` - Source type, currently only `tms` is supported
 * `template` - Url template, valid replacement tokens include:
@@ -440,7 +440,7 @@ A one-way line does not have a valid connection at its first or last node.

 ##### `incompatible_source`

-The `source` tag of a feature references a data source known to have a license incompatiable with OpenStreetMap. This is very much not exhaustive and currently only flags sources containing "google".
+The `source` tag of a feature references a data source known to have a license incompatible with OpenStreetMap. This is very much not exhaustive and currently only flags sources containing "google".

 ##### `invalid_format`

@@ -30,6 +30,164 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@xxxx]: https://github.com/xxxx
 -->

+# 2.18.5
+##### 2020-Sep-08
+
+#### :newspaper: News
+* The OpenStreetMap Foundation is now [directly supporting](https://wiki.osmfoundation.org/wiki/Board/Minutes/2020-09#2020.2FRes42_Accept_contract_with_Quincy_Morgan) Quincy Morgan ([@quincylvania](https://github.com/quincylvania)) as a full-time maintainer of iD
+
+#### :sparkles: Usability
+* Open links from OpenStreetMap Notes in new tabs ([#7883], [#7893], thanks [@JeeZeh])
+* Don't say lines and areas aren't visible enough to disconnect when all their connected points are onscreen ([#7944])
+* Leave behind the area tags when extracting a point from a building part or indoor room ([#7862])
+* Hide background imagery sources that are blocked by the OpenStreetMap API ([#7871], [#7905])
+
+[#7883]: https://github.com/openstreetmap/iD/issues/7883
+[#7893]: https://github.com/openstreetmap/iD/issues/7893
+[#7944]: https://github.com/openstreetmap/iD/issues/7944
+[#7862]: https://github.com/openstreetmap/iD/issues/7862
+[#7871]: https://github.com/openstreetmap/iD/issues/7871
+[#7905]: https://github.com/openstreetmap/iD/issues/7905
+
+[@JeeZeh]: https://github.com/JeeZeh
+
+#### :white_check_mark: Validation
+* Properly let tags on multipolygons fix crossing issues ([#7935])
+* Use tram crossings instead of railway crossings when connecting paths and roads to tram tracks ([#7902])
+* Deprecate `fast_food=pizza` and `fast_food=shawarma` tags
+
+[#7935]: https://github.com/openstreetmap/iD/issues/7935
+[#7902]: https://github.com/openstreetmap/iD/issues/7902
+
+#### :bug: Bugfixes
+* Fix problem where nodes could not be dragged after long-clicking if something was previously selected ([#7826])
+* Fix bug where undoing to the second-to-first node of a way would delete the whole way and exit drawing ([#7772])
+* Correct problem where selected text could not be copied via the keyboard shortcut while features were selected ([#7908])
+* Fix issue where adjusting a selected line or area could hide the quick fixes ([#7386])
+* Fix issue where the Wikipedia field would not default to the user's preferred language ([#7890])
+* Properly show scroll bars for overflowing text area inputs ([#7869])
+
+[#7826]: https://github.com/openstreetmap/iD/issues/7826
+[#7772]: https://github.com/openstreetmap/iD/issues/7772
+[#7908]: https://github.com/openstreetmap/iD/issues/7908
+[#7386]: https://github.com/openstreetmap/iD/issues/7386
+[#7890]: https://github.com/openstreetmap/iD/issues/7890
+[#7869]: https://github.com/openstreetmap/iD/issues/7869
+
+#### :mortar_board: Walkthrough / Help
+* Use a consistent term for photo overlays in the Help pane ([#7859], thanks [@mikini])
+
+[#7859]: https://github.com/openstreetmap/iD/issues/7859
+
+[@mikini]: https://github.com/mikini
+
+#### :rocket: Presets
+
+###### New Presets
+* Add Wig Shop preset ([#7878], [#7912], thanks [@fakeharahman])
+* Add Irish Pub preset ([#7852], thanks [@rory])
+* Add Portable Toilet preset ([#7832], [#7783], thanks [@Nimisha94])
+* Add Tram-Road Crossing and Tram-Path Crossing presets ([#7902])
+* Add Open Road Toll preset ([#7408])
+* Add Juice Fast Food preset ([#7904])
+* Add Dovecote preset ([#7916])
+* Add generic Telecom Feature preset ([#7934])
+* Add Gymnasium preset ([#7818])
+* Add Railway-Railway Crossing preset
+
+###### Changed Presets
+* Add "snorkel" as search term of Scuba Shop ([#7857], [#7874], thanks [@fakeharahman])
+* Rename Tourist Information Office preset to Visitor Center and add search terms ([#7764])
+* Add search terms to the Quarry preset ([#7730])
+* Support Cave Entrance features as nodes that are part of ways ([#7945])
+* Support Emergency Water Tank features as areas and add more fields ([#7915])
+* Update icon for Viewpoint ([#7851])
+* Rename Railway Crossing (Road) preset to Railway-Road Crossing
+* Rename Railway Crossing (Path) preset to Railway-Path Crossing
+
+###### New and Changed Fields
+* Add Units field to Apartment Building ([#7856], [#7896], thanks [@ogbeche77])
+* Add additional fields to Defibrillator ([#7925], thanks [@nlehuby])
+* Add Type field to Parking Garage Entrance / Exit ([#7900], [#7909], thanks [@brokemyspoke])
+* Show Website and Telephone fields by default on office presets ([#7865], [#7875], thanks [@thibaultmol])
+* Add more fields to Ferry Route
+* Show Diet Types field by default on Restaurant ([#7918])
+
+[#7832]: https://github.com/openstreetmap/iD/issues/7832
+[#7783]: https://github.com/openstreetmap/iD/issues/7783
+[#7851]: https://github.com/openstreetmap/iD/issues/7851
+[#7878]: https://github.com/openstreetmap/iD/issues/7878
+[#7912]: https://github.com/openstreetmap/iD/issues/7912
+[#7852]: https://github.com/openstreetmap/iD/issues/7852
+[#7902]: https://github.com/openstreetmap/iD/issues/7902
+[#7408]: https://github.com/openstreetmap/iD/issues/7408
+[#7904]: https://github.com/openstreetmap/iD/issues/7904
+[#7916]: https://github.com/openstreetmap/iD/issues/7916
+[#7934]: https://github.com/openstreetmap/iD/issues/7934
+[#7818]: https://github.com/openstreetmap/iD/issues/7818
+[#7764]: https://github.com/openstreetmap/iD/issues/7764
+[#7857]: https://github.com/openstreetmap/iD/issues/7857
+[#7874]: https://github.com/openstreetmap/iD/issues/7874
+[#7730]: https://github.com/openstreetmap/iD/issues/7730
+[#7945]: https://github.com/openstreetmap/iD/issues/7945
+[#7915]: https://github.com/openstreetmap/iD/issues/7915
+[#7856]: https://github.com/openstreetmap/iD/issues/7856
+[#7896]: https://github.com/openstreetmap/iD/issues/7896
+[#7925]: https://github.com/openstreetmap/iD/issues/7925
+[#7900]: https://github.com/openstreetmap/iD/issues/7900
+[#7909]: https://github.com/openstreetmap/iD/issues/7909
+[#7865]: https://github.com/openstreetmap/iD/issues/7865
+[#7875]: https://github.com/openstreetmap/iD/issues/7875
+[#7918]: https://github.com/openstreetmap/iD/issues/7918
+
+[@fakeharahman]: https://github.com/fakeharahman
+[@Nimisha94]: https://github.com/Nimisha94
+[@rory]: https://github.com/rory
+[@ogbeche77]: https://github.com/ogbeche77
+[@nlehuby]: https://github.com/nlehuby
+[@brokemyspoke]: https://github.com/brokemyspoke
+[@thibaultmol]: https://github.com/thibaultmol
+
+#### :hammer: Development
+* Replace unnecessary logic in the raw tag editor ([#7932], thanks [@til-schneider])
+* Fix export of `geoVecLengthSquare` ([#7894], thanks [@til-schneider])
+* Fix spelling mistakes in markdown files and code comments ([#7892], [#7897] thanks [@peternewman])
+* :warning: `serviceOsm.imageryBlacklists` has been renamed to `serviceOsm.imageryBlocklists` and now returns an array of `RegExp` objects rather than strings
+* Remove redundant `coreContext()` call ([#7926])
+
+[#7932]: https://github.com/openstreetmap/iD/issues/7932
+[#7894]: https://github.com/openstreetmap/iD/issues/7894
+[#7892]: https://github.com/openstreetmap/iD/issues/7892
+[#7926]: https://github.com/openstreetmap/iD/issues/7926
+[#7897]: https://github.com/openstreetmap/iD/issues/7897
+
+[@til-schneider]: https://github.com/til-schneider
+[@peternewman]: https://github.com/peternewman
+
+# 2.18.4
+##### 2020-Jul-31
+
+#### :white_check_mark: Validation
+* Offer to upgrade `access=customer` tag to `access=customers` ([#7831], [#7836], thanks [@sun-geo])
+
+[#7831]: https://github.com/openstreetmap/iD/issues/7831
+[#7836]: https://github.com/openstreetmap/iD/issues/7836
+
+[@sun-geo]: https://github.com/sun-geo
+
+#### :bug: Bugfixes
+* Fix critical bug where iD would be unusable in some places ([#7858])
+* Fix issue with background layers using `CRS=EPSG:4326` on WMS version 1.3.0 ([#7557])
+* Fix typo in message for multiple features that are too bendy to straighten ([#7845], thanks [@manfredbrandl])
+* Make sure the Add Note label in the Help pane matches the toolbar label ([#7841])
+
+[#7858]: https://github.com/openstreetmap/iD/issues/7858
+[#7557]: https://github.com/openstreetmap/iD/issues/7557
+[#7845]: https://github.com/openstreetmap/iD/issues/7845
+[#7841]: https://github.com/openstreetmap/iD/issues/7841
+
+[@manfredbrandl]: https://github.com/manfredbrandl
+
 # 2.18.3
 ##### 2020-Jul-22

@@ -440,7 +598,7 @@ You can now:
 * :warning: Add dedicated initialization step to `coreContext` ([#7304])
 * :warning: Remove various convenience functions of `coreContext`
 * :warning: Fetch JSON resources asynchronously at runtime using `coreFileFetcher` instead of bundling them ([#4994])
-* :warning: Add `coreUploader` to manage programatic uploading of edits ([#7247], [#7333])
+* :warning: Add `coreUploader` to manage programmatic uploading of edits ([#7247], [#7333])
 * :warning: Wrap localization functionality into global `localizer` singleton of `coreLocalizer`
 * :warning: Replace `context.storage()` with global `prefs` singleton of `corePreferences`
 * Add optimized `coreTree.waySegments` endpoint to return edges overlapping an area
@@ -1265,7 +1423,7 @@ _Press <kbd>G</kbd> to toggle change highlighting._
 * Fix error upon changing the Unsquare Building threshold ([#6690])
 * Don't hide all multilingual names upon deleting one ([#6491])
 * Correctly populate the Bike Lanes field with existing values ([#6141])
-* Show the correct location for coordinates in the `N DD° MM.MMM' W DD° MM.MMM'` format without a commma separator ([#6582])
+* Show the correct location for coordinates in the `N DD° MM.MMM' W DD° MM.MMM'` format without a comma separator ([#6582])
 * Don't treat platforms with a `kerb` tag as primarily curbs ([#6742])
 * Remove deleted features from the map immediately when undoing or redoing ([#6480])
 * Properly resize Mapillary and Bing Streetside photos when resizing the viewer ([#6286])
@@ -1868,7 +2026,7 @@ _Map all the branded businesses in your town!_
 [#5901]: https://github.com/openstreetmap/iD/issues/5901

 #### :mortar_board: Walkthrough / Help
- Make the keyboard shorcuts viewable on narrow window sizes ([#6174])
+- Make the keyboard shortcuts viewable on narrow window sizes ([#6174])

 [#6174]: https://github.com/openstreetmap/iD/issues/6174

@@ -2042,7 +2200,7 @@ _Map all the branded businesses in your town!_
 [#5979]: https://github.com/openstreetmap/iD/issues/5979

 #### :rocket: Presets
-* Add Bar field to Restuarant, Cafe, and Hotel ([#5947], [#5970], thanks [@alphagamer7])
+* Add Bar field to Restaurant, Cafe, and Hotel ([#5947], [#5970], thanks [@alphagamer7])
 * Rename Jeweler to Jewelry Store ([#5948])
 * Add unsearchable generic Boundary preset ([#5975])
 * Don't render roads with a "footway" tag too thin ([#5936])
@@ -2367,7 +2525,7 @@ _Click the new "zoom to" link on the sidebar under the preset icon, or press <kb
 #### :sparkles: Usability

 * Open the combobox when clicking anywhere in the text field ([#5596], [#5636], thanks [@maxgrossman])
-* Add close buttom to the save sidebar ([#5614], [#5622], thanks [@maxgrossman])
+* Add close button to the save sidebar ([#5614], [#5622], thanks [@maxgrossman])
 * Render reservoirs and fountains with the water fill pattern ([#5606], thanks [@RudyTheDev])
 * Render marine barriers with a blue stroke ([#5606], thanks [@RudyTheDev])
 * Press enter to submit values in combo fields without deselecting the feature ([#5725])
@@ -3923,7 +4081,7 @@ _Check out the new help texts by opening the Help pane (shortcut <kbd>H</kbd>)._
 * Add Retail Building to buildings, switch Commercial icon to suitcase ([#4590])
 * Change tourist attraction icon from monument to star ([#4563], [#4584], thanks [@lucymk])
 * Add preset for `man_made=monitoring_station` ([#4581], thanks [@abdeldjalil09])
-* Deprectate (i.e. make non-searchable) `office=administrative` ([#4578])
+* Deprecate (i.e. make non-searchable) `office=administrative` ([#4578])
 * Update transit-related presets for Public Transport v2 schema ([#3041], [#3508], [#4566], [#4585])
 * Changed Marketplace preset to not default to `building=yes` ([#4559], [#4568], thanks [@tastrax])
 * Add preset for `railway=miniature` ([#4555], thanks [@tastrax])
@@ -5460,7 +5618,7 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t
 ##### 2016-Mar-18
 * Avoid jumpiness when dragging node markers (#3003)
 * Rename "Dock" -> "Wet Dock / Dry Dock" (#3030)
-* Refresh lables when switching to a new GPX file (#3032)
+* Refresh labels when switching to a new GPX file (#3032)
 * Fix bug where adding a space to a name would undo a previous edit (#3035)
 * Display GPX tracks immediately when loaded or toggled (#3027)
 * Include "Local GPX" in imagery used list when GPX loaded via url parameter (#2804)
@@ -5512,13 +5670,13 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t
 * Add 'building' combo field for ice rink and swim facility
 * Building field should be combo not typeCombo (because `building=yes` is a valid tag)
 * Link to wiki for guidance on good changeset comments (#2923, thanks @kepta)
-* Make preset fields section collapsable (#2894)
+* Make preset fields section collapsible (#2894)
 * Make sure DrawLine mode is called with a clean pre-operation graph (#2303, thanks @tyrasd)
 * Default to user's language when localizing names (#2882, thanks @kepta)
 * Autocomplete changeset comments from previous changeset comments (#2002, thanks @jfirebaugh)
 * Add universal multiline text field for description, fixme (#1518)
 * Fix crash when selecting a category preset with enter button
-* Remove overly agressive regexes for cleaning up websites and emails (#2892, thanks @kepta)
+* Remove overly aggressive regexes for cleaning up websites and emails (#2892, thanks @kepta)
 * Correct typo "Platic" -> "Plastic" (#2925, thanks @M1dgard)
 * Rename "Unclassified Road" to "Minor Road" (#2916)

@@ -5868,7 +6026,7 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t
 ##### 2014-Mar-28
 * Disable circularize and orthogonalize operations when way is <80% contained in the viewport
 * Add place=neighbourhood preset
-* Add denomination=* field for cemetary, graveyard, funeral home
+* Add denomination=* field for cemetery, graveyard, funeral home
 * Add preset for shop=funeral_directors
 * Add icon for public_transport=stop_position
 * Support quartile scheme for any imagery source (#2112)
@@ -5886,7 +6044,7 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t
 * Add amenity=nightclub
 * Add smoking field for many presets under amenity, building, office, tourism (#1990)
 * barrier=fence shouldn't be an area (fixes #2158)
-* Remove building_area from hospital, school, kindergarden
+* Remove building_area from hospital, school, kindergarten
 * Fix recycling field keys (#2140)


@@ -90,42 +90,60 @@ documentation, repository gardening, and other stuff that makes developers happy
 * <sub>[![chore][chore]][chore_link]
 [![chore-dependency][chore-dependency]][chore-dependency_link]
 [![chore-documentation][chore-documentation]][chore-documentation_link]
-[![chore-greenkeeper][chore-greenkeeper]][chore-greenkeeper_link]</sub>
+[![chore-dependabot][chore-dependabot]][chore-dependabot_link]</sub>

 [chore]: http://labl.es/svg?text=chore&bgcolor=fef2c0
 [chore-dependency]: http://labl.es/svg?text=chore-dependency&bgcolor=fef2c0
 [chore-documentation]: http://labl.es/svg?text=chore-documentation&bgcolor=fef2c0
-[chore-greenkeeper]: http://labl.es/svg?text=chore-greenkeeper&bgcolor=fef2c0
+[chore-dependabot]: http://labl.es/svg?text=chore-dependabot&bgcolor=fef2c0

 [chore_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Achore
 [chore-dependency_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Achore-dependency
 [chore-documentation_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Achore-documentation
-[chore-greenkeeper_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Achore-greenkeeper
+[chore-dependabot_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Achore-dependabot

-Light blue labels are for **features**. We use labels to group them into categories.
+Light blue labels are for **components**, the specific parts of iD that concern the issue.

 * <sub>[![core][core]][core_link]
-[![localization][localization]][localization_link]
-[![performance][performance]][performance_link]
+[![operation][operation]][operation_link]
 [![preset][preset]][preset_link]
-[![renderer][renderer]][renderer_link]
+[![streetlevel][streetlevel]][streetlevel_link]
 [![validation][validation]][validation_link]</sub>

 [core]: http://labl.es/svg?text=core&bgcolor=c5def5
-[localization]: http://labl.es/svg?text=localization&bgcolor=c5def5
-[performance]: http://labl.es/svg?text=performance&bgcolor=c5def5
+[operation]: http://labl.es/svg?text=operation&bgcolor=c5def5
 [preset]: http://labl.es/svg?text=preset&bgcolor=c5def5
-[renderer]: http://labl.es/svg?text=renderer&bgcolor=c5def5
+[streetlevel]: http://labl.es/svg?text=streetlevel&bgcolor=c5def5
 [validation]: http://labl.es/svg?text=validation&bgcolor=c5def5

 [core_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Acore
-[localization_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Alocalization
-[performance_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Aperformance
+[operation_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%operation
 [preset_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Apreset
-[renderer_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Arenderer
+[streetlevel_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Astreetlevel
 [validation_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Avalidation

-Dark Grey labels are for **waitfor items**. We won't work on these now, but we'll keep the issues
+Dark teal labels are for **categories**, the high-level concepts that the issue falls under.
+
+* <sub>[![accessibility][accessibility]][accessibility_link]
+[![compatibility][compatibility]][compatibility_link]
+[![localization][localization]][localization_link]
+[![performance][performance]][performance_link]
+[![usability][usability]][usability_link]</sub>
+
+[accessibility]: http://labl.es/svg?text=accessibility&bgcolor=007f99
+[compatibility]: http://labl.es/svg?text=compatibility&bgcolor=007f99
+[localization]: http://labl.es/svg?text=localization&bgcolor=007f99
+[performance]: http://labl.es/svg?text=performance&bgcolor=007f99
+[usability]: http://labl.es/svg?text=usability&bgcolor=007f99
+
+[accessibility_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Aaccessibility
+[compatibility_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Acompatibility
+[localization_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Alocalization
+[performance_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Aperformance
+[usability_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Ausability
+
+
+Dark grey labels are for **waitfor items**. We won't work on these now, but we'll keep the issues
 open while we wait for something to happen.

 * <sub>[![waitfor][waitfor]][waitfor_link]
@@ -146,7 +164,7 @@ open while we wait for something to happen.
 [waitfor-info_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Awaitfor-info
 [waitfor-upstream_link]: https://github.com/openstreetmap/iD/issues?q=is%3Aopen+is%3Aissue+label%3Awaitfor-upstream

-Light Grey labels are for **wontfix items**. We've decided these doesn't belong in
+Light grey labels are for **wontfix items**. We've decided these doesn't belong in
 iD at this time. Don't feel bad, sometimes we change our minds later and revisit them!
 (ISATIDL = "I saw a thing I don't like", a common OpenStreetMap complaint)

@@ -185,7 +203,7 @@ You can use the [development preview site](https://ideditor.netlify.app) to test
 unreleased features and verify bug fixes, all without building iD yourself. This site
 is updated with the latest code and translations every time we change the `develop` branch.

-The deployments on https://openstreetmap.org and https://preview.ideditor.com/release
+The deployments on https://openstreetmap.org and https://ideditor-release.netlify.app
 are updated only with [stable releases](https://github.com/openstreetmap/iD/releases).
 Recently fixed issues may still be present on these sites until the next version of iD
 is released.
@@ -2,10 +2,6 @@

 [![Build Status](https://travis-ci.org/openstreetmap/iD.svg?branch=develop)](https://travis-ci.org/openstreetmap/iD)

-
-: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`._
-
-
 ## Basics

 * iD is a JavaScript [OpenStreetMap](https://www.openstreetmap.org/) editor.
@@ -24,11 +20,11 @@
 if you're looking for something to do.
 * [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
+  * Stable mirror of `release` branch: https://ideditor-release.netlify.app
  * Development mirror of `develop` branch + latest translations: https://ideditor.netlify.com
-  * Development mirror of `v3-prototype` branch:  https://preview.ideditor.com/master
+  * 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:
+Come on in, the water's lovely. More help? Ping `quincylvania` or `bhousel` on:
 * [OpenStreetMap US Slack](https://slack.openstreetmap.us/)
 (`#id` or `#general` channels)
 * [OpenStreetMap IRC](https://wiki.openstreetmap.org/wiki/IRC)
@@ -43,7 +43,7 @@ $  git tag vA.B.C
 $  git push origin -f release vA.B.C
 ```
 - Open https://github.com/openstreetmap/iD/tags
- Click `•••` –> `Create Release` and link to `CHANGELOG.md` in `Describe this release`
+- Click `•••` –> `Create Release` and link to [`CHANGELOG.md`](https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md) in `Describe this release`

 #### Prepare `develop` branch for further development

@@ -51,7 +51,7 @@ $  git push origin -f release vA.B.C
 $  git checkout develop
 ```

- Increment version number and add `-dev` suffix in `modules/core/context.js` and `package.json`
+- Increment version number and add `-dev` suffix in `modules/core/context.js` and `package.json`, e.g. `2.18.5-dev`

 ```bash
 $  git add . && git commit -m 'Set development version number'
@@ -0,0 +1,8 @@
+{
+  "presets": [
+    [
+      "@babel/env"
+    ]
+  ],
+  "compact": false
+}
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import buble from '@rollup/plugin-buble';
+import babel from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
 import includePaths from 'rollup-plugin-includepaths';
 import json from '@rollup/plugin-json';
@@ -28,7 +28,9 @@ export default {
    nodeResolve({ dedupe: ['object-inspect'] }),
    commonjs(),
    json({ indent: '' }),
-    buble()
+    babel({
+      babelHelpers: 'bundled'
+    })
  ]
 };

@@ -67,13 +67,17 @@ textarea {

 button,
 input {
-    line-height: normal;
+    line-height: inherit;
+	letter-spacing: inherit;
 }

 /* Hide default number spinner controls */
 input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {
-display: none;
+	display: none;
+}
+input[type=number] {
+    -moz-appearance: textfield;
 }

 /*
@@ -241,6 +241,12 @@ path.line.stroke.tag-highway-track,
 path.line.stroke.tag-highway-road {
    stroke-width: 5;
 }
+path.line.casing.tag-highway-service.tag-service-driveway {
+    stroke-width: 6.25;
+}
+path.line.stroke.tag-highway-service.tag-service-driveway {
+    stroke-width: 4.25;
+}

 path.line.shadow.tag-highway-path,
 path.line.shadow.tag-highway-footway,
@@ -288,6 +294,12 @@ path.line.stroke.tag-highway-steps {
 .low-zoom path.line.stroke.tag-highway-road {
    stroke-width: 3;
 }
+.low-zoom  path.line.casing.tag-highway-service.tag-service-driveway {
+    stroke-width: 4.25;
+}
+.low-zoom  path.line.stroke.tag-highway-service.tag-service-driveway {
+    stroke-width: 2.25;
+}

 .low-zoom path.line.shadow.tag-highway-path,
 .low-zoom path.line.shadow.tag-highway-footway,
@@ -412,6 +424,16 @@ path.line.casing.tag-service.tag-service {
    stroke: #666;
 }

+path.line.stroke.tag-highway-service.tag-service-parking_aisle {
+    stroke: #cccac7;
+}
+path.line.stroke.tag-highway-service.tag-service-driveway {
+    stroke: #fff6e4;
+}
+path.line.stroke.tag-highway-service.tag-service-emergency_access {
+    stroke: #ddb2aa;
+}
+
 /* unmaintained track roads */
 path.line.stroke.tag-highway-track,
 path.line.stroke.tag-track {
@@ -1,5 +1,5 @@

-/* narrow width miscellanous things */
+/* narrow width miscellaneous things */
 path.line.shadow.tag-aerialway,
 path.line.shadow.tag-attraction-summer_toboggan,
 path.line.shadow.tag-attraction-water_slide,
@@ -304,22 +304,16 @@ label.streetside-hires {
    border-radius: 4px;
    top: -25px;
 }
-#ideditor-mly .domRenderer .Attribution {
-    /* we will roll our own to avoid async update issues like #4526 */
-    display: none;
+
+.mly-wrapper .AttributionContainer .AttributionIconContainer .AttributionMapillaryLogo {
+    margin-top: 3px;
 }

-.mly-wrapper .photo-attribution a:active {
-    color: #35af6d;
-}
-@media (hover: hover) {
-    .mly-wrapper .photo-attribution a:hover {
-        color: #35af6d;
-    }
-}
-
-.mly-wrapper .mapillary-js-dom {
-    z-index: 9;
+.mly-wrapper .AttributionContainer .AttributionImageContainer {
+    color: #fff;
+    font-size: 10px;
+    font-weight: 300;
+    overflow: hidden;
 }


@@ -355,11 +349,13 @@ label.streetside-hires {
    top: 10px;
    width: 100%;
    z-index: 10;
+    pointer-events: none;
 }

 .photo-controls {
    display: inline-block;
    z-index: 10;
+    pointer-events: initial;
 }

 .photo-controls button,
@@ -198,15 +198,15 @@
    dominant-baseline: middle;
 }
 .layer-mapdata text.label {
-    fill: #ff26d4;
+    fill: #ddd;
 }
 .layer-mapdata text.label.hover,
 .layer-mapdata text.label.selected {
-    fill: #f6634f;
+    fill: #fff;
 }
 .layer-mapdata text.label-halo {
    opacity: 0.7;
    stroke: #000;
    stroke-width: 5px;
    stroke-miterlimit: 1;
-}
+}
@@ -22,14 +22,10 @@ en:
      context: "{base} – {context}"
      changes: "({changes}) {base}"
      changes_context: "({changes}) {base} – {context}"
-    labeled_and_more: "{labeled} and {count} more"
+    labeled_and_more:
+      one: "{labeled} and {count} more"
+      other: "{labeled} and {count} more"
  modes:
-    add_feature:
-      title: Add a feature
-      description: "Search for features to add to the map."
-      key: Tab
-      result: "{count} result"
-      results: "{count} results"
    add_area:
      title: Area
      description: "Add parks, buildings, lakes or other areas to the map."
@@ -83,22 +79,22 @@ en:
    copy:
      title: Copy
      description:
-        single: Set this feature for pasting.
-        multiple: Set these features for pasting.
+        one: Set this feature for pasting.
+        other: Set these features for pasting.
      annotation:
-        single: Copied a feature.
-        multiple: "Copied {n} features."
+        one: Copied a feature.
+        other: "Copied {n} features."
      too_large:
-        single: This can't be copied because not enough of it is currently visible.
-        multiple: These can't be copied because not enough of them are currently visible.
+        one: This can't be copied because not enough of it is currently visible.
+        other: These can't be copied because not enough of them are currently visible.
    paste:
      title: Paste
      description:
-        single: "Add a duplicate {feature} here."
-        multiple: "Add {n} duplicate features here."
+        one: "Add a duplicate {feature} here."
+        other: "Add {n} duplicate features here."
      annotation:
-        single: Pasted a feature.
-        multiple: "Pasted {n} features."
+        one: Pasted a feature.
+        other: "Pasted {n} features."
      nothing_copied: No features have been copied.
    circularize:
      title: Circularize
@@ -107,8 +103,9 @@ en:
        multiple: Make these features circular.
      key: O
      annotation:
-        single: Made a feature circular.
-        multiple: Made features circular.
+        feature:
+          one: Made a feature circular.
+          other: "Made {n} features circular."
      multiple_blockers:
        multiple: These can't be made circular for multiple reasons.
      not_closed:
@@ -138,11 +135,11 @@ en:
      key: Q
      annotation:
        corner:
-          single: Squared a corner.
-          multiple: Squared several corners.
+          one: Squared a corner.
+          other: "Squared {n} corners."
        feature:
-          single: Squared the corners of a feature.
-          multiple: Squared the corners of several features.
+          one: Squared the corners of a feature.
+          other: "Squared the corners of {n} features."
      multiple_blockers:
        multiple: These can't be squared for multiple reasons.
      end_vertex:
@@ -171,12 +168,15 @@ en:
        lines: Straighten these lines.
      key: S
      annotation:
-        points: Straightened several points.
-        line: Straightened a line.
-        lines: Straightened several lines.
+        point:
+          one: Straightened a point.
+          other: "Straightened {n} points."
+        line:
+          one: Straightened a line.
+          other: "Straightened {n} lines."
      too_bendy:
        single: This can't be straightened because it bends too much.
-        multiple: These can't be straighted because they bend too much.
+        multiple: These can't be straightened because they bend too much.
      connected_to_hidden:
        single: This can't be straightened because it is connected to a hidden feature.
        multiple: These can't be straightened because some are connected to hidden features.
@@ -200,7 +200,9 @@ en:
        line: Deleted a line.
        area: Deleted an area.
        relation: Deleted a relation.
-        multiple: "Deleted {n} features."
+        feature:
+          one: "Deleted a feature."
+          other: "Deleted {n} features."
      too_large:
        single: This feature can't be deleted because not enough of it is currently visible.
        multiple: These features can't be deleted because not enough of them are currently visible.
@@ -225,14 +227,17 @@ en:
        building_address: Remove all non-address and non-building tags.
        building: Remove all non-building tags.
        address: Remove all non-address tags.
+        generic: Remove tags.
      annotation:
        building:
-          single: Downgraded a feature to a basic building.
-          multiple: "Downgraded {n} features to basic buildings."
+          one: Downgraded a feature to a basic building.
+          other: "Downgraded {n} features to basic buildings."
        address:
-          single: Downgraded a feature to an address.
-          multiple: "Downgraded {n} features to addresses."
-        multiple: "Downgraded {n} features."
+          one: Downgraded a feature to an address.
+          other: "Downgraded {n} features to addresses."
+        generic:
+          one: "Downgraded a feature."
+          other: "Downgraded {n} features."
      has_wikidata_tag:
        single: This feature can't be downgraded because it has a Wikidata tag.
        multiple: These features can't be downgraded because some have Wikidata tags.
@@ -295,7 +300,9 @@ en:
      title: Merge
      description: Merge these features.
      key: C
-      annotation: "Merged {n} features."
+      annotation:
+        one: "Merged a feature."
+        other: "Merged {n} features."
      not_eligible: These features can't be merged.
      not_adjacent: These features can't be merged because their endpoints aren't connected.
      restriction: "These features can't be merged because it would damage a \"{relation}\" relation."
@@ -316,7 +323,9 @@ en:
        line: Moved a line.
        area: Moved an area.
        relation: Moved a relation.
-        multiple: Moved multiple features.
+        feature:
+          one: "Moved a feature."
+          other: "Moved {n} features."
      incomplete_relation:
        single: This feature can't be moved because it hasn't been fully downloaded.
        multiple: These features can't be moved because they haven't been fully downloaded.
@@ -331,37 +340,39 @@ en:
        multiple: These features can't be moved because parts of them have not yet been downloaded.
    reflect:
      title:
-        long: Reflect Long
-        short: Reflect Short
+        long: Flip Long
+        short: Flip Short
      description:
        long:
-          single: Reflect this feature across its long axis.
-          multiple: Reflect these features across their long axis.
+          single: Flip this feature across its long axis.
+          multiple: Flip these features across their long axis.
        short:
-          single: Reflect this feature across its short axis.
-          multiple: Reflect these features across their short axis.
+          single: Flip this feature across its short axis.
+          multiple: Flip these features across their short axis.
      key:
        long: T
        short: Y
      annotation:
        long:
-          single: Reflected a feature across its long axis.
-          multiple: Reflected multiple features across their long axis.
+          feature:
+            one: Flipped a feature across its long axis.
+            other: "Flipped {n} features across their long axis."
        short:
-          single: Reflected a feature across its short axis.
-          multiple: Reflected multiple features across their short axis.
+          feature:
+            one: Flipped a feature across its short axis.
+            other: "Flipped {n} features across their short axis."
      incomplete_relation:
-        single: This feature can't be reflected because it hasn't been fully downloaded.
-        multiple: These features can't be reflected because they haven't been fully downloaded.
+        single: This feature can't be flipped because it hasn't been fully downloaded.
+        multiple: These features can't be flipped because they haven't been fully downloaded.
      too_large:
-        single: This feature can't be reflected because not enough of it is currently visible.
-        multiple: These features can't be reflected because not enough of them are currently visible.
+        single: This feature can't be flipped because not enough of it is currently visible.
+        multiple: These features can't be flipped because not enough of them are currently visible.
      connected_to_hidden:
-        single: This feature can't be reflected because it is connected to a hidden feature.
-        multiple: These features can't be reflected because some are connected to hidden features.
+        single: This feature can't be flipped because it is connected to a hidden feature.
+        multiple: These features can't be flipped because some are connected to hidden features.
      not_downloaded:
-        single: This feature can't be reflected because parts of it have not yet been downloaded.
-        multiple: These features can't be reflected because parts of them have not yet been downloaded.
+        single: This feature can't be flipped because parts of it have not yet been downloaded.
+        multiple: These features can't be flipped because parts of them have not yet been downloaded.
    rotate:
      title: Rotate
      description:
@@ -371,8 +382,10 @@ en:
      annotation:
        line: Rotated a line.
        area: Rotated an area.
-        multiple: Rotated multiple features.
        relation: Rotated a relation.
+        feature:
+          one: Rotated a feature.
+          other: "Rotated {n} features."
      incomplete_relation:
        single: This feature can't be rotated because it hasn't been fully downloaded.
        multiple: These features can't be rotated because they haven't been fully downloaded.
@@ -395,24 +408,70 @@ en:
        features: Flip the directions of these features.
      key: V
      annotation:
-        point: Reversed a point.
-        points: Reversed multiple points.
-        line: Reversed a line.
-        lines: Reversed multiple lines.
-        features: Reversed multiple features.
+        point:
+          one: Reversed a point.
+          other: "Reversed {n} points."
+        line:
+          one: Reversed a line.
+          other: "Reversed {n} lines."
+        feature:
+          one: Reversed a feature.
+          other: "Reversed {n} features."
+    scale:
+      annotation:
+        down:
+          feature:
+            one: Scaled down a feature.
+            other: "Scaled down {n} features."
+        up:
+          feature:
+            one: Scaled up a feature.
+            other: "Scaled up {n} features."
+      too_small:
+        single: This feature can't be scaled down because it would become too small.
+        multiple: These features can't be scaled down because they would become too small.
+      too_large:
+        single: This feature can't be scaled because not enough of it is currently visible.
+        multiple: These features can't be scaled because not enough of them are currently visible.
+      connected_to_hidden:
+        single: This feature can't be scaled because it is connected to a hidden feature.
+        multiple: These features can't be scaled because some are connected to hidden features.
+      not_downloaded:
+        single: This feature can't be scaled because parts of it have not yet been downloaded.
+        multiple: These features can't be scaled because parts of them have not yet been downloaded.
    split:
      title: Split
      description:
-        line: Split this line into two at this node.
-        area: Split the boundary of this area into two.
-        multiple: Split the lines/area boundaries at this node into two.
+        line:
+          single:
+            single_node: Divide this line into two at this point.
+            multiple_node: Divide this line at these points.
+          multiple:
+            single_node: Divide these lines at this point.
+            multiple_node: Divide these lines at these points.
+        area:
+          single:
+            single_node: Divide the edge of this area into two at this point.
+            multiple_node: Divide the edge of this area at these points.
+          multiple:
+            single_node: Divide the edges of these areas at this point.
+            multiple_node: Divide the edges of these areas at these points.
+        feature:
+          multiple:
+            single_node: Divide these features at this point.
+            multiple_node: Divide these features at these points.
      key: X
      annotation:
-        line: Split a line.
-        area: Split an area boundary.
-        multiple: "Split {n} lines/area boundaries."
+        line:
+          one: "Split a line."
+          other: "Split {n} lines."
+        area:
+          one: "Split the edge of an area."
+          other: "Split {n} areas."
+        feature:
+          one: "Split a feature."
+          other: "Split {n} features."
      not_eligible: Lines can't be split at their beginning or end.
-      multiple_ways: There are too many lines here to split.
      connected_to_hidden: This can't be split because it is connected to a hidden feature.
    restriction:
      annotation:
@@ -434,8 +493,8 @@ en:
        feature:
          multiple: Extract points from these features.
      annotation:
-        single: Extracted a point.
-        multiple: "Extracted {n} points."
+        one: Extracted a point.
+        other: "Extracted {n} points."
      too_large:
        single: A point can't be extracted because not enough of this feature is visible.
        multiple: Points can't be extracted because not enough of these features are visible.
@@ -500,8 +559,9 @@ en:
    key: '`'
    tooltip: Toggle the sidebar.
  feature_info:
-    hidden_warning: "{count} hidden features"
-    hidden_details: "These features are currently hidden: {details}"
+    hidden_warning:
+      one: "{count} hidden feature"
+      other: "{count} hidden features"
  osm_api_status:
    message:
      error: Unable to reach the OpenStreetMap API. Your edits are safe locally. Check your network connection.
@@ -516,7 +576,7 @@ en:
    request_review: "I would like someone to review my edits."
    save: Upload
    cancel: Cancel
-    changes: "Changes ({count})"
+    changes: Changes
    download_changes: Download osmChange file
    errors: Errors
    warnings: Warnings
@@ -531,9 +591,14 @@ en:
    google_warning_link: https://www.openstreetmap.org/copyright
  contributors:
    list: "Edits by {users}"
-    truncated_list: "Edits by {users} and {count} others"
+    truncated_list:
+      one: "Edits by {users} and {count} other"
+      other: "Edits by {users} and {count} others"
  info_panels:
    key: I
+    selected:
+      one: "{n} selected"
+      other: "{n} selected"
    background:
      key: B
      title: Background
@@ -551,7 +616,6 @@ en:
    history:
      key: H
      title: History
-      selected: "{n} selected"
      no_history: "No History (New Feature)"
      version: Version
      last_edit: Last Edit
@@ -571,13 +635,13 @@ en:
    measurement:
      key: M
      title: Measurement
-      selected: "{n} selected"
      geometry: Geometry
      closed_line: closed line
      closed_area: closed area
      center: Center
      perimeter: Perimeter
      length: Length
+      distance: Distance
      area: Area
      centroid: Centroid
      location: Location
@@ -620,7 +684,9 @@ en:
    choose_relation: Choose a parent relation
    role: Role
    choose: Select feature type
-    results: "{n} results for {search}"
+    results:
+      one: "{n} result for {search}"
+      other: "{n} results for {search}"
    no_documentation_key: "There is no documentation available."
    edit_reference: "edit/translate"
    wiki_reference: View documentation
@@ -880,10 +946,7 @@ en:
      delete: Leave Deleted
      download_changes: Or download osmChange file
      done: "All conflicts resolved!"
-      help: |
-        Another user changed some of the same map features you changed.
-        Click on each feature below for more details about the conflict, and choose whether to keep
-        your changes or the other user's changes.
+      help: "Another user changed some of the same map features you changed. Click on each feature below for more details about the conflict, and choose whether to keep your changes or the other user's changes."
  merge_remote_changes:
    conflict:
      deleted: 'This feature has been deleted by {user}.'
@@ -1324,7 +1387,7 @@ en:
      title: "Editing & Saving"
      select_h: "Select"
      select_left_click: "{leftclick} Left-click or {tap_icon} tap a feature to select it. This will highlight it with a pulsing glow and display further details about it in the sidebar."
-      select_right_click: "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides commands such as copy, rotate, and delete."
+      select_right_click: "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides operations such as copy, rotate, and delete."
      select_space: "The `{space}` key can also be used instead of left-click when selecting and drawing."
      multiselect_h: "Multiselect"
      multiselect: "Selecting multiple features together lets you quickly edit them all at once."
@@ -1365,7 +1428,7 @@ en:
      move_point: "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen."
      delete_point_h: "Deleting Points"
      delete_point: "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it."
-      delete_point_command: "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** command."
+      delete_point_command: "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** operation."
    lines:
      title: Lines
      intro: "*Lines* are used to represent features such as roads, railroads, and rivers. Lines should be drawn down the center of the feature that they represent."
@@ -1383,13 +1446,13 @@ en:
      connect_line_drag: "To connect a line to another feature, drag one of the line's nodes onto the other feature until both features snap together. Tip: You can hold down the `{alt}` key to prevent nodes from connecting to other features."
      connect_line_tag: "If you know that the connection has traffic lights or crosswalks, you can add them by selecting the connecting node and using the feature editor to select the correct feature's type."
      disconnect_line_h: "Disconnecting Lines"
-      disconnect_line_command: "To disconnect a road from another feature, {rightclick} right-click or {longpress_icon} long-press the connecting node and select the {disconnect_icon} **{disconnect}** command from the edit menu."
+      disconnect_line_command: "To disconnect a road from another feature, {rightclick} right-click or {longpress_icon} long-press the connecting node and choose the {disconnect_icon} **{disconnect}** operation from the edit menu."
      move_line_h: "Moving Lines"
-      move_line_command: "To move an entire line, {rightclick} right-click the line and select the {move_icon} **{move}** command from the edit menu. Then move the mouse, and {leftclick} left-click to place the line in a new location."
+      move_line_command: "To move an entire line, {rightclick} right-click the line and choose the {move_icon} **{move}** operation from the edit menu. Then move the mouse, and {leftclick} left-click to place the line in a new location."
      move_line_connected: "Lines that are connected to other features will stay connected as you move the line to a new location. iD may prevent you from moving a line across another connected line."
      delete_line_h: "Deleting Lines"
      delete_line: "If a line is entirely incorrect, for example a road that doesn't exist in the real world, it's OK to delete it. Be careful when deleting features: the background imagery you are using might be outdated, and a road that looks wrong could simply be newly built."
-      delete_line_command: "To delete a line, {rightclick} right-click or {longpress_icon} long-press the line to show the edit menu, then use the {delete_icon} **{delete}** command."
+      delete_line_command: "To delete a line, {rightclick} right-click or {longpress_icon} long-press the line to show the edit menu, then use the {delete_icon} **{delete}** operation."
    areas:
      title: Areas
      intro: "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas. Areas should be traced around the edge of the feature that they represent, for example, around the base of a building."
@@ -1401,13 +1464,13 @@ en:
      add_area_continue: "Continue placing nodes by {leftclick} clicking or {tap_icon} tapping along the edge of the area. While drawing, you can zoom in or drag the map in order to add more detail."
      add_area_finish: "To finish an area, click or tap on the first or last node again or press `{return}`."
      square_area_h: "Square Corners"
-      square_area_command: "Many area features like buildings have square corners. To square the corners of an area, {rightclick} right-click or {longpress_icon} long-press the edge of the area and select the {orthogonalize_icon} **{orthogonalize}** command from the edit menu."
+      square_area_command: "Many area features like buildings have square corners. To square the corners of an area, {rightclick} right-click or {longpress_icon} long-press the edge of the area and choose the {orthogonalize_icon} **{orthogonalize}** operation from the edit menu."
      modify_area_h: "Modifying Areas"
      modify_area_dragnode: "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations."
      modify_area_addnode: "You can also create new nodes along an area by {leftclick}**x2** double-clicking or {doubletap_icon} double-tapping an edge, or by dragging the small triangles at the midpoints between nodes."
      delete_area_h: "Deleting Areas"
      delete_area: "If an area is entirely incorrect, for example a building that doesn't exist in the real world, it's OK to delete it. Be cautious when deleting features - the background imagery you are using might be outdated, and a building that looks wrong could simply be newly built."
-      delete_area_command: "To delete an area, {rightclick} right-click or {longpress_icon} long-press the area to show the edit menu, then use the {delete_icon} **{delete}** command."
+      delete_area_command: "To delete an area, {rightclick} right-click or {longpress_icon} long-press the area to show the edit menu, then use the {delete_icon} **{delete}** operation."
    relations:
      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."
@@ -1420,7 +1483,7 @@ en:
      relation_types_h: "Relation Types"
      multipolygon_h: "Multipolygons"
      multipolygon: "A *multipolygon* relation is a group of one or more *outer* features and one or more inner features. The outer features define the outer edges of the multipolygon, and the inner features define sub-areas or holes cut out from the inside of the multipolygon."
-      multipolygon_create: "To create a multipolygon, for example a building with a hole in it, draw the outer edge as an area and the inner edge as a line or different kind of area. Then `{shift}`+{leftclick} left-click to select both features, {rightclick} right-click to show the edit menu, and select the {merge_icon} **{merge}** command."
+      multipolygon_create: "To create a multipolygon, for example a building with a hole in it, draw the outer edge as an area and the inner edge as a line or different kind of area. Then `{shift}`+{leftclick} left-click to select both features, {rightclick} right-click to show the edit menu, and choose the {merge_icon} **{merge}** operation."
      multipolygon_merge: "Merging several lines or areas will create a new multipolygon relation with all selected areas as members. iD will choose the inner and outer roles automatically, based on which features are contained inside other features."
      turn_restriction_h: "Turn restrictions"
      turn_restriction: "A *turn restriction* relation is a group of several road segments in an intersection. Turn restrictions consist of a *from* road, *via* node or roads, and a *to* road."
@@ -1432,6 +1495,25 @@ en:
      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 \"{relations}\" section of the feature editor, then press the {plus} add button to add this feature to a nearby existing relation or a new relation."
+    operations:
+      title: Operations
+      intro: "*Operations* are special commands you can use to edit features. {rightclick} Right-click or {longpress_icon} long-press any feature to view the available operations."
+      intro_2: "Each operation has its own keyboard shortcut. Most operations can be applied to multiple features at once."
+      straighten: "{straighten_icon} **{straighten}** removes bends from lines. It can also align groups of points into neat rows."
+      orthogonalize: "{orthogonalize_icon} **{orthogonalize}** snaps the corners of areas and lines to 90°. You can square individual corners or entire features."
+      circularize: "{circularize_icon} **{circularize}** turns areas and closed lines into circles."
+      move: "{move_icon} **{move}** lets you drag features around the map."
+      rotate: "{rotate_icon} **{rotate}** lets you swivel features around their center points."
+      reflect: "{reflect_short_icon} **{reflect_short}** and {reflect_long_icon} **{reflect_long}** reflect features over their short and long axes."
+      continue: "{continue_icon} **{continue}** lets you extend existing lines from their endpoints."
+      reverse: "{reverse_icon} **{reverse}** changes the direction of features. The direction matters for things like one-way roads, traffic signs, waterways, and cliffs."
+      disconnect: "{disconnect_icon} **{disconnect}** separates connected lines and areas from each other. You can disconnect entire features or just selected points."
+      merge: "{merge_icon} **{merge}** combines multiple features into one. You can merge areas together to create multipolygons, merge lines together to create longer lines, and merge points into anything to transfer their tags."
+      split: "{split_icon} **{split}** divides lines at the selected points. If specific lines are also selected, only those are split."
+      extract: "{extract_icon} **{extract}** detaches points from lines. It also pulls points out of buildings and other areas."
+      delete: "{delete_icon} **{delete}** removes features from the map. Anything that doesn't exist in the real world should be deleted."
+      downgrade: "{downgrade_icon} **{downgrade}** removes most tags except building and address info. This is helpful when businesses close yet their facilities remain."
+      copy_paste: "{copy_icon} **{copy}** and {paste_icon} **{paste}** let you duplicate features."
    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, open the {data_icon} **{map_data}** panel and enable the {osm_notes} layer."
@@ -1448,7 +1530,7 @@ en:
      intro: "The background imagery that appears beneath the map data is an important resource for mapping. This imagery can be aerial photos collected from satellites, airplanes, and drones, or it can be scanned historical maps or other freely available source data."
      sources_h: "Imagery Sources"
      choosing: "To see which imagery sources are available for editing, open the {layers_icon} **{background_settings}** panel on the side of the map."
-      sources: "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference."
+      sources: "The [Bing Maps](https://www.bing.com/maps/) satellite layer or the best local imagery is set as the default background. Depending on where you are editing, multiple imagery sources are available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference."
      offsets_h: "Adjusting Imagery Offset"
      offset: "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"{imagery_offset}\" section at the bottom of the Background Settings pane."
      offset_change: "Press the small triangle buttons to adjust the imagery offset in small steps, or hold the {leftclick} left mouse button and drag within the gray square to slide the imagery into alignment."
@@ -1456,8 +1538,8 @@ en:
      title: Street Level Photos
      intro: "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Bing Streetside](https://www.microsoft.com/en-us/maps/streetside), [Mapillary](https://www.mapillary.com), and [OpenStreetCam](https://www.openstreetcam.org)."
      using_h: "Using Street Level Photos"
-      using: "To use street level photos for mapping, open the {data_icon} **{map_data}** panel on the side of the map to enable or disable the available photo layers."
-      photos: "When enabled, the photo layer displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken."
+      using: "To use street level photos for mapping, open the {data_icon} **{map_data}** panel on the side of the map to enable or disable the available photo overlays."
+      photos: "When enabled, the photo overlay displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken."
      viewer: "When you select one of the photo locations, a photo viewer appears in the bottom corner of the map. The photo viewer contains controls to step forward and backward in the image sequence. It also shows the username of the person who captured the image, the date it was captured, and a link to view the image on the original site."
    gps:
      title: GPS Traces
@@ -1509,11 +1591,11 @@ en:
  issues:
    title: Issues
    key: I
-    list_title: "Issues ({count})"
+    list_title: "Issues"
    errors:
-      list_title: "Errors ({count})"
+      list_title: "Errors"
    warnings:
-      list_title: "Warnings ({count})"
+      list_title: "Warnings"
    rules:
      title: Rules
    user_resolved_issues: Issues resolved by your edits
@@ -1546,7 +1628,7 @@ en:
    suggested: "Suggested updates:"
    enable_all: Enable All
    disable_all: Disable All
-    reset_ignored: Reset Ignored ({count})
+    reset_ignored: Reset Ignored
    fix_one:
      title: fix
    fix_all:
@@ -1609,10 +1691,9 @@ en:
      tip: "Find unroutable roads, paths, and ferry routes"
      routable:
        message:
-          multiple: "{count} routable features are connected only to each other."
+          one: "{highway} is disconnected from other roads and paths"
+          other: "{count} routable features are connected only to each other"
        reference: "All roads, paths, and ferry routes should connect to form a single routing network."
-      highway:
-        message: "{highway} is disconnected from other roads and paths"
    fixme_tag:
      message: '{feature} has a "Fix Me" request'
      reference: 'A "fixme" tag indicates that a mapper has requested help with a feature.'
@@ -2079,7 +2160,7 @@ en:
      edit_menu_tank_touch: "**{longpress_icon} Long-press the storage tank you created to show the edit menu.**"
      circle_tank: "**Press the {circularize_icon} {circularize} button to make the tank a circle.**"
      retry_circle: "You didn't press the {circularize_icon} {circularize} button. Try again."
-      play: "Great Job! Practice tracing a few more buildings, and try some of the other commands on the edit menu. **When you are ready to continue to the next chapter, press '{next}'.**"
+      play: "Great Job! Practice tracing a few more buildings, and try some of the other operations in the edit menu. **When you are ready to continue to the next chapter, press '{next}'.**"
    startediting:
      title: "Start Editing"
      help: "You're now ready to edit OpenStreetMap!{br}You can replay this walkthrough anytime or view more documentation by pressing the {help_icon} {help} button or the `{help_key}` key."
@@ -2173,17 +2254,19 @@ en:
        merge: "Combine (merge) selected features"
        disconnect: "Disconnect selected features"
        extract: "Extract a point from a feature"
-        split: "Split a line into two at the selected node"
+        split: "Split features at the selected points"
        reverse: "Reverse selected features"
        move: "Move selected features"
        nudge: "Nudge selected features"
        nudge_more: "Nudge selected features by a lot"
+        scale: "Scale selected features"
+        scale_more: "Scale selected features by a lot"
        rotate: "Rotate selected features"
        orthogonalize: "Square corners of a line or area"
        straighten: "Straighten a line or points"
        circularize: "Circularize a closed line or area"
-        reflect_long: "Reflect features across the longer axis"
-        reflect_short: "Reflect features across the shorter axis"
+        reflect_long: "Flip features across the longer axis"
+        reflect_short: "Flip features across the shorter axis"
        delete: "Delete selected features"
      commands:
        title: "Commands"
@@ -115,6 +115,10 @@
    "old": {"amenity": "kiosk"},
    "replace": {"shop": "kiosk"}
  },
+  {
+    "old": {"amenity": "notice_board"},
+    "replace": {"advertising": "board"}
+  },
  {
    "old": {"amenity": "nursery"},
    "replace": {"amenity": "kindergarten"}
@@ -199,6 +203,10 @@
    "old": {"attraction": "ferris_wheel"},
    "replace": {"attraction": "big_wheel"}
  },
+  {
+    "old": {"barrier": "chicane"},
+    "replace": {"barrier": "cycle_barrier"}
+  },
  {
    "old": {"barrier": "curb"},
    "replace": {"barrier": "kerb"}
@@ -223,6 +231,10 @@
    "old": {"barrier": "wood_fence"},
    "replace": {"barrier": "fence", "fence_type": "wood"}
  },
+  {
+    "old": {"amenity": "bench", "capacity": "*"},
+    "replace": {"amenity": "bench", "seats": "$1"}
+  },
  {
    "old": {"bicycle:oneway": "*"},
    "replace": {"oneway:bicycle": "$1"}
@@ -474,6 +486,14 @@
    "old": {"escalator": "*"},
    "replace": {"highway": "steps", "conveying": "$1"}
  },
+  {
+    "old": {"fast_food": "pizza"},
+    "replace": {"cuisine": "pizza"}
+  },
+  {
+    "old": {"fast_food": "shawarma"},
+    "replace": {"cuisine": "shawarma"}
+  },
  {
    "old": {"fee": "0"},
    "replace": {"fee": "no"}
@@ -1142,6 +1162,10 @@
    "old": {"rwn_expected_route_relations": "*"},
    "replace": {"expected_rwn_route_relations": "$1"}
  },
+  {
+    "old": {"service": "drive_through"},
+    "replace": {"service": "drive-through"}
+  },
  {
    "old": {"shop": "adult"},
    "replace": {"shop": "erotic"}
@@ -1538,6 +1562,10 @@
    "old": {"unnamed": "*"},
    "replace": {"noname": "$1"}
  },
+  {
+    "old": {"vending": "parcel_mail_in;parcel_pickup"},
+    "replace": {"vending": "parcel_pickup;parcel_mail_in"}
+  },
  {
    "old": {"vhf_channel": "*"},
    "replace": {"vhf": "$1"}
@@ -367,6 +367,11 @@ en:
        label: Building
        # 'terms: structure'
        terms: '[translate with synonyms or related terms for ''Building'', separated by commas]'
+      building/flats:
+        # 'building:flats=*'
+        label: Units
+        # building/flats field placeholder
+        placeholder: '2, 4, 6, 8...'
      building/levels:
        # 'building:levels=*'
        label: Levels
@@ -625,6 +630,9 @@ en:
      date:
        # date=*
        label: Date
+      defibrillator/location:
+        # 'defibrillator:location=*'
+        label: Location Description
      delivery:
        # delivery=*
        label: Delivery
@@ -757,6 +765,11 @@ en:
          anticlockwise: Counterclockwise
          # direction=clockwise
          clockwise: Clockwise
+      direction_point:
+        # direction=*
+        label: Direction (Degrees Clockwise)
+        # direction_point field placeholder
+        placeholder: '45, 90, 180, 270'
      direction_vertex:
        # direction=*
        label: Direction Affected
@@ -786,6 +799,9 @@ en:
        label: Distance
        # 'terms: length,mileage'
        terms: '[translate with synonyms or related terms for ''Distance'', separated by commas]'
+      disused/amenity:
+        # 'disused:amenity=*'
+        label: Type
      disused/railway:
        # 'disused:railway=*'
        label: Type
@@ -1623,6 +1639,8 @@ en:
          undefined: Assumed to be No
          # oneway=yes
          'yes': 'Yes'
+        # 'terms: bidirectional,oneway,unidirectional'
+        terms: '[translate with synonyms or related terms for ''One Way'', separated by commas]'
      oneway/bicycle:
        # 'oneway:bicycle=*'
        label: One Way (Bicycles)
@@ -1713,6 +1731,14 @@ en:
          surface: Surface
          # parking=underground
          underground: Underground
+      parking_entrance:
+        # parking=*
+        label: Type
+        options:
+          # parking=multi-storey
+          multi-storey: Multilevel
+          # parking=underground
+          underground: Underground
      parking_space:
        # parking_space=*
        label: Type
@@ -1920,6 +1946,11 @@ en:
      population:
        # population=*
        label: Population
+      portable:
+        # portable=*
+        label: Portable
+        # 'terms: detached,mobile,moveable'
+        terms: '[translate with synonyms or related terms for ''Portable'', separated by commas]'
      post:
        # '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
@@ -1973,6 +2004,10 @@ en:
          both: Both / All
          # 'railway:signal:direction=forward'
          forward: Forward
+      ramp:
+        # ramp=*
+        label: Embedded Ramp
+        terms: '[translate with synonyms or related terms for ''Embedded Ramp'', separated by commas]'
      rating:
        # rating=*
        label: Power Rating
@@ -2560,6 +2595,9 @@ en:
      target:
        # target=*
        label: Target
+      telecom:
+        # telecom=*
+        label: Type
      telecom/medium:
        # 'telecom:medium=*'
        label: Medium
@@ -2746,6 +2784,26 @@ en:
      valve:
        # valve=*
        label: Type
+      vehicles:
+        # 'bus=*, trolleybus=*, tram=*, train=*, subway=*, light_rail=*, monorail=*, ferry=*'
+        label: Vehicles
+        options:
+          # bus=yes
+          bus: Bus
+          # ferry=yes
+          ferry: Ferry
+          # light_rail=yes
+          light_rail: Light Rail
+          # monorail=yes
+          monorail: Monorail
+          # subway=yes
+          subway: Subway
+          # train=yes
+          train: Train
+          # tram=yes
+          tram: Tram
+          # trolleybus=yes
+          trolleybus: Trolleybus
      vending:
        # vending=*
        label: Types of Goods
@@ -2822,6 +2880,11 @@ en:
      water_source:
        # water_source=*
        label: Water Source
+      water_tank/volume:
+        # 'water_tank:volume=*'
+        label: Volume (Liters)
+        # water_tank/volume field placeholder
+        placeholder: '10000, 20000, 30000…'
      water_volume:
        # water_volume=*
        label: Water Reserve Volume (m³)
@@ -3147,10 +3210,20 @@ en:
        name: Biergarten
        # 'terms: beer,bier,booze'
        terms: '<translate with synonyms or related terms for ''Biergarten'', separated by commas>'
+      amenity/binoculars:
+        # amenity=binoculars
+        name: Mounted Binoculars
+        # 'terms: observation viewer,optical ranger,spotting scope,sight,spyglass,telescope,tower viewer,viewfinder,viewing stand'
+        terms: '<translate with synonyms or related terms for ''Mounted Binoculars'', separated by commas>'
      amenity/boat_rental:
        # amenity=boat_rental
        name: Boat Rental
        terms: '<translate with synonyms or related terms for ''Boat Rental'', separated by commas>'
+      amenity/boat_storage:
+        # amenity=boat_storage
+        name: Boat Storage
+        # 'terms: boathouse,dry dock,marina'
+        terms: '<translate with synonyms or related terms for ''Boat Storage'', separated by commas>'
      amenity/bureau_de_change:
        # amenity=bureau_de_change
        name: Currency Exchange
@@ -3167,7 +3240,7 @@ en:
      amenity/cafe/bubble_tea:
        # 'amenity=cafe, cuisine=bubble_tea'
        name: Bubble Tea Cafe
-        # 'terms: boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca'
+        # 'terms: boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca,pearl tea,boba drink'
        terms: '<translate with synonyms or related terms for ''Bubble Tea Cafe'', separated by commas>'
      amenity/cafe/coffee_shop:
        # 'amenity=cafe, cuisine=coffee_shop'
@@ -3351,6 +3424,11 @@ en:
      amenity/fast_food/ice_cream:
        # 'amenity=fast_food, cuisine=ice_cream'
        name: Ice Cream Fast Food
+      amenity/fast_food/juice:
+        # 'amenity=fast_food, cuisine=juice'
+        name: Juice Fast Food
+        # 'terms: cafe,café,beverages,fruit drinks,juice bar,shakes,smoothies'
+        terms: '<translate with synonyms or related terms for ''Juice Fast Food'', separated by commas>'
      amenity/fast_food/kebab:
        # 'amenity=fast_food, cuisine=kebab'
        name: Kebab Fast Food
@@ -3441,7 +3519,7 @@ en:
      amenity/kindergarten:
        # amenity=kindergarten
        name: Preschool / Kindergarten Grounds
-        # 'terms: kindergarden,pre-school'
+        # 'terms: kindergarten,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
@@ -3472,6 +3550,11 @@ en:
        name: Loading Dock
        # 'terms: door,loading bay,shipping,unloading,warehouse'
        terms: '<translate with synonyms or related terms for ''Loading Dock'', separated by commas>'
+      amenity/lounger:
+        # amenity=lounger
+        name: Lounger
+        # 'terms: seat,chair,bench'
+        terms: '<translate with synonyms or related terms for ''Lounger'', separated by commas>'
      amenity/love_hotel:
        # amenity=love_hotel
        name: Love Hotel
@@ -3490,6 +3573,11 @@ en:
        name: Money Transfer Station
        # 'terms: money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange'
        terms: '<translate with synonyms or related terms for ''Money Transfer Station'', separated by commas>'
+      amenity/mortuary:
+        # amenity=mortuary
+        name: Morgue
+        # 'terms: crematorium,funeral home,memorial home,morgue,mortuary,undertaker'
+        terms: '<translate with synonyms or related terms for ''Morgue'', separated by commas>'
      amenity/motorcycle_parking:
        # amenity=motorcycle_parking
        name: Motorcycle Parking
@@ -3671,6 +3759,11 @@ en:
        name: Pub
        # 'terms: alcohol,drink,dive,beer,bier,booze'
        terms: '<translate with synonyms or related terms for ''Pub'', separated by commas>'
+      amenity/pub/irish:
+        # 'amenity=pub, theme=irish'
+        name: Irish Pub
+        # 'terms: irish pub,irish bar'
+        terms: '<translate with synonyms or related terms for ''Irish Pub'', separated by commas>'
      amenity/pub/lgbtq:
        # 'amenity=pub, lgbtq=primary'
        name: LGBTQ+ Pub
@@ -3959,6 +4052,11 @@ en:
        name: Pit Latrine
        # 'terms: head,lavatory,long drop,outhouse,pit toilet,privy'
        terms: '<translate with synonyms or related terms for ''Pit Latrine'', separated by commas>'
+      amenity/toilets/portable:
+        # 'amenity=toilets, portable=yes'
+        name: Portable Toilet
+        # 'terms: restroom,privy,porta john,porta potty,portapot,chemical toilet'
+        terms: '<translate with synonyms or related terms for ''Portable Toilet'', separated by commas>'
      amenity/townhall:
        # amenity=townhall
        name: Town Hall
@@ -4490,7 +4588,7 @@ en:
      building/farm_auxiliary:
        # building=farm_auxiliary
        name: Farm Building
-        # 'terms: agriculture,auxilary,chicken coop,farm auxiliary,pigsty,sty'
+        # 'terms: agriculture,auxiliary,auxilary,chicken coop,farm auxiliary,pigsty,sty'
        terms: '<translate with synonyms or related terms for ''Farm Building'', separated by commas>'
      building/garage:
        # building=garage
@@ -4542,7 +4640,7 @@ en:
      building/kindergarten:
        # building=kindergarten
        name: Preschool / Kindergarten Building
-        # 'terms: kindergarden,pre-school'
+        # 'terms: kindergarten,kindergarden,pre-school'
        terms: '<translate with synonyms or related terms for ''Preschool / Kindergarten Building'', separated by commas>'
      building/mosque:
        # building=mosque
@@ -4896,6 +4994,9 @@ en:
      demolished/building:
        # 'demolished:building=*'
        name: Recently Demolished Building
+      disused/amenity:
+        # 'disused:amenity=*'
+        name: Disused Amenity
      disused/railway:
        # 'disused:railway=*'
        name: Disused Railway Feature
@@ -5023,6 +5124,11 @@ en:
        # golf=cartpath
        name: Golf Cartpath
        terms: '<translate with synonyms or related terms for ''Golf Cartpath'', separated by commas>'
+      golf/clubhouse:
+        # golf=clubhouse
+        name: Golf Clubhouse
+        # 'terms: club house,golf clubhouse,golf house,pro shop'
+        terms: '<translate with synonyms or related terms for ''Golf Clubhouse'', separated by commas>'
      golf/driving_range:
        # golf=driving_range
        name: Driving Range
@@ -5471,6 +5577,11 @@ en:
        name: Tertiary Link
        # 'terms: on ramp,off ramp,ramp,road,street'
        terms: '<translate with synonyms or related terms for ''Tertiary Link'', separated by commas>'
+      highway/toll_gantry:
+        # highway=toll_gantry
+        name: Open Road Toll
+        # 'terms: license plate camera toll,cashless toll,electronic toll,free-flow toll,toll gantry,transponder toll'
+        terms: '<translate with synonyms or related terms for ''Open Road Toll'', separated by commas>'
      highway/track:
        # highway=track
        name: Unmaintained Track Road
@@ -5818,6 +5929,7 @@ en:
      landuse/quarry:
        # landuse=quarry
        name: Quarry
+        # 'terms: aggregate quarry,open pit mine,sand mine,sand pit,sand quarry,sandpit'
        terms: '<translate with synonyms or related terms for ''Quarry'', separated by commas>'
      landuse/railway:
        # landuse=railway
@@ -6222,6 +6334,11 @@ en:
        name: Swimming Pool Facility
        # 'terms: dive,water'
        terms: '<translate with synonyms or related terms for ''Swimming Pool Facility'', separated by commas>'
+      leisure/sports_hall:
+        # leisure=sports_hall
+        name: Gymnasium
+        # 'terms: athletic courts,gym,sports hall,sports venue'
+        terms: '<translate with synonyms or related terms for ''Gymnasium'', separated by commas>'
      leisure/stadium:
        # leisure=stadium
        name: Stadium
@@ -6336,6 +6453,11 @@ en:
        # man_made=cutline
        name: Cut line
        terms: '<translate with synonyms or related terms for ''Cut line'', separated by commas>'
+      man_made/dovecote:
+        # man_made=dovecote
+        name: Dovecote
+        # 'terms: birds,doocot,dovecot,doves,pigeonholes,pigeons'
+        terms: '<translate with synonyms or related terms for ''Dovecote'', separated by commas>'
      man_made/dyke:
        # man_made=dyke
        name: Levee
@@ -6539,6 +6661,11 @@ en:
        name: Communication Tower
        # 'terms: antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower'
        terms: '<translate with synonyms or related terms for ''Communication Tower'', separated by commas>'
+      man_made/tower/cooling:
+        # 'man_made=tower, tower:type=cooling'
+        name: Cooling Tower
+        # 'terms: power plant'
+        terms: '<translate with synonyms or related terms for ''Cooling Tower'', separated by commas>'
      man_made/tower/defensive:
        # 'man_made=tower, tower:type=defensive'
        name: Fortified Tower
@@ -6701,6 +6828,11 @@ en:
        # natural=heath
        name: Heath
        terms: '<translate with synonyms or related terms for ''Heath'', separated by commas>'
+      natural/hot_spring:
+        # natural=hot_spring
+        name: Hot Spring
+        # 'terms: geothermal spring,thermal pool'
+        terms: '<translate with synonyms or related terms for ''Hot Spring'', separated by commas>'
      natural/mud:
        # natural=mud
        name: Mud
@@ -7381,6 +7513,11 @@ en:
        name: Bus Stop
        # 'terms: bus,platform,public transit,public transportation,transit,transportation'
        terms: '<translate with synonyms or related terms for ''Bus Stop'', separated by commas>'
+      public_transport/platform/bus_tram_point:
+        # 'public_transport=platform, bus=yes, tram=yes'
+        name: Tram & Bus Stop
+        # 'terms: bus,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,transit,transportation,trolley'
+        terms: '<translate with synonyms or related terms for ''Tram & Bus Stop'', separated by commas>'
      public_transport/platform/ferry:
        # 'public_transport=platform, ferry=yes'
        name: Ferry Platform
@@ -7573,9 +7710,9 @@ en:
        terms: '<translate with synonyms or related terms for ''Railway Under Construction'', separated by commas>'
      railway/crossing:
        # railway=crossing
-        name: Railway Crossing (Path)
-        # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing'
-        terms: '<translate with synonyms or related terms for ''Railway Crossing (Path)'', separated by commas>'
+        name: Railway-Path Crossing
+        # 'terms: crossing,path railway crossing,pedestrian crossing,level crossing,grade crossing,railroad crossing,railway path crossing,path through railroad,train crossing'
+        terms: '<translate with synonyms or related terms for ''Railway-Path Crossing'', separated by commas>'
      railway/derail:
        # railway=derail
        name: Railway Derailer
@@ -7595,9 +7732,9 @@ en:
        name: Train Station (Halt / Request)
      railway/level_crossing:
        # railway=level_crossing
-        name: Railway Crossing (Road)
-        # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
-        terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
+        name: Railway-Road Crossing
+        # 'terms: crossing,level crossing,grade crossing,railroad crossing,railway road crossing,road railway crossing,road through railroad,train crossing'
+        terms: '<translate with synonyms or related terms for ''Railway-Road Crossing'', separated by commas>'
      railway/light_rail:
        # railway=light_rail
        name: Light Rail Track
@@ -7645,6 +7782,11 @@ en:
        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 Train Track'', separated by commas>'
+      railway/railway_crossing:
+        # railway=railway_crossing
+        name: Railway-Railway Crossing
+        # 'terms: diamond crossing,flat crossing,level junction,railway railway crossing'
+        terms: '<translate with synonyms or related terms for ''Railway-Railway Crossing'', separated by commas>'
      railway/signal:
        # railway=signal
        name: Railway Signal
@@ -7678,6 +7820,16 @@ en:
        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_crossing:
+        # railway=tram_crossing
+        name: Tram-Path Crossing
+        # 'terms: crossing,grade crossing,level crossing,path tram crossing,pedestrian crossing,streetcar crossing,tram path crossing,tramway crossing,trolley crossing'
+        terms: '<translate with synonyms or related terms for ''Tram-Path Crossing'', separated by commas>'
+      railway/tram_level_crossing:
+        # railway=tram_level_crossing
+        name: Tram-Road Crossing
+        # 'terms: crossing,grade crossing,level crossing,pedestrian crossing,road tram crossing,streetcar crossing,tram road crossing,tramway crossing,trolley crossing'
+        terms: '<translate with synonyms or related terms for ''Tram-Road Crossing'', separated by commas>'
      railway/tram_stop:
        # railway=tram_stop
        name: Tram Stopping Position
@@ -7985,6 +8137,7 @@ en:
      shop/doityourself:
        # shop=doityourself
        name: DIY Store
+        # 'terms: craft,diy,do it yourself,hardware,home improvement,tools'
        terms: '<translate with synonyms or related terms for ''DIY Store'', separated by commas>'
      shop/doors:
        # shop=doors
@@ -8123,6 +8276,7 @@ en:
      shop/hardware:
        # shop=hardware
        name: Hardware Store
+        # 'terms: craft,diy,do it yourself,hardware,home improvement,tools'
        terms: '<translate with synonyms or related terms for ''Hardware Store'', separated by commas>'
      shop/health_food:
        # shop=health_food
@@ -8252,7 +8406,7 @@ en:
      shop/music:
        # shop=music
        name: Music Store
-        # 'terms: tape casettes,CDs,compact discs,vinyl records'
+        # 'terms: tape cassettes,CDs,compact discs,vinyl records,CD store,casette,casette store'
        terms: '<translate with synonyms or related terms for ''Music Store'', separated by commas>'
      shop/musical_instrument:
        # shop=musical_instrument
@@ -8357,7 +8511,7 @@ en:
      shop/scuba_diving:
        # shop=scuba_diving
        name: Scuba Diving Shop
-        # 'terms: diving,scuba'
+        # 'terms: diving,scuba,snorkel'
        terms: '<translate with synonyms or related terms for ''Scuba Diving Shop'', separated by commas>'
      shop/seafood:
        # shop=seafood
@@ -8407,7 +8561,7 @@ en:
      shop/supermarket:
        # shop=supermarket
        name: Supermarket
-        # 'terms: grocery,store,shop'
+        # 'terms: grocery,store,shop,grocery store,market,food market'
        terms: '<translate with synonyms or related terms for ''Supermarket'', separated by commas>'
      shop/supermarket/organic:
        # 'shop=supermarket, organic=only'
@@ -8493,7 +8647,7 @@ en:
      shop/video:
        # shop=video
        name: Video Store
-        # 'terms: DVD,VHS,video casette'
+        # 'terms: DVD,VHS,video cassette,video casette'
        terms: '<translate with synonyms or related terms for ''Video Store'', separated by commas>'
      shop/video_games:
        # shop=video_games
@@ -8521,6 +8675,11 @@ en:
        name: Wholesale Store
        # 'terms: warehouse club,cash and carry'
        terms: '<translate with synonyms or related terms for ''Wholesale Store'', separated by commas>'
+      shop/wigs:
+        # shop=wigs
+        name: Wig Shop
+        # 'terms: hair extensions,hair extentions'
+        terms: '<translate with synonyms or related terms for ''Wig Shop'', separated by commas>'
      shop/window_blind:
        # shop=window_blind
        name: Window Blind Store
@@ -8529,6 +8688,9 @@ en:
        # shop=wine
        name: Wine Shop
        terms: '<translate with synonyms or related terms for ''Wine Shop'', separated by commas>'
+      telecom:
+        # telecom=*
+        name: Telecom Feature
      telecom/data_center:
        # telecom=data_center
        name: Data Center
@@ -8570,7 +8732,7 @@ en:
      tourism/artwork/graffiti:
        # 'tourism=artwork, artwork_type=graffiti'
        name: Graffiti
-        # 'terms: Street Artwork,Guerilla Artwork,Graffiti Artwork'
+        # 'terms: Street Artwork,Guerrilla Artwork,Guerilla Artwork,Graffiti Artwork'
        terms: '<translate with synonyms or related terms for ''Graffiti'', separated by commas>'
      tourism/artwork/installation:
        # 'tourism=artwork, artwork_type=installation'
@@ -8654,6 +8816,11 @@ en:
        # 'tourism=information, information=board'
        name: Information Board
        terms: '<translate with synonyms or related terms for ''Information Board'', separated by commas>'
+      tourism/information/board/welcome_sign:
+        # 'tourism=information, information=board, board_type=welcome_sign'
+        name: Welcome Sign
+        # 'terms: new location'
+        terms: '<translate with synonyms or related terms for ''Welcome Sign'', separated by commas>'
      tourism/information/guidepost:
        # 'tourism=information, information=guidepost'
        name: Guidepost
@@ -8665,8 +8832,9 @@ en:
        terms: '<translate with synonyms or related terms for ''Map'', separated by commas>'
      tourism/information/office:
        # 'tourism=information, information=office'
-        name: Tourist Information Office
-        terms: '<translate with synonyms or related terms for ''Tourist Information Office'', separated by commas>'
+        name: Visitor Center
+        # 'terms: information office,tour guide,tourism office,tourist information center,visitors center,visitors information center,welcome center'
+        terms: '<translate with synonyms or related terms for ''Visitor Center'', separated by commas>'
      tourism/information/route_marker:
        # 'tourism=information, information=route_marker'
        name: Trail Marker
@@ -8793,26 +8961,11 @@ en:
        name: City Limit Sign
        # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
        terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
-      traffic_sign/city_limit_vertex:
-        # traffic_sign=city_limit
-        name: City Limit Sign
-        # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
-        terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
      traffic_sign/maxspeed:
        # traffic_sign=maxspeed
        name: Speed Limit Sign
        # 'terms: max speed,maximum speed,road,highway'
        terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
-      traffic_sign/maxspeed_vertex:
-        # traffic_sign=maxspeed
-        name: Speed Limit Sign
-        # 'terms: max speed,maximum speed,road,highway'
-        terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
-      traffic_sign_vertex:
-        # traffic_sign=*
-        name: Traffic Sign
-        # 'terms: road,highway'
-        terms: '<translate with synonyms or related terms for ''Traffic Sign'', separated by commas>'
      type/boundary:
        # type=boundary
        name: Boundary
@@ -8904,8 +9057,8 @@ en:
        terms: '<translate with synonyms or related terms for ''Ferry Route'', separated by commas>'
      type/route/foot:
        # 'type=route, route=foot'
-        name: Foot Route
-        terms: '<translate with synonyms or related terms for ''Foot Route'', separated by commas>'
+        name: Walking Route
+        terms: '<translate with synonyms or related terms for ''Walking Route'', separated by commas>'
      type/route/hiking:
        # 'type=route, route=hiking'
        name: Hiking Route
@@ -30,7 +30,7 @@ A basic preset is of the form:
    ],
    // The geometry types for which this preset is valid.
    // options are point, area, line, and vertex.
-    // vertexes are points that are parts of lines, like the nodes in a road
+    // vertices are points that are parts of lines, like the nodes in a road
    // lines are unclosed ways, and areas are closed ways
    "geometry": [
        "point", "area"
@@ -147,7 +147,7 @@ preset are generally not inherited. E.g. the `shop` field is not inherited by `s

 ##### `icon`

-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"`.
+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"`.

 * [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
@@ -158,11 +158,6 @@ The name of a local SVG icon file. You can use icons from any of the following i
        * [Solid](https://fontawesome.com/icons?d=gallery&s=solid&m=free) (`fas-`)
        * [Regular](https://fontawesome.com/icons?d=gallery&s=regular&m=free) (`far-`)
        * [Brands](https://fontawesome.com/icons?d=gallery&s=brands&m=free) (`fab-`)
-* [The Noun Project](https://thenounproject.com) (`tnp-`), millions of general-purpose icons
-    * The licenses vary. You can only use the public-domain icons in iD, such as those from [OCHA Visual](https://thenounproject.com/ochavisual/).
-    * The icon styles vary. Avoid thin or overly-detailed icons since they will not look good at small sizes.
-    * Use the numeric ID of the icon (e.g. `2009223`). This is shown in the URL when you select an icon on their site.
-    * Unfortunately, you must [sign up for a free API key](https://thenounproject.com/developers/) in order to download new icons (even for public-domain icons). Add a file called `the_noun_project.auth` to the root of your local iD instance containing your credentials like `{"consumer_key": "xxxxxx", "consumer_secret": "xxxxxx"}`. This file is not version-controlled.

 ##### `imageURL`

@@ -197,7 +192,7 @@ By default, presets are available everywhere.

 ##### `notCountryCodes`

-An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blacklist instead of a whitelist.
+An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blocklist.

 ##### `replacement`

@@ -270,8 +265,10 @@ A string specifying the UI and behavior of the field. Must be one of the followi
 * `combo` - Dropdown field for picking one option out of many (e.g. `surface=*`)
 * `typeCombo` - Dropdown field picking a specific type from a generic category key<br/>
 (e.g. `waterway=*`.  If unset, tag will be `waterway=yes`, but dropdown contains options like `stream`, `ditch`, `river`)
-* `multiCombo` - Dropdown field for adding `yes` values to a common multikey<br/>
+* `multiCombo` - Dropdown field for adding `yes` values to multiple keys with the same prefix (a common multikey)<br/>
 (e.g. `recycling:*` -> `recycling:glass=yes`, `recycling:paper=yes`, etc.)
+* `manyCombo` - Dropdown field for adding `yes` values to many different keys<br/>
+(e.g. `bus`, `tram`, `train` -> `bus=yes`, `tram=yes`, etc.)
 * `networkCombo` - Dropdown field that helps users pick a route `network` tag (localized for editing location)
 * `semiCombo` - Dropdown field for adding multiple values to a semicolon-delimited list<br/>
 (e.g. `sport=*` -> `soccer;lacrosse;athletics;field_hockey`)
@@ -379,7 +376,7 @@ For combo fields, spaces are replaced with underscores in the tag value if `snak

 ##### `caseSensitive`

-For combo fields, case-sensitve field values are allowed if `caseSensitive` is `true`. The default is `false`.
+For combo fields, case-sensitive field values are allowed if `caseSensitive` is `true`. The default is `false`.

 ##### `min_value`

@@ -423,7 +420,7 @@ By default, fields are available everywhere.

 ##### `notCountryCodes`

-An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blacklist instead of a whitelist.
+An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blocklist.

 ##### `urlFormat`

@@ -57,6 +57,7 @@
  "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/flats": {"key": "building:flats", "type": "number", "minValue": 0, "label": "Units", "placeholder": "2, 4, 6, 8..."},
  "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"]},
@@ -107,6 +108,7 @@
  "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"},
+  "defibrillator/location": {"key": "defibrillator:location", "type": "textarea", "label": "Location Description"},
  "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"},
@@ -129,12 +131,14 @@
  "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_point": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270", "geometry": ["point"]},
  "direction_vertex_dual": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward"}}},
  "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", "terms": ["length", "mileage"]},
+  "disused/amenity": {"key": "disused:amenity", "type": "typeCombo", "label": "Type"},
  "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"},
@@ -297,7 +301,7 @@
  "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": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be No", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}, "terms": ["bidirectional", "oneway", "unidirectional"]},
  "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"},
@@ -309,6 +313,7 @@
  "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_entrance": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"underground": "Underground", "multi-storey": "Multilevel"}}},
  "parking_space": {"key": "parking_space", "type": "combo", "label": "Type"},
  "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "underground": "Underground", "multi-storey": "Multilevel", "lane": "Roadside Lane", "carports": "Carports", "garage_boxes": "Garage Boxes", "rooftop": "Rooftop", "sheds": "Sheds"}}},
  "payment_multi_fee": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
@@ -334,6 +339,7 @@
  "plots": {"key": "plots", "type": "number", "minValue": 0, "label": "Plots", "placeholder": "10, 20, 30..."},
  "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
  "population": {"key": "population", "type": "text", "label": "Population"},
+  "portable": {"key": "portable", "type": "check", "label": "Portable", "terms": ["detached", "mobile", "moveable"]},
  "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"},
@@ -345,6 +351,7 @@
  "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"}}},
+  "ramp": {"key": "ramp", "type": "check", "label": "Embedded Ramp"},
  "rating": {"key": "rating", "type": "combo", "label": "Power Rating", "snake_case": false},
  "rcn_ref": {"key": "rcn_ref", "type": "text", "label": "Cycling Code"},
  "real_fire": {"countryCodes": ["gb", "ie"], "key": "real_fire", "type": "check", "label": "Real Fire", "terms": ["fire place", "fire"]},
@@ -449,6 +456,7 @@
  "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": {"key": "telecom", "type": "combo", "label": "Type"},
  "telecom/medium": {"key": "telecom:medium", "type": "combo", "label": "Medium"},
  "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
  "to": {"key": "to", "type": "text", "label": "To"},
@@ -466,7 +474,7 @@
  "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_sign/direction": {"key": "traffic_sign:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}, "geometry": ["vertex"]},
  "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"}}},
@@ -480,6 +488,7 @@
  "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"},
  "utility": {"key": "utility", "type": "typeCombo", "label": "Utility"},
  "valve": {"key": "valve", "type": "combo", "label": "Type"},
+  "vehicles": {"keys": ["bus", "trolleybus", "tram", "train", "subway", "light_rail", "monorail", "ferry"], "type": "manyCombo", "label": "Vehicles", "strings": {"options": {"bus": "Bus", "trolleybus": "Trolleybus", "tram": "Tram", "train": "Train", "subway": "Subway", "light_rail": "Light Rail", "monorail": "Monorail", "ferry": "Ferry"}}, "reference": {"key": "public_transport"}, "prerequisiteTag": {"keyNot": "aerialway"}},
  "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"},
  "vhf": {"key": "vhf", "type": "text", "label": "VHF Channel", "terms": ["call sign", "very high frequency"]},
  "video_calls": {"key": "video", "type": "check", "label": "Video Calls"},
@@ -495,6 +504,7 @@
  "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_tank/volume": {"key": "water_tank:volume", "type": "text", "label": "Volume (Liters)", "placeholder": "10000, 20000, 30000…"},
  "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"},
@@ -5,4 +5,4 @@
    "terms": [
        "structure"
    ]
-}
+}
@@ -0,0 +1,7 @@
+{
+    "key": "building:flats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Units",
+    "placeholder": "2, 4, 6, 8..."
+}
@@ -4,4 +4,4 @@
    "minValue": 0,
    "label": "Capacity",
    "placeholder": "50, 100, 200..."
-}
+}
@@ -0,0 +1,5 @@
+{
+    "key": "defibrillator:location",
+    "type": "textarea",
+    "label": "Location Description"
+}
@@ -0,0 +1,9 @@
+{
+    "key": "direction",
+    "type": "number",
+    "label": "Direction (Degrees Clockwise)",
+    "placeholder": "45, 90, 180, 270",
+    "geometry": [
+        "point"
+    ]
+}
@@ -0,0 +1,5 @@
+{
+    "key": "disused:amenity",
+    "type": "typeCombo",
+    "label": "Type"
+}
@@ -10,5 +10,10 @@
            "reversible": "Reversible",
            "alternating": "Alternating"
        }
-    }
+    },
+    "terms": [
+        "bidirectional",
+        "oneway",
+        "unidirectional"
+    ]
 }
@@ -0,0 +1,11 @@
+{
+    "key": "parking",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "underground": "Underground",
+            "multi-storey": "Multilevel"
+        }
+    }
+}
@@ -0,0 +1,10 @@
+{
+    "key": "portable",
+    "type": "check",
+    "label": "Portable",
+    "terms": [
+        "detached",
+        "mobile",
+        "moveable"
+    ]
+}
@@ -0,0 +1,5 @@
+{
+    "key": "ramp",
+    "type": "check",
+    "label": "Embedded Ramp"
+}
@@ -0,0 +1,5 @@
+{
+    "key": "telecom",
+    "type": "combo",
+    "label": "Type"
+}
@@ -8,5 +8,8 @@
          "backward": "Backward",
          "both": "Both / All"
        }
-    }
+    },
+    "geometry": [
+        "vertex"
+    ]
 }
@@ -0,0 +1,32 @@
+{
+    "keys": [
+        "bus",
+        "trolleybus",
+        "tram",
+        "train",
+        "subway",
+        "light_rail",
+        "monorail",
+        "ferry"
+    ],
+    "type": "manyCombo",
+    "label": "Vehicles",
+    "strings": {
+        "options": {
+            "bus": "Bus",
+            "trolleybus": "Trolleybus",
+            "tram": "Tram",
+            "train": "Train",
+            "subway": "Subway",
+            "light_rail": "Light Rail",
+            "monorail": "Monorail",
+            "ferry": "Ferry"
+        }
+    },
+    "reference": {
+        "key": "public_transport"
+    },
+    "prerequisiteTag": {
+        "keyNot": "aerialway"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "key": "water_tank:volume",
+    "type": "text",
+    "label": "Volume (Liters)",
+    "placeholder": "10000, 20000, 30000…"
+}
@@ -19,6 +19,7 @@
  "power": {"icon": "temaki-power", "geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power Feature"},
  "railway": {"icon": "temaki-rail_profile", "fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway Feature"},
  "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"},
+  "telecom": {"icon": "temaki-cable", "fields": ["telecom", "operator"], "geometry": ["point", "vertex", "line", "area"], "tags": {"telecom": "*"}, "searchable": false, "name": "Telecom Feature"},
  "tourism": {"icon": "maki-attraction", "fields": ["name", "tourism"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "*"}, "searchable": false, "name": "Tourism Feature"},
  "waterway": {"fields": ["name", "waterway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"waterway": "*"}, "searchable": false, "name": "Waterway Feature"},
  "addr/interpolation": {"fields": ["addr/interpolation"], "geometry": ["line"], "tags": {"addr:interpolation": "*"}, "name": "Address Interpolation", "searchable": false, "matchScore": 0.2},
@@ -43,7 +44,7 @@
  "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "tags": {"aerialway": "zip_line"}, "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "name": "Zip Line"},
  "aeroway/aerodrome": {"icon": "temaki-airport", "fields": ["name", "iata", "icao", "address", "operator", "operator/type", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "tags": {"aeroway": "aerodrome"}, "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "matchScore": 0.9, "name": "Airport"},
  "aeroway/apron": {"icon": "temaki-planes", "fields": ["ref", "surface"], "geometry": ["area"], "tags": {"aeroway": "apron"}, "terms": ["aircraft parking", "flight line", "hardstand", "ramp", "tarmac", "taxiway"], "name": "Airport Apron"},
-  "aeroway/gate": {"icon": "fas-plane", "fields": ["ref_aeroway_gate"], "geometry": ["point"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"},
+  "aeroway/gate": {"icon": "fas-plane", "fields": ["ref_aeroway_gate"], "geometry": ["point", "vertex"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"},
  "aeroway/hangar": {"icon": "temaki-hangar", "fields": ["name", "building_area"], "geometry": ["area"], "tags": {"aeroway": "hangar"}, "addTags": {"building": "hangar", "aeroway": "hangar"}, "name": "Hangar"},
  "aeroway/helipad": {"icon": "maki-heliport", "fields": ["name", "ref", "operator", "surface", "lit"], "moreFields": ["access_simple", "address", "charge_fee", "fee", "opening_hours", "opening_hours/covid19"], "geometry": ["area", "point"], "tags": {"aeroway": "helipad"}, "terms": ["helicopter", "helipad", "heliport"], "name": "Helipad"},
  "aeroway/holding_position": {"icon": "temaki-plane_taxiing", "fields": ["ref"], "geometry": ["vertex"], "tags": {"aeroway": "holding_position"}, "name": "Aircraft Holding Position"},
@@ -78,10 +79,12 @@
  "amenity/bicycle_rental": {"icon": "temaki-bicycle_rental", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
  "amenity/bicycle_repair_station": {"icon": "temaki-bicycle_repair", "fields": ["operator", "brand", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike chain", "bike multitool", "bike repair", "bike tools", "cycle pump", "cycle repair", "cycling"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
  "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "opening_hours", "opening_hours/covid19", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}", "building_area", "cuisine"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
+  "amenity/binoculars": {"icon": "temaki-binoculars", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "direction", "height", "ele_node"], "moreFields": ["colour", "covered", "indoor", "lit", "manufacturer", "ref"], "geometry": ["point"], "terms": ["observation viewer", "optical ranger", "spotting scope", "sight", "spyglass", "telescope", "tower viewer", "viewfinder", "viewing stand"], "tags": {"amenity": "binoculars"}, "name": "Mounted Binoculars"},
  "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["access_simple", "address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
+  "amenity/boat_storage": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "access_simple", "capacity"], "geometry": ["point", "area"], "tags": {"amenity": "boat_storage"}, "terms": ["boathouse", "dry dock", "marina"], "name": "Boat Storage"},
  "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
-  "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "level", "min_age", "not/name", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
-  "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca"], "name": "Bubble Tea Cafe"},
+  "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "level", "min_age", "not/name", "payment_multi", "ref/vatin", "reservation", "smoking", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+  "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca", "pearl tea", "boba drink"], "name": "Bubble Tea Cafe"},
  "amenity/cafe/coffee_shop": {"icon": "temaki-hot_drink_cup", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "coffee_shop"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": ["americano", "brew", "cafe", "café", "caffe", "caffè", "cappuccino", "cocoa", "coffee shop", "drip", "espresso", "hot drinks", "latte", "macchiato", "tea"], "name": "Coffeehouse"},
  "amenity/car_pooling": {"icon": "temaki-car_pool", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "opening_hours/covid19", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "terms": ["car sharing", "carpooling", "lift sharing", "ride sharing"], "name": "Car Pooling Station"},
  "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
@@ -112,13 +115,14 @@
  "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
  "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
  "amenity/exhibition_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "operator/type", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "not/name", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "exhibition_centre"}, "terms": ["exhibition center", "fair", "exhibition", "exposition", "trade fair", "trade show", "trade exhibition", "expo", "tradeshow"], "name": "Exposition Center"},
-  "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "drive_through"], "moreFields": ["air_conditioning", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+  "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "drive_through", "phone", "website"], "moreFields": ["air_conditioning", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "ref/vatin", "smoking", "takeaway", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
  "amenity/fast_food/ice_cream": {"icon": "fas-ice-cream", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "ice_cream"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "name": "Ice Cream Fast Food", "searchable": false},
  "amenity/fast_food/burger": {"icon": "maki-fast-food", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"},
  "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Fast Food"},
  "amenity/fast_food/donut": {"icon": "temaki-donut", "geometry": ["point", "area"], "terms": ["breakfast", "brunch", "cafe", "canteen", "coffee", "dine", "diner", "donut", "doughnut", "dining", "eat", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "donut"}, "reference": {"key": "cuisine", "value": "donut"}, "name": "Donut Fast Food"},
  "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Fast Food"},
  "amenity/fast_food/hot_dog": {"icon": "fas-hotdog", "geometry": ["point", "area"], "terms": ["ballpark", "frankfurter", "frank", "hotdog stand", "sandwich", "sausage", "wiener"], "tags": {"amenity": "fast_food", "cuisine": "hot_dog"}, "reference": {"key": "cuisine", "value": "hot_dog"}, "name": "Hot Dog Fast Food"},
+  "amenity/fast_food/juice": {"icon": "temaki-drink_cup", "geometry": ["point", "area"], "terms": ["cafe", "café", "beverages", "fruit drinks", "juice bar", "shakes", "smoothies"], "tags": {"amenity": "fast_food", "cuisine": "juice"}, "reference": {"key": "cuisine", "value": "juice"}, "name": "Juice Fast Food"},
  "amenity/fast_food/kebab": {"icon": "temaki-vertical_rotisserie", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "kebab"}, "reference": {"key": "cuisine", "value": "kebab"}, "name": "Kebab Fast Food"},
  "amenity/fast_food/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "fast_food", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Fast Food"},
  "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Fast Food"},
@@ -134,24 +138,26 @@
  "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
  "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
  "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
-  "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+  "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
  "amenity/karaoke_box": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-  "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "not/name", "opening_hours", "opening_hours/covid19", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool / Kindergarten Grounds"},
+  "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "not/name", "opening_hours", "opening_hours/covid19", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarten", "kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool / Kindergarten Grounds"},
  "amenity/kneipp_water_cure": {"icon": "maki-hospital", "fields": ["kneipp_water_cure_multi", "opening_hours", "opening_hours/covid19", "fee"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "kneipp_water_cure"}, "reference": {"key": "amenity", "value": "kneipp_water_cure"}, "name": "Kneipp Water Cure"},
  "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "opening_hours/covid19", "language_multi"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
-  "amenity/lavoir": {"icon": "tnp-4310", "fields": ["name", "operator", "operator/type", "address", "access_simple", "building_area"], "moreFields": ["gnis/feature_id", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "lavoir"}, "terms": ["clothing", "laundry", "washing"], "name": "Lavoir"},
+  "amenity/lavoir": {"icon": "temaki-detergent_bottle", "fields": ["name", "operator", "operator/type", "address", "access_simple", "building_area"], "moreFields": ["gnis/feature_id", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "lavoir"}, "terms": ["clothing", "laundry", "washing"], "name": "Lavoir"},
  "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
  "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "level", "not/name", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
  "amenity/loading_dock": {"icon": "fas-truck-loading", "fields": ["ref", "operator", "access_simple", "door", "width", "height"], "moreFields": ["address", "colour", "level", "lit", "wheelchair"], "geometry": ["vertex"], "terms": ["door", "loading bay", "shipping", "unloading", "warehouse"], "tags": {"amenity": "loading_dock"}, "name": "Loading Dock"},
+  "amenity/lounger": {"icon": "temaki-bench", "fields": ["material", "colour", "access_simple", "lit"], "moreFields": ["height", "inscription", "level", "manufacturer", "operator"], "geometry": ["point"], "tags": {"amenity": "lounger"}, "terms": ["seat", "chair", "bench"], "name": "Lounger"},
  "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "gnis/feature_id", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
  "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
  "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
  "amenity/money_transfer": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
+  "amenity/mortuary": {"icon": "maki-cemetery", "fields": ["name", "operator", "address"], "moreFields": ["religion", "denomination"], "geometry": ["point", "area"], "terms": ["crematorium", "funeral home", "memorial home", "morgue", "mortuary", "undertaker"], "tags": {"amenity": "mortuary"}, "name": "Morgue"},
  "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity_parking", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
  "amenity/music_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
  "amenity/nightclub": {"icon": "fas-cocktail", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair", "fee"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
  "amenity/nightclub/lgbtq": {"icon": "fas-cocktail", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
-  "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance / Exit"},
+  "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["parking_entrance", "ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance / Exit"},
  "amenity/parking_space": {"icon": "temaki-parking_space", "fields": ["parking_space", "capacity"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking_space"}, "addTags": {"amenity": "parking_space", "capacity": "1"}, "terms": ["parking spot", "parking stall"], "matchScore": 0.95, "name": "Parking Space"},
  "amenity/parking_space/disabled": {"icon": "temaki-accessible_space", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking_space", "parking_space": "disabled"}, "addTags": {"amenity": "parking_space", "parking_space": "disabled", "capacity": "1"}, "terms": ["disability", "disabled parking stall", "handicap parking spot", "wheelchair"], "matchScore": 0.95, "name": "Accessible Parking Space"},
  "amenity/parking": {"icon": "temaki-car_parked", "fields": ["operator", "operator/type", "parking", "capacity_parking", "capacity/disabled_parking", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "opening_hours/covid19", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
@@ -183,6 +189,7 @@
  "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "SAT", "homework", "math", "reading", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"},
  "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
  "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "smoking", "brewery"], "moreFields": ["air_conditioning", "cuisine", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "real_fire", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+  "amenity/pub/irish": {"name": "Irish Pub", "icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "theme": "irish"}, "reference": {"key": "theme", "value": "irish"}, "terms": ["irish pub", "irish bar"], "notCountryCodes": ["ie"]},
  "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"},
  "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"},
  "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "opening_hours/covid19", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
@@ -192,9 +199,9 @@
  "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "opening_hours", "opening_hours/covid19", "collection_times"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer", "material", "ref"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
  "amenity/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"},
  "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"},
-  "amenity/refugee_site": {"icon": "tnp-2120771", "fields": ["name", "operator", "operator/type", "informal", "start_date", "capacity", "population"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website"], "geometry": ["point", "area"], "tags": {"amenity": "refugee_site"}, "terms": ["displaced people", "evacuees", "migrants", "ngo", "refugee site"], "name": "Refugee Camp"},
+  "amenity/refugee_site": {"icon": "temaki-tents", "fields": ["name", "operator", "operator/type", "informal", "start_date", "capacity", "population"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website"], "geometry": ["point", "area"], "tags": {"amenity": "refugee_site"}, "terms": ["displaced people", "evacuees", "migrants", "ngo", "refugee site"], "name": "Refugee Camp"},
  "amenity/research_institute": {"icon": "fas-flask", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["applied research", "experimentation", "r&d", "r & d", "r and d", "research and development", "research institution", "research laboratory", "research labs"], "tags": {"amenity": "research_institute"}, "name": "Research Institute Grounds"},
-  "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
+  "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "diet_multi", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
  "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"},
  "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"},
  "amenity/restaurant/chinese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"},
@@ -215,11 +222,11 @@
  "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
  "amenity/sanitary_dump_station": {"icon": "temaki-camper_trailer_dump", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "opening_hours/covid19"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
  "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "grades", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["area", "point"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
-  "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["gnis/feature_id", "lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
+  "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "operator", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["gnis/feature_id", "lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
  "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
  "amenity/shelter/lean_to": {"icon": "temaki-sleep_shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "terms": ["alpine hut", "cabin", "leanto", "lodging", "overnight accommodations", "sleeping shelter", "wilderness hut"], "name": "Lean-To"},
-  "amenity/shelter/picnic_shelter": {"icon": "temaki-picnic_shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
-  "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
+  "amenity/shelter/picnic_shelter": {"icon": "temaki-picnic_shelter", "fields": ["name", "operator", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
+  "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "operator", "building_area", "bench", "lit", "bin"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
  "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "opening_hours/covid19", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "hot_water", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
  "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours", "opening_hours/covid19"], "moreFields": ["covered", "level", "lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
  "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
@@ -238,9 +245,10 @@
  "amenity/telephone": {"icon": "fas-phone-alt", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "lit", "ref", "sms", "video_calls", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
  "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
  "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
-  "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "opening_hours/covid19", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
+  "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "opening_hours/covid19", "operator", "payment_multi_fee", "portable", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
  "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
-  "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
+  "amenity/toilets/disposal/pitlatrine": {"icon": "temaki-latrine", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
+  "amenity/toilets/portable": {"icon": "temaki-latrine", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "area", "vertex"], "terms": ["restroom", "privy", "porta john", "porta potty", "portapot", "chemical toilet"], "tags": {"amenity": "toilets", "portable": "yes"}, "name": "Portable Toilet"},
  "amenity/townhall": {"icon": "temaki-town_hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
  "amenity/townhall/city": {"icon": "temaki-capitol", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "reference": {"key": "townhall:type", "value": "city"}, "name": "City Hall"},
  "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
@@ -273,7 +281,7 @@
  "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "level", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
  "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
  "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
-  "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
+  "amenity/waste_transfer_station": {"icon": "fas-trash-restore", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
  "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
  "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours", "opening_hours/covid19"], "moreFields": ["covered", "drinking_water", "lit", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "RV Drinking Water"},
  "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours", "opening_hours/covid19"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
@@ -339,7 +347,7 @@
  "building/bunker": {"icon": "temaki-bunker", "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
  "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
  "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
-  "building/apartments": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
+  "building/apartments": {"icon": "maki-building", "fields": ["{building}", "building/flats"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
  "building/barn": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
  "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
  "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
@@ -355,7 +363,7 @@
  "building/cowshed": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "cowshed"}, "matchScore": 0.5, "terms": ["byre", "cow barn", "cow house", "cow shed", "cowbarn", "cowhouse", "dairy barn", "milking barn"], "name": "Cowshed"},
  "building/detached": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "detached"}, "terms": ["home", "single", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Detached House"},
  "building/dormitory": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "dormitory"}, "matchScore": 0.5, "name": "Dormitory"},
-  "building/farm_auxiliary": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm_auxiliary"}, "terms": ["agriculture", "auxilary", "chicken coop", "farm auxiliary", "pigsty", "sty"], "matchScore": 0.5, "name": "Farm Building"},
+  "building/farm_auxiliary": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm_auxiliary"}, "terms": ["agriculture", "auxiliary", "auxilary", "chicken coop", "farm auxiliary", "pigsty", "sty"], "matchScore": 0.5, "name": "Farm Building"},
  "building/farm": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm"}, "matchScore": 0.5, "name": "Farm House"},
  "building/garage": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garage"}, "matchScore": 0.5, "name": "Garage"},
  "building/garages": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"},
@@ -368,7 +376,7 @@
  "building/houseboat": {"icon": "temaki-houseboat", "geometry": ["area"], "tags": {"building": "houseboat"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Houseboat"},
  "building/hut": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"},
  "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"},
-  "building/kindergarten": {"icon": "fas-school", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool / Kindergarten Building"},
+  "building/kindergarten": {"icon": "fas-school", "geometry": ["area"], "terms": ["kindergarten", "kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool / Kindergarten Building"},
  "building/mosque": {"icon": "fas-mosque", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"},
  "building/office": {"icon": "maki-suitcase", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "phone", "website"], "geometry": ["area"], "tags": {"building": "office"}, "matchScore": 0.5, "terms": ["business center", "office block"], "name": "Office Building"},
  "building/pavilion": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "terms": ["sports"], "tags": {"building": "pavilion"}, "matchScore": 0.5, "name": "Pavilion Building"},
@@ -390,19 +398,19 @@
  "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
  "building/university": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
  "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"},
-  "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
+  "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
  "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
-  "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["air_conditioning", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "product", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
+  "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "product", "ref/vatin", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
  "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
  "craft/tailor": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "tags": {"craft": "tailor"}, "reference": {"key": "shop", "value": "tailor"}, "name": "Tailor", "searchable": false},
-  "craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "terms": ["combines", "farm equipment", "harvesters", "tractors"], "name": "Agricultural Engines Mechanic"},
+  "craft/agricultural_engines": {"icon": "fas-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "terms": ["combines", "farm equipment", "harvesters", "tractors"], "name": "Agricultural Engines Mechanic"},
  "craft/basket_maker": {"icon": "temaki-vase", "geometry": ["point", "area"], "tags": {"craft": "basket_maker"}, "name": "Basket Maker"},
  "craft/beekeeper": {"icon": "maki-farm", "geometry": ["point", "area"], "tags": {"craft": "beekeeper"}, "name": "Beekeeper"},
  "craft/blacksmith": {"icon": "temaki-anvil_and_hammer", "geometry": ["point", "area"], "tags": {"craft": "blacksmith"}, "name": "Blacksmith"},
  "craft/boatbuilder": {"icon": "temaki-boat_repair", "geometry": ["point", "area"], "tags": {"craft": "boatbuilder"}, "matchScore": 0.6, "name": "Boat Builder"},
  "craft/bookbinder": {"icon": "maki-library", "geometry": ["point", "area"], "terms": ["book repair"], "tags": {"craft": "bookbinder"}, "name": "Bookbinder"},
  "craft/brewery": {"icon": "temaki-storage_fermenter", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "beverage", "bier", "booze", "cider"], "tags": {"craft": "brewery"}, "name": "Brewery"},
-  "craft/carpenter": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["woodworker"], "tags": {"craft": "carpenter"}, "name": "Carpenter"},
+  "craft/carpenter": {"icon": "fas-hammer", "geometry": ["point", "area"], "terms": ["woodworker"], "tags": {"craft": "carpenter"}, "name": "Carpenter"},
  "craft/carpet_layer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "carpet_layer"}, "name": "Carpet Layer"},
  "craft/caterer": {"icon": "temaki-catering", "fields": ["name", "cuisine", "{craft}"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"},
  "craft/chimney_sweeper": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"craft": "chimney_sweeper"}, "name": "Chimney Sweeper"},
@@ -412,14 +420,14 @@
  "craft/distillery": {"icon": "temaki-storage_fermenter", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"},
  "craft/dressmaker": {"icon": "temaki-dress", "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"},
  "craft/electrician": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"},
-  "craft/electronics_repair": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"},
+  "craft/electronics_repair": {"icon": "fas-screwdriver", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"},
  "craft/floorer": {"icon": "temaki-brick_trowel", "geometry": ["point", "area"], "tags": {"craft": "floorer"}, "name": "Floorer"},
  "craft/gardener": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscaper", "grounds keeper"], "tags": {"craft": "gardener"}, "name": "Gardener"},
  "craft/glaziery": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass", "stained-glass", "window"], "tags": {"craft": "glaziery"}, "name": "Glaziery"},
  "craft/handicraft": {"icon": "temaki-vase", "geometry": ["point", "area"], "tags": {"craft": "handicraft"}, "name": "Handicraft Workspace"},
  "craft/hvac": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["heat*", "vent*", "air conditioning"], "tags": {"craft": "hvac"}, "name": "HVAC Workplace"},
  "craft/insulator": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "insulation"}, "name": "Insulator"},
-  "craft/joiner": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "joiner"}, "terms": ["furniture"], "name": "Joiner"},
+  "craft/joiner": {"icon": "fas-hammer", "geometry": ["point", "area"], "tags": {"craft": "joiner"}, "terms": ["furniture"], "name": "Joiner"},
  "craft/key_cutter": {"icon": "fas-key", "geometry": ["point", "area"], "tags": {"craft": "key_cutter"}, "name": "Key Cutter"},
  "craft/metal_construction": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "metal_construction"}, "name": "Metalworker"},
  "craft/painter": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"craft": "painter"}, "name": "Painter"},
@@ -430,7 +438,7 @@
  "craft/plumber": {"icon": "temaki-plumber", "geometry": ["point", "area"], "terms": ["pipe"], "tags": {"craft": "plumber"}, "name": "Plumber"},
  "craft/pottery": {"icon": "temaki-vase", "geometry": ["point", "area"], "terms": ["ceramic", "kiln", "pot", "vase"], "tags": {"craft": "pottery"}, "name": "Pottery Maker"},
  "craft/rigger": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "rigger"}, "name": "Rigger"},
-  "craft/roofer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "roofer"}, "name": "Roofer"},
+  "craft/roofer": {"icon": "fas-hammer", "geometry": ["point", "area"], "tags": {"craft": "roofer"}, "name": "Roofer"},
  "craft/saddler": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "saddler"}, "name": "Saddler"},
  "craft/sailmaker": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "sailmaker"}, "name": "Sailmaker"},
  "craft/sawmill": {"icon": "maki-logging", "geometry": ["point", "area"], "terms": ["lumber"], "tags": {"craft": "sawmill"}, "name": "Sawmill"},
@@ -447,6 +455,7 @@
  "craft/winery": {"icon": "maki-alcohol-shop", "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"},
  "cycleway/asl": {"icon": "maki-bicycle", "fields": ["ref", "direction_vertex", "width"], "geometry": ["vertex"], "tags": {"cycleway": "asl"}, "terms": ["advanced stop box", "asl", "bicycle box", "bike box", "bikebox", "cycle box", "cycle stop marking"], "name": "Advanced Stop Line"},
  "demolished/building": {"icon": "fas-house-damage", "fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false},
+  "disused/amenity": {"fields": ["disused/amenity"], "geometry": ["point", "vertex", "area"], "tags": {"disused:amenity": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Amenity"},
  "disused/railway": {"icon": "temaki-rail_profile", "fields": ["disused/railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"disused:railway": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Railway Feature"},
  "disused/shop": {"icon": "fas-store-alt-slash", "fields": ["disused/shop"], "geometry": ["point", "area"], "tags": {"disused:shop": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Shop"},
  "emergency/designated": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "designated"}, "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01},
@@ -456,7 +465,7 @@
  "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
  "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
  "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
-  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
+  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator/location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
  "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
  "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
  "emergency/fire_hose": {"icon": "fas-tape", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"},
@@ -468,13 +477,14 @@
  "emergency/mountain_rescue": {"icon": "temaki-mountain_rescue", "fields": ["name", "address", "operator", "building_area", "email", "website"], "moreFields": ["fax", "gnis/feature_id", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "mountain_rescue"}, "name": "Mountain Rescue"},
  "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
  "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
-  "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
+  "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator", "water_tank/volume", "drinking_water"], "moreFields": ["height", "material"], "geometry": ["point", "vertex", "area"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
  "entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "entrance", "door", "access_simple", "wheelchair", "level", "address"], "geometry": ["vertex"], "tags": {"entrance": "*"}, "terms": ["entrance", "exit", "door"], "matchScore": 0.8, "name": "Entrance / Exit"},
  "entrance/emergency_ward_entrance": {"icon": "maki-hospital", "fields": ["ref", "emergency_ward_entrance", "address", "level", "opening_hours"], "geometry": ["vertex"], "tags": {"emergency": "emergency_ward_entrance"}, "addTags": {"emergency": "emergency_ward_entrance", "entrance": "yes"}, "terms": ["accident & emergency department", "casualty department", "ed", "emergency department", "emergency room", "emergency ward", "er", "ew"], "name": "Emergency Room Entrance"},
  "entrance/emergency": {"icon": "maki-entrance-alt1", "fields": ["ref", "door", "access_simple", "level"], "geometry": ["vertex"], "tags": {"entrance": "emergency"}, "terms": ["fire exit", "door"], "matchScore": 0.8, "name": "Emergency Exit"},
  "ford": {"icon": "temaki-pedestrian", "fields": ["name", "depth", "access", "seasonal"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
  "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"},
  "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "name": "Golf Cartpath"},
+  "golf/clubhouse": {"icon": "maki-golf", "fields": ["name", "operator", "address", "building_area", "access_simple"], "moreFields": ["air_conditioning", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["club house", "golf clubhouse", "golf house", "pro shop"], "tags": {"golf": "clubhouse"}, "name": "Golf Clubhouse"},
  "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range"}, "addTags": {"golf": "driving_range", "landuse": "grass"}, "name": "Driving Range"},
  "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway"}, "addTags": {"golf": "fairway", "landuse": "grass"}, "name": "Fairway"},
  "golf/green": {"icon": "temaki-golf_green", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green"}, "addTags": {"golf": "green", "landuse": "grass"}, "name": "Putting Green"},
@@ -484,7 +494,7 @@
  "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough"}, "addTags": {"golf": "rough", "landuse": "grass"}, "name": "Rough"},
  "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee"}, "addTags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "name": "Tee Box"},
  "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard"}, "addTags": {"golf": "water_hazard", "natural": "water"}, "name": "Water Hazard"},
-  "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "level", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
+  "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area", "phone", "website"], "moreFields": ["brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "level", "opening_hours", "opening_hours/covid19", "payment_multi", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
  "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"},
  "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"},
  "healthcare/audiologist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["ear", "hearing", "sound"], "tags": {"healthcare": "audiologist"}, "name": "Audiologist"},
@@ -565,12 +575,13 @@
  "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
  "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
  "highway/speed_camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
-  "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "tactile_paving", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
+  "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "tactile_paving", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "ramp", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
  "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["incline_steps", "conveying", "access_simple", "indoor", "level_semi", "width"], "moreFields": ["{highway/steps}", "handrail", "step_count", "surface"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
  "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
  "highway/street_lamp": {"icon": "temaki-street_lamp_arm", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "lamp_mount", "direction", "height", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
  "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"},
  "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"},
+  "highway/toll_gantry": {"notCountryCodes": ["de"], "icon": "temaki-toll_gantry", "fields": ["ref", "operator", "access", "maxheight", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["website"], "geometry": ["vertex"], "tags": {"highway": "toll_gantry"}, "terms": ["license plate camera toll", "cashless toll", "electronic toll", "free-flow toll", "toll gantry", "transponder toll"], "name": "Open Road Toll"},
  "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["covered", "flood_prone", "horse_scale", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"},
  "highway/traffic_mirror": {"icon": "maki-circle-stroked", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"},
  "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"},
@@ -636,7 +647,7 @@
  "landuse/landfill": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
  "landuse/meadow": {"icon": "maki-garden", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "meadow"}, "terms": ["grazing", "hay field", "pasture"], "name": "Meadow"},
  "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
-  "landuse/military/airfield": {"icon": "tnp-2009265", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"},
+  "landuse/military/airfield": {"icon": "temaki-fighter_jet", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"},
  "landuse/military/barracks": {"icon": "temaki-army_tent", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"},
  "landuse/military/danger_area": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "danger_area"}, "addTags": {"landuse": "military", "military": "danger_area"}, "terms": ["air force", "army", "base", "blast", "bomb", "explo*", "force", "guard", "mine", "marine", "navy", "troop", "war"], "name": "Danger Area"},
  "landuse/military/naval_base": {"icon": "temaki-anchor_medal", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "naval_base"}, "addTags": {"landuse": "military", "military": "naval_base"}, "terms": ["base", "fight", "force", "guard", "marine", "navy", "ship", "sub", "troop", "war"], "name": "Naval Base"},
@@ -645,7 +656,7 @@
  "landuse/military/training_area": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "training_area"}, "addTags": {"landuse": "military", "military": "training_area"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Military Training Area"},
  "landuse/orchard": {"icon": "maki-park", "fields": ["name", "operator", "trees"], "moreFields": ["address", "email", "fax", "phone", "species/wikidata", "website"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"},
  "landuse/plant_nursery": {"icon": "fas-seedling", "fields": ["name", "operator", "plant"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
-  "landuse/quarry": {"icon": "temaki-pick_hammer", "geometry": ["area", "point"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
+  "landuse/quarry": {"icon": "temaki-pick_hammer", "geometry": ["area", "point"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": ["aggregate quarry", "open pit mine", "sand mine", "sand pit", "sand quarry", "sandpit"], "name": "Quarry"},
  "landuse/railway": {"icon": "temaki-train", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"},
  "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
  "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": ["christian", "churchyard", "hindu", "jewish", "mosque", "muslim", "place of worship", "shinto", "sikh", "taoist", "temple", "shrine", "synagogue"], "name": "Religious Area"},
@@ -669,7 +680,7 @@
  "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"},
  "leisure/firepit": {"icon": "temaki-campfire", "fields": ["access_simple", "seasonal", "width"], "moreFields": ["ref"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["bonfire", "campfire", "fire circle", "fire hole", "fire place", "fire ring", "firepit", "fireplace", "firering"], "name": "Fire Pit"},
  "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
-  "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"},
+  "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"},
  "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["asanas", "meditation", "modern yoga", "studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
  "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "wheelchair", "blind"], "moreFields": ["access_simple", "opening_hours", "opening_hours/covid19"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"},
  "leisure/fitness_station/balance_beam": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "balance_beam"}, "addTags": {"leisure": "fitness_station", "fitness_station": "balance_beam", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["balance", "exercise", "fitness", "gym", "trim trail"], "name": "Exercise Balance Beam"},
@@ -690,12 +701,12 @@
  "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
  "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
  "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
-  "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "vhf", "website"], "geometry": ["area", "point", "vertex"], "terms": ["boats", "docks", "harbor", "harbour", "moorings", "yachts"], "tags": {"leisure": "marina"}, "addTags": {"leisure": "marina", "seamark:type": "harbour", "seamark:harbour:category": "marina"}, "name": "Marina"},
+  "leisure/marina": {"icon": "temaki-sailboat", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "vhf", "website"], "geometry": ["area", "point", "vertex"], "terms": ["boats", "docks", "harbor", "harbour", "moorings", "yachts"], "tags": {"leisure": "marina"}, "addTags": {"leisure": "marina", "seamark:type": "harbour", "seamark:harbour:category": "marina"}, "name": "Marina"},
  "leisure/miniature_golf": {"icon": "temaki-golf_green", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
  "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["area", "point"], "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
  "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "moreFields": ["level"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
  "leisure/park": {"icon": "temaki-tree_and_bench", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "smoking", "website"], "geometry": ["area", "point"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
-  "leisure/picnic_table": {"icon": "maki-picnic-site", "fields": ["material", "lit", "bench"], "moreFields": ["level"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
+  "leisure/picnic_table": {"icon": "maki-picnic-site", "fields": ["material", "lit", "bench", "colour"], "moreFields": ["height", "level", "manufacturer", "operator"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
  "leisure/picnic_table/chess": {"icon": "fas-chess-pawn", "geometry": ["point"], "tags": {"leisure": "picnic_table", "sport": "chess"}, "reference": {"key": "sport", "value": "chess"}, "terms": ["bench", "chess board", "checkerboard", "checkers", "chequerboard", "game table"], "name": "Chess Table"},
  "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["address", "charge_fee", "covered", "fee", "gnis/feature_id", "indoor", "payment_multi_fee"], "geometry": ["area", "point"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
  "leisure/pitch/american_football": {"icon": "maki-american-football", "geometry": ["area", "point"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": ["football", "gridiron"], "name": "American Football Field"},
@@ -726,9 +737,10 @@
  "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
  "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
  "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "surface", "access_simple", "fee", "payment_multi_fee", "charge_fee", "lanes"], "moreFields": ["lit", "opening_hours", "opening_hours/covid19", "seamark/type", "width"], "geometry": ["line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "addTags": {"leisure": "slipway", "highway": "service", "service": "slipway"}, "matchScore": 1.1, "name": "Slipway"},
-  "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "opening_hours/covid19", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
+  "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "opening_hours/covid19", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
  "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"},
  "leisure/sports_centre/swimming": {"icon": "fas-swimmer", "geometry": ["area", "point"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
+  "leisure/sports_hall": {"icon": "maki-pitch", "fields": ["name", "operator", "sport", "address", "building_area", "access_simple"], "moreFields": ["air_conditioning", "level", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "geometry": ["point", "area"], "terms": ["athletic courts", "gym", "sports hall", "sports venue"], "tags": {"leisure": "sports_hall"}, "name": "Gymnasium"},
  "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "operator", "sport", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
  "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "charge_fee", "lit"], "moreFields": ["opening_hours", "opening_hours/covid19", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
  "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "gnis/feature_id", "opening_hours", "opening_hours/covid19", "operator"], "geometry": ["area", "point"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
@@ -746,13 +758,14 @@
  "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
  "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge_combo", "layer", "maxweight"], "moreFields": ["gnis/feature_id", "manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge Area", "matchScore": 0.85},
  "man_made/bunker_silo": {"icon": "temaki-bunker_silo", "fields": ["content"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
-  "man_made/cairn": {"icon": "temaki-cairn", "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"},
+  "man_made/cairn": {"icon": "temaki-cairn", "fields": ["height", "ele", "ele_node", "check_date"], "moreFields": ["colour", "material", "name", "operator", "ref"], "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"},
  "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
  "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
  "man_made/courtyard": {"icon": "maki-square-stroked", "fields": ["name"], "moreFields": [], "geometry": ["area"], "tags": {"man_made": "courtyard"}, "terms": ["court", "enclosed open air", "quadrangle", "yard"], "name": "Courtyard"},
  "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "manufacturer", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
  "man_made/cross": {"icon": "maki-religious-christian", "fields": ["name", "material", "height", "ele_node", "inscription", "direction"], "geometry": ["point", "vertex"], "tags": {"man_made": "cross"}, "name": "Cross"},
  "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
+  "man_made/dovecote": {"icon": "fas-dove", "fields": ["operator", "building_area", "height", "capacity"], "moreFields": ["layer", "location"], "geometry": ["area", "point"], "terms": ["birds", "doocot", "dovecot", "doves", "pigeonholes", "pigeons"], "tags": {"man_made": "dovecote"}, "name": "Dovecote"},
  "man_made/dyke": {"geometry": ["line"], "tags": {"man_made": "dyke"}, "terms": ["Dike", "Dyke", "Floodbank", "Stopbank"], "name": "Levee"},
  "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"},
  "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country_flag", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
@@ -795,6 +808,7 @@
  "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect", "gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
  "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours", "opening_hours/covid19"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"},
  "man_made/tower/communication": {"icon": "temaki-tower_communication", "fields": ["{man_made/tower}", "communication_multi", "mimics"], "moreFields": ["{man_made/tower}", "mimics"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"},
+  "man_made/tower/cooling": {"icon": "temaki-cooling_tower", "fields": ["ref", "operator", "material", "building_area", "height"], "moreFields": ["layer"], "geometry": ["area"], "terms": ["power plant"], "tags": {"man_made": "tower", "tower:type": "cooling"}, "reference": {"key": "tower:type", "value": "cooling"}, "name": "Cooling Tower"},
  "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"},
  "man_made/tower/minaret": {"icon": "temaki-domed_tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"},
  "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours", "opening_hours/covid19"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
@@ -820,7 +834,7 @@
  "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
  "natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"},
  "natural/cape": {"icon": "temaki-beach", "fields": ["name", "ele_node", "description"], "geometry": ["point", "vertex"], "tags": {"natural": "cape"}, "terms": ["bay", "coastline", "erosion", "headland", "promontory"], "name": "Cape"},
-  "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "ele_node", "access_simple", "direction", "fee", "payment_multi_fee", "charge_fee"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "hollow", "grotto", "shelter", "cavity"], "name": "Cave Entrance"},
+  "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "vertex", "area"], "fields": ["name", "ele_node", "access_simple", "direction", "fee", "payment_multi_fee", "charge_fee"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "hollow", "grotto", "shelter", "cavity"], "name": "Cave Entrance"},
  "natural/cliff": {"icon": "temaki-cliff_falling_rocks", "fields": ["name", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "cliff"}, "terms": ["crag", "escarpment", "rock face", "scarp"], "name": "Cliff"},
  "natural/coastline": {"icon": "temaki-beach", "geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"},
  "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"},
@@ -828,6 +842,7 @@
  "natural/glacier": {"icon": "temaki-snow", "geometry": ["area"], "tags": {"natural": "glacier"}, "terms": ["ice", "snow"], "name": "Glacier"},
  "natural/grassland": {"icon": "temaki-grass", "geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["field", "prairie", "savanna"], "name": "Grassland"},
  "natural/heath": {"icon": "temaki-shrub_low", "geometry": ["area"], "tags": {"natural": "heath"}, "terms": [], "name": "Heath"},
+  "natural/hot_spring": {"icon": "maki-water", "fields": ["name", "intermittent"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"natural": "hot_spring"}, "terms": ["geothermal spring", "thermal pool"], "name": "Hot Spring"},
  "natural/mud": {"geometry": ["area"], "tags": {"natural": "mud"}, "terms": ["wetland"], "name": "Mud"},
  "natural/peak": {"icon": "maki-mountain", "fields": ["name", "ele_node"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"},
  "natural/reef": {"icon": "temaki-beach", "geometry": ["area", "point"], "tags": {"natural": "reef"}, "terms": ["barrier", "coral", "ocean", "sand", "shoal"], "name": "Reef"},
@@ -859,7 +874,7 @@
  "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["area", "point"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"},
  "network/type/node_network": {"fields": ["name", "rwn_ref", "expected_rwn_route_relations", "rcn_ref", "expected_rcn_route_relations"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
  "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
-  "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
+  "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
  "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "searchable": false, "name": "Administrative Office"},
  "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
  "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "name": "Travel Agency", "searchable": false},
@@ -903,7 +918,7 @@
  "office/quango": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "quango"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation", "quasi autonomous", "quasi-autonomous"], "name": "Quasi-NGO Office"},
  "office/religion": {"icon": "maki-suitcase", "fields": ["{office}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"office": "religion"}, "terms": [], "name": "Religious Office"},
  "office/research": {"icon": "fas-flask", "geometry": ["point", "area"], "tags": {"office": "research"}, "terms": ["R and D", "research and development", "research lab", "r&d", "rnd"], "name": "Research Office"},
-  "office/surveyor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "surveyor"}, "terms": [], "name": "Surveyor Office"},
+  "office/surveyor": {"icon": "fas-vest", "geometry": ["point", "area"], "tags": {"office": "surveyor"}, "terms": [], "name": "Surveyor Office"},
  "office/tax_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "tax_advisor"}, "terms": ["tax", "tax consultant"], "name": "Tax Advisor Office"},
  "office/telecommunication": {"icon": "maki-telephone", "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet service provider", "isp", "network", "telephone", "voice"], "name": "Telecom Office"},
  "office/therapist": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"},
@@ -947,7 +962,7 @@
  "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "baby_seat", "wheelchair", "blind"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"},
  "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "terms": ["zipline", "zip wire", "zipwire"], "name": "Play Zip Line"},
  "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "name": "Point", "matchScore": 0.1},
-  "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "opening_hours/covid19", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"},
+  "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "opening_hours/covid19", "building_area", "phone", "website"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"},
  "power/cable": {"icon": "temaki-cable", "fields": ["name", "ref", "operator", "voltage", "location", "layer"], "geometry": ["line"], "tags": {"power": "cable"}, "searchable": false, "name": "Power Cable"},
  "power/cable/underground": {"icon": "temaki-cable", "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"},
  "power/generator": {"icon": "temaki-power", "fields": ["ref", "operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity"], "moreFields": ["colour", "height", "level", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
@@ -969,8 +984,8 @@
  "power/switch": {"icon": "temaki-power_switch", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"},
  "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["line_management", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
  "power/transformer": {"icon": "temaki-power_transformer", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"},
-  "public_transport/platform_point": {"icon": "temaki-sign_and_bench", "fields": ["name", "ref_stop_position", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "tactile_paving", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
-  "public_transport/platform": {"icon": "temaki-board_transit", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
+  "public_transport/platform_point": {"icon": "temaki-sign_and_bench", "fields": ["name", "ref_stop_position", "network", "operator", "vehicles", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "tactile_paving", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
+  "public_transport/platform": {"icon": "temaki-board_transit", "fields": ["ref_platform", "network", "operator", "vehicles", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
  "public_transport/platform/aerialway_point": {"icon": "temaki-gondola_lift", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Aerialway Stop / Platform"},
  "public_transport/platform/ferry_point": {"icon": "temaki-ferry", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Ferry Stop / Platform"},
  "public_transport/platform/light_rail_point": {"icon": "temaki-light_rail", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "reference": {"key": "railway", "value": "platform"}, "searchable": false, "name": "Light Rail Stop / Platform"},
@@ -979,6 +994,7 @@
  "public_transport/platform/train_point": {"icon": "temaki-train", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "train": "yes"}, "reference": {"key": "railway", "value": "platform"}, "searchable": false, "name": "Train Stop / Platform"},
  "public_transport/platform/aerialway": {"icon": "temaki-board_gondola_lift", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Platform"},
  "public_transport/platform/bus_point": {"icon": "temaki-bus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop"},
+  "public_transport/platform/bus_tram_point": {"icon": "temaki-tram", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes", "tram": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "tram": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "transit", "transportation", "trolley"], "name": "Tram & Bus Stop"},
  "public_transport/platform/bus": {"icon": "temaki-board_bus", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Platform"},
  "public_transport/platform/ferry": {"icon": "temaki-board_ferry", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Platform"},
  "public_transport/platform/light_rail": {"icon": "temaki-board_light_rail", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Platform"},
@@ -999,7 +1015,7 @@
  "public_transport/station_train": {"icon": "temaki-train", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"},
  "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"},
  "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"},
-  "public_transport/station": {"icon": "temaki-transit", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
+  "public_transport/station": {"icon": "temaki-transit", "fields": ["name", "network", "operator", "vehicles", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
  "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
  "public_transport/stop_position_aerialway": {"icon": "temaki-gondola_lift", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"},
  "public_transport/stop_position_bus": {"icon": "temaki-bus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"},
@@ -1010,7 +1026,7 @@
  "public_transport/stop_position_train": {"icon": "temaki-train", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "train": "yes"}, "addTags": {"public_transport": "stop_position", "train": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stopping Location"},
  "public_transport/stop_position_tram": {"icon": "temaki-tram", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "tram": "yes"}, "addTags": {"public_transport": "stop_position", "tram": "yes", "railway": "tram_stop"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stopping Location"},
  "public_transport/stop_position_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "electric", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stopping Location"},
-  "public_transport/stop_position": {"icon": "temaki-transit", "fields": ["name", "ref_stop_position", "network", "operator"], "moreFields": [], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2},
+  "public_transport/stop_position": {"icon": "temaki-transit", "fields": ["name", "ref_stop_position", "network", "operator", "vehicles"], "moreFields": [], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2},
  "railway/halt": {"icon": "temaki-rail_flag", "geometry": ["point", "vertex"], "tags": {"railway": "halt"}, "name": "Train Station (Halt / Request)", "searchable": false},
  "railway/platform": {"icon": "temaki-board_train", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false},
  "railway/station": {"icon": "temaki-train", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "matchScore": 0.95, "name": "Train Station", "searchable": false},
@@ -1018,11 +1034,11 @@
  "railway/abandoned": {"icon": "temaki-railway_track_askew", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered", "incline"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"},
  "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"},
  "railway/construction": {"icon": "temaki-railway_track_partial", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "incline", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "matchScore": 0.95, "name": "Railway Under Construction"},
-  "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"},
+  "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "path railway crossing", "pedestrian crossing", "level crossing", "grade crossing", "railroad crossing", "railway path crossing", "path through railroad", "train crossing"], "name": "Railway-Path Crossing"},
  "railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"},
  "railway/disused": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "disused"}, "matchScore": 0.95, "name": "Disused Railway"},
  "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "incline", "structure", "gauge", "service_rail"], "moreFields": ["covered", "electrified", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular Track"},
-  "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"},
+  "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "level crossing", "grade crossing", "railroad crossing", "railway road crossing", "road railway crossing", "road through railroad", "train crossing"], "name": "Railway-Road Crossing"},
  "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "incline", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail Track"},
  "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"},
  "railway/miniature": {"icon": "temaki-railway_track_mini", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Train Track"},
@@ -1032,22 +1048,25 @@
  "railway/preserved": {"icon": "temaki-train_steam", "fields": ["railway", "{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "*", "railway:preserved": "yes"}, "addTags": {"railway": "rail", "railway:preserved": "yes"}, "reference": {"key": "railway:preserved"}, "terms": ["historic train", "preserved rail", "steam train", "tourist train"], "name": "Heritage Railway Track"},
  "railway/rail": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["permanent way", "rail line", "railroad track", "railway track", "track", "train track"], "name": "Train Track"},
  "railway/rail/highspeed": {"icon": "temaki-train_bullet", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Train Track"},
+  "railway/railway_crossing": {"icon": "temaki-x_oblique", "geometry": ["vertex"], "tags": {"railway": "railway_crossing"}, "terms": ["diamond crossing", "flat crossing", "level junction", "railway railway crossing"], "name": "Railway-Railway Crossing"},
  "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
  "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
  "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit", "underground railway"], "name": "Subway Track"},
  "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
  "railway/train_wash": {"icon": "temaki-train_wash", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
+  "railway/tram_crossing": {"icon": "temaki-crossing_tram_striped", "geometry": ["vertex"], "tags": {"railway": "tram_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "path tram crossing", "pedestrian crossing", "streetcar crossing", "tram path crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Path Crossing"},
+  "railway/tram_level_crossing": {"icon": "temaki-crossing_tram_solid", "geometry": ["vertex"], "tags": {"railway": "tram_level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "road tram crossing", "streetcar crossing", "tram road crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Road Crossing"},
  "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"},
  "railway/yard": {"icon": "temaki-freight_car", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
  "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
-  "route/ferry": {"icon": "temaki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "from", "to"], "moreFields": ["charge_toll", "distance", "dog", "interval", "maxheight", "maxweight", "network", "opening_hours", "opening_hours/covid19", "ref_route", "roundtrip", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
+  "route/ferry": {"icon": "temaki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "from", "to"], "moreFields": ["charge_toll", "distance", "dog", "email", "interval", "maxheight", "maxweight", "network", "oneway", "opening_hours", "opening_hours/covid19", "phone", "ref_route", "reservation", "roundtrip", "vhf", "website", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
  "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
  "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
  "seamark/buoy_lateral": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
  "seamark/buoy_lateral/green": {"icon": "temaki-buoy", "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
  "seamark/buoy_lateral/red": {"icon": "temaki-buoy", "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
  "seamark/mooring": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
-  "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "phone", "ref/vatin", "second_hand", "stroller", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
+  "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "ref/vatin", "second_hand", "stroller", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
  "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "searchable": false, "name": "Boutique"},
  "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "searchable": false, "name": "Fashion Store"},
  "shop/vacant": {"icon": "maki-shop", "fields": ["name", "address", "building_area"], "geometry": ["point", "area"], "tags": {"shop": "vacant"}, "name": "Vacant Shop", "searchable": false},
@@ -1087,7 +1106,7 @@
  "shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"},
  "shop/chocolate": {"icon": "maki-confectionery", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"},
  "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"},
-  "shop/clothes/second_hand": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "second_hand": "only"}, "terms": ["blouses", "clothes", "consignment", "dresses", "pants", "second hand", "shirts", "shorts", "skirts", "slacks", "suits", "used"], "name": "Secondhand Clothing Store"},
+  "shop/clothes/second_hand": {"icon": "fas-tshirt", "geometry": ["point", "area"], "tags": {"shop": "clothes", "second_hand": "only"}, "terms": ["blouses", "clothes", "consignment", "dresses", "pants", "second hand", "shirts", "shorts", "skirts", "slacks", "suits", "used"], "name": "Secondhand Clothing Store"},
  "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"},
  "shop/clothes/wedding": {"icon": "temaki-gown", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "wedding"}, "reference": {"key": "clothes", "value": "wedding"}, "terms": ["boutique", "bridal", "bride", "bridegroom", "bridesmaid", "groom", "groomsman", "tuxedo", "wedding dress", "wedding gown"], "name": "Wedding Clothes Store"},
  "shop/coffee": {"icon": "temaki-coffee", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"},
@@ -1103,7 +1122,7 @@
  "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
  "shop/deli": {"icon": "temaki-meat", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"},
  "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"},
-  "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "name": "DIY Store"},
+  "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "terms": ["craft", "diy", "do it yourself", "hardware", "home improvement", "tools"], "name": "DIY Store"},
  "shop/doors": {"icon": "fas-door-open", "geometry": ["point", "area"], "tags": {"shop": "doors"}, "name": "Door Shop"},
  "shop/dry_cleaning": {"icon": "temaki-clothes_hanger", "geometry": ["point", "area"], "tags": {"shop": "dry_cleaning"}, "name": "Dry Cleaner"},
  "shop/e-cigarette": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "e-cigarette"}, "terms": ["electronic", "vape", "vaping", "vapor"], "name": "E-Cigarette Shop"},
@@ -1131,13 +1150,13 @@
  "shop/greengrocer": {"icon": "fas-carrot", "fields": ["{shop}", "organic"], "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
  "shop/hairdresser_supply": {"icon": "temaki-hair_care", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
  "shop/hairdresser": {"icon": "temaki-beauty_salon", "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"},
-  "shop/hardware": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "name": "Hardware Store"},
+  "shop/hardware": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "terms": ["craft", "diy", "do it yourself", "hardware", "home improvement", "tools"], "name": "Hardware Store"},
  "shop/health_food": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["wholefood", "vitamins", "vegetarian", "vegan"], "tags": {"shop": "health_food"}, "name": "Health Food Shop"},
  "shop/hearing_aids": {"icon": "temaki-hearing_aid", "geometry": ["point", "area"], "tags": {"shop": "hearing_aids"}, "name": "Hearing Aids Store"},
  "shop/herbalist": {"icon": "fas-leaf", "geometry": ["point", "area"], "tags": {"shop": "herbalist"}, "name": "Herbalist"},
  "shop/hifi": {"icon": "temaki-speaker", "geometry": ["point", "area"], "terms": ["audio", "hi-fi", "high fidelity", "stereo", "video"], "tags": {"shop": "hifi"}, "name": "Hifi Store"},
  "shop/hobby": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "hobby"}, "terms": ["manga", "figurine", "model"], "name": "Hobby Shop"},
-  "shop/household_linen": {"icon": "tnp-4306", "geometry": ["point", "area"], "tags": {"shop": "household_linen"}, "terms": ["bedspreads", "blankets", "domestic cloths", "curtains", "handkerchieves", "napkins", "pillow cases", "robes", "sheets", "towels"], "name": "Household Linen Shop"},
+  "shop/household_linen": {"icon": "temaki-cloth", "geometry": ["point", "area"], "tags": {"shop": "household_linen"}, "terms": ["bedspreads", "blankets", "domestic cloths", "curtains", "handkerchieves", "napkins", "pillow cases", "robes", "sheets", "towels"], "name": "Household Linen Shop"},
  "shop/houseware": {"icon": "fas-blender", "geometry": ["point", "area"], "terms": ["home", "household", "kitchenware"], "tags": {"shop": "houseware"}, "name": "Houseware Store"},
  "shop/hunting": {"icon": "temaki-binoculars", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"},
  "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"},
@@ -1159,7 +1178,7 @@
  "shop/money_lender": {"icon": "temaki-money_hand", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
  "shop/motorcycle_repair": {"icon": "temaki-motorcycle_repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"},
  "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "brand", "{shop}"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"},
-  "shop/music": {"icon": "fas-compact-disc", "geometry": ["point", "area"], "terms": ["tape casettes", "CDs", "compact discs", "vinyl records"], "tags": {"shop": "music"}, "name": "Music Store"},
+  "shop/music": {"icon": "fas-compact-disc", "geometry": ["point", "area"], "terms": ["tape cassettes", "CDs", "compact discs", "vinyl records", "CD store", "casette", "casette store"], "tags": {"shop": "music"}, "name": "Music Store"},
  "shop/musical_instrument": {"icon": "fas-guitar", "geometry": ["point", "area"], "terms": ["guitar"], "tags": {"shop": "musical_instrument"}, "name": "Musical Instrument Store"},
  "shop/newsagent": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"shop": "newsagent"}, "name": "Newspaper/Magazine Shop"},
  "shop/nutrition_supplements": {"icon": "fas-pills", "geometry": ["point", "area"], "terms": ["health", "supplement", "vitamin"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
@@ -1181,7 +1200,7 @@
  "shop/radiotechnics": {"icon": "fas-microchip", "geometry": ["point", "area"], "tags": {"shop": "radiotechnics"}, "terms": ["antenna", "transistor"], "name": "Radio/Electronic Component Store"},
  "shop/religion": {"icon": "maki-shop", "fields": ["{shop}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"shop": "religion"}, "name": "Religious Store"},
  "shop/rental": {"icon": "fas-dolly", "geometry": ["point", "area"], "tags": {"shop": "rental"}, "name": "Rental Shop"},
-  "shop/scuba_diving": {"icon": "temaki-scuba_diving", "fields": ["{shop}", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
+  "shop/scuba_diving": {"icon": "temaki-scuba_diving", "fields": ["{shop}", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba", "snorkel"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
  "shop/seafood": {"icon": "temaki-fish_cleaning", "geometry": ["point", "area"], "terms": ["fishmonger"], "tags": {"shop": "seafood"}, "name": "Seafood Shop"},
  "shop/second_hand": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["secondhand", "second hand", "resale", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
  "shop/sewing": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},
@@ -1191,7 +1210,7 @@
  "shop/sports": {"icon": "fas-futbol", "fields": ["name", "operator", "sport", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "sports"}, "terms": ["athletics"], "name": "Sporting Goods Store"},
  "shop/stationery": {"icon": "fas-paperclip", "geometry": ["point", "area"], "terms": ["card", "paper"], "tags": {"shop": "stationery"}, "name": "Stationery Store"},
  "shop/storage_rental": {"icon": "temaki-storage_rental", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["device storage", "garages", "self storage", "self-service storage", "storage lockers", "storage rental", "storage units"], "name": "Storage Rental"},
-  "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi", "organic"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
+  "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi", "organic"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop", "grocery store", "market", "food market"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
  "shop/supermarket/organic": {"icon": "maki-grocery", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "reference": {"key": "organic"}, "terms": ["natural foods"], "name": "Organic Supermarket"},
  "shop/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["hot tub equipment store", "hot tub maintenance store", "hot tub supply store", "pool shop", "pool store", "swimming pool equipment store", "swimming pool installation store", "swimming pool maintenance store", "swimming pool supply shop"], "tags": {"shop": "swimming_pool"}, "name": "Pool Supply Store"},
  "shop/tailor": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"},
@@ -1210,12 +1229,13 @@
  "shop/vacuum_cleaner": {"icon": "temaki-vacuum", "geometry": ["point", "area"], "tags": {"shop": "vacuum_cleaner"}, "name": "Vacuum Cleaner Store"},
  "shop/variety_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "variety_store"}, "name": "Variety Store"},
  "shop/video_games": {"icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games"}, "name": "Video Game Store"},
-  "shop/video": {"icon": "temaki-movie_rental", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"},
+  "shop/video": {"icon": "temaki-movie_rental", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video cassette", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"},
  "shop/watches": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"},
  "shop/water_sports": {"icon": "fas-swimmer", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
-  "shop/water": {"icon": "tnp-2009234", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
+  "shop/water": {"icon": "temaki-water_bottle", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
  "shop/weapons": {"icon": "temaki-dagger", "geometry": ["point", "area"], "terms": ["ammo", "gun", "knife", "knives"], "tags": {"shop": "weapons"}, "name": "Weapon Shop"},
  "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"},
+  "shop/wigs": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["hair extensions", "hair extentions"], "tags": {"shop": "wigs"}, "name": "Wig Shop"},
  "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"},
  "shop/wine": {"icon": "maki-alcohol-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
  "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
@@ -1224,9 +1244,9 @@
  "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "level", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "terms": ["bnb", "holiday rental", "lodging", "overnight accommodations", "vacation rental"], "name": "Guest Apartment / Condo"},
  "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
  "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["level", "material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
-  "tourism/artwork/bust": {"icon": "fas-user-alt", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex"], "tags": {"tourism": "artwork", "artwork_type": "bust"}, "reference": {"key": "artwork_type"}, "terms": ["figure"], "name": "Bust"},
-  "tourism/artwork/graffiti": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "graffiti"}, "reference": {"key": "artwork_type"}, "terms": ["Street Artwork", "Guerilla Artwork", "Graffiti Artwork"], "name": "Graffiti"},
-  "tourism/artwork/installation": {"icon": "temaki-sculpture", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "installation"}, "reference": {"key": "artwork_type"}, "terms": ["interactive art", "intervention art", "modern art"], "name": "Art Installation"},
+  "tourism/artwork/bust": {"icon": "fas-user-alt", "fields": ["name", "artist", "material", "inscription"], "geometry": ["point", "vertex"], "tags": {"tourism": "artwork", "artwork_type": "bust"}, "reference": {"key": "artwork_type", "value": "bust"}, "terms": ["figure"], "name": "Bust"},
+  "tourism/artwork/graffiti": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "graffiti"}, "reference": {"key": "artwork_type", "value": "graffiti"}, "terms": ["Street Artwork", "Guerrilla Artwork", "Guerilla Artwork", "Graffiti Artwork"], "name": "Graffiti"},
+  "tourism/artwork/installation": {"icon": "temaki-sculpture", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "installation"}, "reference": {"key": "artwork_type", "value": "installation"}, "terms": ["interactive art", "intervention art", "modern art"], "name": "Art Installation"},
  "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"},
  "tourism/artwork/sculpture": {"icon": "temaki-sculpture", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"},
  "tourism/artwork/statue": {"icon": "temaki-statue", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
@@ -1243,9 +1263,10 @@
  "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "terms": ["concierge", "lodge", "lodging", "overnight accommodations"], "name": "Hotel"},
  "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "moreFields": ["level"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"},
  "tourism/information/board": {"icon": "temaki-info_board", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"},
+  "tourism/information/board/welcome_sign": {"icon": "maki-embassy", "geometry": ["point"], "terms": ["new location"], "tags": {"tourism": "information", "information": "board", "board_type": "welcome_sign"}, "name": "Welcome Sign"},
  "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "ele_node", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"},
  "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
-  "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
+  "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "terms": ["information office", "tour guide", "tourism office", "tourist information center", "visitors center", "visitors information center", "welcome center"], "name": "Visitor Center"},
  "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "ele_node"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"},
  "tourism/information/terminal": {"icon": "temaki-app_terminal", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"},
  "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "terms": ["lodging", "motor hotel", "overnight accommodations"], "name": "Motel"},
@@ -1254,7 +1275,7 @@
  "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
  "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "website"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
  "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "opening_hours/covid19", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
-  "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
+  "tourism/viewpoint": {"icon": "temaki-spotting_scope", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
  "tourism/wilderness_hut": {"icon": "temaki-cabin", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["alpine hut", "cabin", "backcountry hut", "bothy", "lodge", "lodging", "overnight accommodations", "sleeping shelter", "wilderness hut"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
  "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
  "tourism/zoo/petting": {"icon": "fas-horse", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "petting_zoo"}, "reference": {"key": "zoo", "value": "petting_zoo"}, "terms": ["Children's Zoo", "Children's Farm", "Petting Farm", "farm animals"], "name": "Petting Zoo"},
@@ -1270,12 +1291,9 @@
  "traffic_calming/island": {"icon": "temaki-diamond", "fields": ["surface"], "geometry": ["vertex", "line", "area"], "terms": ["circle", "roundabout", "slow"], "tags": {"traffic_calming": "island"}, "name": "Traffic Island"},
  "traffic_calming/rumble_strip": {"icon": "temaki-rumble_strip", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["audible lines", "sleeper lines", "growlers"], "tags": {"traffic_calming": "rumble_strip"}, "name": "Rumble Strip"},
  "traffic_calming/table": {"icon": "temaki-speed_table", "fields": ["surface", "direction_vertex"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Speed Table"},
-  "traffic_sign_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction"], "geometry": ["vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
-  "traffic_sign": {"icon": "fas-directions", "fields": ["traffic_sign", "direction"], "geometry": ["point"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
-  "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
-  "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "name"], "geometry": ["point"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
-  "traffic_sign/maxspeed_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "maxspeed"], "geometry": ["vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
-  "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "maxspeed"], "geometry": ["point"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
+  "traffic_sign": {"icon": "fas-directions", "fields": ["traffic_sign", "traffic_sign/direction", "direction_point"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
+  "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["{traffic_sign}", "name"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
+  "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["{traffic_sign}", "maxspeed"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
  "type/multipolygon": {"icon": "iD-multipolygon", "geometry": ["area", "relation"], "tags": {"type": "multipolygon"}, "removeTags": {}, "name": "Multipolygon", "searchable": false, "matchScore": 0.1},
  "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"},
  "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "moreFields": ["gnis/feature_id"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"},
@@ -1285,33 +1303,33 @@
  "type/enforcement/maxspeed": {"icon": "iD-relation", "fields": ["maxspeed"], "geometry": ["relation"], "tags": {"type": "enforcement", "enforcement": "maxspeed"}, "reference": {"key": "enforcement", "value": "maxspeed"}, "terms": ["maxspeed", "radar", "speed camera"], "name": "Speed Limit Enforcement"},
  "type/public_transport/stop_area_group": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area_group"}, "reference": {"key": "public_transport", "value": "stop_area_group"}, "name": "Transit Stop Area Group"},
  "type/restriction": {"icon": "iD-restriction", "fields": ["restriction", "except"], "geometry": ["relation"], "tags": {"type": "restriction"}, "name": "Restriction"},
-  "type/restriction/no_left_turn": {"icon": "iD-restriction-no-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_left_turn"}, "name": "No Left Turn"},
-  "type/restriction/no_right_turn": {"icon": "iD-restriction-no-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_right_turn"}, "name": "No Right Turn"},
-  "type/restriction/no_straight_on": {"icon": "iD-restriction-no-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_straight_on"}, "name": "No Straight On"},
-  "type/restriction/no_u_turn": {"icon": "iD-restriction-no-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_u_turn"}, "name": "No U-turn"},
-  "type/restriction/only_left_turn": {"icon": "iD-restriction-only-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_left_turn"}, "name": "Only Left Turn"},
-  "type/restriction/only_right_turn": {"icon": "iD-restriction-only-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_right_turn"}, "name": "Only Right Turn"},
-  "type/restriction/only_straight_on": {"icon": "iD-restriction-only-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_straight_on"}, "name": "Only Straight On"},
-  "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_u_turn"}, "name": "Only U-turn"},
+  "type/restriction/no_left_turn": {"icon": "iD-restriction-no-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_left_turn"}, "reference": {"key": "restriction", "value": "no_left_turn"}, "name": "No Left Turn"},
+  "type/restriction/no_right_turn": {"icon": "iD-restriction-no-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_right_turn"}, "reference": {"key": "restriction", "value": "no_right_turn"}, "name": "No Right Turn"},
+  "type/restriction/no_straight_on": {"icon": "iD-restriction-no-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_straight_on"}, "reference": {"key": "restriction", "value": "no_straight_on"}, "name": "No Straight On"},
+  "type/restriction/no_u_turn": {"icon": "iD-restriction-no-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_u_turn"}, "reference": {"key": "restriction", "value": "no_u_turn"}, "name": "No U-turn"},
+  "type/restriction/only_left_turn": {"icon": "iD-restriction-only-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_left_turn"}, "reference": {"key": "restriction", "value": "only_left_turn"}, "name": "Only Left Turn"},
+  "type/restriction/only_right_turn": {"icon": "iD-restriction-only-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_right_turn"}, "reference": {"key": "restriction", "value": "only_right_turn"}, "name": "Only Right Turn"},
+  "type/restriction/only_straight_on": {"icon": "iD-restriction-only-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_straight_on"}, "reference": {"key": "restriction", "value": "only_straight_on"}, "name": "Only Straight On"},
+  "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_u_turn"}, "reference": {"key": "restriction", "value": "only_u_turn"}, "name": "Only U-turn"},
  "type/route_master": {"icon": "iD-route-master", "fields": ["name", "route_master", "ref", "operator", "network"], "moreFields": ["colour", "interval", "opening_hours", "opening_hours/covid19", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route_master"}, "name": "Route Master"},
  "type/route": {"icon": "iD-route", "fields": ["name", "route", "ref_route", "operator", "network", "network/type"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"},
-  "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"},
-  "type/route/bus": {"icon": "temaki-bus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"},
-  "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "from", "to"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"},
-  "type/route/ferry": {"icon": "temaki-ferry", "fields": ["{route/ferry}"], "moreFields": ["{route/ferry}"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
-  "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["{type/route/hiking}"], "moreFields": ["{type/route/hiking}"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"},
-  "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"},
-  "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},
-  "type/route/light_rail": {"icon": "temaki-light_rail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"},
-  "type/route/monorail": {"icon": "temaki-monorail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "monorail"}, "name": "Monorail Route"},
-  "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["{type/route/power}"], "moreFields": ["{type/route/power}"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"},
-  "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "ref_route", "operator", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
-  "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "from", "to"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
-  "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "from", "to"], "moreFields": ["colour", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
-  "type/route/subway": {"icon": "temaki-subway", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
-  "type/route/train": {"icon": "temaki-train", "fields": ["name", "ref_route", "operator", "network", "from", "to"], "moreFields": ["colour", "distance", "duration", "interval", "opening_hours", "opening_hours/covid19", "roundtrip", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
-  "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
-  "type/route/trolleybus": {"icon": "temaki-trolleybus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "trolleybus"}, "name": "Trolleybus Route"},
+  "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "reference": {"key": "route", "value": "bicycle"}, "name": "Cycle Route"},
+  "type/route/bus": {"icon": "temaki-bus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "reference": {"key": "route", "value": "bus"}, "name": "Bus Route"},
+  "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "from", "to"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "reference": {"key": "route", "value": "detour"}, "name": "Detour Route"},
+  "type/route/ferry": {"icon": "temaki-ferry", "fields": ["{route/ferry}"], "moreFields": ["{route/ferry}"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "reference": {"key": "route", "value": "ferry"}, "name": "Ferry Route"},
+  "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["{type/route/hiking}"], "moreFields": ["{type/route/hiking}"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "reference": {"key": "route", "value": "foot"}, "name": "Walking Route"},
+  "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "reference": {"key": "route", "value": "hiking"}, "name": "Hiking Route"},
+  "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "reference": {"key": "route", "value": "horse"}, "name": "Riding Route"},
+  "type/route/light_rail": {"icon": "temaki-light_rail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "reference": {"key": "route", "value": "light_rail"}, "name": "Light Rail Route"},
+  "type/route/monorail": {"icon": "temaki-monorail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "monorail"}, "reference": {"key": "route", "value": "monorail"}, "name": "Monorail Route"},
+  "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["{type/route/power}"], "moreFields": ["{type/route/power}"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "reference": {"key": "route", "value": "pipeline"}, "name": "Pipeline Route"},
+  "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "ref_route", "operator", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "reference": {"key": "route", "value": "piste"}, "name": "Piste/Ski Route"},
+  "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "from", "to"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "reference": {"key": "route", "value": "power"}, "name": "Power Route"},
+  "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "from", "to"], "moreFields": ["colour", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "reference": {"key": "route", "value": "road"}, "name": "Road Route"},
+  "type/route/subway": {"icon": "temaki-subway", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "reference": {"key": "route", "value": "subway"}, "name": "Subway Route"},
+  "type/route/train": {"icon": "temaki-train", "fields": ["name", "ref_route", "operator", "network", "from", "to"], "moreFields": ["colour", "distance", "duration", "interval", "opening_hours", "opening_hours/covid19", "roundtrip", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "reference": {"key": "route", "value": "train"}, "name": "Train Route"},
+  "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "reference": {"key": "route", "value": "tram"}, "name": "Tram Route"},
+  "type/route/trolleybus": {"icon": "temaki-trolleybus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "trolleybus"}, "reference": {"key": "route", "value": "trolleybus"}, "name": "Trolleybus Route"},
  "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
  "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "destination_waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
  "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
@@ -2332,7 +2350,7 @@
  "amenity/fast_food/sandwich/Blimpie": {"name": "Blimpie", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/Blimpie/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4926479", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Blimpie", "brand:wikidata": "Q4926479", "brand:wikipedia": "en:Blimpie", "cuisine": "sandwich", "name": "Blimpie", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Bob's": {"name": "Bob's", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/bobsbrasil/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1392113", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Bob's", "brand:wikidata": "Q1392113", "brand:wikipedia": "en:Bob's", "cuisine": "burger", "name": "Bob's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ao", "br", "cl", "pt"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/chicken/Bojangles'": {"name": "Bojangles'", "icon": "fas-drumstick-bite", "imageURL": "https://graph.facebook.com/Bojangles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q891163", "amenity": "fast_food", "cuisine": "chicken"}, "addTags": {"amenity": "fast_food", "brand": "Bojangles'", "brand:wikidata": "Q891163", "brand:wikipedia": "en:Bojangles' Famous Chicken 'n Biscuits", "cuisine": "chicken", "name": "Bojangles'", "official_name": "Bojangles' Famous Chicken 'n Biscuits", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "chicken"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Booster Juice": {"name": "Booster Juice", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/boosterjuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4943796", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Booster Juice", "brand:wikidata": "Q4943796", "brand:wikipedia": "en:Booster Juice", "cuisine": "juice", "name": "Booster Juice", "takeaway": "yes"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Booster Juice": {"name": "Booster Juice", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/boosterjuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4943796", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Booster Juice", "brand:wikidata": "Q4943796", "brand:wikipedia": "en:Booster Juice", "cuisine": "juice", "name": "Booster Juice", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/chicken/Boston Market": {"name": "Boston Market", "icon": "fas-drumstick-bite", "imageURL": "https://graph.facebook.com/BostonMarket/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q603617", "amenity": "fast_food", "cuisine": "american;chicken"}, "addTags": {"amenity": "fast_food", "brand": "Boston Market", "brand:wikidata": "Q603617", "brand:wikipedia": "en:Boston Market", "cuisine": "american;chicken", "name": "Boston Market", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "chicken"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/ice_cream/Braum's": {"name": "Braum's", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/BraumsIceCreamandDairyStores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4958263", "amenity": "fast_food", "cuisine": "ice_cream"}, "addTags": {"amenity": "fast_food", "brand": "Braum's", "brand:wikidata": "Q4958263", "brand:wikipedia": "en:Braum's", "cuisine": "ice_cream", "name": "Braum's", "shop": "dairy", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/Bruegger's Bagels": {"name": "Bruegger's Bagels", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Brueggers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4978656", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Bruegger's Bagels", "brand:wikidata": "Q4978656", "brand:wikipedia": "en:Bruegger's", "cuisine": "bagel", "name": "Bruegger's Bagels", "short_name": "Bruegger's", "takeaway": "yes"}, "countryCodes": ["us"], "terms": ["breuger's", "breugger's", "bruger's", "brugger's"], "matchScore": 2, "suggestion": true},
@@ -2390,7 +2408,7 @@
  "amenity/fast_food/ice_cream/Freddy's": {"name": "Freddy's", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/FreddysUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5496837", "amenity": "fast_food", "cuisine": "ice_cream;burger"}, "addTags": {"amenity": "fast_food", "brand": "Freddy's", "brand:wikidata": "Q5496837", "brand:wikipedia": "en:Freddy's Frozen Custard & Steakburgers", "cuisine": "ice_cream;burger", "name": "Freddy's", "official_name": "Freddys Frozen Custard & Steakburgers", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/mexican/Freebirds": {"name": "Freebirds", "icon": "fas-pepper-hot", "imageURL": "https://graph.facebook.com/freebirdsworldburrito/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5500367", "amenity": "fast_food", "cuisine": "mexican"}, "addTags": {"amenity": "fast_food", "brand": "Freebirds", "brand:wikidata": "Q5500367", "brand:wikipedia": "en:Freebirds World Burrito", "cuisine": "mexican", "name": "Freebirds", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "mexican"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Freshslice Pizza": {"name": "Freshslice Pizza", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/Freshslice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5503082", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Freshslice Pizza", "brand:wikidata": "Q5503082", "brand:wikipedia": "en:Freshslice Pizza", "cuisine": "pizza", "name": "Freshslice Pizza", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Freshëns": {"name": "Freshëns", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Freshens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q88353412", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Freshëns", "brand:wikidata": "Q88353412", "cuisine": "juice;salad", "name": "Freshëns", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Freshëns": {"name": "Freshëns", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/Freshens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q88353412", "amenity": "fast_food", "cuisine": "juice;salad"}, "addTags": {"amenity": "fast_food", "brand": "Freshëns", "brand:wikidata": "Q88353412", "cuisine": "juice;salad", "name": "Freshëns", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Gabriel Pizza": {"name": "Gabriel Pizza", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/gabrielpizza/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5515791", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Gabriel Pizza", "brand:wikidata": "Q5515791", "brand:wikipedia": "en:Gabriel Pizza", "cuisine": "pizza", "name": "Gabriel Pizza", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Gino's Pizza (Canada)": {"name": "Gino's Pizza (Canada)", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/GinosPizzaGroup/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q84029134", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Gino's Pizza", "brand:wikidata": "Q84029134", "cuisine": "pizza", "name": "Gino's Pizza", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Gino's Pizza (West Virginia)": {"name": "Gino's Pizza (West Virginia)", "icon": "maki-restaurant-pizza", "imageURL": "https://pbs.twimg.com/profile_images/1240550288/TwitterProfile_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5563205", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Gino's Pizza", "brand:wikidata": "Q5563205", "brand:wikipedia": "en:Gino's Pizza and Spaghetti", "cuisine": "pizza", "name": "Gino's Pizza", "official_name": "Gino's Pizza & Spaghetti House", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2421,7 +2439,7 @@
  "amenity/fast_food/burger/In-N-Out Burger": {"name": "In-N-Out Burger", "icon": "maki-fast-food", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FInNOut.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1205312", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "In-N-Out Burger", "brand:wikidata": "Q1205312", "brand:wikipedia": "en:In-N-Out Burger", "cuisine": "burger", "name": "In-N-Out Burger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Jack in the Box": {"name": "Jack in the Box", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/jackinthebox/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1538507", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Jack in the Box", "brand:wikidata": "Q1538507", "brand:wikipedia": "en:Jack in the Box", "cuisine": "burger", "name": "Jack in the Box", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Jack's": {"name": "Jack's", "icon": "maki-fast-food", "imageURL": "https://pbs.twimg.com/profile_images/1194591890965966848/ajrBO2Z3_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6110826", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Jack's", "brand:wikidata": "Q6110826", "brand:wikipedia": "en:Jack's", "cuisine": "burger", "name": "Jack's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Jamba Juice": {"name": "Jamba Juice", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/jambajuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3088784", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Jamba Juice", "brand:wikidata": "Q3088784", "brand:wikipedia": "en:Jamba Juice", "cuisine": "juice", "name": "Jamba Juice", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Jamba Juice": {"name": "Jamba Juice", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/jambajuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3088784", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Jamba Juice", "brand:wikidata": "Q3088784", "brand:wikipedia": "en:Jamba Juice", "cuisine": "juice", "name": "Jamba Juice", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Jersey Mike's Subs": {"name": "Jersey Mike's Subs", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/jerseymikes/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6184897", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Jersey Mike's Subs", "brand:wikidata": "Q6184897", "brand:wikipedia": "en:Jersey Mike's Subs", "cuisine": "sandwich", "name": "Jersey Mike's Subs", "short_name": "Jersey Mike's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Jimmy John's": {"name": "Jimmy John's", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/jimmyjohns/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1689380", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Jimmy John's", "brand:wikidata": "Q1689380", "brand:wikipedia": "en:Jimmy John's", "cuisine": "sandwich", "name": "Jimmy John's", "official_name": "Jimmy John's Gourmet Sandwiches", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/Jimmy the Greek": {"name": "Jimmy the Greek", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/gimmejimmy.jtg/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17077817", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Jimmy the Greek", "brand:wikidata": "Q17077817", "brand:wikipedia": "en:Jimmy the Greek (restaurant)", "cuisine": "greek", "name": "Jimmy the Greek", "takeaway": "yes"}, "countryCodes": ["ae", "ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2469,7 +2487,7 @@
  "amenity/fast_food/sandwich/Num Pang": {"name": "Num Pang", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/NumPangKitchen/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62079702", "amenity": "fast_food", "cuisine": "cambodian;sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Num Pang", "brand:wikidata": "Q62079702", "brand:wikipedia": "en:Num Pang", "cuisine": "cambodian;sandwich", "name": "Num Pang", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/mexican/O'Tacos": {"name": "O'Tacos", "icon": "fas-pepper-hot", "imageURL": "https://graph.facebook.com/Otacos.France/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q28494040", "amenity": "fast_food", "cuisine": "mexican"}, "addTags": {"amenity": "fast_food", "brand": "O'Tacos", "brand:wikidata": "Q28494040", "brand:wikipedia": "en:O'Tacos", "cuisine": "mexican", "name": "O'Tacos", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "mexican"}, "countryCodes": ["be", "fr"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Oporto": {"name": "Oporto", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Oportos/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4412342", "amenity": "fast_food", "cuisine": "burger;chicken"}, "addTags": {"amenity": "fast_food", "brand": "Oporto", "brand:wikidata": "Q4412342", "brand:wikipedia": "en:Oporto (restaurant)", "cuisine": "burger;chicken", "name": "Oporto", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["au"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Orange Julius": {"name": "Orange Julius", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/OrangeJulius/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3355059", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Orange Julius", "brand:wikidata": "Q3355059", "brand:wikipedia": "en:Orange Julius", "cuisine": "juice", "name": "Orange Julius", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Orange Julius": {"name": "Orange Julius", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/OrangeJulius/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3355059", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Orange Julius", "brand:wikidata": "Q3355059", "brand:wikipedia": "en:Orange Julius", "cuisine": "juice", "name": "Orange Julius", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/P. Terry's": {"name": "P. Terry's", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/pterrys/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q19903521", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "P. Terry's", "brand:wikidata": "Q19903521", "brand:wikipedia": "en:P. Terry's", "cuisine": "burger", "name": "P. Terry's", "official_name": "P. Terry's Burger Stand", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Pal's": {"name": "Pal's", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Palsweb/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7126094", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Pal's", "brand:wikidata": "Q7126094", "brand:wikipedia": "en:Pal's", "cuisine": "burger", "name": "Pal's", "official_name": "Pal's Sudden Service", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Panago": {"name": "Panago", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/panago/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17111672", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Panago", "brand:wikidata": "Q17111672", "brand:wikipedia": "en:Panago", "cuisine": "pizza", "name": "Panago", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2521,7 +2539,7 @@
  "amenity/fast_food/burger/Shake Shack": {"name": "Shake Shack", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/shakeshack/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1058722", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Shake Shack", "brand:wikidata": "Q1058722", "brand:wikipedia": "en:Shake Shack", "cuisine": "burger", "name": "Shake Shack", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["gb", "us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Sibylla": {"name": "Sibylla", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/sibyllasverige/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q488643", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Sibylla", "brand:wikidata": "Q488643", "brand:wikipedia": "en:Sibylla (fast food)", "cuisine": "burger", "name": "Sibylla", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["fi", "se"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Smashburger": {"name": "Smashburger", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/smashburger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17061332", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Smashburger", "brand:wikidata": "Q17061332", "brand:wikipedia": "en:Smashburger", "cuisine": "burger", "name": "Smashburger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Smoothie King": {"name": "Smoothie King", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/SmoothieKing/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5491421", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Smoothie King", "brand:wikidata": "Q5491421", "brand:wikipedia": "en:Smoothie King", "cuisine": "juice", "name": "Smoothie King", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Smoothie King": {"name": "Smoothie King", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/SmoothieKing/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5491421", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Smoothie King", "brand:wikidata": "Q5491421", "brand:wikipedia": "en:Smoothie King", "cuisine": "juice", "name": "Smoothie King", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Sonic": {"name": "Sonic", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/sonicdrivein/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7561808", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Sonic", "brand:wikidata": "Q7561808", "brand:wikipedia": "en:Sonic Drive-In", "cuisine": "burger", "drive_in": "yes", "name": "Sonic", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "terms": ["sonic drive in"], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Specialty's": {"name": "Specialty's", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/specialtys/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64339210", "amenity": "fast_food", "cuisine": "sandwich;bakery"}, "addTags": {"amenity": "fast_food", "brand": "Specialty's", "brand:wikidata": "Q64339210", "cuisine": "sandwich;bakery", "name": "Specialty's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/chicken/St-Hubert Express": {"name": "St-Hubert Express", "icon": "fas-drumstick-bite", "imageURL": "https://graph.facebook.com/sthubert/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3495225", "amenity": "fast_food", "cuisine": "chicken;barbecue"}, "addTags": {"amenity": "fast_food", "brand": "St-Hubert", "brand:wikidata": "Q3495225", "brand:wikipedia": "fr:St-Hubert (restaurant)", "cuisine": "chicken;barbecue", "name": "St-Hubert Express", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "chicken"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2548,7 +2566,7 @@
  "amenity/fast_food/burger/The Habit Burger Grill": {"name": "The Habit Burger Grill", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/habitburger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q18158741", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"alt_name": "Habit Burger Grill", "amenity": "fast_food", "brand": "The Habit Burger Grill", "brand:wikidata": "Q18158741", "brand:wikipedia": "en:The Habit Burger Grill", "cuisine": "burger", "name": "The Habit Burger Grill", "short_name": "Habit Burger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": ["the habit burger"], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/The Pizza Company": {"name": "The Pizza Company", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/thepizzacompany/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2413520", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"alt_name": "Pizza Company", "amenity": "fast_food", "brand": "The Pizza Company", "brand:wikidata": "Q2413520", "brand:wikipedia": "en:The Pizza Company", "cuisine": "pizza", "name": "The Pizza Company", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ae", "bh", "cn", "jo", "kh", "la", "mm", "my", "sa", "th", "vn"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Togo's": {"name": "Togo's", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/togossandwiches/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3530375", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Togo's", "brand:wikidata": "Q3530375", "brand:wikipedia": "en:Togo's", "cuisine": "sandwich", "name": "Togo's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Tropical Smoothie Cafe": {"name": "Tropical Smoothie Cafe", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/tropicalsmoothiecafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7845817", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Tropical Smoothie Cafe", "brand:wikidata": "Q7845817", "brand:wikipedia": "en:Tropical Smoothie Cafe", "cuisine": "juice", "name": "Tropical Smoothie Cafe", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Tropical Smoothie Cafe": {"name": "Tropical Smoothie Cafe", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/tropicalsmoothiecafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7845817", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Tropical Smoothie Cafe", "brand:wikidata": "Q7845817", "brand:wikipedia": "en:Tropical Smoothie Cafe", "cuisine": "juice", "name": "Tropical Smoothie Cafe", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/Tudor's Biscuit World": {"name": "Tudor's Biscuit World", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/tudorsbiscuitworld/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7851262", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Tudor's Biscuit World", "brand:wikidata": "Q7851262", "brand:wikipedia": "en:Tudor's Biscuit World", "cuisine": "american", "name": "Tudor's Biscuit World", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Upper Crust": {"name": "Upper Crust", "icon": "temaki-sandwich", "imageURL": "https://pbs.twimg.com/profile_images/1156194120324591619/0Wy7xKDd_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7898585", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Upper Crust", "brand:wikidata": "Q7898585", "brand:wikipedia": "en:Upper Crust (restaurant chain)", "cuisine": "sandwich", "name": "Upper Crust", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["de", "dk", "eg", "es", "fi", "gb", "ie", "no", "se"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Valentine": {"name": "Valentine", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/valentineqc/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3553635", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Valentine", "brand:wikidata": "Q3553635", "brand:wikipedia": "fr:Valentine (restaurant)", "cuisine": "burger", "name": "Valentine", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -5260,8 +5278,8 @@
  "shop/hobby/ジャンプショップ": {"name": "ジャンプショップ", "icon": "fas-dragon", "imageURL": "https://graph.facebook.com/jumpshoptokyo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11310200", "shop": "hobby"}, "addTags": {"brand": "ジャンプショップ", "brand:en": "Jump Shop", "brand:ja": "ジャンプショップ", "brand:wikidata": "Q11310200", "brand:wikipedia": "ja:ジャンプショップ", "name": "ジャンプショップ", "name:en": "Jump Shop", "name:ja": "ジャンプショップ", "shop": "hobby"}, "countryCodes": ["jp"], "terms": ["ジャンプ"], "matchScore": 2, "suggestion": true},
  "shop/hobby/ポケモンセンター": {"name": "ポケモンセンター", "icon": "fas-dragon", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FPokemon%20centre.jpg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q89673816", "shop": "hobby"}, "addTags": {"brand": "ポケモンセンター", "brand:en": "Pokémon Center", "brand:ja": "ポケモンセンター", "brand:wikidata": "Q89673816", "name": "ポケモンセンター", "name:en": "Pokémon Center", "name:ja": "ポケモンセンター", "shop": "hobby"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
  "shop/hobby/駿河屋": {"name": "駿河屋", "icon": "fas-dragon", "imageURL": "https://graph.facebook.com/SurugayaJP/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q88485610", "shop": "hobby"}, "addTags": {"brand": "駿河屋", "brand:en": "Surugaya", "brand:ja": "駿河屋", "brand:wikidata": "Q88485610", "name": "駿河屋", "name:en": "Surugaya", "name:ja": "駿河屋", "shop": "hobby"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-  "shop/household_linen/Carré Blanc": {"name": "Carré Blanc", "icon": "tnp-4306", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q55596025", "shop": "household_linen"}, "addTags": {"brand": "Carré Blanc", "brand:wikidata": "Q55596025", "brand:wikipedia": "fr:Carré blanc (entreprise)", "name": "Carré Blanc", "shop": "household_linen"}, "terms": [], "matchScore": 2, "suggestion": true},
-  "shop/household_linen/Descamps": {"name": "Descamps", "icon": "tnp-4306", "imageURL": "https://graph.facebook.com/Descamps/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q91002058", "shop": "household_linen"}, "addTags": {"brand": "Descamps", "brand:wikidata": "Q91002058", "name": "Descamps", "shop": "household_linen"}, "terms": [], "matchScore": 2, "suggestion": true},
+  "shop/household_linen/Carré Blanc": {"name": "Carré Blanc", "icon": "temaki-cloth", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q55596025", "shop": "household_linen"}, "addTags": {"brand": "Carré Blanc", "brand:wikidata": "Q55596025", "brand:wikipedia": "fr:Carré blanc (entreprise)", "name": "Carré Blanc", "shop": "household_linen"}, "terms": [], "matchScore": 2, "suggestion": true},
+  "shop/household_linen/Descamps": {"name": "Descamps", "icon": "temaki-cloth", "imageURL": "https://graph.facebook.com/Descamps/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q91002058", "shop": "household_linen"}, "addTags": {"brand": "Descamps", "brand:wikidata": "Q91002058", "name": "Descamps", "shop": "household_linen"}, "terms": [], "matchScore": 2, "suggestion": true},
  "shop/houseware/At Home": {"name": "At Home", "icon": "fas-blender", "imageURL": "https://graph.facebook.com/AtHomeStores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5522290", "shop": "houseware"}, "addTags": {"brand": "At Home", "brand:wikidata": "Q5522290", "brand:wikipedia": "en:At Home (store)", "name": "At Home", "shop": "houseware"}, "countryCodes": ["us"], "terms": ["garden ridge"], "matchScore": 2, "suggestion": true},
  "shop/houseware/Bed Bath & Beyond": {"name": "Bed Bath & Beyond", "icon": "fas-blender", "imageURL": "https://graph.facebook.com/BedBathAndBeyond/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q813782", "shop": "houseware"}, "addTags": {"brand": "Bed Bath & Beyond", "brand:wikidata": "Q813782", "brand:wikipedia": "en:Bed Bath & Beyond", "name": "Bed Bath & Beyond", "shop": "houseware"}, "countryCodes": ["ca", "mx", "nz", "us"], "terms": [], "matchScore": 2, "suggestion": true},
  "shop/houseware/Blokker": {"name": "Blokker", "icon": "fas-blender", "imageURL": "https://graph.facebook.com/BlokkerNL/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q884934", "shop": "houseware"}, "addTags": {"brand": "Blokker", "brand:wikidata": "Q884934", "brand:wikipedia": "en:Blokker Holding", "name": "Blokker", "shop": "houseware"}, "countryCodes": ["be", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -0,0 +1,18 @@
+{
+    "icon": "temaki-cable",
+    "fields": [
+        "telecom",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "telecom": "*"
+    },
+    "searchable": false,
+    "name": "Telecom Feature"
+}
@@ -4,7 +4,8 @@
        "ref_aeroway_gate"
    ],
    "geometry": [
-        "point"
+        "point",
+        "vertex"
    ],
    "tags": {
        "aeroway": "gate"
@@ -0,0 +1,39 @@
+{
+    "icon": "temaki-binoculars",
+    "fields": [
+        "operator",
+        "access_simple",
+        "fee",
+        "payment_multi_fee",
+        "charge_fee",
+        "direction",
+        "height",
+        "ele_node"
+    ],
+    "moreFields": [
+        "colour",
+        "covered",
+        "indoor",
+        "lit",
+        "manufacturer",
+        "ref"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "observation viewer",
+        "optical ranger",
+        "spotting scope",
+        "sight",
+        "spyglass",
+        "telescope",
+        "tower viewer",
+        "viewfinder",
+        "viewing stand"
+    ],
+    "tags": {
+        "amenity": "binoculars"
+    },
+    "name": "Mounted Binoculars"
+}
@@ -0,0 +1,22 @@
+{
+    "icon": "temaki-boat_rental",
+    "fields": [
+        "name",
+        "operator",
+        "access_simple",
+        "capacity"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "boat_storage"
+    },
+    "terms": [
+        "boathouse",
+        "dry dock",
+        "marina"
+    ],
+    "name": "Boat Storage"
+}
@@ -10,7 +10,9 @@
        "outdoor_seating",
        "internet_access",
        "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -26,12 +28,10 @@
        "min_age",
        "not/name",
        "payment_multi",
-        "phone",
        "ref/vatin",
        "reservation",
        "smoking",
        "takeaway",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -17,7 +17,10 @@
        "bubble milk tea",
        "pearl milk tea",
        "taiwanese tea drink",
-        "tapioca"
+        "tapioca",
+        "pearl tea",
+        "boba drink"
+        
    ],
    "name": "Bubble Tea Cafe"
 }
@@ -8,7 +8,9 @@
        "building_area",
        "opening_hours",
        "opening_hours/covid19",
-        "drive_through"
+        "drive_through",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -27,11 +29,9 @@
        "opening_hours/covid19",
        "outdoor_seating",
        "payment_multi",
-        "phone",
        "ref/vatin",
        "smoking",
        "takeaway",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -0,0 +1,25 @@
+{
+    "icon": "temaki-drink_cup",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "cafe",
+        "café",
+        "beverages",
+        "fruit drinks",
+        "juice bar",
+        "shakes",
+        "smoothies"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "juice"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "juice"
+    },
+    "name": "Juice Fast Food"
+}
@@ -8,7 +8,9 @@
        "building_area",
        "internet_access",
        "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -21,10 +23,8 @@
        "opening_hours/covid19",
        "outdoor_seating",
        "payment_multi",
-        "phone",
        "ref/vatin",
        "smoking",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -30,6 +30,7 @@
        "point"
    ],
    "terms": [
+        "kindergarten",
        "kindergarden",
        "pre-school"
    ],
@@ -1,5 +1,5 @@
 {
-    "icon": "tnp-4310",
+    "icon": "temaki-detergent_bottle",
    "fields": [
        "name",
        "operator",
@@ -0,0 +1,28 @@
+{
+    "icon": "temaki-bench",
+    "fields": [
+        "material",
+        "colour",
+        "access_simple",
+        "lit"
+    ],
+    "moreFields": [
+        "height",
+        "inscription",
+        "level",
+        "manufacturer",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "amenity": "lounger"
+    },
+    "terms": [
+        "seat",
+        "chair",
+        "bench"
+    ],
+    "name": "Lounger"
+}
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-cemetery",
+    "fields": [
+        "name",
+        "operator",
+        "address"
+    ],
+    "moreFields": [
+        "religion",
+        "denomination"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "crematorium",
+        "funeral home",
+        "memorial home",
+        "morgue",
+        "mortuary",
+        "undertaker"
+    ],
+    "tags": {
+        "amenity": "mortuary"
+    },
+    "name": "Morgue"
+}
@@ -1,6 +1,7 @@
 {
    "icon": "maki-entrance-alt1",
    "fields": [
+	"parking_entrance",
        "ref",
        "access_simple",
        "address",
@@ -0,0 +1,21 @@
+{
+    "name": "Irish Pub",
+    "icon": "maki-beer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "pub",
+        "theme": "irish"
+    },
+    "reference": {
+        "key": "theme",
+        "value": "irish"
+    },
+    "terms": [
+        "irish pub",
+        "irish bar"
+    ],
+    "notCountryCodes": ["ie"]
+}
@@ -1,5 +1,5 @@
 {
-    "icon": "tnp-2120771",
+    "icon": "temaki-tents",
    "fields": [
        "name",
        "operator",
@@ -3,6 +3,7 @@
    "fields": [
        "name",
        "cuisine",
+        "diet_multi",
        "address",
        "building_area",
        "opening_hours",
@@ -17,7 +18,6 @@
        "brewery",
        "capacity",
        "delivery",
-        "diet_multi",
        "email",
        "fax",
        "gnis/feature_id",
@@ -2,6 +2,7 @@
    "icon": "maki-shelter",
    "fields": [
        "name",
+        "operator",
        "shelter_type",
        "building_area",
        "bench",
@@ -2,7 +2,7 @@
    "icon": "temaki-picnic_shelter",
    "fields": [
        "name",
-        "shelter_type",
+        "operator",
        "building_area",
        "lit",
        "bin"
@@ -2,10 +2,11 @@
    "icon": "temaki-transit_shelter",
    "fields": [
        "name",
-        "shelter_type",
+        "operator",
        "building_area",
        "bench",
-        "lit"
+        "lit",
+        "bin"
    ],
    "geometry": [
        "point",
@@ -16,6 +16,7 @@
        "opening_hours/covid19",
        "operator",
        "payment_multi_fee",
+        "portable",
        "toilets/handwashing",
        "toilets/position"
    ],
@@ -1,5 +1,5 @@
 {
-    "icon": "tnp-2009541",
+    "icon": "temaki-latrine",
    "fields": [
        "toilets/disposal",
        "{amenity/toilets}",
@@ -0,0 +1,29 @@
+{
+    "icon": "temaki-latrine",
+    "fields": [
+        "toilets/disposal",
+        "{amenity/toilets}",
+        "toilets/handwashing"
+    ],
+    "moreFields": [
+        "{amenity/toilets}"
+    ],
+    "geometry": [
+        "point",
+        "area",
+        "vertex"
+    ],
+    "terms": [
+        "restroom",
+        "privy",
+        "porta john",
+        "porta potty",
+        "portapot",
+        "chemical toilet"
+    ],
+    "tags": {
+        "amenity": "toilets",
+        "portable": "yes"
+    },
+    "name": "Portable Toilet"
+}
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-waste-basket",
+    "icon": "fas-trash-restore",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,9 @@
 {
    "icon": "maki-building",
+    "fields": [
+        "{building}",
+        "building/flats"
+    ],
    "geometry": [
        "area"
    ],
@@ -8,4 +12,4 @@
    },
    "matchScore": 0.5,
    "name": "Apartment Building"
-}
+}
@@ -8,6 +8,7 @@
    },
    "terms": [
        "agriculture",
+        "auxiliary",
        "auxilary",
        "chicken coop",
        "farm auxiliary",
@@ -4,6 +4,7 @@
        "area"
    ],
    "terms": [
+        "kindergarten",
        "kindergarden",
        "pre-school"
    ],
@@ -7,7 +7,9 @@
        "address",
        "building_area",
        "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "access_simple",
@@ -7,7 +7,9 @@
        "address",
        "building_area",
        "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -21,10 +23,8 @@
        "internet_access/fee",
        "internet_access/ssid",
        "level",
-        "phone",
        "product",
        "ref/vatin",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "fas-tools",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "fas-hammer",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "fas-screwdriver",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "fas-hammer",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "fas-hammer",
    "geometry": [
        "point",
        "area"
@@ -0,0 +1,16 @@
+{
+    "fields": [
+        "disused/amenity"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "disused:amenity": "*"
+    },
+    "matchScore": 0.05,
+    "searchable": false,
+    "name": "Disused Amenity"
+}
@@ -3,10 +3,13 @@
    "fields": [
        "indoor",
        "ref",
-        "operator"
+        "operator",
+        "defibrillator/location"
    ],
    "moreFields": [
-        "level"
+        "level",
+        "opening_hours",
+        "access_simple"
    ],
    "geometry": [
        "point",
@@ -3,11 +3,18 @@
    "fields": [
        "name",
        "ref",
-        "operator"
+        "operator",
+        "water_tank/volume",
+        "drinking_water"
+    ],
+    "moreFields": [
+        "height",
+        "material"
    ],
    "geometry": [
        "point",
-        "vertex"
+        "vertex",
+        "area"
    ],
    "terms": [
        "water tank",
@@ -0,0 +1,39 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "building_area",
+        "access_simple"
+    ],
+    "moreFields": [
+        "air_conditioning",
+        "fee",
+        "payment_multi_fee",
+        "charge_fee",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "level",
+        "opening_hours",
+        "opening_hours/covid19",
+        "phone",
+        "website",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "club house",
+        "golf clubhouse",
+        "golf house",
+        "pro shop"
+    ],
+    "tags": {
+        "golf": "clubhouse"
+    },
+    "name": "Golf Clubhouse"
+}
@@ -6,7 +6,9 @@
        "operator",
        "healthcare/speciality",
        "address",
-        "building_area"
+        "building_area",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "brand",
@@ -19,8 +21,6 @@
        "opening_hours",
        "opening_hours/covid19",
        "payment_multi",
-        "phone",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -17,6 +17,7 @@
        "lit",
        "name",
        "ref",
+        "ramp",
        "stroller",
        "wheelchair"
    ],
@@ -0,0 +1,33 @@
+{
+    "notCountryCodes": [
+        "de"
+    ],
+    "icon": "temaki-toll_gantry",
+    "fields": [
+        "ref",
+        "operator",
+        "access",
+        "maxheight",
+        "opening_hours",
+        "opening_hours/covid19",
+        "payment_multi"
+    ],
+    "moreFields": [
+        "website"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "toll_gantry"
+    },
+    "terms": [
+        "license plate camera toll",
+        "cashless toll",
+        "electronic toll",
+        "free-flow toll",
+        "toll gantry",
+        "transponder toll"
+    ],
+    "name": "Open Road Toll"
+}
@@ -1,5 +1,5 @@
 {
-    "icon": "tnp-2009265",
+    "icon": "temaki-fighter_jet",
    "fields": [
        "name",
        "iata",
@@ -19,6 +19,13 @@
    "tags": {
        "landuse": "quarry"
    },
-    "terms": [],
+    "terms": [
+        "aggregate quarry",
+        "open pit mine",
+        "sand mine",
+        "sand pit",
+        "sand quarry",
+        "sandpit"
+    ],
    "name": "Quarry"
 }
@@ -20,6 +20,7 @@
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
+        "level",
        "payment_multi"
    ],
    "geometry": [
@@ -1,5 +1,5 @@
 {
-    "icon": "tnp-2009223",
+    "icon": "temaki-sailboat",
    "fields": [
        "name",
        "operator",
@@ -3,10 +3,14 @@
    "fields": [
        "material",
        "lit",
-        "bench"
+        "bench",
+        "colour"
    ],
    "moreFields": [
-        "level"
+        "height",
+        "level",
+        "manufacturer",
+        "operator"
    ],
    "geometry": [
        "point"
@@ -13,6 +13,7 @@
        "email",
        "fax",
        "gnis/feature_id",
+        "level",
        "opening_hours",
        "opening_hours/covid19",
        "phone",
@@ -0,0 +1,35 @@
+{
+    "icon": "maki-pitch",
+    "fields": [
+        "name",
+        "operator",
+        "sport",
+        "address",
+        "building_area",
+        "access_simple"
+    ],
+    "moreFields": [
+        "air_conditioning",
+        "level",
+        "opening_hours",
+        "opening_hours/covid19",
+        "fee",
+        "payment_multi_fee",
+        "charge_fee",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "athletic courts",
+        "gym",
+        "sports hall",
+        "sports venue"
+    ],
+    "tags": {
+        "leisure": "sports_hall"
+    },
+    "name": "Gymnasium"
+}
@@ -1,5 +1,18 @@
 {
    "icon": "temaki-cairn",
+    "fields": [
+        "height",
+        "ele",
+        "ele_node",
+        "check_date"
+    ],
+    "moreFields": [
+        "colour",
+        "material",
+        "name",
+        "operator",
+        "ref"
+    ],
    "geometry": [
        "point",
        "area"
@@ -0,0 +1,29 @@
+{
+    "icon": "fas-dove",
+    "fields": [
+        "operator",
+        "building_area",
+        "height",
+        "capacity"
+    ],
+    "moreFields": [
+        "layer",
+        "location"
+    ],
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "terms": [
+        "birds",
+        "doocot",
+        "dovecot",
+        "doves",
+        "pigeonholes",
+        "pigeons"
+    ],
+    "tags": {
+        "man_made": "dovecote"
+    },
+    "name": "Dovecote"
+}
@@ -0,0 +1,28 @@
+{
+    "icon": "temaki-cooling_tower",
+    "fields": [
+        "ref",
+        "operator",
+        "material",
+        "building_area",
+        "height"
+    ],
+    "moreFields": [
+        "layer"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "terms": [
+        "power plant"
+    ],
+    "tags": {
+        "man_made": "tower",
+        "tower:type": "cooling"
+    },
+    "reference": {
+        "key": "tower:type",
+        "value": "cooling"
+    },
+    "name": "Cooling Tower"
+}
@@ -2,6 +2,7 @@
    "icon": "maki-triangle",
    "geometry": [
        "point",
+        "vertex",
        "area"
    ],
    "fields": [
@@ -0,0 +1,21 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "intermittent"
+    ],
+    "moreFields": [
+        "gnis/feature_id"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "natural": "hot_spring"
+    },
+    "terms": [
+        "geothermal spring",
+        "thermal pool"
+    ],
+    "name": "Hot Spring"
+}
@@ -6,7 +6,9 @@
        "address",
        "building_area",
        "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -23,10 +25,8 @@
        "level",
        "not/name",
        "operator",
-        "phone",
        "ref/vatin",
        "smoking",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-suitcase",
+    "icon": "fas-vest",
    "geometry": [
        "point",
        "area"
@@ -7,7 +7,9 @@
        "address",
        "opening_hours",
        "opening_hours/covid19",
-        "building_area"
+        "building_area",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -17,8 +19,6 @@
        "internet_access/fee",
        "internet_access/ssid",
        "level",
-        "phone",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -4,6 +4,7 @@
        "ref_platform",
        "network",
        "operator",
+        "vehicles",
        "departures_board",
        "surface"
    ],
@@ -0,0 +1,43 @@
+{
+    "icon": "temaki-tram",
+    "fields": [
+        "{public_transport/platform_point}"
+    ],
+    "moreFields": [
+        "{public_transport/platform_point}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "tram": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "tram": "yes",
+        "highway": "bus_stop"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "bus",
+        "light rail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "streetcar",
+        "track",
+        "tram",
+        "transit",
+        "transportation",
+        "trolley"
+    ],
+    "name": "Tram & Bus Stop"
+}
@@ -5,6 +5,7 @@
        "ref_stop_position",
        "network",
        "operator",
+        "vehicles",
        "departures_board",
        "shelter"
    ],
@@ -4,6 +4,7 @@
        "name",
        "network",
        "operator",
+        "vehicles",
        "address",
        "building_area",
        "internet_access"
@@ -4,7 +4,8 @@
        "name",
        "ref_stop_position",
        "network",
-        "operator"
+        "operator",
+        "vehicles"
    ],
    "moreFields": [],
    "geometry": [
--- a/Show More
+++ b/Show More