bump dev version

see 95fab6dbdc (r168567074)

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,7 +25,7 @@ Follow these steps to test your PR yourself and make it a lot easier and faster
 
 **This is how it works:**
 1. After you submit your PR, the system will create a preview and comment on your PR:
-   > 🍱 You can preview the tagging presets of this pull request here.
+   > 🍱 Your pull request preview is ready.
    If this is your first contribution to this project, the preview will not happen right away but requires a click from one of the project members. We will do this ASAP.
 
 2. Once the preview is ready, use it to test your changes.

.github/dependabot.yml

@@ -9,3 +9,4 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    versioning-strategy: increase-if-necessary

.github/workflows/deploy-preview.yml

@@ -58,7 +58,7 @@ jobs:
         env:
           NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
           NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
-        run: ./node_modules/.bin/netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
+        run: ./node_modules/.bin/netlify deploy --no-build --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
 
       - name: Add comment to pull request
         uses: actions/github-script@v7
@@ -80,7 +80,7 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: pullRequestNumber,
-                body: `${start} **[Your pull request preview is ready](https://pr-${pullRequestNumber}--ideditor-presets-preview.netlify.app/id/dist/#locale=en&map=17.00/14.65485/121.06466)**\n\nPlease use this preview to check your changes. Ideally use [the **test documentation** template](https://github.com/openstreetmap/id-tagging-schema/blob/main/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L38-L69) and document your test results by commenting on the PR. This will speed up the review process for everyone.\n\nFYI, once this PR is merged, you can use [the iD Editor Preview](http://preview.ideditor.com/) to test your changes in interaction with all other changes.`
+                body: `${start} **[Your pull request preview is ready](https://pr-${pullRequestNumber}--ideditor-presets-preview.netlify.app/id/dist/#locale=en&map=18.00/48.841708/2.587656)**\n\nPlease use this preview to check your changes. Ideally use [the **test documentation** template](https://github.com/openstreetmap/id-tagging-schema/blob/main/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L38-L69) and document your test results by commenting on the PR. This will speed up the review process for everyone.\n\nFYI, once this PR is merged, you can use [the iD Editor Preview](http://preview.ideditor.com/) to test your changes in interaction with all other changes.`
               });
             } else {
               console.log(`Preview URL comment already added to PR #${pullRequestNumber}`);

.github/workflows/staging.yml

@@ -54,4 +54,4 @@ jobs:
         env:
           NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
           NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
-        run: ./node_modules/.bin/netlify deploy --prod --dir=iD/dist
+        run: ./node_modules/.bin/netlify deploy --no-build --prod --dir=iD/dist

CHANGELOG.md

@@ -23,6 +23,73 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@xxxx]: https://github.com/xxxx
 -->
 
+
+# 6.12.0
+##### 2025-Jul-23
+
+#### New Presets
+* Add preset for `climbing=route` point, way and relation ([#1598], thanks [@harahu])
+* Add preset for `climbing=crag` point and relation ([#1597], thanks [@harahu])
+* Add preset for `memorial=blue_plaque` ([#1601], thanks [@hb0nd])
+* Add preset for `climbing=route_bottom` ([#1590], thanks [@zbycz])
+* Add historic=aircraft Preset ([#1556], thanks [@novolife])
+* Create teahouse preset ([#1555], thanks [@novolife])
+#### New and Changed Fields
+* Add bridge to the structure field of canal ([#1587], thanks [@novolife])
+* Add preset for `climbing=area` ([#1596], thanks [@harahu])
+* Add "Suitable For Dogs" field to `amenity=drinking_water` preset ([#1584], thanks [@codeinabox])
+* Add roof shape and roof height fields to building presets ([#1552], thanks [@trs998])
+* Fix fields of `historic=aircraft` ([#1566], thanks [@novolife])
+#### Changed Presets
+* Add terms to `shop=fabric` ([#1619], thanks [@matkoniecz])
+* Add term "solicitor" to  lawyer preset ([#1604], thanks [@hb0nd])
+* Add terms to `amenity=toilets` preset ([#1583], thanks [@matkoniecz])
+* Add `direction` field to Observation Tower preset ([#1575], thanks [@zbycz])
+* Add terms to `amenity=telephone` ([#1574], thanks [@matkoniecz])
+* Make `social_facility` more findable ([#1576], thanks [@matkoniecz])
+* Add term "apparel" to `shop=clothes` preset ([#1382], thanks [@matkoniecz])
+* Add term to `shop=stationery` to prevent misspelling ([#1514], thanks [@matkoniecz])
+* Add `ref` key to `natural=tree` `moreFields` ([#1398], thanks [@gy-mate])
+#### Regional Presets and Fields
+* Add preset for `memorial=blue_plaque` ([#1601], thanks [@hb0nd])
+#### Documentation and Other Changes
+* Docs: Update broken transifex links ([#1630], thanks [@homersimpsons])
+* Docs/Governance: Add closing of abandoned PRs to responsibilities of the the triage role ([#1603], thanks [@matkoniecz])
+* Docs: Add detailed information on integration testing ([#1593], thanks [@harahu])
+* Docs: Streamline wording of PR preview ([#1606], thanks [@tordans])
+
+[#1382]: https://github.com/openstreetmap/id-tagging-schema/pull/1382
+[#1398]: https://github.com/openstreetmap/id-tagging-schema/pull/1398
+[#1514]: https://github.com/openstreetmap/id-tagging-schema/pull/1514
+[#1552]: https://github.com/openstreetmap/id-tagging-schema/pull/1552
+[#1555]: https://github.com/openstreetmap/id-tagging-schema/pull/1555
+[#1556]: https://github.com/openstreetmap/id-tagging-schema/pull/1556
+[#1566]: https://github.com/openstreetmap/id-tagging-schema/pull/1566
+[#1574]: https://github.com/openstreetmap/id-tagging-schema/pull/1574
+[#1575]: https://github.com/openstreetmap/id-tagging-schema/pull/1575
+[#1576]: https://github.com/openstreetmap/id-tagging-schema/pull/1576
+[#1583]: https://github.com/openstreetmap/id-tagging-schema/pull/1583
+[#1584]: https://github.com/openstreetmap/id-tagging-schema/pull/1584
+[#1587]: https://github.com/openstreetmap/id-tagging-schema/pull/1587
+[#1590]: https://github.com/openstreetmap/id-tagging-schema/pull/1590
+[#1593]: https://github.com/openstreetmap/id-tagging-schema/pull/1593
+[#1596]: https://github.com/openstreetmap/id-tagging-schema/pull/1596
+[#1597]: https://github.com/openstreetmap/id-tagging-schema/pull/1597
+[#1598]: https://github.com/openstreetmap/id-tagging-schema/pull/1598
+[#1601]: https://github.com/openstreetmap/id-tagging-schema/pull/1601
+[#1603]: https://github.com/openstreetmap/id-tagging-schema/pull/1603
+[#1604]: https://github.com/openstreetmap/id-tagging-schema/pull/1604
+[#1606]: https://github.com/openstreetmap/id-tagging-schema/pull/1606
+[#1619]: https://github.com/openstreetmap/id-tagging-schema/pull/1619
+[#1630]: https://github.com/openstreetmap/id-tagging-schema/pull/1630
+[@homersimpsons]: https://github.com/@homersimpsons
+[@hb0nd]: https://github.com/@hb0nd
+[@novolife]: https://github.com/@novolife
+[@codeinabox]: https://github.com/@codeinabox
+[@trs998]: https://github.com/@trs998
+[@zbycz]: https://github.com/@zbycz
+
+
 # 6.11.0
 ##### 2025-May-12
 

CONTRIBUTING.md

@@ -17,19 +17,19 @@ Read the [GUIDELINES](./GUIDELINES.md) to help you understand what fields and ta
 
   Example: To extend the list of English terms for `shrub`, [modify the `terms`-key in the JSON file](https://github.com/openstreetmap/id-tagging-schema/blob/v3.1.0/data/presets/natural/shrub.json#L16-L19)).
 
-* **All languages** other than English (US) are managed [in the Transifex Project of the iD Editor](https://www.transifex.com/openstreetmap/id-editor/) inside the translation resource _'preset'_.
+* **All languages** other than English (US) are managed [in the Transifex Project of the iD Editor](https://app.transifex.com/openstreetmap/id-editor/) inside the translation resource _'preset'_.
 
   To to find and update a translation, you can …
-  1. [open the translation page](https://www.transifex.com/openstreetmap/id-editor/translate/)
-  2. select a language
+  1. [open the translation page](https://app.transifex.com/openstreetmap/id-editor/translate/)
+  2. select a language at the top
   3. select _'presets'_
   4. search for `key:living_street` or `translation_text:'Living Street'` or `key:highway/living_street`
 
-* **Request access:** To contribute to a language, [select a language](https://www.transifex.com/openstreetmap/id-editor/languages/) and use 'Join team' to request access. The administrators will approve requests routinely, only rejecting requests for overly specific locales.
+* **Request access:** To contribute to a language, [select a language](https://app.transifex.com/openstreetmap/id-editor/languages/) and use 'Join team' to request access. The administrators will approve requests routinely, only rejecting requests for overly specific locales.
 
 * **Base language:** The JSON files in this repository require an "English (US)" translation. This includes data, that use the `locationSet` property to reduce the scope of the data to specific countries since users might still select English as an editor language in those countries. Some presets use a (untranslatable) proper name. See also "Developer Notes".
 
-* **Transifex "Developer Notes":** Use the "Developer Notes" section in Transifex to learn more about the context of a given translation string. For example, [looking at `presets.fields.direction_cardinal-US-CA-NZ.label` in Transiflex](https://www.transifex.com/openstreetmap/id-editor/translate/#en_GB/presets/406422633?q=key%3Adirection_cardinal) will give you the "Developer Notes: `direction=* | Local preset for countries "CA", "NZ", "US"`" which helps you understand that, (a) this label describes the key `direction` and (b) it is only visible in three countries, so other languages usually don't need to translate it (leave it blank or add the English translation instead).
+* **Transifex "Developer Notes":** Use the "Developer Notes" section in Transifex to learn more about the context of a given translation string. For example, [looking at `presets.fields.direction_cardinal-US-CA-NZ.label` in Transiflex](https://app.transifex.com/openstreetmap/id-editor/translate/#en_GB/presets/406422633?q=key%3Apresets.fields.direction_cardinal-US-CA-NZ.label) will give you the "Developer Notes: `direction=* | Local preset for countries "CA", "NZ", "US"`" which helps you understand that, (a) this label describes the key `direction` and (b) it is only visible in three countries, so other languages usually don't need to translate it (leave it blank or add the English translation instead).
 
 * **Release:** All translation changes are released whenever [a new id-tagging-schema release is created](https://github.com/openstreetmap/id-tagging-schema/releases). They will become visible inside iD and other editors once those editors a short while after that (which can vary as different editors have different release schedules and in some cases, e.g. in iD, translations might even be fetched dynamically from the most recent id-tagging-schema release).
 
@@ -50,16 +50,33 @@ Icons from different sources (_icon sets_) can be used in the tagging schema. He
 
 ### Info-`i`
 
-![Screenshot of a preset in iD with the information details open.](https://github.com/openstreetmap/id-tagging-schema/assets/111561/13549318-cd7c-4dd1-9948-7a2d84662f04)
+<img alt="Screenshot of a preset in iD with the information details open." src="https://github.com/openstreetmap/id-tagging-schema/assets/111561/13549318-cd7c-4dd1-9948-7a2d84662f04" width="400" />
 
 iD and other tools provide users with a way to learn more about the main tag of a preset. It is important to provide good information in this information panel. Here are a few notes on how to do this:
-- Does your tag have a Wikibase entry? Click the small pencil icon next to the text to open the Wikibase item on the OSM wiki. Improve this wording if needed. If the Wikibase item is missing, [learn more about how to add it in "Current methods for creating new items"](https://wiki.openstreetmap.org/wiki/Data_items#Item_creation_process).
+- Does your tag have a OSM Wiki data item? Click the small pencil icon next to the text to open the data item on the OSM Wiki. Improve this wording if needed. If the data item is missing, [learn more about how to add it in "Current methods for creating new items"](https://wiki.openstreetmap.org/wiki/Data_items#Item_creation_process).
 - Does your tag have a Wiki page with a good image?
 - Your preset might need [a `reference` property](https://github.com/ideditor/schema-builder?tab=readme-ov-file#reference) to force the system to use a specific tag for the information section.
 
-### Code Style
+### Integration Testing With iD
 
-The input files are JSON files which use 4-space indentation. You can use the `npm run lint` command to check whether your files match the expected code style and run `npm run lint:fix` to reformat them if they don't do so.
+There are two ways to inspect how your changes to the schema affect the user experience in the iD editor:
+
+**a. Use the PR preview:**
+
+After you submit your PR, the system will create a preview and comment on your PR:
+
+> 🍱 Your pull request preview is ready.
+
+If this is your first contribution to this project, the preview will not happen right away but requires a click from one of the project members. We will do this ASAP.
+
+**b. Use a local instance of the iD editor:**
+
+If you have [set up](https://github.com/openstreetmap/iD#installation) your own local instance of the iD editor, you can [configure](https://github.com/openstreetmap/iD/blob/develop/API.md#environment-variables) it to use your local set of tagging presets by setting the `ID_PRESETS_CDN_URL` environment variable.
+
+1. First build and serve the schema: `npm run build && npm run dist && npx serve -Cp 1234`. Remember that you need to run this command again should you make further changes.
+2. Now, in your iD repository, start an iD instance using your custom schema:
+   - on macOS & Linux: `npx cross-env ID_PRESETS_CDN_URL=http://localhost:1234/ npm start`
+   - on Windows: `set ID_PRESETS_CDN_URL=http://localhost:1234/ && npm start`
 
 ### Installation and Testing
 
@@ -71,4 +88,6 @@ The following `npm` commands are used in this repository:
 * `npm run dist` – validates the source data and compiles output files for iD
 * `npm run translations` – fetches translations from transifex and compiles the translations files for iD
 
-If you have [set up](https://github.com/openstreetmap/iD#installation) your own local instance of the iD editor, you can [configure](https://github.com/openstreetmap/iD/blob/develop/API.md#environment-variables) it to use your local set of tagging presets by setting the `ID_PRESETS_CDN_URL` environment variable. If you do that, don't forget to run `npm run dist` to compile the tagging schema output, as iD will otherwise not see the changes you made.
+### Code Style
+
+The input files are JSON files which use 4-space indentation. You can use the `npm run lint` command to check whether your files match the expected code style and run `npm run lint:fix` to reformat them if they don't do so.

GOVERNANCE.md

@@ -33,11 +33,12 @@ Github shows a `(Collaborator)` label next to users with any permission on this
 
 ### Triage Role
 
-(No one has the triage role at the moment. Please reach out if you want to help.)
+* [Mateusz](https://github.com/matkoniecz) contributes to this project as a volunteer.
 
 The triage role includes:
 - Proactively helping to clarify issues and PRs.
 - Closing issues as duplicates or not planned.
+- Closing abandoned, duplicated or invalid PRs.
 - Assigning labels to issues and PRs.
 
 Github shows a `(Collaborator)` label next to users with any permission on this repository.
@@ -70,7 +71,13 @@ Github shows a `(Contributor)` label next to users that previously committed to
 
 - Usually squash merge PRs to make the history simpler
 - Give the merge a meaningful description of the change
-- Add labels to the PR to simplify creating the changelog: `new-*`, `add-*`, `bug`
+- Add labels to the PR before merging which get picked up by our [release drafter](https://github.com/openstreetmap/id-tagging-schema/blob/main/.github/release-drafter.yml)
+
+**How to close…**
+
+- Provide context and an explanation for the chosen action
+- Consider reaching out to the author before taking action
+- We're happy to reopen PRs if opinions change.
 
 ### Releases
 

GUIDELINES.md

@@ -49,7 +49,7 @@ In addition, the deprecated tag must have reasonably high usage to be considered
 
 Deprecation rules work such that the user sees a message with suggestions and can act only when editing the given element. This makes them well-suited for gradual, human-reviewed updates of taggings like crossings. However, they are not suitable for cleaning up incorrect tagging from the database, especially for low-volume changes.
 
-There are, however, alternatives to consider: 
+There are, however, alternatives to consider:
 - Your cleanup task might be eligible for an automated (bot) edit. [Please learn more on the wiki…](https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct)
 - If your task is small enough, a few [editing sessions in JOSM](https://wiki.openstreetmap.org/wiki/JOSM) will often do the trick. However, mass-replacing without checking each object is still considered an automated edit, so the [guidelines apply](https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct). Please consult other mappers first.
 - A good way to work down a list of tasks is to create [a MapRoulette Challenge](https://maproulette.org/).
@@ -65,7 +65,7 @@ The user interface must be clear, concise, and easy to use, leaving no room for
 - Check the search functionality to ensure other presets do not cause confusion.
 - Select an icon or start the process to create a new one.
 - Define which fields to show (`fields`) and suggest (`moreFields`), considering the order of fields.
-- Check the `(i)` documentation and add or update the [OSM Wikibase item](https://wiki.openstreetmap.org/wiki/Data_items) if needed to provide a helpful short text.
+- Check the [`(i)` documentation](./CONTRIBUTING.md#info-i) and add or update the OSM Wiki data item if needed to provide a helpful short text.
 - Use the PR preview to add test cases with deep links to OSM objects that demonstrate the preset in use.
 
 ## 3. Implement

data/deprecated.json

@@ -2103,5 +2103,13 @@
   {
      "old": {"cycleway:left": "opposite"},
      "replace": {"oneway:bicycle": "no", "cycleway:left": "no"}
+  },
+  {
+    "old": {"man_made": "torii"},
+    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "torii"}
+  },
+  {
+    "old": {"man_made": "paifang"},
+    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "paifang"}
   }
 ]

data/fields/address.json

@@ -7,7 +7,6 @@
     "keys": [
         "addr:block_number",
         "addr:city",
-        "addr:block_number",
         "addr:conscriptionnumber",
         "addr:country",
         "addr:county",

data/fields/aircraft/type.json

@@ -0,0 +1,16 @@
+{
+    "key": "aircraft:type",
+    "type": "semiCombo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "military": "Military",
+            "helicopter": "Helicopter",
+            "airliner": "Airliner",
+            "jet": "Jet",
+            "fixed_wing": "Fixed Wing",
+            "cargo": "Cargo",
+            "glider": "Glider"
+        }
+    }
+}

data/fields/bath/sand_bath-JP.json

@@ -0,0 +1,10 @@
+{
+    "key": "bath:sand_bath",
+    "label": "Sand Bath",
+    "type": "check",
+    "locationSet": {
+        "include": [
+            "JP"
+        ]
+    }
+}

data/fields/bath/sand_bath.json

@@ -1,5 +0,0 @@
-{
-    "key": "bath:sand_bath",
-    "label": "Sand Bath",
-    "type": "check"
-}

data/fields/building.json

@@ -63,7 +63,8 @@
             "train_station": "Train Station Building",
             "transportation": "Transportation Building",
             "university": "University Building",
-            "warehouse": "Warehouse"
+            "warehouse": "Warehouse",
+            "container": "Container"
         }
     },
     "terms": [

data/fields/cabins.json

@@ -0,0 +1,5 @@
+{
+    "key": "cabins",
+    "type": "check",
+    "label": "Cabins"
+}

data/fields/caravans.json

@@ -3,9 +3,9 @@
     "type": "check",
     "label": "Campervan / Camping Trailer",
     "terms": [
-        "Camper",
-        "Camper Trailer",
-        "Caravan",
-        "Tourer"
+        "camper",
+        "camper trailer",
+        "caravan",
+        "tourer"
     ]
 }

data/fields/ceremonial_gate.json

@@ -0,0 +1,13 @@
+{
+    "key": "ceremonial_gate",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "torii": "Torii",
+            "paifang": "Paifang",
+            "hongsalmun": "Hongsalmun",
+            "iljumun": "Iljumun"
+        }
+    }
+}

data/fields/check_date.json

@@ -5,7 +5,7 @@
     "placeholder": "YYYY-MM-DD",
     "universal": true,
     "terms": [
-        "survey date",
-        "last survey date"
+        "last survey date",
+        "survey date"
     ]
 }

data/fields/circumference.json

@@ -5,7 +5,7 @@
     "snake_case": false,
     "placeholder": "1 m, 20 cm, 30\"…",
     "terms": [
-        "DBH",
+        "dbh",
         "diameter at breast height"
     ]
 }

data/fields/climbing/bolts.json

@@ -0,0 +1,10 @@
+{
+    "key": "climbing:bolts",
+    "type": "number",
+    "minValue": 0,
+    "label": "Number of Bolts",
+    "prerequisiteTag": {
+        "key": "climbing:sport",
+        "value": "yes"
+    }
+}

data/fields/climbing/grade/french.json

@@ -0,0 +1,48 @@
+{
+    "key": "climbing:grade:french",
+    "type": "combo",
+    "label": "Grade (French)",
+    "placeholder": "5c",
+    "caseSensitive": false,
+    "customValues": true,
+    "autoSuggestions": false,
+    "options": [
+        "1",
+        "2",
+        "3-",
+        "3",
+        "3+",
+        "4a",
+        "4b",
+        "4c",
+        "5a",
+        "5b",
+        "5c",
+        "5c+",
+        "6a",
+        "6a+",
+        "6b",
+        "6b+",
+        "6c",
+        "6c+",
+        "7a",
+        "7a+",
+        "7b",
+        "7b+",
+        "7c",
+        "7c+",
+        "8a",
+        "8a+",
+        "8b",
+        "8b+",
+        "8c",
+        "8c+",
+        "9a",
+        "9a+",
+        "9b",
+        "9b+",
+        "9c",
+        "9c+",
+        "10a"
+    ]
+}

data/fields/climbing/grade/saxon.json

@@ -0,0 +1,39 @@
+{
+    "key": "climbing:grade:saxon",
+    "type": "combo",
+    "label": "Grade (Saxon)",
+    "placeholder": "VIIa",
+    "caseSensitive": true,
+    "customValues": true,
+    "autoSuggestions": false,
+    "options": [
+        "I",
+        "II",
+        "III",
+        "IV",
+        "V",
+        "VI",
+        "VIIa",
+        "VIIb",
+        "VII",
+        "VIIc",
+        "VIIIa",
+        "VIIIb",
+        "VIIIc",
+        "IXa",
+        "IXb",
+        "IXc",
+        "Xa",
+        "Xb",
+        "Xc",
+        "XIa",
+        "XIb",
+        "XIc",
+        "XIIa",
+        "XIIb",
+        "XIIc",
+        "XIIIa",
+        "XIIIb",
+        "XIIIc"
+    ]
+}

data/fields/climbing/grade/uiaa.json

@@ -0,0 +1,51 @@
+{
+    "key": "climbing:grade:uiaa",
+    "type": "combo",
+    "label": "Grade (UIAA)",
+    "placeholder": "6-",
+    "caseSensitive": false,
+    "customValues": true,
+    "autoSuggestions": false,
+    "options": [
+        "1-",
+        "1",
+        "1+",
+        "2-",
+        "2",
+        "2+",
+        "3-",
+        "3",
+        "3+",
+        "4-",
+        "4",
+        "4+",
+        "5-",
+        "5",
+        "5+",
+        "6-",
+        "6",
+        "6+",
+        "7-",
+        "7",
+        "7+",
+        "8-",
+        "8",
+        "8+",
+        "9-",
+        "9",
+        "9+",
+        "10-",
+        "10",
+        "10+",
+        "11-",
+        "11",
+        "11+",
+        "12-",
+        "12",
+        "12+",
+        "13-",
+        "13",
+        "13+",
+        "14-"
+    ]
+}

data/fields/climbing/grade/yds_class.json

@@ -0,0 +1,45 @@
+{
+    "key": "climbing:grade:yds_class",
+    "type": "combo",
+    "label": "Grade (YDS)",
+    "placeholder": "5.10a",
+    "caseSensitive": false,
+    "customValues": true,
+    "autoSuggestions": false,
+    "options": [
+        "5",
+        "5.1",
+        "5.2",
+        "5.3",
+        "5.4",
+        "5.5",
+        "5.6",
+        "5.7",
+        "5.8",
+        "5.9",
+        "5.10a",
+        "5.10b",
+        "5.10c",
+        "5.10d",
+        "5.11a",
+        "5.11b",
+        "5.11c",
+        "5.11d",
+        "5.12a",
+        "5.12b",
+        "5.12c",
+        "5.12d",
+        "5.13a",
+        "5.13b",
+        "5.13c",
+        "5.13d",
+        "5.14a",
+        "5.14b",
+        "5.14c",
+        "5.14d",
+        "5.15a",
+        "5.15b",
+        "5.15c",
+        "5.15d"
+    ]
+}

data/fields/climbing/length.json

@@ -0,0 +1,6 @@
+{
+    "key": "climbing:length",
+    "type": "number",
+    "minValue": 0,
+    "label": "Length (Meters)"
+}

data/fields/climbing/sport.json

@@ -0,0 +1,5 @@
+{
+    "key": "climbing:sport",
+    "type": "check",
+    "label": "Sport climbing (bolted climbing)"
+}

data/fields/climbing/trad.json

@@ -0,0 +1,5 @@
+{
+    "key": "climbing:trad",
+    "type": "check",
+    "label": "Traditional climbing"
+}

data/fields/crossing_raised.json

@@ -5,8 +5,8 @@
     "terms": [
         "flat top",
         "hump",
-        "speed",
-        "slow"
+        "slow",
+        "speed"
     ],
     "strings": {
         "options": {

data/fields/descent.json

@@ -4,7 +4,7 @@
     "type": "number",
     "label": "Total Descent",
     "terms": [
-        "descent",
-        "cumulative elevation"
+        "cumulative elevation",
+        "descent"
     ]
 }

data/fields/diet_multi.json

@@ -3,8 +3,8 @@
     "type": "multiCombo",
     "label": "Diet Types",
     "terms": [
-        "gluten free",
         "fruitarian",
+        "gluten free",
         "halal",
         "kosher",
         "lactose free",

data/fields/dog_check.json

@@ -0,0 +1,5 @@
+{
+    "key": "dog",
+    "type": "check",
+    "label": "Suitable For Dogs"
+}

data/fields/education.json

@@ -0,0 +1,18 @@
+{
+    "key": "education",
+    "type": "typeCombo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "college": "College",
+            "dancing_school": "Dancing School",
+            "driving_school": "Driving School",
+            "kindergarten": "Kindergarten",
+            "language_school": "Language School",
+            "music_school": "Music School",
+            "prep_school": "Test Prep / Tutoring School",
+            "school": "School",
+            "university": "University"
+        }
+    }
+}

data/fields/fhrs/id-GB.json

@@ -10,8 +10,8 @@
         ]
     },
     "terms": [
-        "Food Hygiene Rating Scheme",
-        "Food Hygiene Rating System",
-        "Food Standards Agency"
+        "food hygiene rating scheme",
+        "food hygiene rating system",
+        "food standards agency"
     ]
 }

data/fields/fuel/fuel_multi.json

@@ -37,20 +37,20 @@
     "autoSuggestions": true,
     "caseSensitive": true,
     "terms": [
-        "diesel",
-        "gas",
-        "gasoline",
-        "petrol",
-        "ethanol",
         "biodiesel",
         "bioethanol",
+        "cng",
+        "diesel",
+        "ethanol",
         "fuel",
         "fuel mix",
-        "mixture",
-        "propane",
+        "gas",
+        "gasoline",
+        "lng",
         "lpg",
-        "cng",
-        "lng"
+        "mixture",
+        "petrol",
+        "propane"
     ],
     "locationSet": {
         "exclude": [

data/fields/gnis/feature_id-US.json

@@ -10,8 +10,8 @@
         ]
     },
     "terms": [
-        "Federal Geographic Names Information Service",
-        "United States Board on Geographic Names",
-        "USA"
+        "federal geographic names information service",
+        "united states board on geographic names",
+        "usa"
     ]
 }

data/fields/house.json

@@ -1,5 +1,38 @@
 {
     "key": "house",
     "type": "combo",
-    "label": "House Type"
+    "label": "House Type",
+    "strings": {
+        "options": {
+            "bungalow": {
+                "title": "Bungalow",
+                "description": "A small house with a single storey"
+            },
+            "detached": {
+                "title": "Detached House",
+                "description": "A house that is not connected to any other houses"
+            },
+            "link-detached": {
+                "title": "Link-Detached House",
+                "description": "A house that is connected to another house by a garage or other non-living area"
+            },
+            "maisonette": {
+                "title": "Maisonette",
+                "description": "A residential dwelling, split over two floors with private external entrances rather than a communal entrance"
+            },
+            "semi-detached": {
+                "title": "Semi-Detached House",
+                "description": "A house that is attached to another house on one side"
+            },
+            "terrace": {
+                "title": "Row of Townhouses",
+                "description": "A row of houses that are attached to each other in a line (mapping each house as a separate area is preferred)"
+            },
+            "terraced": {
+                "title": "Single Townhouse",
+                "description": "Individual house in a row of townhouses"
+            }
+        }
+    },
+    "autoSuggestions": false
 }

data/fields/irrigation_pivot.json

@@ -4,8 +4,8 @@
     "label": "Center-Pivot Irrigation",
     "terms": [
         "central pivot irrigation",
-        "water wheel",
-        "circle irrigation"
+        "circle irrigation",
+        "water wheel"
     ],
     "strings": {
         "options": {

data/fields/level_semi.json

@@ -5,8 +5,8 @@
     "terms": [
         "building floors",
         "decks",
-        "stories",
         "storeys",
+        "stories",
         "storys"
     ]
 }

data/fields/manufacturer/wikidata.json

@@ -0,0 +1,9 @@
+{
+    "key": "manufacturer:wikidata",
+    "keys": [
+        "manufacturer:wikidata",
+        "manufacturer:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Manufacturer Wikidata"
+}

data/fields/model/wikidata.json

@@ -0,0 +1,9 @@
+{
+    "key": "model:wikidata",
+    "keys": [
+        "model:wikidata",
+        "model:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Model Wikidata"
+}

data/fields/payment_multi.json

@@ -2,6 +2,9 @@
     "key": "payment:",
     "type": "multiCombo",
     "label": "Payment Types",
+    "reference": {
+        "key": "payment:*"
+    },
     "strings": {
         "options": {
             "account_cards": "Account Card",

data/fields/phone.json

@@ -6,7 +6,7 @@
     ],
     "type": "tel",
     "label": "Telephone",
-    "placeholder": "+31 42 123 4567",
+    "placeholder": "+000 0000 0000 0000",
     "terms": [
         "phone number"
     ]

data/fields/picnic_table.json

@@ -3,7 +3,7 @@
     "type": "check",
     "label": "Picnic Table",
     "terms": [
-        "outdoor table",
-        "bench"
+        "bench",
+        "outdoor table"
     ]
 }

data/fields/playground.json

@@ -1,5 +1,94 @@
 {
     "key": "playground",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "activitypanel": "Activity Panel",
+            "aerialrotator": "Aerial Rotator",
+            "archimedes_screw": "Archimedes Screw",
+            "balance": "Balancing Device (unspecified)",
+            "balancebeam": "Balance Beam",
+            "ball_pool": "Ball Pool",
+            "bannister_bars": "Banister Bars",
+            "basketrotator": "Basket Rotator",
+            "basketswing": "Basket Swing",
+            "belt_bridge": "Belt Bridge",
+            "blackboard": "Blackboard",
+            "bridge": "Bridge",
+            "cushion": "Bouncy Cushion",
+            "chute": "Chute",
+            "climbing": "Climbing Device (unspecified)",
+            "climbing_pole": "Climbing Pole",
+            "climbing_slope": "Climbing Slope",
+            "climbingframe": "Climbing Frame",
+            "climbingwall": "Climbing Wall",
+            "dome": "Dome",
+            "excavator": "Excavator",
+            "exercise": "Exercise Device",
+            "funnel_ball": "Funnel Ball",
+            "hammock": "Hammock",
+            "hamster_wheel": "Hamster Wheel",
+            "hopscotch": "Hopscotch",
+            "horizontal_bar": "Horizontal Bar",
+            "ladder": "Ladder",
+            "map": "Map",
+            "maze": "Maze",
+            "marble_run": "Marble Run",
+            "monkey_bars": "Monkey Bars",
+            "mound": "Artificial Mound",
+            "musical_instrument": "Musical Instrument",
+            "parallel_bars": "Parallel Bars",
+            "platform": "Platform",
+            "playhouse": "Playhouse",
+            "pump": "Pump",
+            "ride_on": "Fixed Riding Device",
+            "rope_swing": "Rope Swing",
+            "rope_traverse": "Rope Traverse",
+            "rotator": "Rotating Device (unspecified)",
+            "roundabout": "Merry-Go-Round / Roundabout",
+            "sand": "Sand Play Device (unspecified)",
+            "sand_pulley": "Sand Pulley",
+            "sand_seesaw": "Sand Seesaw",
+            "sand_wheel": "Sand Wheel",
+            "sandpit": "Sandbox / Sandpit",
+            "seat": "Seat",
+            "seesaw": "Seesaw",
+            "sieve": "Sieve",
+            "sledding": "Sledding Hill",
+            "slide": "Slide",
+            "speaking_tube": "Speaking Tube",
+            "spinner": "Spinner",
+            "spinner_bowl": "Spinner Bowl",
+            "spinning_circle": "Spinning Circle",
+            "spinning_disc": "Spinning Disc",
+            "spring_board": "Spring Board",
+            "springy": "Spring Rider",
+            "splash_pad": "Splash Pad",
+            "stepping_post": "Stepping Post",
+            "stepping_stone": "Stepping Stone",
+            "steps": "Steps",
+            "structure": "Playground Structure",
+            "swing": "Swing",
+            "baby_swing": "Baby Swing",
+            "tire_swing": "Tire Swing",
+            "table": "Table",
+            "teenshelter": "Teen Shelter",
+            "track": "Playground Track",
+            "trampoline": "Trampoline",
+            "tunnel_tube": "Tunnel Tube",
+            "water": "Water Device (unspecified)",
+            "water_barrier": "Water Barrier",
+            "water_basin": "Water Basin",
+            "water_cannon": "Water Cannon",
+            "water_channel": "Water Channel",
+            "water_seesaw": "Water Seesaw",
+            "water_sprayer": "Water Sprayer",
+            "water_stream": "Water Stream",
+            "water_wheel": "Water Wheel",
+            "wobble_bridge": "Wobble Bridge",
+            "youth_bench": "Youth Bench",
+            "zipwire": "Zipline / Zipwire"
+        }
+    }
 }

data/fields/post.json

@@ -4,11 +4,9 @@
     "keys": [
         "post:block_number",
         "post:city",
-        "post:block_number",
         "post:conscriptionnumber",
         "post:county",
         "post:country",
-        "post:county",
         "post:district",
         "post:floor",
         "post:hamlet",

data/fields/real_fire-GB-IE.json

@@ -9,7 +9,7 @@
     "type": "check",
     "label": "Real Fire",
     "terms": [
-        "fire place",
-        "fire"
+        "fire",
+        "fire place"
     ]
 }

data/fields/ref/FR/siret-FR.json

@@ -10,7 +10,7 @@
         ]
     },
     "terms": [
-        "French company identification number",
-        "SIRET"
+        "french company identification number",
+        "siret"
     ]
 }

data/fields/ref/edubase-GB.json

@@ -10,7 +10,7 @@
         ]
     },
     "terms": [
-        "Edubase Reference",
-        "DfE URN"
+        "dfe urn",
+        "edubase reference"
     ]
 }

data/fields/ref/linz/place_id-NZ.json

@@ -12,12 +12,12 @@
         ]
     },
     "terms": [
-        "NZ",
-        "LINZ",
-        "Land Information New Zealand",
-        "Toitū Te Whenua",
-        "NZGB",
-        "New Zealand Geographic Board",
-        "Ngā Pou Taunaha o Aotearoa"
+        "land information new zealand",
+        "linz",
+        "new zealand geographic board",
+        "ngā pou taunaha o aotearoa",
+        "nz",
+        "nzgb",
+        "toitū te whenua"
     ]
 }

data/fields/roof/height.json

@@ -0,0 +1,6 @@
+{
+    "key": "roof:height",
+    "minValue": 0,
+    "type": "number",
+    "label": "Roof Height (Meters)"
+}

data/fields/roof/shape.json

@@ -0,0 +1,30 @@
+{
+    "key": "roof:shape",
+    "type": "combo",
+    "label": "Roof Shape",
+    "strings": {
+        "options": {
+            "flat": "Flat",
+            "gabled": "Gabled",
+            "gabled_height_moved": "Gabled (Height Moved)",
+            "skillion": "Skillion",
+            "hipped": "Hipped",
+            "half-hipped": "Half-Hipped",
+            "side_hipped": "Side-Hipped",
+            "side_half-hipped": "Side Half-Hipped",
+            "mansard": "Mansard",
+            "gambrel": "Gambrel",
+            "hipped-and-gabled": "Hipped & Gabled",
+            "pyramidal": "Pyramidal",
+            "crosspitched": "Cross-Pitched",
+            "sawtooth": "Sawtooth",
+            "butterfly": "Butterfly",
+            "cone": "Cone",
+            "dome": "Dome",
+            "onion": "Onion",
+            "round": "Round"
+        }
+    },
+    "autoSuggestions": true,
+    "customValues": false
+}

data/fields/salt.json

@@ -3,7 +3,7 @@
     "type": "check",
     "label": "Salt",
     "terms": [
-        "saline",
-        "salinated"
+        "salinated",
+        "saline"
     ]
 }

data/fields/self_checkout.json

@@ -0,0 +1,12 @@
+{
+    "key": "self_checkout",
+    "type": "radio",
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "only": "Only",
+            "no": "No"
+        }
+    },
+    "label": "Self Checkout"
+}

data/fields/static_caravans.json

@@ -3,9 +3,9 @@
     "type": "check",
     "label": "Mobile Homes",
     "terms": [
-        "House Trailers",
-        "Park Home",
-        "Static Caravans",
-        "Trailer home"
+        "house trailers",
+        "park home",
+        "static caravans",
+        "trailer home"
     ]
 }

data/fields/structure_canal.json

@@ -0,0 +1,15 @@
+{
+    "type": "structureRadio",
+    "keys": [
+        "bridge",
+        "tunnel"
+    ],
+    "label": "Structure",
+    "placeholder": "Unknown",
+    "strings": {
+        "options": {
+            "bridge": "Bridge",
+            "tunnel": "Tunnel"
+        }
+    }
+}

data/fields/tower/construction.json

@@ -7,6 +7,7 @@
         "freestanding": "roentgen-tube",
         "guyed_lattice": "roentgen-lattice_guyed",
         "guyed_tube": "roentgen-tube_guyed",
-        "lattice": "roentgen-lattice"
+        "lattice": "roentgen-lattice",
+        "dish": "fas-satellite-dish"
     }
 }

data/fields/traffic_calming.json

@@ -5,8 +5,8 @@
     "terms": [
         "flat top",
         "hump",
-        "speed",
-        "slow"
+        "slow",
+        "speed"
     ],
     "strings": {
         "options": {

data/fields/water_source.json

@@ -8,7 +8,8 @@
             "water_tank": "Water Tank",
             "pond": "Pond",
             "river": "River",
-            "stream": "Stream"
+            "stream": "Stream",
+            "groundwater": "Groundwater"
         }
     }
 }

data/fields/website/menu.json

@@ -4,10 +4,10 @@
     "placeholder": "https://example.com",
     "label": "Menu Link",
     "terms": [
-        "online menu",
+        "menu",
         "menu uri",
         "menu url",
-        "website menu",
-        "menu"
+        "online menu",
+        "website menu"
     ]
 }

data/fields/wood_provided.json

@@ -0,0 +1,13 @@
+{
+    "key": "wood_provided",
+    "type": "check",
+    "label": "Firewood Provided",
+    "locationSet": {
+        "include": [
+            "ch",
+            "dk",
+            "fi",
+            "se"
+        ]
+    }
+}

data/preset_categories/climbing.json

@@ -0,0 +1,12 @@
+{
+    "icon": "temaki-climbing",
+    "name": "Climbing Features",
+    "members": [
+        "climbing/route",
+        "climbing/route_bottom",
+        "climbing/crag",
+        "type/route/climbing",
+        "type/site/climbing/crag",
+        "type/site/climbing/area"
+    ]
+}

data/preset_categories/route.json

@@ -20,6 +20,7 @@
         "type/route/pipeline",
         "type/route/detour",
         "type/route_master",
+        "type/route/climbing",
         "type/route"
     ]
 }

data/preset_categories/water.json

@@ -4,8 +4,9 @@
     "members": [
         "natural/water",
         "natural/water/pond",
-        "natural/water/basin",
         "natural/water/lake",
-        "natural/water/reservoir"
+        "natural/water/reservoir",
+        "natural/water/river",
+        "natural/water/basin"
     ]
 }

data/presets/@templates/contact.json

@@ -1,5 +1,4 @@
 {
-    "fields": [],
     "moreFields": [
         "email",
         "fax",

data/presets/@templates/poi.json

@@ -1,5 +1,4 @@
 {
-    "fields": [],
     "moreFields": [
         "{@templates/contact}",
         "address",

data/presets/aerialway/j-bar.json

@@ -13,11 +13,11 @@
     },
     "terms": [
         "drag lift",
+        "jaybar",
+        "jbar",
         "skiing",
         "snowboarding",
-        "surface cable",
-        "jaybar",
-        "jbar"
+        "surface cable"
     ],
     "name": "J-Bar Lift"
 }

data/presets/aerialway/pylon.json

@@ -12,9 +12,9 @@
     },
     "terms": [
         "chair lift pole",
+        "lift tower",
         "skiing",
-        "snowboarding",
-        "lift tower"
+        "snowboarding"
     ],
     "name": "Aerialway Pylon"
 }

data/presets/aerialway/zip_line.json

@@ -18,7 +18,7 @@
         "flying fox",
         "foefie slide",
         "gravity propelled aerial ropeslide",
-        "Tyrolean traverse",
+        "tyrolean traverse",
         "zip wire",
         "zip-line",
         "zipline",

data/presets/aeroway/aerodrome.json

@@ -6,8 +6,7 @@
         "icao",
         "address",
         "operator",
-        "operator/type",
-        "{@templates/internet_access}"
+        "operator/type"
     ],
     "moreFields": [
         "{@templates/contact}",

data/presets/aeroway/jet_bridge.json

@@ -24,10 +24,10 @@
         "finger",
         "gangway",
         "jet bridge",
-        "jetbridge",
         "jet way",
+        "jetbridge",
         "jetway",
-        "PBB",
+        "pbb",
         "portal",
         "terminal gate connector"
     ],

data/presets/aeroway/terminal.json

@@ -19,8 +19,8 @@
         "aeroway": "terminal"
     },
     "terms": [
-        "airport",
-        "aerodrome"
+        "aerodrome",
+        "airport"
     ],
     "name": "Airport Terminal"
 }

data/presets/amenity/animal_shelter.json

@@ -24,12 +24,12 @@
         "kitten",
         "pet care",
         "pet rescue",
+        "pound",
         "puppy",
         "raptor",
         "reptile",
         "rescue",
-        "spca",
-        "pound"
+        "spca"
     ],
     "tags": {
         "amenity": "animal_shelter"

data/presets/amenity/atm.json

@@ -25,9 +25,9 @@
         "vertex"
     ],
     "terms": [
-        "money",
         "cash",
-        "machine"
+        "machine",
+        "money"
     ],
     "tags": {
         "amenity": "atm"

data/presets/amenity/baking_oven.json

@@ -21,8 +21,8 @@
         "clay oven",
         "horno",
         "masonry oven",
-        "tabun oven",
-        "pizza oven"
+        "pizza oven",
+        "tabun oven"
     ],
     "name": "Baking Oven"
 }

data/presets/amenity/bar.json

@@ -24,10 +24,10 @@
         "area"
     ],
     "terms": [
-        "dive",
         "beer",
         "bier",
-        "booze"
+        "booze",
+        "dive"
     ],
     "tags": {
         "amenity": "bar"

data/presets/amenity/bar/lgbtq.json

@@ -7,9 +7,9 @@
     "terms": [
         "gay bar",
         "lesbian bar",
-        "lgbtq bar",
+        "lgb bar",
         "lgbt bar",
-        "lgb bar"
+        "lgbtq bar"
     ],
     "tags": {
         "amenity": "bar",

data/presets/amenity/bench.json

@@ -23,8 +23,8 @@
         "line"
     ],
     "terms": [
-        "seat",
-        "chair"
+        "chair",
+        "seat"
     ],
     "tags": {
         "amenity": "bench"

data/presets/amenity/bicycle_parking/building.json

@@ -21,11 +21,11 @@
         "key": "bicycle_parking"
     },
     "terms": [
-        "Bike Parking Station",
+        "bike parking station",
         "cycle parking",
         "cycling",
-        "Multi-Storey Bicycle Park",
-        "Multi-Storey Bike Park"
+        "multi-storey bicycle park",
+        "multi-storey bike park"
     ],
     "name": "Bicycle Parking Garage"
 }

data/presets/amenity/bicycle_parking/lockers.json

@@ -13,9 +13,9 @@
         "key": "bicycle_parking"
     },
     "terms": [
+        "bike lockers",
         "cycle locker",
-        "cycling",
-        "Bike Lockers"
+        "cycling"
     ],
     "name": "Bicycle Lockers"
 }

data/presets/amenity/bicycle_parking/shed.json

@@ -17,9 +17,9 @@
         "key": "bicycle_parking"
     },
     "terms": [
+        "bike shed",
         "cycle shed",
-        "cycling",
-        "Bike Shed"
+        "cycling"
     ],
     "name": "Bicycle Shed"
 }

data/presets/amenity/bicycle_rental.json

@@ -21,11 +21,11 @@
         "area"
     ],
     "terms": [
-        "bike",
         "bicycle",
-        "bikeshare",
-        "bike share",
         "bicycle share",
+        "bike",
+        "bike share",
+        "bikeshare",
         "cycle dock",
         "cycle hub",
         "cycleshare",

data/presets/amenity/bicycle_repair_station.json

@@ -26,10 +26,10 @@
         "bike multitool",
         "bike repair",
         "bike tools",
+        "compressed air",
         "cycle pump",
         "cycle repair",
-        "cycling",
-        "compressed air"
+        "cycling"
     ],
     "tags": {
         "amenity": "bicycle_repair_station"

data/presets/amenity/bicycle_wash.json

@@ -18,13 +18,13 @@
         "area"
     ],
     "terms": [
-        "bike",
         "bicycle",
-        "bike wash",
-        "bicycle wash",
         "bicycle cleaning",
-        "cycle wash",
+        "bicycle wash",
+        "bike",
+        "bike wash",
         "cycle rinse station",
+        "cycle wash",
         "cycling"
     ],
     "tags": {

data/presets/amenity/binoculars.json

@@ -24,8 +24,8 @@
     "terms": [
         "observation viewer",
         "optical ranger",
-        "spotting scope",
         "sight",
+        "spotting scope",
         "spyglass",
         "telescope",
         "tower viewer",

data/presets/amenity/cafe/bubble_tea.json

@@ -14,12 +14,12 @@
     },
     "terms": [
         "boba",
+        "boba drink",
         "bubble milk tea",
         "pearl milk tea",
-        "taiwanese tea drink",
-        "tapioca",
         "pearl tea",
-        "boba drink"
+        "taiwanese tea drink",
+        "tapioca"
     ],
     "name": "Bubble Tea Cafe"
 }

data/presets/amenity/cafe/coffee_shop.json

@@ -16,9 +16,9 @@
         "americano",
         "brew",
         "cafe",
-        "café",
         "caffe",
         "caffè",
+        "café",
         "cappuccino",
         "cocoa",
         "coffee shop",

data/presets/amenity/cafe/teahouse.json

@@ -0,0 +1,30 @@
+{
+    "icon": "maki-cafe",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "cafe",
+        "cuisine": "tea"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "cafe"
+    },
+    "terms": [
+        "black tea",
+        "green tea",
+        "hot drinks",
+        "oolong tea",
+        "tea",
+        "tea drink",
+        "tea house",
+        "tea room",
+        "teahouse",
+        "tearoom",
+        "white tea",
+        "yellow tea"
+    ],
+    "name": "Teahouse"
+}

data/presets/amenity/casino.json

@@ -21,11 +21,11 @@
         "area"
     ],
     "terms": [
-        "gambling",
-        "roulette",
+        "blackjack",
         "craps",
+        "gambling",
         "poker",
-        "blackjack"
+        "roulette"
     ],
     "tags": {
         "amenity": "casino"

data/presets/amenity/charging_station.json

@@ -26,9 +26,11 @@
         "amenity": "charging_station"
     },
     "terms": [
-        "EV",
-        "Electric Vehicle",
-        "Supercharger"
+        "charge point",
+        "charging stall",
+        "electric vehicle",
+        "ev",
+        "supercharger"
     ],
     "name": "Charging Station"
 }

data/presets/amenity/cinema.json

@@ -25,10 +25,10 @@
         "film",
         "flick",
         "movie",
-        "theater",
         "picture",
+        "screen",
         "show",
-        "screen"
+        "theater"
     ],
     "tags": {
         "amenity": "cinema"

data/presets/amenity/clinic/dialysis.json

@@ -17,8 +17,8 @@
         "value": "dialysis"
     },
     "terms": [
-        "kidney dialysis",
-        "dialysis clinic"
+        "dialysis clinic",
+        "kidney dialysis"
     ],
     "name": "Dialysis Center"
 }

data/presets/amenity/clinic/fertility.json

@@ -7,9 +7,9 @@
     "terms": [
         "egg",
         "fertility",
+        "ovulation",
         "reproductive",
-        "sperm",
-        "ovulation"
+        "sperm"
     ],
     "tags": {
         "amenity": "clinic",

data/presets/amenity/clock/sundial.json

@@ -6,7 +6,6 @@
         "visibility",
         "inscription"
     ],
-    "moreFields": [],
     "geometry": [
         "point",
         "vertex"

data/presets/amenity/community_centre/lgbtq.json

@@ -12,12 +12,12 @@
         "area"
     ],
     "terms": [
-        "lgbtq event",
-        "lgbtq hall",
+        "lgb event",
+        "lgb hall",
         "lgbt event",
         "lgbt hall",
-        "lgb event",
-        "lgb hall"
+        "lgbtq event",
+        "lgbtq hall"
     ],
     "tags": {
         "amenity": "community_centre",

data/presets/amenity/dentist.json

@@ -16,8 +16,8 @@
         "area"
     ],
     "terms": [
-        "tooth",
-        "teeth"
+        "teeth",
+        "tooth"
     ],
     "tags": {
         "amenity": "dentist"

data/presets/amenity/device_charging_station.json

@@ -0,0 +1,29 @@
+{
+    "icon": "temaki-electronic",
+    "fields": [
+        "access_simple",
+        "capacity",
+        "fee",
+        "payment_multi",
+        "level",
+        "lockable",
+        "opening_hours"
+    ],
+    "moreFields": [
+        "wheelchair",
+        "operator",
+        "indoor"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "amenity": "device_charging_station"
+    },
+    "terms": [
+        "charger",
+        "plug",
+        "usb"
+    ],
+    "name": "Device Charging Station"
+}

data/presets/amenity/doctors/cardiology.json

@@ -6,7 +6,7 @@
     ],
     "terms": [
         "cardiac surgeon",
-        "Cardiology",
+        "cardiology",
         "cardiovascular system",
         "coronary artery",
         "heart"

data/presets/amenity/doctors/gastroenterology.json

@@ -6,13 +6,13 @@
     ],
     "terms": [
         "bowels",
-        "digestive system",
         "digestion",
+        "digestive system",
         "esophagus",
         "food pipe",
         "gallstone",
-        "gastrointestinal tract",
         "gastroenterology",
+        "gastrointestinal tract",
         "gullet",
         "intestines",
         "large intestine",

data/presets/amenity/doctors/general.json

@@ -5,10 +5,10 @@
         "area"
     ],
     "terms": [
-        "gp",
+        "family doctor",
         "family physician",
         "family practitioner",
-        "family doctor"
+        "gp"
     ],
     "tags": {
         "amenity": "doctors",

data/presets/amenity/doctors/gynaecology.json

@@ -9,8 +9,8 @@
         "gynaecologist",
         "gynaecology",
         "gynecology",
-        "OBGYN",
         "ob/gyn",
+        "obgyn",
         "obstetrics",
         "ovulation",
         "reproductive",