Improve icon for craft=rigger (#1775)

see 95fab6dbdc (r168567074)

.github/ISSUE_TEMPLATE/0-enhancement.yaml

@@ -0,0 +1,110 @@
+name: Add support of a missing OSM tag
+description: This requests an OSM tag to be added to the tagging schema in the form of a new preset, field or value.
+# title: ''
+labels: needs-triage
+# assignees: ''
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this request to add a new tag to the tagging schema.
+  - type: input
+    attributes:
+      label: OSM Tag(s)
+      description: Please list the tag or tags which you would like to see included.
+      placeholder: tourism=camp_site
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: How would you like this tag to see supported?
+      description: 'A tag can be supported in different ways: A preset, a field or a option in a dropdown field.'
+      options:
+        - As a Preset
+        - As a Field
+        - As an Option of a Field
+        - Other (please indicate below)
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Label
+      description: The title/name/label of the preset, field or field option (preferably in American English).
+      placeholder: Campground
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Aliases
+      description: 'Only for Presets: Synonyms of the name of the preset.'
+      placeholder: Campsite
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Terms
+      description: 'Only for Presets and Fields: Synonyms of the name of the preset.'
+      placeholder: Camping, Tenting, Camp Site, Caravans, …
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Link to OSM Wiki page
+      description: Link to the documentation of this tag on the OSM wiki.
+      placeholder: https://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Status of the Tag
+      description: The status of the tag(s) according to the OSM wiki.
+      options:
+        - Approved
+        - De Facto
+        - In Use
+        - Unspecified / Unknown
+        - Voting
+        - Abandoned
+        - Deprecated
+        - Discardable
+        - Draft
+        - Imported
+        - Obsolete
+        - Proposed
+        - Rejected
+        - Other (please indicate below)
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Usage of the tag
+      description: How many OSM object exist currently which use the tag?
+      placeholder: '126,000'
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Suggested Icon
+      description: Each preset needs an icon ([learn more…](https://github.com/ideditor/schema-builder/blob/main/ICONS.md#icons)). Any suggestion, yet, on which? Or do we need a new one?
+      placeholder: 'maki-park'
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Replaces other Tag?
+      description: Does this tag replace a different one which is already supported by the tagging schema?
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Regional Tag?
+      description: Should this tag only be available in a specific region or country?
+      placeholder: global
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Further Information
+      description: Please add further details about this tag which should be considered. For example, include a link to taginfo, taghistory or to an overpass query, add a list tools which support this tag, etc.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/1-bug.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug,needs-triage
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. …
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/2-deprecating.yaml

@@ -0,0 +1,37 @@
+name: Add a New Deprecation Rule
+description: This requests an OSM tag to be added to list of deprecated tags.
+# title: ''
+labels: deprecating,needs-triage
+# assignees: ''
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this request to enhance the tagging schema.
+  - type: input
+    attributes:
+      label: Deprecated OSM Tag(s)
+      description: Please list the tag(s) which are to be included in the list of deprecation rules.
+      placeholder: highway=ford
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Replacement OSM Tag(s)
+      description: Please list by which tag(s) the deprecated tag(s) should be replaced with.
+      placeholder: ford=yes
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Link to OSM Wiki page
+      description: Link to the OSM wiki where the deprecation of the tag(s) is documented.
+      placeholder: https://wiki.openstreetmap.org/wiki/Deprecated_features
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Further Information
+      description: Please add further details about this tag. For example, include a link to taginfo, taghistory or to an overpass query.
+    validations:
+      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,72 @@
+### Description, Motivation & Context
+
+<!-- Help readers to understand why this is relevant -->
+
+### Related issues
+
+<!-- Please link any related issues here. 
+     Use "Closes #123" to reference issues that should be closed automatically when this is merged. -->
+
+### Links and data
+
+**Relevant OSM Wiki links:**
+- …
+
+**Relevant tag usage stats:**
+> …
+<!-- E.g., Numbers from Taginfo https://taginfo.openstreetmap.org/ and maybe local Taginfo https://taginfo.geofabrik.de/ -->
+<!-- E.g., a link to https://taghistory.raifer.tech -->
+
+### Checklist and Test-Documentation Template
+
+<details><summary>Read on to get your PR merged faster…</summary>
+
+Follow these steps to test your PR yourself and make it a lot easier and faster for maintainers to check and approve it.
+
+**This is how it works:**
+1. 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.
+
+2. Once the preview is ready, use it to test your changes.
+
+3. Now copy the snippet below into a new comment and fill out the blanks.
+
+4. Now your PR is ready to be reviewed.
+
+```
+## Test-Documentation
+
+### Preview links & Sidebar Screenshots
+
+<!-- Use the preview to find examples, select the feature in question and **copy this link here**.
+     Find examples of nodes/areas. Find examples with a lot of tags or very few tags. – Whatever helps to test this thoroughly.
+     Add relevant **screenshots** of the sidebar of those examples. -->
+
+<!-- FYI: What we will check:
+     - Is the [icon](https://github.com/ideditor/schema-builder/blob/main/ICONS.md) well chosen.
+     - Are the fields well-structured and have good labels.
+     - Do the dropdowns (etc.) work well and show helpful data. -->
+
+### Search
+
+<!-- **Test the search** of your preset and share relevant **screenshots** here.
+     - Test the preset name as search terms.
+     - Also test the preset terms and aliases as search terms (if present). -->
+
+### Info-`i`
+
+<!-- **Test the info-i** for your fields and preset and share relevant **screenshots** here.
+     The info needs to help mappers understand the preset and when to use it.
+     [Learn more…](https://github.com/openstreetmap/id-tagging-schema/blob/main/CONTRIBUTING.md#info-i)
+ -->
+
+### Wording
+
+- [ ] American English
+- [ ] `name`, `aliases` (if present) use Title Case
+- [ ] `terms` (if present) use lower case, sorted A-Z
+<!-- Learn more in https://github.com/openstreetmap/id-tagging-schema/blob/main/GUIDELINES.md#2-design-the-preset -->
+```
+
+</details>

.github/dependabot.yml

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

.github/release-drafter.yml

@@ -0,0 +1,62 @@
+name-template: 'v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
+categories:
+  - title: 'New Presets'
+    labels:
+      - 'new-preset'
+  - title: 'New and Changed Fields'
+    labels:
+      - 'field'
+      - 'new-field'
+      - 'new-value'
+  - title: 'Changed Presets'
+    labels:
+      - 'preset'
+      - 'add-field'
+      - 'new-icon'
+      - 'new-label'
+  - title: 'Regional Presets and Fields'
+    labels:
+      - 'regional'
+  - title: 'Deprecated Tags'
+    labels:
+      - 'deprecating'
+  - title: 'Bug Fixes'
+    labels:
+      - 'bug'
+  - title: 'Documentation and Other Changes'
+    labels:
+      - 'ci'
+      - 'documentation'
+      - 'new-category'
+      - 'schema-builder'
+      - 'schema'
+  - title: 'Dependencies'
+    collapse-after: 3
+    labels:
+      - 'dependencies'
+category-template: '#### $TITLE'
+change-template: '* $TITLE (#$NUMBER, thanks @$AUTHOR)'
+change-title-escapes: '\<*_&'
+version-resolver:
+  major:
+    labels:
+      - 'breaking'
+  minor:
+    labels:
+      - 'enhancement'
+      - 'new-preset'
+      - 'new-field'
+      - 'new-value'
+      - 'new-icon'
+      - 'new-label'
+      - 'new-category'
+      - 'add-field'
+      - 'deprecating'
+      - 'regional'
+  patch:
+    labels:
+      - 'bug'
+      - 'documentation'
+  default: minor
+template: '$CHANGES'

.github/workflows/build-preview.yml

@@ -0,0 +1,49 @@
+name: Build Preview
+
+on:
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  build-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - run: npm clean-install
+      - run: npm run dist
+      - uses: actions/checkout@v4
+        with:
+          repository: openstreetmap/iD
+          path: './iD'
+      - run: npm clean-install
+        working-directory: './iD'
+      - run: npm run all
+        working-directory: './iD'
+        env:
+          ID_PRESETS_CDN_URL: '../../'
+      - run: npm run dist
+        working-directory: './iD'
+        env:
+          ID_PRESETS_CDN_URL: '../../'
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: preview
+          path: |
+            dist
+            iD/dist
+
+      - name: Store pull request number for later use
+        run: |
+          echo ${{github.event.number}} > ./pr_number
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pr
+          path: ./pr_number

.github/workflows/codespell.yml

@@ -1,17 +0,0 @@
-# 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,./dist/translations
-          ignore_words_list: "auxilary,casette,cemetary,chancel,extentions,faiway,generat,goverment,guerilla,kindergarden,pavillion,sculpter,storys"
-          only_warn: 1

.github/workflows/deploy-preview.yml

@@ -0,0 +1,109 @@
+name: Deploy Preview
+
+on:
+  workflow_run:
+    workflows: ["Build Preview"]
+    types:
+      - completed
+
+jobs:
+  deploy-preview:
+    environment: pr-previews
+    runs-on: ubuntu-latest
+    if: ${{github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+      - run: npm clean-install
+
+      - name: Get pull request number
+        uses: actions/github-script@v7
+        id: pull-request-number
+        with:
+          result-encoding: string
+          script: |
+            const unzipper = require('unzipper');
+            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{github.event.workflow_run.id}}
+            });
+            const artifact = artifacts.data.artifacts.filter(
+              artifact => artifact.name === 'pr'
+            )[0];
+            if (!artifact) {
+              throw new Error('No "pr" artifact found');
+            }
+            const download = await github.rest.actions.downloadArtifact({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              artifact_id: artifact.id,
+              archive_format: 'zip'
+            });
+            const directory = await unzipper.Open.buffer(Buffer.from(download.data));
+            const file = directory.files.find(d => d.path === 'pr_number');
+            const content = await file.buffer();
+            return content.toString();
+      - uses: dawidd6/action-download-artifact@v8
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          workflow: build-preview.yml
+          pr: ${{steps.pull-request-number.outputs.result}}
+          name: preview
+          allow_forks: true
+
+      - name: Deploy to Netlify
+        env:
+          NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
+          NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
+        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
+        with:
+          script: |
+            const pullRequestNumber = parseInt(${{steps.pull-request-number.outputs.result}}, 10);
+            const start = ':bento:';
+            const author = 'github-actions[bot]';
+            const comments = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: pullRequestNumber
+            });
+            const commentExists = comments.data.some(
+              comment => comment.user.login === author && comment.body.startsWith(start)
+            );
+            if (!commentExists) {
+              await github.rest.issues.createComment({
+                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=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}`);
+            }
+
+      - name: Clean up artifact
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{github.event.workflow_run.id}}
+            });
+            const artifact = artifacts.data.artifacts.filter(
+              artifact => artifact.name === 'preview'
+            )[0];
+            if (!artifact) {
+              throw new Error('No "preview" artifact found');
+            }
+            await github.rest.actions.deleteArtifact({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              artifact_id: artifact.id
+            });

.github/workflows/deploy.yml

@@ -0,0 +1,37 @@
+name: Deploy
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    if: github.repository == 'openstreetmap/id-tagging-schema'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4 # If you're using actions/checkout@v3 you must set persist-credentials to false in most cases for the deployment to work correctly.
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install Node.js dependencies
+        run: npm clean-install
+
+      - name: Build
+        run: npm run build
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: interim # The branch the action should deploy to.
+          folder: interim # The folder the action should deploy.

.github/workflows/lint.yml

@@ -1,13 +1,38 @@
-name: prettier check
+name: Code Style Checks
 on: [push, pull_request]
 jobs:
   lint:
+    name: Check file endings
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          disallowedFiles=`find data/ -type f -not -iname "*.json" -not -iname "*.md"`
+          for f in $disallowedFiles
+          do
+            echo "::error file=$f::File $f is not a .json or .md file."
+          done
+          if [ ! -z "$disallowedFiles" ]; then exit 1; fi
+
+  prettier:
     name: Check for code formatting mistakes
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16'
-      - run: npm install
+          node-version-file: '.nvmrc'
+      - run: npm clean-install
       - run: npm run lint
+
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: codespell-project/actions-codespell@v2
+        with:
+          check_filenames: true
+          skip: ./.git,./dist,./data/deprecated.json,./data/discarded.json,package.json,package-lock.json,./scripts
+          ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te,brunch"
+          only_warn: 1

.github/workflows/release-drafter.yml

@@ -0,0 +1,21 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v6
+        with:
+           disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/staging.yml

@@ -0,0 +1,57 @@
+name: Build and Deploy Staging Instance
+
+on:
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: read
+
+jobs:
+  build-deploy:
+    if: github.repository == 'openstreetmap/id-tagging-schema'
+    runs-on: ubuntu-latest
+    environment: staging
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      # install and build development version of id-tagging-schema
+      - run: npm clean-install
+      - run: npm run translations
+        env:
+          transifex_password: ${{secrets.TX_TOKEN}}
+        if: env.transifex_password != null
+      - run: npm run dist
+      # install and build development version of iD using freshest version of presets and ELI
+      - uses: actions/checkout@v4
+        with:
+          repository: openstreetmap/id
+          path: './iD'
+      - run: npm clean-install
+        working-directory: './iD'
+      - run: npm install editor-layer-index
+        working-directory: './iD'
+      - run: mkdir dist/data
+        working-directory: './iD'
+      - run: npm run imagery
+        working-directory: './iD'
+      - run: npm run all
+        working-directory: './iD'
+      - run: npm run translations
+        working-directory: './iD'
+        env:
+          transifex_password: ${{secrets.TX_TOKEN}}
+        if: env.transifex_password != null
+      - run: mkdir iD/dist/id-tagging-schema && mv dist iD/dist/id-tagging-schema/dist
+      - run: npm run dist
+        working-directory: './iD'
+        env:
+          ID_PRESETS_CDN_URL: './id-tagging-schema/'
+      # deploy to netlify
+      - name: Deploy to Netlify
+        env:
+          NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
+          NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
+        run: ./node_modules/.bin/netlify deploy --no-build --prod --dir=iD/dist

.github/workflows/test.yml

@@ -1,7 +1,7 @@
 # This workflow will do a clean install of node dependencies and run tests across different versions of node.
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: test
+name: Test
 
 on:
   push:
@@ -15,13 +15,13 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: ['18']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm install
+    - run: npm clean-install
     - run: npm run test

.gitignore

@@ -4,6 +4,6 @@
 /node_modules/
 /.tx/tmp/
 npm-debug.log
-package-lock.json
 
 transifex.auth
+interim

.nvmrc

@@ -0,0 +1 @@
+lts/*

.prettierrc

@@ -1,6 +1,6 @@
 {
-	"parser": "json-stringify",
-	"proseWrap": "never",
-	"bracketSpacing": true,
-	"endOfLine": "lf"
+    "parser": "json-stringify",
+    "proseWrap": "never",
+    "bracketSpacing": true,
+    "endOfLine": "lf"
 }

.vscode/settings.json

@@ -36,5 +36,8 @@
             ],
             "url": "./node_modules/@ideditor/schema-builder/schemas/preset_defaults.json"
         }
-    ]
+    ],
+    "files.exclude": {
+        "**/dist": true
+    }
 }

CONTRIBUTING.md

@@ -0,0 +1,93 @@
+# Contributing to the tagging schema
+
+## Submitting Issues
+
+Don't hesitate to submit feedback about issues or how the tagging schema could be improved, but please [search existing issues](https://github.com/search?l=&q=repo%3Aopenstreetmap%2Fid-tagging-schema&type=Issues) before [opening a new one](https://github.com/openstreetmap/id-tagging-schema/issues/new/choose).
+
+iD's [code of conduct](https://github.com/openstreetmap/iD/blob/release/CODE_OF_CONDUCT.md) and [privacy policy](https://github.com/openstreetmap/iD/blob/release/PRIVACY.md) also apply to this project.
+
+
+## General Guidelines
+
+Read the [GUIDELINES](./GUIDELINES.md) to help you understand what fields and tags should be added to the tagging schema.
+
+## Translating
+
+* **English (US) translations** are managed inside the JSON files of this repository. The Transifex translations for "English (en)" are only a reference for other languages but not exported.
+
+  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://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://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://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://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).
+
+
+## Making Changes
+
+You are highly welcome to help this project by submitting pull requests!
+
+### Overview and General Structure
+
+Detailed documentation for the data format used in this repository is located with the [schema-builder](https://github.com/ideditor/schema-builder) package, which is the technical basis of this project.
+
+To make a change, update the corresponding file within the `data` folder: The `presets` contain a representation of OpenStreetMap's [map features](https://wiki.openstreetmap.org/wiki/Map_Features), and the `fields` are their properties. In addition, the tagging schema contains a few `categories` of presets and a list of `deprecated` and `discardable` tags.
+
+### Icons
+
+Icons from different sources (_icon sets_) can be used in the tagging schema. Head over to the [dedicated page](https://github.com/ideditor/schema-builder/blob/main/ICONS.md#icons) about how to use them.
+
+### Info-`i`
+
+<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 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.
+
+### Integration Testing With iD
+
+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
+
+The following `npm` commands are used in this repository:
+
+* `npm install` – installs or updates the repository's required dependencies
+* `npm test` – validates the source data
+* `npm run build` – validates the source data and builds some files which are used during development (e.g. strings to be supplied to the translation platform)
+* `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
+
+### 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

@@ -0,0 +1,97 @@
+# Roles, People, and Processes for Maintaining the Tagging Schema
+
+This document outlines how this project is maintained.
+
+## Roles & People
+
+### Maintainer Role
+
+[Martin](https://github.com/tyrasd) maintains this project as part of his work on the iD Editor project.
+
+The maintainer role includes:
+- Having the final say in decisions for the tagging schema.
+- Creating releases.
+- Updating dependencies.
+- Assign roles.
+
+and all the following roles.
+
+Github shows a `(Member)` label next to users with full access to this repository and the organisation.
+
+### Co-Maintainer Role
+
+- [Kyle](https://github.com/k-yle) contributes to this project as a volunteer.
+- [Tobias](https://github.com/tordans) contributes to this project as a volunteer.
+
+The co-maintainer role includes:
+- Reviewing PRs.
+- Merging "clear-cut" PRs by others.
+
+and all the following roles.
+
+Github shows a `(Collaborator)` label next to users with any permission on this repository.
+
+### Triage Role
+
+* [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.
+
+### Contributors
+
+To all contributors, thank you so much for your support! ❤ Especially for:
+- Suggesting new presets and fields or updates to the repository.
+- Researching and helping with issues and PRs.
+- Translating the tagging schema.
+
+Code contributions: [Check this complete list of contributors on GitHub](https://github.com/openstreetmap/id-tagging-schema/graphs/contributors).
+
+Github shows a `(Contributor)` label next to users that previously committed to this repository.
+
+## Processes
+
+### PR Reviews and Merges
+
+- PRs need approval from two people: the author and one or more (co-)maintainers before being merged.
+- Non-"clear-cut" changes need to be merged by the maintainer.
+- We might revert merges later if necessary.
+
+**What is a clear-cut change?**
+
+- No or minimal controversial discussion on the change.
+- Coding and contribution [guidelines](./GUIDELINES.md) are met.
+
+**How to merge…**
+
+- Usually squash merge PRs to make the history simpler
+- Give the merge a meaningful description of the change
+- 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
+
+There is no set release schedule at the moment, but releases usually occur every other month. After this project is released, the projects that rely on the data need to update and release as well.
+
+### Assigning roles
+
+- The maintainer of the iD editor has traditionally and continues to maintain this project.
+- Co-maintainer and triage roles are assigned by the current maintainer of the repository.
+
+## Previous Maintainers
+
+Many thanks to all previous maintainers! ❤
+
+- [Milos](https://github.com/mbrzakovic)
+- [Quincy](https://github.com/quincylvania)
+- [Bryan](https://github.com/bhousel)

GUIDELINES.md

@@ -0,0 +1,77 @@
+# Guidelines for the Tagging Schema
+
+Do you have an idea for a new preset or field? Read this!
+
+## 1. Evaluate Your Idea for the Tagging Schema Project
+
+Adding a preset or field to the tagging schema is a significant responsibility.
+We must ensure that both new and experienced users can understand the presets and fields,
+thereby contributing high-quality data to OpenStreetMap (OSM).
+
+Consider the following:
+
+### General Guidelines
+
+- 📋 **Established Documentation**: The tagging schema will only consider tags that are well-documented on the OSM wiki. The documentation should be clear and unambiguous.
+- 🏷️ **Established Tags Only**: No new or unestablished tags should be part of presets. Establishing tags must remain a community-driven process, not dictated by software implementation.
+- ✅ **Proposal or Accepted**: A tag is considered established when it has completed the [proposal process](https://wiki.openstreetmap.org/wiki/Proposal_process) or is otherwise accepted by the OSM community. Factors include the tag's duration and frequency of use, whether its usage is increasing over time and its usage by mainstream data consumers.
+- 🤷 **Notable Purpose**: Especially for less established tags, presets and fields should have a practical application. OSM allows for the collection of a wide variety of data, some of it for niche purposes. For example, the brightness of street lamps might be documented, but it doesn't necessarily warrant a preset or field.
+- 🕓 **Effort vs. Impact**: Consider whether the effort required is justified by the impact the preset or field will have. Assess how many elements this new type will apply to. This is particularly important if you do not plan to contribute the code changes yourself through a pull request (PR).
+
+### User Experience
+
+No preset or field is isolated; they are always presented alongside others in various user interfaces that utilize the tagging schema.
+
+- 🔦 **Easy to Pick**: Users must be able to understand and select the correct preset given the limited information available in the user interfaces. Good presets guide the user with clear names and helpful additional documentation `(i)`.
+- 🔎 **Easy to Search**: When searching, similar presets will appear next to each other. Consider and test typical search scenarios. You might need to adjust the names and documentation of other presets to ensure users can make the best decision.
+- 👨‍💻 **Users Are Not Experts**: No prior knowledge of OpenStreetMap or any other background information should be necessary.
+- 🐿️ **Easy Answer**: Users are often on the go and impatient. Fields should allow for quick, straightforward, and clear answers.
+
+### Situational Presets
+
+- 🙈 **Unsearchable Presets**: The tagging schema is not only for adding information but also for presenting existing information. Consider adding an unsearchable preset for tagging that should be highlighted with a preset on the map and with defined fields. Reasons to make a preset unsearchable include: multiple ways to tag something where one method is preferred, or other reasons to hide commonly used tags from the search and list interface to preserve a good [user experience](#user-experience).
+- 🏝️ **Local Presets and Fields**: Generally, presets and fields in OSM should be globally applicable, and efforts should be made to ensure this. However, when local tagging conventions exist or when presets only make sense for certain regions, presets and fields can be given a local filter. This increases the need for thorough testing and makes it more challenging to maintain a good [user experience](#user-experience).
+
+### Tag Updates and Additions
+
+- ➕ **Suggested Additions**: Presets can suggest additional tags. These suggestions must be clearly supported by the wiki and community consensus.
+- 🔄 **Updates**: Deprecation rules can suggest updating tags. Good documentation and consensus are needed for these deprecations.
+
+**In both cases, _indicators for consensus_ are:**
+
+- The deprecation is documented in the wiki and is either official (resulting from a proposal process) or long-standing (about a year).
+- There is a significant drop in usage compared to previous numbers, with a negative trend ([visible in the graph](https://taghistory.raifer.tech/)).
+- Usage of the deprecated tag remains stagnant for a longer period (about a year).
+
+In addition, the deprecated tag must have reasonably high usage to be considered. Low usage tags should be addressed through other cleanup methods, such as [MapRoulette](https://maproulette.org/) or similar initiatives.
+
+**Deprecations are not for cleanup:**
+
+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:
+- 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/).
+- Should those options not suit you, you can always suggest such changes in the [OSM community forum](https://community.openstreetmap.org/).
+
+## 2. Design the Preset
+
+The user interface must be clear, concise, and easy to use, leaving no room for misunderstandings.
+
+- Define the tags required on an object to trigger the preset.
+- Choose a name, category, and define a list of American English search terms.
+- Use Title Case for the the preset `name` and [`aliases`](https://github.com/ideditor/schema-builder?tab=readme-ov-file#aliases) as well as the field [`label`](https://github.com/ideditor/schema-builder?tab=readme-ov-file#label) property. Use lower case for the preset [`terms`](https://github.com/ideditor/schema-builder?tab=readme-ov-file#terms) (sorted A-Z) and Title Case or sentences for preset's [`strings`-`options`](https://github.com/ideditor/schema-builder?tab=readme-ov-file#strings).
+- 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](./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
+
+If you are familiar with `JSON`, you can implement the preset or field yourself. First, create a ticket to introduce your tagging idea and discuss it with the community to get feedback on its feasibility and desirability. After implementation, create a pull request to get it merged.
+
+For more details on adding presets, see ["Making changes"](./CONTRIBUTING.md#making-changes).
+
+If you are not familiar with `JSON`, still create a ticket. The more you have considered and prepared from the above steps, the easier it will be for someone else to code it.

README.md

@@ -1,14 +1,22 @@
-![test](https://github.com/openstreetmap/id-tagging-schema/workflows/test/badge.svg) [![npm version](https://badge.fury.io/js/%40openstreetmap%2Fid-tagging-schema.svg)](https://badge.fury.io/js/%40openstreetmap%2Fid-tagging-schema)
+[![test](https://github.com/openstreetmap/id-tagging-schema/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/openstreetmap/id-tagging-schema/actions/workflows/test.yml) [![npm version](https://badge.fury.io/js/%40openstreetmap%2Fid-tagging-schema.svg)](https://badge.fury.io/js/%40openstreetmap%2Fid-tagging-schema)
 
 # iD Tagging Schema
 
 This is the directory of OpenStreetMap tagging data used by the [iD editor](https://github.com/openstreetmap/iD).
 It includes presets, fields, deprecations, and more.
 
+## Participate!
+
+* Read up about how you can contribute to the iD Tagging Schema on the [contributing page](CONTRIBUTING.md).
+* [Translate!](CONTRIBUTING.md#Translating)
+* See the [open issues](https://github.com/openstreetmap/id-tagging-schema/issues?state=open) in the issue tracker if you're looking for something to do.
+* Need more help? Ping user `tyr_asd` (Martin Raifer) on [OpenStreetMap Discord](https://discord.gg/openstreetmap) (`#id-and-rapid` channel) or [OpenStreetMap US Slack](https://slack.openstreetmap.us/) (`#id` channel).
+
 ## Background
 
-OpenStreetMap itself does not have a formal tagging [schema](https://en.wikipedia.org/wiki/Database_schema),
-but editing tools need to know how tags are used in order to facilitate mapping.
+OpenStreetMap itself does not have a formal rigid [database schema](https://en.wikipedia.org/wiki/Database_schema), but relies on a [tagging](https://wiki.openstreetmap.org/wiki/Tags) [folksonomy](https://en.wikipedia.org/wiki/Folksonomy) instead.
+
+Editing tools need to know how tags are used in order to facilitate mapping.
 This Tagging Schema fills that need, but with a number of caveats:
 
 - This isn't authoritative or definitive
@@ -17,18 +25,6 @@ This Tagging Schema fills that need, but with a number of caveats:
 - We support tags based on practicality, usage, and community approval
 - Sometimes there are reasons we can't support a tag even if it's used or approved
 
-## Translations
-
-* English translations for the `terms`-key should be added to the JSON data ([Example](https://github.com/openstreetmap/id-tagging-schema/blob/v3.1.0/data/presets/natural/shrub.json#L16-L19)).
-
-* Apart from that, translations are managed [in the Transifex Project of the iD Editor](https://www.transifex.com/openstreetmap/id-editor/) inside the translation resource _'preset'_.
-
-  To translate, you can [open the translation page](https://www.transifex.com/openstreetmap/id-editor/translate/), select a language, select _'preset'_ and search for `key:living_street` or `translation_text:'Living Street'` to find and change translations.
-
-  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.
-
-* All translation changes will be released whenever [a new id-tagging-schema release is created](https://github.com/openstreetmap/id-tagging-schema/releases). They will be visible inside iD and other editors once those editors update their dependencies and release a new version as well.
-
 ## Usage
 
 ### Java/Android
@@ -37,17 +33,17 @@ The [westnordost/osmfeatures](https://github.com/westnordost/osmfeatures) projec
 a component of [StreetComplete](https://github.com/westnordost/StreetComplete),
 makes it easier to use this data with Android or other Java platforms.
 
+### Use by Other Editors
+
+iD tagging schema is used not only by iD. Here's a [list of projects](https://github.com/openstreetmap/id-tagging-schema/wiki/Projects-that-are-using-this-tagging-schema) which use the data from the id-tagging-schema.
+
 ## Related Projects
 
-iD also incorporates preset data from the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index).
+* The [OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Map_features) documents the current usage of tags, and hosts discussions about proposed new tags.
+* The [ideditor/schema-builder](https://github.com/ideditor/schema-builder) project holds the documentation for the data format used in this repository
+* iD also incorporates preset data from the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index).
+* Other editors also include their own models of interpretations of OSM tags. See for example [Vespucci's](https://github.com/simonpoole/beautified-JOSM-preset) or [JOSM's](https://josm.openstreetmap.de/wiki/Presets) tagging presets.
 
 ## Contributing
 
-iD's [code of conduct](https://github.com/openstreetmap/iD/blob/release/CODE_OF_CONDUCT.md) and
-[privacy policy](https://github.com/openstreetmap/iD/blob/release/PRIVACY.md) also apply to this project.
-
-### Making Changes
-
-Documentation for the data formats is located with the [schema-builder](https://github.com/ideditor/schema-builder)
-package, which is the technical basis of this project. To make a change, update a
-file within the `data` folder and rebuild by running `npm run build` in your terminal.
+See the dedicated [CONTRIBUTING](CONTRIBUTING.md) page for information about this.

data/deprecated.json

@@ -59,10 +59,6 @@
     "old": {"amenity": "community_center"},
     "replace": {"amenity": "community_centre"}
   },
-  {
-    "old": {"amenity": "dancing_school"},
-    "replace": {"leisure": "dance", "dance:teaching": "yes" }
-  },
   {
     "old": {"amenity": "dog_bin"},
     "replace": {"amenity": "waste_basket", "waste": "dog_excrement"}
@@ -80,8 +76,8 @@
     "replace": {"amenity": "charging_station"}
   },
   {
-     "old": {"amenity": "charging_station", "car": "*"},
-     "replace": {"amenity": "charging_station", "motorcar": "$1"}
+    "old": {"amenity": "charging_station", "car": "*"},
+    "replace": {"amenity": "charging_station", "motorcar": "$1"}
   },
   {
     "old": {"amenity": "fire_hydrant"},
@@ -115,6 +111,14 @@
     "old": {"amenity": "kiosk"},
     "replace": {"shop": "kiosk"}
   },
+  {
+    "old": {"amenity": "lifeboat_station"},
+    "replace": {"emergency": "water_rescue"}
+  },
+  {
+    "old": {"amenity": "lockers"},
+    "replace": {"amenity": "locker"}
+  },
   {
     "old": {"amenity": "notice_board"},
     "replace": {"advertising": "board"}
@@ -275,10 +279,6 @@
     "old": {"building": "comercial"},
     "replace": {"building": "commercial"}
   },
-  {
-    "old": {"building": "constraction"},
-    "replace": {"building": "construction"}
-  },
   {
     "old": {"building": "convenience"},
     "replace": {"building": "retail"}
@@ -359,10 +359,6 @@
     "old": {"building": "Sí"},
     "replace": {"building": "yes"}
   },
-  {
-    "old": {"building": "under constraction"},
-    "replace": {"building": "construction"}
-  },
   {
     "old": {"building": "under construction"},
     "replace": {"building": "construction"}
@@ -407,10 +403,6 @@
     "old": {"camp_site": "camp_pitch"},
     "replace": {"tourism": "camp_pitch"}
   },
-  {
-    "old": {"shop": "clothes", "clothes": "second_hand"},
-    "replace": {"shop": "clothes", "second_hand": "yes"}
-  },
   {
     "old": {"color": "*"},
     "replace": {"colour": "$1"}
@@ -438,14 +430,6 @@
     "old": {"craft": "glass"},
     "replace": {"craft": "glaziery"}
   },
-  {
-    "old": {"craft": "jeweler"},
-    "replace": {"shop": "jewelry"}
-  },
-  {
-    "old": {"craft": "optician"},
-    "replace": {"shop": "optician"}
-  },
   {
     "old": {"craft": "sculpter"},
     "replace": {"craft": "sculptor"}
@@ -458,6 +442,18 @@
     "old": {"crossing": "traffic_lights"},
     "replace": {"crossing": "traffic_signals"}
   },
+  {
+    "old": {"crossing": "no", "highway": "crossing"},
+    "replace": {"crossing": "no"}
+  },
+  {
+    "old": {"cuisine": "barbeque"},
+    "replace": {"cuisine": "barbecue"}
+  },
+  {
+    "old": {"cuisine": "bbq"},
+    "replace": {"cuisine": "barbecue"}
+  },
   {
     "old": {"cuisine": "gluten-free"},
     "replace": {"diet:gluten_free": "*"}
@@ -551,17 +547,17 @@
     "replace": {"direction": "W"}
   },
   {
-    "old": {"disabled_spaces":"*"},
+    "old": {"disabled_spaces": "*"},
     "replace": {"capacity:disabled": "$1"}
   },
+  {
+    "old": {"door": "loadingdock"},
+    "replace": {"amenity": "loading_dock"}
+  },
   {
     "old": {"drinkable": "*"},
     "replace": {"drinking_water": "$1"}
   },
-  {
-    "old": {"dropped_kerb": "*"},
-    "replace": {"kerb": "lowered"}
-  },
   {
     "old": {"embankment": "1"},
     "replace": {"embankment": "yes"}
@@ -582,6 +578,46 @@
     "old": {"embassy": "embassy"},
     "replace": {"embassy": "yes"}
   },
+  {
+    "old": {"emergency": "dry_riser_inlet"},
+    "replace": {"emergency": "fire_service_inlet", "fire_mains": "dry"}
+  },
+  {
+    "old": {"emergency": "sprinkler_connection"},
+    "replace": {"emergency": "fire_service_inlet", "fire_sprinkler": "yes"}
+  },
+  {
+    "old": {"emergency": "lifeguard_base"},
+    "replace": {"emergency": "lifeguard", "lifeguard": "base"}
+  },
+  {
+    "old": {"emergency": "lifeguard_platform"},
+    "replace": {"emergency": "lifeguard", "lifeguard": "tower"}
+  },
+  {
+    "old": {"emergency": "lifeguard_tower"},
+    "replace": {"emergency": "lifeguard", "lifeguard": "tower"}
+  },
+  {
+    "old": {"emergency": "water_rescue_station"},
+    "replace": {"emergency": "water_rescue"}
+  },
+  {
+    "old": {"emergency": "lifeboat_station"},
+    "replace": {"emergency": "water_rescue"}
+  },
+  {
+    "old": {"emergency": "ses_station"},
+    "replace": {"emergency": "disaster_response"}
+  },
+  {
+    "old": {"emergency": "marine_rescue"},
+    "replace": {"emergency": "water_rescue"}
+  },
+  {
+    "old": {"emergency_service": "air"},
+    "replace": {"emergency": "air_rescue_service"}
+  },
   {
     "old": {"entrance": "emergency_exit"},
     "replace": {"entrance": "emergency"}
@@ -650,6 +686,10 @@
     "old": {"footway": "both"},
     "replace": {"sidewalk": "both"}
   },
+  {
+    "old": {"sidewalk": "none"},
+    "replace": {"sidewalk": "no"}
+  },
   {
     "old": {"footway": "crossing", "highway": "cycleway"},
     "replace": {"cycleway": "crossing", "highway": "cycleway"}
@@ -690,6 +730,10 @@
     "old": {"generator:source": "photovoltaic"},
     "replace": {"generator:source": "solar", "generator:method": "photovoltaic"}
   },
+  {
+    "old": {"generator:method": "solar"},
+    "replace": {"generator:source": "solar"}
+  },
   {
     "old": {"golf": "faiway"},
     "replace": {"golf": "fairway"}
@@ -718,10 +762,18 @@
     "old": {"healthcare": "birthing_center"},
     "replace": {"healthcare": "birthing_centre"}
   },
+  {
+    "old": {"healthcare:speciality": "internist"},
+    "replace": {"healthcare:speciality": "internal"}
+  },
   {
     "old": {"highway": "abandoned"},
     "replace": {"abandoned:highway": "*"}
   },
+  {
+    "old": {"highway": "service", "service": "busway"},
+    "replace": {"highway": "busway"}
+  },
   {
     "old": {"highway": "bridleway", "horse": "no"},
     "replace": {"highway": "path", "horse": "no"}
@@ -735,8 +787,8 @@
     "replace": {"highway": "path", "foot": "no"}
   },
   {
-    "old": {"highway": "ford"},
-    "replace": {"ford": "*"}
+    "old": {"highway": "path", "ladder": "yes"},
+    "replace": {"highway": "ladder"}
   },
   {
     "old": {"highway": "platform"},
@@ -750,6 +802,14 @@
     "old": {"highway": "unsurfaced"},
     "replace": {"highway": "road", "surface": "unpaved"}
   },
+  {
+    "old": {"historic": "archaeological_site", "site_type": "*"},
+    "replace": {"historic": "archaeological_site", "archaeological_site": "$1"}
+  },
+  {
+    "old": {"industrial": "gas"},
+    "replace": {"utility": "gas"}
+  },
   {
     "old": {"information": "citymap"},
     "replace": {"tourism": "information", "information": "map", "map_type": "street", "map_size": "city"}
@@ -778,6 +838,10 @@
     "old": {"information": "wildlife"},
     "replace": {"tourism": "information", "information": "board", "board_type": "wildlife"}
   },
+  {
+    "old": {"information": "board", "board_type": "map"},
+    "replace": {"tourism": "information", "information": "map"}
+  },
   {
     "old": {"internet_access": "public"},
     "replace": {"internet_access": "yes", "internet_access:fee": "no"}
@@ -786,6 +850,14 @@
     "old": {"internet_access": "wifi"},
     "replace": {"internet_access": "wlan"}
   },
+  {
+    "old": {"internet_access": "wi-fi"},
+    "replace": {"internet_access": "wlan"}
+  },
+  {
+    "old": {"internet_access": "WLAN"},
+    "replace": {"internet_access": "wlan"}
+  },
   {
     "old": {"internet_access:fee": "0"},
     "replace": {"internet_access:fee": "no"}
@@ -890,6 +962,14 @@
     "old": {"landuse": "reservoir"},
     "replace": {"natural": "water", "water": "reservoir"}
   },
+  {
+    "old": {"landuse": "reservoir", "reservoir_type": "tailings", "natural": "water", "water": "reservoir"},
+    "replace": {"man_made": "tailings_pond"}
+  },
+  {
+    "old": {"landuse": "reservoir", "reservoir_type": "tailings"},
+    "replace": {"man_made": "tailings_pond"}
+  },
   {
     "old": {"landuse": "school"},
     "replace": {"landuse": "education"}
@@ -930,10 +1010,18 @@
     "old": {"leisure": "ice_rink", "sport": "skating"},
     "replace": {"leisure": "ice_rink", "sport": "ice_skating"}
   },
+  {
+    "old": {"leisure": "maze"},
+    "replace": {"attraction": "maze"}
+  },
   {
     "old": {"leisure": "recreation_ground"},
     "replace": {"landuse": "recreation_ground"}
   },
+  {
+    "old": {"leisure": "swimming_pool", "swimming_pool": "hot_tub"},
+    "replace": {"leisure": "hot_tub"}
+  },
   {
     "old": {"leisure": "table_tennis_table"},
     "replace": {"leisure": "pitch", "sport": "table_tennis"}
@@ -954,14 +1042,6 @@
     "old": {"levels": "*"},
     "replace": {"building:levels": "$1"}
   },
-  {
-    "old": {"LEVELS": "*"},
-    "replace": {"building:levels": "$1"}
-  },
-  {
-    "old": {"levels_count": "*"},
-    "replace": {"building:levels": "$1"}
-  },
   {
     "old": {"man_made": "cut_line"},
     "replace": {"man_made": "cutline"}
@@ -1050,6 +1130,14 @@
     "old": {"man_made": "winery"},
     "replace": {"craft": "winery"}
   },
+  {
+    "old": {"map_type": "tactile_map", "information": "map"},
+    "replace": {"information": "tactile_map"}
+  },
+  {
+    "old": {"map_type": "tactile_model", "information": "map"},
+    "replace": {"information": "tactile_model"}
+  },
   {
     "old": {"maxage": "*"},
     "replace": {"max_age": "$1"}
@@ -1086,6 +1174,10 @@
     "old": {"natural": "marsh"},
     "replace": {"natural": "wetland", "wetland": "marsh"}
   },
+  {
+    "old": {"natural": "water", "water": "reservoir", "reservoir_type": "tailings"},
+    "replace": {"man_made": "tailings_pond"}
+  },
   {
     "old": {"natural": "waterfall"},
     "replace": {"waterway": "waterfall"}
@@ -1094,10 +1186,6 @@
     "old": {"NOTE": "*"},
     "replace": {"note": "$1"}
   },
-  {
-    "old": {"nosquare": "*"},
-    "replace": {"nonsquare": "$1"}
-  },
   {
     "old": {"office": "administrative"},
     "replace": {"office": "government"}
@@ -1122,12 +1210,6 @@
     "old": {"oneway": "alternate"},
     "replace": {"oneway": "alternating"}
   },
-  {
-    "old": {"oneway": "no;yes"}
-  },
-  {
-    "old": {"oneway": "unknown"}
-  },
   {
     "old": {"operator:type": "goverment"},
     "replace": {"operator:type": "government"}
@@ -1175,10 +1257,121 @@
     "old": {"parking": "street"},
     "replace": {"parking": "lane"}
   },
+  {
+    "old": {"parking:lane:both": "no"},
+    "replace": {"parking:both": "no"}
+  },
+  {
+    "old": {"parking:lane:both": "no_parking"},
+    "replace": {"parking:both": "no", "parking:both:restriction": "no_parking"}
+  },
+  {
+    "old": {"parking:lane:both": "no_stopping"},
+    "replace": {"parking:both": "no", "parking:both:restriction": "no_stopping"}
+  },
+  {
+    "old": {"parking:lane:both": "fire_lane"},
+    "replace": {"parking:both": "no", "parking:both:restriction": "no_stopping", "parking:both:restriction:reason": "fire_lane"}
+  },
+  {
+    "old": {"parking:lane:both": "separate"},
+    "replace": {"parking:both": "separate"}
+  },
+  {
+    "old": {"parking:lane:both": "diagonal"},
+    "replace": {"parking:both": "yes", "parking:both:orientation": "diagonal"}
+  },
+  {
+    "old": {"parking:lane:both": "parallel"},
+    "replace": {"parking:both": "yes", "parking:both:orientation": "parallel"}
+  },
+  {
+    "old": {"parking:lane:both": "perpendicular"},
+    "replace": {"parking:both": "yes", "parking:both:orientation": "perpendicular"}
+  },
+  {
+    "old": {"parking:lane:both:parallel": "on_street"},
+    "replace": {"parking:both": "lane"}
+  },
+  {
+    "old": {"parking:lane:left": "no"},
+    "replace": {"parking:left": "no"}
+  },
+  {
+    "old": {"parking:lane:left": "no_parking"},
+    "replace": {"parking:left": "no", "parking:left:restriction": "no_parking"}
+  },
+  {
+    "old": {"parking:lane:left": "no_stopping"},
+    "replace": {"parking:left": "no", "parking:left:restriction": "no_stopping"}
+  },
+  {
+    "old": {"parking:lane:left": "separate"},
+    "replace": {"parking:left": "separate"}
+  },
+  {
+    "old": {"parking:lane:left": "diagonal"},
+    "replace": {"parking:left": "yes", "parking:left:orientation": "diagonal"}
+  },
+  {
+    "old": {"parking:lane:left": "parallel"},
+    "replace": {"parking:left": "yes", "parking:left:orientation": "parallel"}
+  },
+  {
+    "old": {"parking:lane:left": "perpendicular"},
+    "replace": {"parking:left": "yes", "parking:left:orientation": "perpendicular"}
+  },
+  {
+    "old": {"parking:lane:right": "no"},
+    "replace": {"parking:right": "no"}
+  },
+  {
+    "old": {"parking:lane:right": "no_parking"},
+    "replace": {"parking:right": "no", "parking:right:restriction": "no_parking"}
+  },
+  {
+    "old": {"parking:lane:right": "no_stopping"},
+    "replace": {"parking:right": "no", "parking:right:restriction": "no_stopping"}
+  },
+  {
+    "old": {"parking:lane:right": "separate"},
+    "replace": {"parking:right": "separate"}
+  },
+  {
+    "old": {"parking:lane:right": "diagonal"},
+    "replace": {"parking:right": "yes", "parking:right:orientation": "diagonal"}
+  },
+  {
+    "old": {"parking:lane:right": "parallel"},
+    "replace": {"parking:right": "yes", "parking:right:orientation": "parallel"}
+  },
+  {
+    "old": {"parking:lane:right": "perpendicular"},
+    "replace": {"parking:right": "yes", "parking:right:orientation": "perpendicular"}
+  },
+  {
+    "old": {"parking:lane:right:parallel": "on_street"},
+    "replace": {"parking:right": "lane"}
+  },
+  {
+    "old": {"parking:orientation": "*"},
+    "replace": {"orientation": "$1"}
+  },
+  {
+    "old": {"orientation": "orthogonal"},
+    "replace": {"orientation": "perpendicular"}
+  },
+  {
+    "old": {"parking:orientation": "orthogonal"},
+    "replace": {"parking:orientation": "perpendicular"}
+  },
   {
     "old": {"place_name": "*"},
     "replace": {"name": "$1"}
   },
+  {
+    "old": {"playground:theme": "playground"}
+  },
   {
     "old": {"pole": "transition"},
     "replace": {"location:transition": "yes"}
@@ -1295,10 +1488,6 @@
     "old": {"religion": "catholic"},
     "replace": {"religion": "christian", "denomination": "catholic"}
   },
-  {
-    "old": {"reservations": "*"},
-    "replace": {"reservation": "$1"}
-  },
   {
     "old": {"roof:color": "*"},
     "replace": {"roof:colour": "$1"}
@@ -1311,10 +1500,6 @@
     "old": {"route": "ncn"},
     "replace": {"route": "bicycle", "network": "ncn"}
   },
-  {
-    "old": {"rwn_expected_route_relations": "*"},
-    "replace": {"expected_rwn_route_relations": "$1"}
-  },
   {
     "old": {"service": "drive_through"},
     "replace": {"service": "drive-through"}
@@ -1367,6 +1552,10 @@
     "old": {"shop": "cafe"},
     "replace": {"amenity": "cafe"}
   },
+  {
+    "old": {"shop": "clothes", "clothes": "second_hand"},
+    "replace": {"shop": "clothes", "second_hand": "yes"}
+  },
   {
     "old": {"shop": "consulting"},
     "replace": {"office": "consulting"}
@@ -1433,16 +1622,12 @@
   },
   {
     "old": {"shop": "organic"},
-    "replace": {"shop": "supermarket", "organic": "only"}
+    "replace": {"shop": "yes", "organic": "only"}
   },
   {
     "old": {"shop": "perfume"},
     "replace": {"shop": "perfumery"}
   },
-  {
-    "old": {"shop": "photo_studio"},
-    "replace": {"craft": "photographer"}
-  },
   {
     "old": {"shop": "real_estate"},
     "replace": {"office": "estate_agent"}
@@ -1463,10 +1648,6 @@
     "old": {"shop": "winery"},
     "replace": {"craft": "winery"}
   },
-  {
-    "old": {"showers": "*"},
-    "replace": {"shower": "$1"}
-  },
   {
     "old": {"sloped_curb": "0"},
     "replace": {"kerb": "flush"}
@@ -1511,22 +1692,6 @@
     "old": {"sloped_curb": "yes"},
     "replace": {"kerb": "lowered"}
   },
-  {
-    "old": {"speed_limit": "*"},
-    "replace": {"maxspeed": "$1"}
-  },
-  {
-    "old": {"speedlimit": "*"},
-    "replace": {"maxspeed": "$1"}
-  },
-  {
-    "old": {"SpeedLimit": "*"},
-    "replace": {"maxspeed": "$1"}
-  },
-  {
-    "old": {"SPEEDLIMIT": "*"},
-    "replace": {"maxspeed": "$1"}
-  },
   {
     "old": {"sport": "horse_shoes"},
     "replace": {"sport": "horseshoes"}
@@ -1539,6 +1704,10 @@
     "old": {"sport": "shuffle_board"},
     "replace": {"sport": "shuffleboard"}
   },
+  {
+    "old": {"sport": "team_handball"},
+    "replace": {"sport": "handball"}
+  },
   {
     "old": {"station": "light_rail"},
     "replace": {"station": "light_rail", "light_rail": "yes"}
@@ -1559,6 +1728,38 @@
     "old": {"stream": "intermittent", "waterway": "stream"},
     "replace": {"intermittent": "yes", "waterway": "stream"}
   },
+  {
+    "old": {"street_cabinet": "broadband"},
+    "replace": {"utility": "telecom"}
+  },
+  {
+    "old": {"street_cabinet": "cable_tv"},
+    "replace": {"utility": "television"}
+  },
+  {
+    "old": {"street_cabinet": "communications"},
+    "replace": {"utility": "telecom"}
+  },
+  {
+    "old": {"street_cabinet": "gas"},
+    "replace": {"utility": "gas"}
+  },
+  {
+    "old": {"street_cabinet": "power"},
+    "replace": {"utility": "power"}
+  },
+  {
+    "old": {"street_cabinet": "street_lighting"},
+    "replace": {"utility": "street_lighting"}
+  },
+  {
+    "old": {"street_cabinet": "telecom"},
+    "replace": {"utility": "telecom"}
+  },
+  {
+    "old": {"survey_date": "*"},
+    "replace": {"survey:date": "$1"}
+  },
   {
     "old": {"sustenance": "bar"},
     "replace": {"amenity": "bar"}
@@ -1615,6 +1816,14 @@
     "old": {"tourism": "bed_and_breakfast"},
     "replace": {"tourism": "guest_house", "guest_house": "bed_and_breakfast"}
   },
+  {
+    "old": {"tourism": "picnic_table"},
+    "replace": {"leisure": "picnic_table"}
+  },
+  {
+    "old": {"tourism": "resort"},
+    "replace": {"leisure": "resort"}
+  },
   {
     "old": {"tower:type": "power"},
     "replace": {"power": "tower"}
@@ -1667,6 +1876,10 @@
     "old": {"transformer": "traction"},
     "replace": {"transformer": "main"}
   },
+  {
+    "old": {"traffic_calming": "island", "area": "yes"},
+    "replace": {"area:highway": "traffic_island"}
+  },
   {
     "old": {"tunnel": "1"},
     "replace": {"tunnel": "yes"}
@@ -1760,20 +1973,20 @@
     "replace": {"volcano:status": "extinct"}
   },
   {
-    "old": {"voltage-high": "*", "transformer":"generator"},
-    "replace": {"voltage:secondary":"$1", "transformer":"generator"}
+    "old": {"voltage-high": "*", "transformer": "generator"},
+    "replace": {"voltage:secondary": "$1", "transformer": "generator"}
   },
   {
-    "old": {"voltage-low": "*", "transformer":"generator"},
-    "replace": {"voltage:primary":"$1", "transformer":"generator"}
+    "old": {"voltage-low": "*", "transformer": "generator"},
+    "replace": {"voltage:primary": "$1", "transformer": "generator"}
   },
   {
     "old": {"voltage-high": "*"},
-    "replace": {"voltage:primary":"$1"}
+    "replace": {"voltage:primary": "$1"}
   },
   {
     "old": {"voltage-low": "*"},
-    "replace": {"voltage:secondary":"$1"}
+    "replace": {"voltage:secondary": "$1"}
   },
   {
     "old": {"wall_type": "noise_barrier"},
@@ -1838,5 +2051,65 @@
   {
     "old": {"wood": "mixed"},
     "replace": {"leaf_cycle": "mixed", "leaf_type": "mixed"}
+  },
+  {
+    "old": {"cycleway": "none"},
+    "replace": {"cycleway": "no"}
+  },
+  {
+    "old": {"cycleway:left": "none"},
+    "replace": {"cycleway:left": "no"}
+  },
+  {
+    "old": {"cycleway:right": "none"},
+    "replace": {"cycleway:right": "no"}
+  },
+  {
+    "old": {"cycleway:both": "none"},
+    "replace": {"cycleway:both": "no"}
+  },
+  {
+    "old": {"communication": "pole"},
+    "replace": {"man_made": "utility_pole", "utility": "telecom"}
+  },
+  {
+    "old": {"telephone": "pole"},
+    "replace": {"man_made": "utility_pole", "utility": "telecom"}
+  },
+  {
+    "old": {"telecom": "pole"},
+    "replace": {"man_made": "utility_pole", "utility": "telecom"}
+  },
+  {
+    "old": {"pstn": "pole"},
+    "replace": {"man_made": "utility_pole", "utility": "telecom"}
+  },
+  {
+    "old": {"memorial:type": "stolperstein"},
+    "replace": {"memorial": "stolperstein"}
+  },
+  {
+    "old": {"memorial:text": "*"},
+    "replace": {"inscription": "$1"}
+  },
+  {
+    "old": {"industrial": "brickworks"},
+    "replace": {"industrial": "brickyard"}
+  },
+  {
+     "old": {"cycleway": "opposite"},
+     "replace": {"oneway:bicycle": "no", "cycleway:both": "no"}
+  },
+  {
+     "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/discarded.json

@@ -1,6 +1,5 @@
 {
   "created_by": true,
-  "converted_by": true,
 
   "odbl": true,
   "odbl:note": true,
@@ -53,5 +52,17 @@
   "yh:TOTYUMONO": true,
   "yh:TYPE": true,
   "yh:WIDTH": true,
-  "yh:WIDTH_RANK": true
+  "yh:WIDTH_RANK": true,
+
+  "LINZ2OSM:dataset": true,
+  "LINZ2OSM:layer": true,
+  "LINZ2OSM:source_version": true,
+  "LINZ:dataset": true,
+  "LINZ:layer": true,
+  "LINZ:source_version": true,
+  "linz2osm:objectid": true,
+
+  "fid": true,
+  "import_uuid": true,
+  "gnis:import_uuid": true
 }

data/fields/activity.json

@@ -14,7 +14,7 @@
             "bicycle": "Cycling",
             "mtb": "Mountain Biking",
             "horse": "Horseback Riding",
-            "Ski": "Skiing"
+            "ski": "Skiing"
         }
     }
 }

data/fields/address.json

@@ -1,12 +1,13 @@
 {
     "type": "address",
     "key": "addr",
+    "reference": {
+        "key": "addr:*"
+    },
     "keys": [
         "addr:block_number",
         "addr:city",
-        "addr:block_number",
         "addr:conscriptionnumber",
-        "addr:county",
         "addr:country",
         "addr:county",
         "addr:district",
@@ -23,9 +24,9 @@
         "addr:street",
         "addr:subdistrict",
         "addr:suburb",
+        "addr:town",
         "addr:unit"
     ],
-    "icon": "address",
     "label": "Address",
     "strings": {
         "placeholders": {
@@ -48,20 +49,21 @@
             "housenumber": "123",
             "housenumber!jp": "Building No./Lot No.",
             "neighbourhood": "Neighbourhood",
-            "neighbourhood!jp": "Chōme/Aza/Koaza",
+            "neighbourhood!jp": "Machi/Chōme/Aza/Koaza",
             "place": "Place",
             "postcode": "Postcode",
             "province": "Province",
             "province!cn": "Province/Municipality/AR/SAR",
             "province!jp": "Prefecture",
             "quarter": "Quarter",
-            "quarter!jp": "Ōaza/Machi",
+            "quarter!jp": "Ōaza",
             "state": "State",
             "street": "Street",
             "subdistrict": "Subdistrict",
             "subdistrict!vn": "Ward/Commune/Townlet",
             "suburb": "Suburb",
-            "suburb!jp": "Ward",
+            "suburb!jp": "Ward (政令市)",
+            "town": "Town",
             "unit": "Unit"
         }
     },

data/fields/advertising.json

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

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/alt_name.json

@@ -0,0 +1,16 @@
+{
+    "key": "alt_name",
+    "type": "localized",
+    "label": "Alternative Name",
+    "universal": true,
+    "terms": [
+        "aka",
+        "alias",
+        "also known as",
+        "nonstandard name",
+        "secondary name"
+    ],
+    "prerequisiteTag": {
+        "key": "name"
+    }
+}

data/fields/archaeological_site.json

@@ -0,0 +1,22 @@
+{
+    "key": "archaeological_site",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "baths": "Baths",
+            "city": "Historic City",
+            "crannog": "Crannog",
+            "enclosure": "Enclosure",
+            "fortification": "Fortification",
+            "hut_circle": "Hut Circle",
+            "megalith": "Megalith",
+            "necropolis": "Necropolis",
+            "petroglyph": "Rock Carving",
+            "roman_circus": "Roman Circus",
+            "roman_villa": "Roman Villa",
+            "settlement": "Historic Settlement",
+            "tumulus": "Tumulus"
+        }
+    }
+}

data/fields/armrest.json

@@ -0,0 +1,12 @@
+{
+    "key": "armrest",
+    "type": "check",
+    "label": "Armrests",
+    "strings": {
+        "options": {
+            "undefined": "Unknown",
+            "yes": "One or more armrests",
+            "no": "No armrests"
+        }
+    }
+}

data/fields/artwork_type.json

@@ -1,5 +1,20 @@
 {
     "key": "artwork_type",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "sculpture": "Sculpture",
+            "statue": "Statue",
+            "mural": "Mural",
+            "installation": "Art Installation",
+            "graffiti": "Graffiti",
+            "bust": "Bust",
+            "painting": "Painting",
+            "mosaic": "Mosaic",
+            "relief": "Relief",
+            "stone": "Artistically Worked Stone",
+            "tilework": "Tile Work"
+        }
+    }
 }

data/fields/athletics_pitch.json

@@ -0,0 +1,17 @@
+{
+    "key": "athletics",
+    "type": "semiCombo",
+    "label": "Event",
+    "strings": {
+        "options": {
+            "discus_throw": "Discus",
+            "hammer_throw": "Hammer Throw",
+            "high_jump": "High Jump",
+            "javelin_throw": "Javelin",
+            "long_jump": "Long Jump",
+            "pole_vault": "Pole Vault",
+            "shot_put": "Shot Put",
+            "triple_jump": "Triple Jump"
+        }
+    }
+}

data/fields/athletics_track.json

@@ -0,0 +1,16 @@
+{
+    "key": "athletics",
+    "type": "semiCombo",
+    "label": "Event",
+    "strings": {
+        "options": {
+            "javelin_throw": "Javelin",
+            "long_jump": "Long Jump",
+            "pole_vault": "Pole Vault",
+            "running": "Running",
+            "sprint": "Sprinting",
+            "steeplechase": "Steeplechase",
+            "triple_jump": "Triple Jump"
+        }
+    }
+}

data/fields/attraction.json

@@ -1,5 +1,28 @@
 {
     "key": "attraction",
     "type": "typeCombo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "animal": "Animal Enclosure",
+            "water_slide": "Water Slide",
+            "amusement_ride": "Amusement Ride",
+            "roller_coaster": "Roller Coaster",
+            "carousel": "Carousel",
+            "maze": "Maze",
+            "summer_toboggan": "Summer Toboggan",
+            "big_wheel": "Ferris Wheel",
+            "train": "Tourist Train",
+            "bumper_car": "Bumper Cars",
+            "bungee_jumping": "Bungee Jumping",
+            "dark_ride": "Dark Ride",
+            "drop_tower": "Drop Tower Ride",
+            "kiddie_ride": "Kiddie Ride",
+            "log_flume": "Log Flume",
+            "pirate_ship": "Pirate Ship Ride",
+            "river_rafting": "River Rapids Ride",
+            "swing_carousel": "Swing Carousel",
+            "alpine_coaster": "Alpine Coaster"
+        }
+    }
 }

data/fields/barrier.json

@@ -1,5 +1,32 @@
 {
     "key": "barrier",
     "type": "typeCombo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "fence": "Fence",
+            "gate": "Gate",
+            "wall": "Wall",
+            "hedge": "Hedge",
+            "kerb": "Curb",
+            "bollard": "Bollard",
+            "lift_gate": "Boom Gate",
+            "retaining_wall": "Retaining Wall",
+            "block": "Large Block",
+            "guard_rail": "Guard Rail",
+            "cycle_barrier": "Cycle Barrier",
+            "stile": "Stile",
+            "entrance": "Entrance",
+            "swing_gate": "Swing Gate",
+            "cattle_grid": "Cattle Grid",
+            "ditch": "Ditch",
+            "toll_booth": "Toll Booth",
+            "city_wall": "City Wall",
+            "kissing_gate": "Kissing Gate",
+            "chain": "Chain",
+            "jersey_barrier": "Jersey Barrier",
+            "height_restrictor": "Height Restrictor",
+            "turnstile": "Turnstile"
+        }
+    }
 }

data/fields/basin.json

@@ -1,5 +1,13 @@
 {
     "key": "basin",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "detention": "Detention",
+            "evaporation": "Evaporation",
+            "infiltration": "Infiltration",
+            "retention": "Retention"
+        }
+    }
 }

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/bath/type.json

@@ -1,5 +1,14 @@
 {
     "key": "bath:type",
     "type": "combo",
-    "label": "Specialty"
+    "label": "Specialty",
+    "strings": {
+        "options": {
+            "hammam": "Hammam",
+            "hot_spring": "Hot Spring",
+            "lake": "Lake",
+            "onsen": "Onsen",
+            "thermal": "Thermal Bath"
+        }
+    }
 }

data/fields/bicycle_parking.json

@@ -1,5 +1,15 @@
 {
     "key": "bicycle_parking",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "stands": "Stand (supports bicycle frame)",
+            "wall_loops": "Wheelbender (supports wheel only)",
+            "shed": "Closed Shed",
+            "lockers": "Individual Lockers",
+            "building": "In a Building",
+            "handlebar_holder": "Handlebar Holder"
+        }
+    }
 }

data/fields/bicycle_road.json

@@ -0,0 +1,26 @@
+{
+    "key": "bicycle_road",
+    "type": "defaultCheck",
+    "label": "Cycle Street",
+    "terms": [
+        "bicycle boulevard",
+        "bicycle road",
+        "cyclestreet",
+        "neighborhood bikeway",
+        "neighborhood byway",
+        "neighborhood greenway",
+        "neighborway"
+    ],
+    "locationSet": {
+        "exclude": [
+            "BE",
+            "NL"
+        ]
+    },
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "yes": "Yes"
+        }
+    }
+}

data/fields/bike_ride.json

@@ -0,0 +1,5 @@
+{
+    "key": "bike_ride",
+    "type": "check",
+    "label": "Bike and Ride"
+}

data/fields/board_type.json

@@ -1,5 +1,18 @@
 {
     "key": "board_type",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "art": "Art",
+            "astronomy": "Astronomy",
+            "geology": "Geology",
+            "history": "History",
+            "nature": "Nature",
+            "notice": "Notice Board",
+            "plants": "Plants",
+            "welcome_sign": "Welcome Sign",
+            "wildlife": "Wildlife"
+        }
+    }
 }

data/fields/bollard.json

@@ -1,5 +1,14 @@
 {
     "key": "bollard",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "fixed": "Fixed Bollard",
+            "flexible": "Flexible Bollard",
+            "foldable": "Foldable Bollard",
+            "removable": "Removable Bollard",
+            "rising": "Rising Bollard"
+        }
+    }
 }

data/fields/books.json

@@ -0,0 +1,5 @@
+{
+    "key": "books",
+    "type": "semiCombo",
+    "label": "Type of Books"
+}

data/fields/brewery.json

@@ -1,8 +1,13 @@
 {
     "key": "brewery",
     "type": "semiCombo",
-    "label": "Draft Beers",
+    "label": "Sold Beer brands",
     "terms": [
-        "on tap"
+        "beer brand",
+        "beer dispensing",
+        "bottled beer",
+        "draft beer",
+        "on tap",
+        "tap beer"
     ]
 }

data/fields/bridge.json

@@ -3,5 +3,6 @@
     "type": "typeCombo",
     "label": "Type",
     "usage": "group",
-    "placeholder": "Default"
+    "placeholder": "Default",
+    "stringsCrossReference": "{bridge_combo}"
 }

data/fields/bridge/ref.json

@@ -0,0 +1,12 @@
+{
+    "key": "bridge:ref",
+    "type": "text",
+    "label": "Bridge Number",
+    "reference": {
+        "key": "bridge"
+    },
+    "prerequisiteTag": {
+        "key": "bridge",
+        "valueNot": "no"
+    }
+}

data/fields/bridge_combo.json

@@ -1,5 +1,17 @@
 {
     "key": "bridge",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "aqueduct": "Aqueduct",
+            "boardwalk": "Boardwalk",
+            "cantilever": "Cantilever Bridge",
+            "covered": "Covered Bridge",
+            "low_water_crossing": "Low Water Crossing",
+            "movable": "Movable Bridge",
+            "trestle": "Trestle Bridge",
+            "viaduct": "Viaduct"
+        }
+    }
 }

data/fields/building.json

@@ -2,6 +2,71 @@
     "key": "building",
     "type": "combo",
     "label": "Building",
+    "strings": {
+        "options": {
+            "allotment_house": "Allotment House",
+            "apartments": "Apartment Building",
+            "barn": "Barn",
+            "boathouse": "Boathouse",
+            "bungalow": "Bungalow",
+            "bunker": "Bunker",
+            "cabin": "Cabin",
+            "carport": "Carport",
+            "cathedral": "Cathedral Building",
+            "chapel": "Chapel Building",
+            "church": "Church Building",
+            "civic": "Civic Building",
+            "college": "College Building",
+            "commercial": "Commercial Building",
+            "construction": "Building Under Construction",
+            "cowshed": "Cowshed",
+            "detached": "Detached House",
+            "dormitory": "Dormitory",
+            "farm": "Farm House",
+            "farm_auxiliary": "Farm Building",
+            "fire_station": "Fire Station Building",
+            "garage": "Garage",
+            "garages": "Garages",
+            "ger": "Yurt",
+            "grandstand": "Grandstand",
+            "greenhouse": "Greenhouse",
+            "hangar": "Hangar Building",
+            "hospital": "Hospital Building",
+            "hotel": "Hotel Building",
+            "house": "House",
+            "houseboat": "Houseboat",
+            "hut": "Hut",
+            "industrial": "Industrial Building",
+            "kindergarten": "Preschool / Kindergarten Building",
+            "manufacture": "Industrial Production Building",
+            "mosque": "Mosque Building",
+            "office": "Office Building",
+            "outbuilding": "Outbuilding",
+            "pavilion": "Pavilion Building",
+            "public": "Public Building",
+            "residential": "Residential Building",
+            "retail": "Retail Building",
+            "riding_hall": "Horseback Riding Arena",
+            "roof": "Roof",
+            "ruins": "Building Ruins",
+            "school": "School Building",
+            "semidetached_house": "Semi-Detached House",
+            "service": "Service Building",
+            "shed": "Shed",
+            "stable": "Stable",
+            "stadium": "Stadium Building",
+            "static_caravan": "Mobile Home",
+            "sty": "Pigsty",
+            "synagogue": "Synagogue Building",
+            "temple": "Temple Building",
+            "terrace": "Row Houses",
+            "train_station": "Train Station Building",
+            "transportation": "Transportation Building",
+            "university": "University Building",
+            "warehouse": "Warehouse",
+            "container": "Container"
+        }
+    },
     "terms": [
         "structure"
     ]

data/fields/building/colour.json

@@ -0,0 +1,9 @@
+{
+    "key": "building:colour",
+    "type": "colour",
+    "label": "Façade Color",
+    "terms": [
+        "building color",
+        "facade color"
+    ]
+}

data/fields/building/levels_building.json

@@ -2,8 +2,8 @@
     "key": "building:levels",
     "type": "number",
     "minValue": 0,
-    "label": "Building Levels",
-    "placeholder": "2, 4, 6...",
+    "label": "{building/levels}",
+    "placeholder": "{building/levels}",
     "prerequisiteTag": {
         "key": "building",
         "valueNot": "no"

data/fields/building/part.json

@@ -0,0 +1,6 @@
+{
+    "key": "building:part",
+    "type": "combo",
+    "default": "yes",
+    "label": "Building Part"
+}

data/fields/building/prefabricated.json

@@ -0,0 +1,10 @@
+{
+    "key": "building:prefabricated",
+    "type": "check",
+    "terms": [
+        "manufactured",
+        "modular",
+        "portable"
+    ],
+    "label": "Prefabricated"
+}

data/fields/building_area.json

@@ -1,9 +1,8 @@
 {
     "key": "building",
     "type": "combo",
-    "default": "yes",
     "geometry": [
         "area"
     ],
-    "label": "Building"
+    "label": "{building}"
 }

data/fields/building_area_yes.json

@@ -0,0 +1,9 @@
+{
+    "key": "building",
+    "type": "combo",
+    "default": "yes",
+    "geometry": [
+        "area"
+    ],
+    "label": "{building}"
+}

data/fields/cabins.json

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

data/fields/camp_site.json

@@ -0,0 +1,32 @@
+{
+    "key": "camp_site",
+    "type": "combo",
+    "label": "Type",
+    "options": [
+        "basic",
+        "standard",
+        "serviced",
+        "deluxe"
+    ],
+    "strings": {
+        "options": {
+            "basic": {
+                "title": "Basic (only tent/vehicle spots)",
+                "description": "Nothing but a place to pitch a tent or park a vehicle"
+            },
+            "standard": {
+                "title": "Standard (offers toilets and water)",
+                "description": "Toilets and water are provided or available nearby"
+            },
+            "serviced": {
+                "title": "Serviced (offers showers and electricity)",
+                "description": "Toilets, water, showers and electricity are provided"
+            },
+            "deluxe": {
+                "title": "Deluxe (offers laundry or swimming pool, etc.)",
+                "description": "Fully serviced and has additional amenities like a laundry, swimming pool or similar recreation facilities"
+            }
+        }
+    },
+    "autoSuggestions": false
+}

data/fields/capacity/caravans.json

@@ -2,6 +2,10 @@
     "key": "capacity:caravans",
     "type": "number",
     "minValue": 0,
-    "label": "Capacity (Caravans)",
-    "placeholder": "10, 20, 50..."
+    "label": "Capacity (Campervan / Camping Trailer)",
+    "placeholder": "10, 20, 50...",
+    "prerequisiteTag": {
+        "key": "caravans",
+        "valueNot": "no"
+    }
 }

data/fields/caravans.json

@@ -0,0 +1,11 @@
+{
+    "key": "caravans",
+    "type": "check",
+    "label": "Campervan / Camping Trailer",
+    "terms": [
+        "camper",
+        "camper trailer",
+        "caravan",
+        "tourer"
+    ]
+}

data/fields/cash_in.json

@@ -1,5 +1,5 @@
 {
     "key": "cash_in",
     "type": "check",
-    "label": "Cash In"
+    "label": "Deposits"
 }

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

@@ -1,6 +1,11 @@
 {
     "key": "check_date",
-    "type": "text",
+    "type": "date",
     "label": "Last Checked Date",
-    "placeholder": "YYYY-MM-DD"
+    "placeholder": "YYYY-MM-DD",
+    "universal": true,
+    "terms": [
+        "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/clothes.json

@@ -1,5 +1,27 @@
 {
     "key": "clothes",
     "type": "semiCombo",
-    "label": "Clothes"
+    "label": "Clothes",
+    "strings": {
+        "options": {
+            "babies": "Baby Clothing",
+            "children": "Children's Clothing",
+            "denim": "Jeans Clothing",
+            "fur": "Fur Clothing",
+            "hats": "Hats",
+            "maternity": "Maternity Clothing",
+            "men": "Men's Clothing",
+            "motorcycle": "Motorcycle Clothing",
+            "oversize": "Plus Size Clothing",
+            "socks": "Socks",
+            "sports": "Sportswear",
+            "suits": "Suits",
+            "swimwear": "Swimwear",
+            "traditional": "Traditional Garments / Folk Costumes",
+            "underwear": "Underwear",
+            "wedding": "Wedding Clothing",
+            "women": "Women's Clothing",
+            "workwear": "Workwear"
+        }
+    }
 }

data/fields/collector.json

@@ -1,5 +1,12 @@
 {
     "key": "collector",
     "type": "semiCombo",
-    "label": "Items"
+    "label": "Items",
+    "strings": {
+        "options": {
+            "coins": "Coins",
+            "stamps": "Stamps",
+            "comics": "Comics"
+        }
+    }
 }

data/fields/colour.json

@@ -1,5 +1,5 @@
 {
     "key": "colour",
-    "type": "text",
+    "type": "colour",
     "label": "Color"
 }

data/fields/community_centre.json

@@ -0,0 +1,16 @@
+{
+    "key": "community_centre",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "club_home": "Club Home",
+            "community_hall": "Community Hall",
+            "cultural_centre": "Cultural Centre",
+            "family_centre": "Family Centre",
+            "parish_hall": "Parish Hall",
+            "village_hall": "Village Hall",
+            "youth_centre": "Youth Center"
+        }
+    }
+}

data/fields/consulate.json

@@ -1,5 +1,15 @@
 {
     "key": "consulate",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "consulate_general": "Consulate General",
+            "honorary_consul": "Honorary Consul",
+            "yes": "Consulate",
+            "consular_office": "Consular Services Office",
+            "consular_agency": "Consular Services Agency",
+            "residence": "Official Residence of a Consul"
+        }
+    }
 }

data/fields/contact/facebook.json

@@ -0,0 +1,6 @@
+{
+    "key": "contact:facebook",
+    "type": "url",
+    "label": "Facebook Username or URL",
+    "placeholder": "https://www.facebook.com/LocalBusiness"
+}

data/fields/contact/webcam.json

@@ -1,7 +1,6 @@
 {
     "key": "contact:webcam",
     "type": "url",
-    "icon": "website",
     "label": "Webcam URL",
     "placeholder": "http://example.com/"
 }

data/fields/count.json

@@ -0,0 +1,6 @@
+{
+    "key": "count",
+    "type": "number",
+    "minValue": 1,
+    "label": "Number of Features"
+}

data/fields/country_flag.json

@@ -5,5 +5,7 @@
     "prerequisiteTag": {
         "key": "flag:type",
         "value": "national"
-    }
+    },
+    "snake_case": false,
+    "caseSensitive": true
 }

data/fields/covered_no.json

@@ -1,7 +1,7 @@
 {
     "key": "covered",
     "type": "check",
-    "label": "Covered",
+    "label": "{covered}",
     "strings": {
         "options": {
             "undefined": "Assumed to be No",

data/fields/craft.json

@@ -1,5 +1,66 @@
 {
     "key": "craft",
     "type": "typeCombo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "agricultural_engines": "Agricultural Engines Mechanic",
+            "basket_maker": "Basket Maker",
+            "beekeeper": "Beekeeper",
+            "blacksmith": "Blacksmith",
+            "boatbuilder": "Boat Builder",
+            "bookbinder": "Bookbinder",
+            "brewery": "Brewery",
+            "builder": "Builder",
+            "carpenter": "Carpenter",
+            "carpet_layer": "Carpet Layer",
+            "caterer": "Caterer",
+            "chimney_sweeper": "Chimney Sweeper",
+            "cleaning": "Cleaning Service",
+            "clockmaker": "Clockmaker",
+            "confectionery": "Candy Maker",
+            "distillery": "Distillery",
+            "dressmaker": "Dressmaker",
+            "electronics_repair": "Electronics Repair",
+            "electrician": "Electrician",
+            "floorer": "Floorer",
+            "builder": "Builder",
+            "gardener": "Gardener",
+            "glaziery": "Glaziery",
+            "grinding_mill": "Grinding Mill",
+            "handicraft": "Handicraft",
+            "hvac": "HVAC",
+            "insulation": "Insulator",
+            "jeweller": "Jeweller",
+            "joiner": "Joiner",
+            "key_cutter": "Key Cutter",
+            "locksmith": "Locksmith",
+            "metal_construction": "Metalworker",
+            "oil_mill": "Oil Mill",
+            "painter": "Painter",
+            "parquet_layer": "Parquet Layer",
+            "photographer": "Photographer",
+            "photographic_laboratory": "Photographic Laboratory",
+            "plasterer": "Plasterer",
+            "plumber": "Plumber",
+            "pottery": "Pottery Maker",
+            "rigger": "Rigger",
+            "roofer": "Roofer",
+            "saddler": "Saddler",
+            "sailmaker": "Sailmaker",
+            "sawmill": "Sawmill",
+            "scaffolder": "Scaffolder",
+            "sculptor": "Sculptor",
+            "shoemaker": "Shoemaker",
+            "signmaker": "Signmaker",
+            "stonemason": "Stonemason",
+            "tailor": "Tailor",
+            "tiler": "Tiler",
+            "tinsmith": "Tinsmith",
+            "upholsterer": "Upholsterer",
+            "watchmaker": "Watchmaker",
+            "window_construction": "Window Construction",
+            "winery": "Winery"
+        }
+    }
 }

data/fields/crane/type.json

@@ -6,9 +6,17 @@
         "options": {
             "portal_crane": "Portal Crane",
             "floor-mounted_crane": "Floor-mounted Crane",
-            "travel_lift": "Travel Lift"
+            "travel_lift": "Travel Lift",
+            "gantry_crane": "Gantry Crane",
+            "tower_crane": "Tower Crane"
         }
     },
+    "icons": {
+        "portal_crane": "roentgen-crane_portal",
+        "gantry_crane": "roentgen-crane_gantry",
+        "tower_crane": "roentgen-crane",
+        "travel_lift": "roentgen-crane_travel_lift"
+    },
     "autoSuggestions": false,
     "customValues": false
 }

data/fields/crop.json

@@ -1,5 +1,35 @@
 {
     "key": "crop",
     "type": "semiCombo",
-    "label": "Crops"
+    "label": "Crops",
+    "strings": {
+        "options": {
+            "asparagus": "Asparagus",
+            "barley": "Barley",
+            "beet": "Beets",
+            "cassava": "Cassava",
+            "coffee": "Coffee",
+            "cotton": "Cotton",
+            "cranberries": "Cranberries",
+            "fast_growing_wood": "Short-Rotation Coppice",
+            "flowers": "Flowers",
+            "grape": "Grapes",
+            "grass": "Grass",
+            "hop": "Hops",
+            "lavender": "Lavender",
+            "maize": "Corn",
+            "potato": "Potatoes",
+            "rape": "Rapeseed",
+            "rice": "Rice",
+            "strawberry": "Strawberries",
+            "sugar_beet": "Sugar Beets",
+            "sugarcane": "Sugarcane",
+            "sunflower": "Sunflowers",
+            "soy": "Soybeans",
+            "tea": "Tea",
+            "tobacco": "Tobacco",
+            "vegetable": "Vegetables",
+            "wheat": "Wheat"
+        }
+    }
 }

data/fields/crossing.json

@@ -1,5 +1,17 @@
 {
     "key": "crossing",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "options": [
+        "traffic_signals",
+        "uncontrolled",
+        "unmarked"
+    ],
+    "strings": {
+        "options": {
+            "traffic_signals": "Crossing With Traffic Signals",
+            "uncontrolled": "Only Road Markings",
+            "unmarked": "No Road Markings or Traffic Signals"
+        }
+    }
 }

data/fields/crossing/markings-BG.json

@@ -0,0 +1,20 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "no",
+        "dots",
+        "dashes",
+        "yes"
+    ],
+    "locationSet": {
+        "include": [
+            "BG"
+        ]
+    }
+}

data/fields/crossing/markings-DE-AT-CH.json

@@ -0,0 +1,23 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "yes",
+        "no",
+        "dots",
+        "dashes",
+        "surface"
+    ],
+    "locationSet": {
+        "include": [
+            "DE",
+            "AT",
+            "CH"
+        ]
+    }
+}

data/fields/crossing/markings-PL.json

@@ -0,0 +1,20 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "dots",
+        "surface",
+        "yes",
+        "no"
+    ],
+    "locationSet": {
+        "include": [
+            "PL"
+        ]
+    }
+}

data/fields/crossing/markings.json

@@ -0,0 +1,47 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "Crossing Markings",
+    "strings": {
+        "options": {
+            "zebra": "Longitudinal Bars",
+            "lines": "Transverse Lines",
+            "no": "Unmarked",
+            "ladder": "Ladder With Longitudinal Bars",
+            "dots": "Dotted Transverse Lines",
+            "dashes": "Dashed Transverse Lines",
+            "yes": "Marked Somehow",
+            "surface": "Surface Treatment Only",
+            "ladder:skewed": "Ladder With Diagonal Bars",
+            "pictograms": "Painted Pictograms",
+            "lines:paired": "Double Transverse Lines",
+            "zebra:double": "Triple-Four",
+            "zebra:paired": "Paired Longitudinal Bars",
+            "zebra:bicolour": "Longitudinal Bars With Alternating Colors",
+            "ladder:paired": "Ladder With Paired Longitudinal Bars"
+        }
+    },
+    "icons": {
+        "zebra": "iD-crossing_markings-zebra",
+        "lines": "iD-crossing_markings-lines",
+        "ladder": "iD-crossing_markings-ladder",
+        "dots": "iD-crossing_markings-dots",
+        "dashes": "iD-crossing_markings-dashes",
+        "surface": "iD-crossing_markings-surface",
+        "ladder:skewed": "iD-crossing_markings-ladder_skewed",
+        "lines:paired": "iD-crossing_markings-lines_paired",
+        "zebra:double": "iD-crossing_markings-zebra_double",
+        "zebra:paired": "iD-crossing_markings-zebra_paired",
+        "zebra:bicolour": "iD-crossing_markings-zebra_bicolour",
+        "ladder:paired": "iD-crossing_markings-ladder_paired"
+    },
+    "locationSet": {
+        "exclude": [
+            "BG",
+            "DE",
+            "AT",
+            "CH",
+            "PL"
+        ]
+    }
+}

data/fields/crossing/markings_yes-BG.json

@@ -0,0 +1,21 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "no",
+        "dots",
+        "dashes",
+        "yes"
+    ],
+    "locationSet": {
+        "include": [
+            "BG"
+        ]
+    }
+}

data/fields/crossing/markings_yes-DE-AT-CH.json

@@ -0,0 +1,24 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "yes",
+        "no",
+        "dots",
+        "dashes",
+        "surface"
+    ],
+    "locationSet": {
+        "include": [
+            "DE",
+            "AT",
+            "CH"
+        ]
+    }
+}

data/fields/crossing/markings_yes-PL.json

@@ -0,0 +1,21 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "dots",
+        "surface",
+        "yes",
+        "no"
+    ],
+    "locationSet": {
+        "include": [
+            "PL"
+        ]
+    }
+}

data/fields/crossing/markings_yes.json

@@ -0,0 +1,17 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
+    "locationSet": {
+        "exclude": [
+            "BG",
+            "DE",
+            "AT",
+            "CH",
+            "PL"
+        ]
+    }
+}

data/fields/crossing_raised.json

@@ -5,19 +5,13 @@
     "terms": [
         "flat top",
         "hump",
-        "speed",
-        "slow"
+        "slow",
+        "speed"
     ],
     "strings": {
         "options": {
             "undefined": "No",
             "table": "Yes"
         }
-    },
-    "terms": [
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ]
+    }
 }

data/fields/cuisine.json

@@ -6,48 +6,93 @@
         "options": {
             "pizza": "Pizza",
             "burger": "Burger",
-            "regional": "Regional",
             "coffee_shop": "Coffee Shop",
+            "regional": "Regional",
             "italian": "Italian",
-            "chinese": "Chinese",
             "sandwich": "Sandwich",
-            "japanese": "Japanese",
-            "mexican": "Mexican",
-            "kebab": "Kebab",
-            "indian": "Indian",
+            "chinese": "Chinese",
             "chicken": "Chicken",
-            "fish": "Fish",
-            "asian": "Asian",
-            "french": "French",
-            "spanish": "Spanish",
-            "portuguese": "Portuguese",
-            "russian": "Russian",
-            "polish": "Polish",
-            "thai": "Thai",
-            "korean": "Korean",
+            "japanese": "Japanese",
+            "kebab": "Kebab",
+            "mexican": "Mexican",
             "american": "American",
-            "seafood": "Seafood",
-            "sushi": "Sushi",
+            "asian": "Asian",
             "ice_cream": "Ice Cream",
+            "indian": "Indian",
+            "sushi": "Sushi",
+            "seafood": "Seafood",
+            "thai": "Thai",
+            "french": "French",
             "german": "German",
+            "breakfast": "Breakfast",
             "greek": "Greek",
-            "vietnamese": "Vietnamese",
-            "turkish": "Turkish",
-            "lebanese": "Lebanese",
-            "indonesian": "Indonesian",
-            "malaysian": "Malaysian",
-            "taiwanese": "Taiwanese",
-            "juice": "Juice",
-            "bubble_tea": "Bubble Tea",
-            "hot_dog": "Hot Dog",
-            "cake": "Cake",
-            "pankcake": "Pancake",
-            "pasta": "Pasta",
-            "salad": "Salad",
-            "chocolate": "Chocolate",
-            "dessert": "Dessert",
             "steak_house": "Steak House",
-            "donut": "Donut"
+            "fish_and_chips": "Fish and Chips",
+            "korean": "Korean",
+            "barbecue": "Barbecue",
+            "donut": "Donut",
+            "noodle": "Noodle",
+            "vietnamese": "Vietnamese",
+            "fish": "Fish",
+            "turkish": "Turkish",
+            "cake": "Cake",
+            "pasta": "Pasta",
+            "tex-mex": "Tex-Mex",
+            "bubble_tea": "Bubble Tea",
+            "ramen": "Ramen",
+            "mediterranean": "Mediterranean",
+            "spanish": "Spanish",
+            "friture": "Friterie",
+            "tea": "Tea",
+            "grill": "Bar and Grill",
+            "juice": "Juice",
+            "salad": "Salad",
+            "crepe": "Crepe",
+            "hot_dog": "Hot Dog",
+            "pancake": "Pancake",
+            "dessert": "Dessert",
+            "diner": "Diner",
+            "tapas": "Tapas",
+            "portuguese": "Portuguese",
+            "beef_bowl": "Gyūdon",
+            "russian": "Russian",
+            "indonesian": "Indonesian",
+            "wings": "Chicken Wings",
+            "lebanese": "Lebanese",
+            "arab": "Arab",
+            "curry": "Curry",
+            "malaysian": "Malaysian",
+            "bagel": "Bagel",
+            "georgian": "Georgian",
+            "polish": "Polish",
+            "african": "African",
+            "western": "Western",
+            "sausage": "Sausage",
+            "filipino": "Filipino",
+            "caribbean": "Caribbean",
+            "soba": "Soba",
+            "peruvian": "Peruvian",
+            "brazilian": "Brazilian",
+            "oriental": "Oriental",
+            "fine_dining": "Fine Dining",
+            "frozen_yogurt": "Frozen Yogurt",
+            "argentinian": "Argentinian",
+            "balkan": "Balkan",
+            "bavarian": "Bavarian",
+            "shawarma": "Shawarma",
+            "persian": "Persian",
+            "middle_eastern": "Middle Eastern",
+            "pastry": "Pastry",
+            "soup": "Soup",
+            "fries": "Fries",
+            "taiwanese": "Taiwanese",
+            "bistro": "Bistro",
+            "european": "European",
+            "moroccan": "Moroccan",
+            "hawaiian": "Hawaiian",
+            "brunch": "Brunch",
+            "udon": "Udon",
+            "ukrainian": "Ukrainian"
         }
     },
     "terms": [

data/fields/currency_multi.json

@@ -7,5 +7,6 @@
         "cash",
         "coins",
         "money"
-    ]
+    ],
+    "caseSensitive": true
 }

data/fields/cycle_barrier.json

@@ -0,0 +1,16 @@
+{
+    "key": "cycle_barrier",
+    "type": "combo",
+    "label": "Type",
+    "customValues": false,
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "single": "Single",
+            "double": "Double",
+            "triple": "Triple",
+            "diagonal": "Diagonal",
+            "tilted": "Tilted"
+        }
+    }
+}