Test cycleway_lane tagging with separate fields

We might want to use a directionalCombo for this. However, that would suggest to tag data for cycleway:left:lane=* when in fact there is no cycleway:left=lane. This tries to work around this by adding separate fields with re-conditions.

.github/ISSUE_TEMPLATE/0-enhancement.yaml

@@ -1,7 +1,7 @@
 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: enhancement
+labels: needs-triage
 # assignees: ''
 body:
   - type: markdown
@@ -82,6 +82,13 @@ body:
       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?

.github/ISSUE_TEMPLATE/1-bug.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: bug,needs-triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/2-deprecating.yaml

@@ -1,7 +1,7 @@
 name: Add a New Deprecation Rule
 description: This requests an OSM tag to be added to list of deprecated tags.
 # title: ''
-labels: deprecating
+labels: deprecating,needs-triage
 # assignees: ''
 body:
   - type: markdown

.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:
+   > 🍱 You can preview the tagging presets of this pull request here.
+   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/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

@@ -12,13 +12,13 @@ jobs:
   build-preview:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - 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@v3
+      - uses: actions/checkout@v4
         with:
           repository: openstreetmap/iD
           path: './iD'
@@ -33,7 +33,7 @@ jobs:
         env:
           ID_PRESETS_CDN_URL: '../../'
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: preview
           path: |
@@ -43,7 +43,7 @@ jobs:
       - name: Store pull request number for later use
         run: |
           echo ${{github.event.number}} > ./pr_number
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: pr
           path: ./pr_number

.github/workflows/deploy-preview.yml

@@ -8,17 +8,18 @@ on:
 
 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/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
-      - run: npm install --global netlify-cli@6
-      - run: npm install unzipper@0.10
+      - run: npm clean-install
 
       - name: Get pull request number
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         id: pull-request-number
         with:
           result-encoding: string
@@ -45,21 +46,22 @@ jobs:
             const file = directory.files.find(d => d.path === 'pr_number');
             const content = await file.buffer();
             return content.toString();
-      - uses: dawidd6/action-download-artifact@v2
+      - 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: netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
+        run: ./node_modules/.bin/netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
 
       - name: Add comment to pull request
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const pullRequestNumber = parseInt(${{steps.pull-request-number.outputs.result}}, 10);
@@ -78,14 +80,14 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: pullRequestNumber,
-                body: `${start} You can preview the tagging presets of this pull request [here](https://pr-${pullRequestNumber}--ideditor-presets-preview.netlify.app/id/dist/#locale=en).`
+                body: `${start} **[Your pull request preview is ready](https://pr-${pullRequestNumber}--ideditor-presets-preview.netlify.app/id/dist/#locale=en&map=17.00/14.65485/121.06466)**\n\nPlease use this preview to check your changes. Ideally use [the **test documentation** template](https://github.com/openstreetmap/id-tagging-schema/blob/main/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L38-L69) and document your test results by commenting on the PR. This will speed up the review process for everyone.\n\nFYI, once this PR is merged, you can use [the iD Editor Preview](http://preview.ideditor.com/) to test your changes in interaction with all other changes.`
               });
             } else {
               console.log(`Preview URL comment already added to PR #${pullRequestNumber}`);
             }
 
       - name: Clean up artifact
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |

.github/workflows/deploy.yml

@@ -12,15 +12,15 @@ jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'Deploy') && github.repository == 'openstreetmap/id-tagging-schema'"
+    if: github.repository == 'openstreetmap/id-tagging-schema'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3 # If you're using actions/checkout@v3 you must set persist-credentials to false in most cases for the deployment to work correctly.
+        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@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
@@ -31,8 +31,7 @@ jobs:
         run: npm run build
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.5.0
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          BRANCH: main # The branch the action should deploy to.
-          FOLDER: . # The folder the action should deploy.
-          CLEAN: false # Automatically remove deleted files from the deploy branch
+          branch: interim # The branch the action should deploy to.
+          folder: interim # The folder the action should deploy.

.github/workflows/lint.yml

@@ -5,36 +5,34 @@ jobs:
     name: Check file endings
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
-          notJSONs=`find data/ -type f -not -iname "*.json"`
-          for f in $notJSONs
+          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 file."
+            echo "::error file=$f::File $f is not a .json or .md file."
           done
-          if [ ! -z "$notJSONs" ]; then exit 1; fi
+          if [ ! -z "$disallowedFiles" ]; then exit 1; fi
 
   prettier:
     name: Check for code formatting mistakes
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - run: npm clean-install
-      - run: 'for f in `find data/ -type f -not -iname "*.json"`; do echo "::error File $f is not a .json file."; done'
       - run: npm run lint
 
   codespell:
     name: Check for spelling errors
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: codespell-project/actions-codespell@master
+      - uses: actions/checkout@v4
+      - uses: codespell-project/actions-codespell@v2
         with:
           check_filenames: true
-          skip: ./.git,./dist,./data/deprecated.json
-          ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te"
+          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 --prod --dir=iD/dist

.github/workflows/test.yml

@@ -18,9 +18,9 @@ jobs:
         node-version: ['18']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm clean-install

.gitignore

@@ -6,3 +6,4 @@
 npm-debug.log
 
 transifex.auth
+interim

.vscode/settings.json

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

CHANGELOG.md

@@ -23,6 +23,219 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@xxxx]: https://github.com/xxxx
 -->
 
+# 6.10.0
+##### 2025-Mar-20
+
+#### New Presets
+* Add preset for `amenity=veterinary_pharmacy` ([#1451], thanks [@Avan2021])
+* Add preset for `shop=groundskeeping` ([#1448], thanks [@Avan2021])
+* Add preset for `shop=bbq` ([#1430], thanks [@andrewharvey])
+#### Changed Presets
+* Show `fire_hydrant/position` field by default for all Hydrants ([#1441], thanks [@sun-geo])
+* Add `wheelchair` field to Cycle Barrier preset ([#1232], thanks [@k-yle])
+* Add `operator` field to `highway=street_lamp` ([#1327], thanks [@CorruptComputer])
+* Use couch icon for `craft=upholsterer` ([#1462], thanks [@westnordost])
+* Update icons for some shop presets: (`vacant` [#1457], `art` [#1458], `craft` [#1459], `e-cigarette` [#1460], `amenity=marketplace` [#1461], thanks [@westnordost])
+#### New and Changed Fields
+* Add fields for Cycle Barrier properties: `cycle_barrier` type, `cycle_barrier:installation`, `deflection` angle, `maxwidth:physical`, `opening` width, `overlap` width and `spacing` distance ([#1232], thanks [@k-yle])
+* Add field for Center-Pivot Irrigation `irrigation=pivot` ([#1320], thanks [@arch0345])
+* Add `entrance=shop` value also to Entrance Type field ([#1446])
+* Add field toilets to `amenity=fast_food` as `moreFileds` ([#1454], thanks [@Avan2021])
+* Use translated strings for `bridge`  and `tunnel` values also in `structure` fields
+* Add values `stone` and `tilework` to Artwork Type field ([#1443], thanks [@okainov])
+#### Bugfixes
+* Remove tag deprecation rule for `shop=photo_studio` ([#1407])
+#### Documentation and Other Changes
+* Remove `interim` directory in main branch (it's now available in a dedicated branch called `interim`) ([#1307])
+
+[#1232]: https://github.com/openstreetmap/id-tagging-schema/pull/1232
+[#1232]: https://github.com/openstreetmap/id-tagging-schema/pull/1232
+[#1320]: https://github.com/openstreetmap/id-tagging-schema/pull/1320
+[#1327]: https://github.com/openstreetmap/id-tagging-schema/pull/1327
+[#1307]: https://github.com/openstreetmap/id-tagging-schema/pull/1307
+[#1407]: https://github.com/openstreetmap/id-tagging-schema/issues/1407
+[#1430]: https://github.com/openstreetmap/id-tagging-schema/pull/1430
+[#1441]: https://github.com/openstreetmap/id-tagging-schema/pull/1441
+[#1443]: https://github.com/openstreetmap/id-tagging-schema/pull/1443
+[#1446]: https://github.com/openstreetmap/id-tagging-schema/pull/1446
+[#1448]: https://github.com/openstreetmap/id-tagging-schema/pull/1448
+[#1451]: https://github.com/openstreetmap/id-tagging-schema/pull/1451
+[#1454]: https://github.com/openstreetmap/id-tagging-schema/pull/1454
+[#1457]: https://github.com/openstreetmap/id-tagging-schema/pull/1457
+[#1458]: https://github.com/openstreetmap/id-tagging-schema/pull/1458
+[#1459]: https://github.com/openstreetmap/id-tagging-schema/pull/1459
+[#1460]: https://github.com/openstreetmap/id-tagging-schema/pull/1460
+[#1461]: https://github.com/openstreetmap/id-tagging-schema/pull/1461
+[#1462]: https://github.com/openstreetmap/id-tagging-schema/pull/1462
+[@Avan2021]: https://github.com/Avan2021
+[@sun-geo]: https://github.com/sun-geo
+[@CorruptComputer]: https://github.com/CorruptComputer
+
+
+# 6.9.1
+##### 2025-Feb-18
+
+* fix "Detached House" translation in en-GB ([#1438])
+
+[#1438]: https://github.com/openstreetmap/id-tagging-schema/issues/1438
+
+
+# 6.9.0
+##### 2025-Feb-06
+
+#### New Presets
+* Add preset for `office=translator` ([#1298], thanks [@deevroman])
+* Add hidden presets for `highway=path + path=crossing` ([#1201], thanks [@tordans])
+* Add preset for `shop=gold_buyer` ([#1374], thanks [@matkoniecz])
+* Add preset for `natural=arch` ([#1352], thanks [@jake-low])
+* Add preset for `entrance=shop` ([#1299], thanks [@deevroman])
+* Add presets for `cycleway=traffic_island` ([#1068], thanks [@k-yle])
+* Rework crossing presets to be better structured and easier to work with ([#1201], thanks [@tordans])
+#### Changed Presets
+* Add `building` (with default value `yes`) field to Funeral Service Hall preset ([#1324], thanks [@arch0345])
+* Add additional search terms to Monitoring Station preset ([#1347], thanks [@mnalis])
+* Add additional search terms to Public Bookcase Station preset ([#1333], [#1354], thanks [@Coehill] and [@danieldegroot2])
+* Change icon of Ticket Validator preset ([#1388], thanks [@matkoniecz])
+* Rename `shop=yes` to reuse the name "Shop (Unspecified type)" ([#1415], thanks [@Dimitar5555])
+* Only apply `layer=1` on newly created `building=roof` objects ([#1342]) and tweak fields of roof preset
+#### New and Changed Fields
+* Add `camp_site` (type) field to Campground preset ([#1286], thanks [@osmuser63783])
+* Improve label of `internet_access` field ([#1346], thanks [@mnalis])
+* Add value `e-cigarettes` to `vending` field of Vending Machine preset ([#1371], thanks [@tiuck])
+* Add translatable strings for values of the `map_type` tag ([#1373], thanks [@tiuck])
+* Add value `sac_scale=strolling` to Hiking Path Difficulty field ([#1383], thanks [@felagund])
+* Add descriptions to options for `parking` field ([#1402], thanks [@Nekzuris])
+* Add universal field for `panoramax` photo ids ([#1344], thanks [@mnalis])
+* Include `addr:town` in list of tags of the Address field ([#1433])
+#### Regional Presets and Fields
+* Add presets for `meadow=meadow_orchard`, `orchard=meadow_orchard` ([#1218], thanks [@tordans])
+* Add presets for `highway=path-`based bicycle-foot path tagging in some European countries ([#1384], thanks [@olafkryus])
+#### Deprecated Tags
+* Replace ~~`information=map + map_type=tactile_map`~~ with information=tactile_map ([#1373], thanks [@tiuck])
+* Replace ~~`information=map + map_type=tactile_model`~~ with information=tactile_model ([#1373], thanks [@tiuck])
+* Replace ~~`parking:lane:*=*`~~ with `parking:*` tags ([#1390], thanks [@tiptoptom])
+* Replace ~~`cycleway*=opposite`~~ with `oneway:bicycle=no` ([#1295], thanks [@tordans])
+#### Bugfixes
+* Fix spelling of Amphitheater preset to American English ([#1366], thanks [@1ec5])
+#### Documentation and Other Changes
+* Improve documentation about how ℹ️ icon works in iD ([#1257], thanks [@tordans])
+* Clarify guidelines about deprecation rules ([#1309], thanks [@tordans])
+* Add question about potential preset icon to github issue template ([#1377], thanks [@tordans])
+* Synchronize list of discardable tags with JOSM ([#1423])
+
+[#1201]: https://github.com/openstreetmap/id-tagging-schema/pull/1201
+[#1218]: https://github.com/openstreetmap/id-tagging-schema/pull/1218
+[#1257]: https://github.com/openstreetmap/id-tagging-schema/pull/1257
+[#1286]: https://github.com/openstreetmap/id-tagging-schema/pull/1286
+[#1295]: https://github.com/openstreetmap/id-tagging-schema/pull/1295
+[#1309]: https://github.com/openstreetmap/id-tagging-schema/pull/1309
+[#1324]: https://github.com/openstreetmap/id-tagging-schema/pull/1324
+[#1333]: https://github.com/openstreetmap/id-tagging-schema/pull/1333
+[#1342]: https://github.com/openstreetmap/id-tagging-schema/issues/1342
+[#1344]: https://github.com/openstreetmap/id-tagging-schema/pull/1344
+[#1346]: https://github.com/openstreetmap/id-tagging-schema/pull/1346
+[#1347]: https://github.com/openstreetmap/id-tagging-schema/pull/1347
+[#1354]: https://github.com/openstreetmap/id-tagging-schema/pull/1354
+[#1366]: https://github.com/openstreetmap/id-tagging-schema/pull/1366
+[#1371]: https://github.com/openstreetmap/id-tagging-schema/pull/1371
+[#1373]: https://github.com/openstreetmap/id-tagging-schema/pull/1373
+[#1373]: https://github.com/openstreetmap/id-tagging-schema/pull/1373
+[#1377]: https://github.com/openstreetmap/id-tagging-schema/pull/1377
+[#1383]: https://github.com/openstreetmap/id-tagging-schema/pull/1383
+[#1384]: https://github.com/openstreetmap/id-tagging-schema/pull/1384
+[#1388]: https://github.com/openstreetmap/id-tagging-schema/pull/1388
+[#1390]: https://github.com/openstreetmap/id-tagging-schema/pull/1390
+[#1402]: https://github.com/openstreetmap/id-tagging-schema/pull/1402
+[#1415]: https://github.com/openstreetmap/id-tagging-schema/pull/1415
+[#1423]: https://github.com/openstreetmap/id-tagging-schema/issues/1423
+[#1433]: https://github.com/openstreetmap/id-tagging-schema/pull/1433
+[@deevroman]: https://github.com/deevroman
+[@jake-low]: https://github.com/jake-low
+[@Coehill]: https://github.com/Coehill
+[@tiuck]: https://github.com/tiuck
+[@felagund]: https://github.com/felagund
+
+
+# 6.8.1
+##### 2024-Aug-19
+
+* Update translations from Transifex
+
+
+# 6.8.0
+##### 2024-Aug-19
+
+#### New Presets
+* Add preset for `man_made=flare` ([#1237])
+* Add presets for Ski Jump features ([#1176], thanks [@olafkryus])
+* Add preset for `leisure=bathing_place` ([#1274], thanks [@osmuser63783])
+* Add preset for `hairdresser=barber` ([#1165], thanks [@kjonosm])
+* Add preset for `man_made=footwear_decontamination` ([#1235])
+* Add preset for Go Kart Facility ([#1281], thanks [@arch0345])
+* Add preset for Chinese Fast Food ([#1280], thanks [@arch0345])
+* Add preset for `amenity=swingerclub` ([#1187], thanks [@Asteliks])
+* Add presets for dedicated types of Community Centers ([#1200], thanks [@tiptoptom])
+#### Changed Presets
+* Add `activity` field to Trail Marker preset ([#1197], thanks [@danieldegroot2])
+* Add `maxweight` field to Helipad preset ([#1234])
+* Add `organic` field to the following presets: Cafe, Fast Food, Ice Cream Shop, Restaurant ([#1247], thanks [@ToastHawaii])
+* Allow presets to be mapped as vertices: Ticket Validator, Fuel Pump, Mineshaft, Marker, Sinkhole, Public Transport Stations, Welcome Sign ([#1233])
+* Add `maxheight` field to Parking Garage Entrance/Exit preset ([#232], thanks [@cicku])
+#### New and Changed Fields
+* Add `armrest` field for Bench preset ([#1227], thanks [@bompstable])
+* Add additional translatable values to the `surface` field: `clay`, `concrete:lanes`, `concrete:plates`, `grass_paver`, `pebblestone`, `tartan` ([#1198], thanks [@michalgwo])
+* Add common name tags as universal fields: `alt_name`, `loc_name`, `nat_name`, `official_name`, `reg_name`, `short_name` ([#215], thanks [@1ec5])
+* Add value `ghost_bike` to the memorial type field ([#1302], thanks [@mnalis])
+#### Deprecated Tags
+* Add tag upgrade rule for `sidewalk=none` to `sidewalk=no`
+#### Bugfixes
+* Fix typo for tag value `material=reinforced_concrete` ([#1245], thanks [@Dimitar5555])
+* Remove unnecessary `matchScore` property from Kitchen Garden preset ([#1253])
+* Fix tag for roller coaster track type field ([#1293], thanks [@arch0345])
+#### Documentation and Other Changes
+* Skip `dist` directory for searching in VS Code ([#1219])
+* Change _deploy_ workflow to write `interim` data to a dedicated branch, instead of the `main` development branch ([#1307])
+* Add repo governance documentation, including roles (co-maintainers, issue triage helpers, contributors) ([#1230])
+* Document guidelines for presets, fields and tag deprecations ([#1229])
+* Add pull request template ([#1239])
+
+[#215]: https://github.com/openstreetmap/id-tagging-schema/pull/215
+[#222]: https://github.com/openstreetmap/id-tagging-schema/pull/222
+[#232]: https://github.com/openstreetmap/id-tagging-schema/pull/232
+[#1165]: https://github.com/openstreetmap/id-tagging-schema/pull/1165
+[#1167]: https://github.com/openstreetmap/id-tagging-schema/pull/1167
+[#1187]: https://github.com/openstreetmap/id-tagging-schema/pull/1187
+[#1197]: https://github.com/openstreetmap/id-tagging-schema/pull/1197
+[#1198]: https://github.com/openstreetmap/id-tagging-schema/pull/1198
+[#1200]: https://github.com/openstreetmap/id-tagging-schema/pull/1200
+[#1219]: https://github.com/openstreetmap/id-tagging-schema/pull/1219
+[#1227]: https://github.com/openstreetmap/id-tagging-schema/pull/1227
+[#1229]: https://github.com/openstreetmap/id-tagging-schema/pull/1229
+[#1230]: https://github.com/openstreetmap/id-tagging-schema/pull/1230
+[#1233]: https://github.com/openstreetmap/id-tagging-schema/pull/1233
+[#1234]: https://github.com/openstreetmap/id-tagging-schema/pull/1234
+[#1235]: https://github.com/openstreetmap/id-tagging-schema/pull/1235
+[#1237]: https://github.com/openstreetmap/id-tagging-schema/pull/1237
+[#1176]: https://github.com/openstreetmap/id-tagging-schema/pull/1176
+[#1239]: https://github.com/openstreetmap/id-tagging-schema/pull/1239
+[#1245]: https://github.com/openstreetmap/id-tagging-schema/pull/1245
+[#1247]: https://github.com/openstreetmap/id-tagging-schema/pull/1247
+[#1253]: https://github.com/openstreetmap/id-tagging-schema/pull/1253
+[#1274]: https://github.com/openstreetmap/id-tagging-schema/pull/1274
+[#1280]: https://github.com/openstreetmap/id-tagging-schema/pull/1280
+[#1281]: https://github.com/openstreetmap/id-tagging-schema/pull/1281
+[#1293]: https://github.com/openstreetmap/id-tagging-schema/pull/1293
+[#1302]: https://github.com/openstreetmap/id-tagging-schema/pull/1302
+[#1307]: https://github.com/openstreetmap/id-tagging-schema/pull/1307
+[@bompstable]: https://github.com/bompstable
+[@michalgwo]: https://github.com/michalgwo
+[@ToastHawaii]: https://github.com/ToastHawaii
+[@olafkryus]: https://github.com/olafkryus
+[@osmuser63783]: https://github.com/osmuser63783
+[@Asteliks]: https://github.com/Asteliks
+[@cicku]: https://github.com/cicku
+
+
 # 6.7.3
 ##### 2024-Apr-5
 
@@ -281,7 +494,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Add specific presets for Trees which have the tags `leaf_cycle`/`leaf_type` mapped ([#956])
 #### Changed Presets
 * Add field to specify the type of a `house` ([#921], thanks [@arch0345])
-* Allow Drinking Water to be mapped on verticed ([#925], thanks [@arch0345])
+* Allow Drinking Water to be mapped on vertices ([#925], thanks [@arch0345])
 * Rename preset for Trash Cans and Recycling Bins ([#938], thanks [@arch0345])
 * Add `direction` field to Emergency Bay preset
 * Add more fields to Parcel Locker preset for the tags: `wheelchair`, `indoor` ([#940]), `collection_times`, `surveillance`

CONTRIBUTING.md

@@ -1,3 +1,5 @@
+# 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).
@@ -7,12 +9,7 @@ iD's [code of conduct](https://github.com/openstreetmap/iD/blob/release/CODE_OF_
 
 ## General Guidelines
 
-As a general guideline, the tagging schema will only consider tags that are documented on the OSM wiki and have completed a [proposal process](https://wiki.openstreetmap.org/wiki/Proposal_process) or can in some other way be considered as _accepted_ by the OpenStreetMap community.
-
-As the tagging schema is meant to be a general representation of the OSM data for a wide audience of users, some tags might be considered out of scope: for example when a tag requires expert knowledge to be used, or when a tag is extremely rare.
-
-Tags which are not universally applicable globally, can and should be limited to their respective region in the corresponding preset or field of this repository.
-
+Read the [GUIDELINES](./GUIDELINES.md) to help you understand what fields and tags should be added to the tagging schema.
 
 ## Translating
 
@@ -26,7 +23,7 @@ Tags which are not universally applicable globally, can and should be limited to
   1. [open the translation page](https://www.transifex.com/openstreetmap/id-editor/translate/)
   2. select a language
   3. select _'presets'_
-  4. search for `key:living_street` or `translation_text:'Living Street'`
+  4. search for `key:living_street` or `translation_text:'Living Street'` or `key:highway/living_street`
 
 * **Request access:** To contribute to a language, [select a language](https://www.transifex.com/openstreetmap/id-editor/languages/) and use 'Join team' to request access. The administrators will approve requests routinely, only rejecting requests for overly specific locales.
 
@@ -39,16 +36,27 @@ Tags which are not universally applicable globally, can and should be limited to
 
 ## 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](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.
+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`
+
+![Screenshot of a preset in iD with the information details open.](https://github.com/openstreetmap/id-tagging-schema/assets/111561/13549318-cd7c-4dd1-9948-7a2d84662f04)
+
+iD and other tools provide users with a way to learn more about the main tag of a preset. It is important to provide good information in this information panel. Here are a few notes on how to do this:
+- Does your tag have a Wikibase entry? Click the small pencil icon next to the text to open the Wikibase item on the OSM wiki. Improve this wording if needed. If the Wikibase item is missing, [learn more about how to add it in "Current methods for creating new items"](https://wiki.openstreetmap.org/wiki/Data_items#Item_creation_process).
+- Does your tag have a Wiki page with a good image?
+- Your preset might need [a `reference` property](https://github.com/ideditor/schema-builder?tab=readme-ov-file#reference) to force the system to use a specific tag for the information section.
+
 ### Code Style
 
 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,90 @@
+# 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
+
+(No one has the triage role at the moment. Please reach out if you want to help.)
+
+The triage role includes:
+- Proactively helping to clarify issues and PRs.
+- Closing issues as duplicates or not planned.
+- 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 to simplify creating the changelog: `new-*`, `add-*`, `bug`
+
+### 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 and add or update the [OSM Wikibase item](https://wiki.openstreetmap.org/wiki/Data_items) 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,4 +1,4 @@
-![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
 
@@ -10,7 +10,7 @@ It includes presets, fields, deprecations, and more.
 * 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` channel) or [OpenStreetMap US Slack](https://slack.openstreetmap.us/) (`#id` channel).
+* 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
 

data/deprecated.json

@@ -76,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"},
@@ -547,7 +547,7 @@
     "replace": {"direction": "W"}
   },
   {
-    "old": {"disabled_spaces":"*"},
+    "old": {"disabled_spaces": "*"},
     "replace": {"capacity:disabled": "$1"}
   },
   {
@@ -686,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"}
@@ -782,10 +786,6 @@
     "old": {"highway": "footway", "foot": "no"},
     "replace": {"highway": "path", "foot": "no"}
   },
-  {
-    "old": {"highway": "ford"},
-    "replace": {"ford": "*"}
-  },
   {
     "old": {"highway": "path", "ladder": "yes"},
     "replace": {"highway": "ladder"}
@@ -803,8 +803,8 @@
     "replace": {"highway": "road", "surface": "unpaved"}
   },
   {
-     "old": {"historic": "archaeological_site", "site_type": "*"},
-     "replace": {"historic": "archaeological_site", "archaeological_site": "$1"}
+    "old": {"historic": "archaeological_site", "site_type": "*"},
+    "replace": {"historic": "archaeological_site", "archaeological_site": "$1"}
   },
   {
     "old": {"industrial": "gas"},
@@ -850,11 +850,11 @@
     "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"}
   },
@@ -963,12 +963,12 @@
     "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", "natural": "water", "water": "reservoir"},
+    "replace": {"man_made": "tailings_pond"}
   },
   {
-     "old": {"landuse": "reservoir", "reservoir_type": "tailings"},
-     "replace": {"man_made": "tailings_pond"}
+    "old": {"landuse": "reservoir", "reservoir_type": "tailings"},
+    "replace": {"man_made": "tailings_pond"}
   },
   {
     "old": {"landuse": "school"},
@@ -1130,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"}
@@ -1167,8 +1175,8 @@
     "replace": {"natural": "wetland", "wetland": "marsh"}
   },
   {
-     "old": {"natural": "water", "water": "reservoir", "reservoir_type": "tailings"},
-     "replace": {"man_made": "tailings_pond"}
+    "old": {"natural": "water", "water": "reservoir", "reservoir_type": "tailings"},
+    "replace": {"man_made": "tailings_pond"}
   },
   {
     "old": {"natural": "waterfall"},
@@ -1249,6 +1257,102 @@
     "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"}
@@ -1524,10 +1628,6 @@
     "old": {"shop": "perfume"},
     "replace": {"shop": "perfumery"}
   },
-  {
-    "old": {"shop": "photo_studio"},
-    "replace": {"craft": "photographer"}
-  },
   {
     "old": {"shop": "real_estate"},
     "replace": {"office": "estate_agent"}
@@ -1873,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"},
@@ -1995,5 +2095,13 @@
   {
     "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"}
   }
 ]

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

@@ -1,12 +1,14 @@
 {
     "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,6 +25,7 @@
         "addr:street",
         "addr:subdistrict",
         "addr:suburb",
+        "addr:town",
         "addr:unit"
     ],
     "label": "Address",
@@ -61,6 +64,7 @@
             "subdistrict!vn": "Ward/Commune/Townlet",
             "suburb": "Suburb",
             "suburb!jp": "Ward (政令市)",
+            "town": "Town",
             "unit": "Unit"
         }
     },

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/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

@@ -12,7 +12,9 @@
             "bust": "Bust",
             "painting": "Painting",
             "mosaic": "Mosaic",
-            "relief": "Relief"
+            "relief": "Relief",
+            "stone": "Artistically Worked Stone",
+            "tilework": "Tile Work"
         }
     }
 }

data/fields/bridge.json

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

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/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/crossing/markings-BG.json

@@ -2,6 +2,7 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
     "stringsCrossReference": "{crossing/markings}",
     "iconsCrossReference": "{crossing/markings}",
     "options": [
@@ -15,6 +16,5 @@
         "include": [
             "BG"
         ]
-    },
-    "autoSuggestions": false
+    }
 }

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

@@ -2,6 +2,9 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "yes",
@@ -10,9 +13,6 @@
         "dashes",
         "surface"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "DE",

data/fields/crossing/markings-PL.json

@@ -2,6 +2,9 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "dots",
@@ -9,9 +12,6 @@
         "yes",
         "no"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "PL"

data/fields/crossing/markings_yes-BG.json

@@ -2,9 +2,10 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
     "stringsCrossReference": "{crossing/markings}",
     "iconsCrossReference": "{crossing/markings}",
-    "default": "yes",
     "options": [
         "zebra",
         "no",
@@ -16,6 +17,5 @@
         "include": [
             "BG"
         ]
-    },
-    "autoSuggestions": false
+    }
 }

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

@@ -2,6 +2,10 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "yes",
@@ -10,15 +14,11 @@
         "dashes",
         "surface"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "DE",
             "AT",
             "CH"
         ]
-    },
-    "default": "yes"
+    }
 }

data/fields/crossing/markings_yes-PL.json

@@ -2,6 +2,10 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "dots",
@@ -9,13 +13,9 @@
         "yes",
         "no"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "PL"
         ]
-    },
-    "default": "yes"
+    }
 }

data/fields/crossing/markings_yes.json

@@ -2,9 +2,9 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "default": "yes",
     "stringsCrossReference": "{crossing/markings}",
     "iconsCrossReference": "{crossing/markings}",
-    "default": "yes",
     "locationSet": {
         "exclude": [
             "BG",

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"
+        }
+    }
+}

data/fields/cycle_barrier/installation.json

@@ -0,0 +1,14 @@
+{
+    "key": "cycle_barrier:installation",
+    "type": "combo",
+    "label": "Installation",
+    "customValues": false,
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "fixed": "Fixed",
+            "openable": "Openable",
+            "removable": "Removable"
+        }
+    }
+}

data/fields/cycleway.json

@@ -36,17 +36,17 @@
                 "title": "Bike Lane Shared With Bus",
                 "description": "A bike lane shared with a bus lane"
             },
-            "opposite_lane": {
-                "title": "Opposite Bike Lane",
-                "description": "A bike lane that travels in the opposite direction of traffic"
-            },
-            "opposite": {
-                "title": "Contraflow Bike Lane",
-                "description": "A bike lane that travels in both directions on a one-way street"
-            },
             "separate": {
                 "title": "Cycleway Mapped Separately",
                 "description": "Indicates that cycleway was mapped as a separate geometry"
+            },
+            "opposite_lane": {
+                "title": "(Deprecated) Opposite Bike Lane",
+                "description": "Please update with oneway, oneway:bicycle, and cycleway:left/right=lane etc."
+            },
+            "opposite": {
+                "title": "(Deprecated) Contraflow Bike Lane",
+                "description": "Please update with oneway=yes, oneway:bicycle=no, and cycleway:both=no etc."
             }
         }
     },

data/fields/cycleway/both_lane.json

@@ -0,0 +1,26 @@
+{
+    "key": "cycleway:both:lane",
+    "prerequisiteTag": {
+        "key": "cycleway:both",
+        "value": "lane"
+    },
+    "type": "combo",
+    "label": "Cycle Lane Type (Both)",
+    "strings": {
+        "options": {
+            "exclusive": {
+                "title": "Exclusive cycle lane",
+                "description": "A cycle lane strictly reserved exclusively for cyclists, segregated from the car lanes, usually through a continuous line."
+            },
+            "advisory": {
+                "title": "Advisory cycle lane",
+                "description": "A cycle lane which is not reserved exclusively for cyclists."
+            }
+        }
+    },
+    "autoSuggestions": false,
+    "reference": {
+        "key": "cycleway:lane"
+    },
+    "terms": []
+}

data/fields/cycleway/left_lane.json

@@ -0,0 +1,26 @@
+{
+    "key": "cycleway:left:lane",
+    "prerequisiteTag": {
+        "key": "cycleway:left",
+        "value": "lane"
+    },
+    "type": "combo",
+    "label": "Cycle Lane Type (Left)",
+    "strings": {
+        "options": {
+            "exclusive": {
+                "title": "Exclusive cycle lane",
+                "description": "A cycle lane strictly reserved exclusively for cyclists, segregated from the car lanes, usually through a continuous line."
+            },
+            "advisory": {
+                "title": "Advisory cycle lane",
+                "description": "A cycle lane which is not reserved exclusively for cyclists."
+            }
+        }
+    },
+    "autoSuggestions": false,
+    "reference": {
+        "key": "cycleway:lane"
+    },
+    "terms": []
+}

data/fields/cycleway/right_lane.json

@@ -0,0 +1,26 @@
+{
+    "key": "cycleway:right:lane",
+    "prerequisiteTag": {
+        "key": "cycleway:right",
+        "value": "lane"
+    },
+    "type": "combo",
+    "label": "Cycle Lane Type (Right)",
+    "strings": {
+        "options": {
+            "exclusive": {
+                "title": "Exclusive cycle lane",
+                "description": "A cycle lane strictly reserved exclusively for cyclists, segregated from the car lanes, usually through a continuous line."
+            },
+            "advisory": {
+                "title": "Advisory cycle lane",
+                "description": "A cycle lane which is not reserved exclusively for cyclists."
+            }
+        }
+    },
+    "autoSuggestions": false,
+    "reference": {
+        "key": "cycleway:lane"
+    },
+    "terms": []
+}

data/fields/deflection.json

@@ -0,0 +1,10 @@
+{
+    "key": "deflection",
+    "type": "number",
+    "label": "Angle",
+    "increment": 5,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "value": "diagonal"
+    }
+}

data/fields/entrance.json

@@ -8,6 +8,7 @@
             "main": "Main",
             "secondary": "Secondary",
             "service": "Service",
+            "shop": "Shop Entrance",
             "exit": "Exit Only",
             "entrance": "Entrance Only",
             "emergency": "Emergency Exit",

data/fields/hashtags.json

@@ -4,5 +4,6 @@
     "label": "Hashtags",
     "usage": "changeset",
     "placeholder": "#example",
+    "autoSuggestions": false,
     "caseSensitive": true
 }

data/fields/internet_access/fee.json

@@ -1,7 +1,7 @@
 {
     "key": "internet_access:fee",
     "type": "combo",
-    "label": "Internet Access",
+    "label": "Internet Access Fee",
     "strings": {
         "options": {
             "no": "Free",

data/fields/irrigation_pivot.json

@@ -0,0 +1,16 @@
+{
+    "key": "irrigation",
+    "type": "defaultCheck",
+    "label": "Center-Pivot Irrigation",
+    "terms": [
+        "central pivot irrigation",
+        "water wheel",
+        "circle irrigation"
+    ],
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "pivot": "Yes"
+        }
+    }
+}

data/fields/layer_1.json

@@ -0,0 +1,7 @@
+{
+    "key": "layer",
+    "type": "number",
+    "label": "{layer}",
+    "placeholder": "0",
+    "default": "1"
+}

data/fields/loc_name.json

@@ -0,0 +1,15 @@
+{
+    "key": "loc_name",
+    "type": "localized",
+    "label": "Local Name",
+    "universal": true,
+    "terms": [
+        "colloquial name",
+        "common name",
+        "informal name",
+        "nickname"
+    ],
+    "prerequisiteTag": {
+        "key": "name"
+    }
+}

data/fields/map_type.json

@@ -1,5 +1,15 @@
 {
     "key": "map_type",
     "type": "typeCombo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "topo": "Topographical Map",
+            "street": "Road Map",
+            "scheme": "Schematic Map",
+            "toposcope": "Toposcope"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false
 }

data/fields/material.json

@@ -18,7 +18,7 @@
             "marble": "Marble",
             "metal": "Metal",
             "plastic": "Plastic",
-            "reinforced_conrete": "Reinforced Concrete",
+            "reinforced_concrete": "Reinforced Concrete",
             "rock": "Rock",
             "sand": "Sand",
             "sandstone": "Sandstone",

data/fields/maxwidth/physical.json

@@ -0,0 +1,6 @@
+{
+    "key": "maxwidth:physical",
+    "type": "roadheight",
+    "label": "Width Limit",
+    "snake_case": false
+}

data/fields/memorial.json

@@ -7,6 +7,7 @@
             "blue_plaque": "Blue Plaque",
             "bust": "Bust",
             "cross": "Memorial Cross",
+            "ghost_bike": "Ghost Bike",
             "obelisk": "Obelisk",
             "plaque": "Commemorative Plaque",
             "sculpture": "Sculpture",

data/fields/nat_name.json

@@ -0,0 +1,9 @@
+{
+    "key": "nat_name",
+    "type": "localized",
+    "label": "National Name",
+    "universal": true,
+    "prerequisiteTag": {
+        "key": "name"
+    }
+}

data/fields/official_name.json

@@ -0,0 +1,14 @@
+{
+    "key": "official_name",
+    "type": "localized",
+    "label": "Official Name",
+    "universal": true,
+    "terms": [
+        "formal name",
+        "full name",
+        "legal name"
+    ],
+    "prerequisiteTag": {
+        "key": "name"
+    }
+}

data/fields/opening.json

@@ -0,0 +1,10 @@
+{
+    "key": "opening",
+    "type": "number",
+    "label": "Opening Width (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}

data/fields/overlap.json

@@ -0,0 +1,10 @@
+{
+    "key": "overlap",
+    "type": "number",
+    "label": "Overlap Width (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}

data/fields/panoramax.json

@@ -0,0 +1,8 @@
+{
+    "key": "panoramax",
+    "type": "identifier",
+    "label": "Panoramax Image ID",
+    "urlFormat": "https://api.panoramax.xyz/#focus=pic&pic={value}",
+    "pattern": "^[a-zA-Z0-9-]{36,}$",
+    "universal": true
+}

data/fields/parking.json

@@ -4,19 +4,58 @@
     "label": "Type",
     "strings": {
         "options": {
-            "surface": "Surface",
-            "underground": "Underground",
-            "multi-storey": "Multilevel",
-            "lane": "Roadside Lane",
-            "carports": "Carports",
-            "garage_boxes": "Garage Boxes",
-            "rooftop": "Rooftop",
-            "sheds": "Sheds",
-            "street_side": "Street-Side",
-            "layby": "Turnout / Lay-By",
-            "on_kerb": "On Kerb",
-            "half_on_kerb": "Half On Kerb",
-            "shoulder": "Shoulder"
+            "surface": {
+                "title": "Surface",
+                "description": "One level of parking on the ground."
+            },
+            "street_side": {
+                "title": "Street-Side",
+                "description": "Parking directly adjacent to the street (but not on it)."
+            },
+            "lane": {
+                "title": "Roadside Lane",
+                "description": "Parking on the street (which could be easily converted to a travel lane)."
+            },
+            "underground": {
+                "title": "Underground",
+                "description": "Underground parking."
+            },
+            "multi-storey": {
+                "title": "Multilevel",
+                "description": "Two or more levels of parking decks in a building structure."
+            },
+            "rooftop": {
+                "title": "Rooftop",
+                "description": "One level of a parking deck on top of a building."
+            },
+            "carports": {
+                "title": "Carports",
+                "description": "Structure used to offer limited protection to vehicles, typically without walls."
+            },
+            "garage_boxes": {
+                "title": "Garage Boxes",
+                "description": "Private garage with multiple individual boxes for one car each."
+            },
+            "sheds": {
+                "title": "Sheds",
+                "description": "Private hangars for vehicles."
+            },
+            "layby": {
+                "title": "Turnout / Lay-By",
+                "description": "Parking at a rest area, alongside a road."
+            },
+            "on_kerb": {
+                "title": "On Kerb",
+                "description": "Parking on the sidewalk."
+            },
+            "half_on_kerb": {
+                "title": "Half On Kerb",
+                "description": "Parking partially on the sidewalk."
+            },
+            "shoulder": {
+                "title": "Shoulder",
+                "description": "Parking on the shoulder."
+            }
         }
     },
     "autoSuggestions": false,

data/fields/piste/type.json

@@ -13,7 +13,8 @@
             "ice_skate": "Ice Skate",
             "snow_park": "Snow Park",
             "playground": "Playground",
-            "connection": "Connection"
+            "connection": "Connection",
+            "ski_jump": "Ski Jump"
         }
     },
     "autoSuggestions": false,

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

@@ -3,7 +3,7 @@
     "type": "identifier",
     "label": "SIRET Number",
     "urlFormat": "https://annuaire-entreprises.data.gouv.fr/etablissement/{value}",
-    "pattern": "^[0-9]{9}([1-7][0-9]{3}|0[1-9][0-9]{2}|00[1-9][0-9]|000[1-9])[0-9]$",
+    "pattern": "^MONACO[A-Z\\d]{5}001|\\d{9}([1-7]\\d{3}|0[1-9]\\d{2}|00[1-9]\\d|000[1-9])\\d$",
     "locationSet": {
         "include": [
             "fr"

data/fields/reg_name.json

@@ -0,0 +1,9 @@
+{
+    "key": "reg_name",
+    "type": "localized",
+    "label": "Regional Name",
+    "universal": true,
+    "prerequisiteTag": {
+        "key": "name"
+    }
+}

data/fields/roller_coaster/track.json

@@ -1,5 +1,5 @@
 {
-    "key": "roller_coaster",
+    "key": "roller_coaster:track",
     "type": "combo",
     "label": "Type",
     "strings": {

data/fields/sac_scale.json

@@ -5,6 +5,7 @@
     "placeholder": "Mountain Hiking, Alpine Hiking...",
     "strings": {
         "options": {
+            "strolling": "Strolling",
             "hiking": "T1: Hiking",
             "mountain_hiking": "T2: Mountain Hiking",
             "demanding_mountain_hiking": "T3: Demanding Mountain Hiking",

data/fields/short_name.json

@@ -0,0 +1,14 @@
+{
+    "key": "short_name",
+    "type": "localized",
+    "label": "Short Name",
+    "universal": true,
+    "terms": [
+        "abbreviation",
+        "acronym",
+        "initialism"
+    ],
+    "prerequisiteTag": {
+        "key": "name"
+    }
+}

data/fields/source.json

@@ -1,8 +1,8 @@
 {
     "key": "source",
     "type": "semiCombo",
-    "universal": true,
     "label": "Sources",
+    "usage": "changeset",
     "snake_case": false,
     "caseSensitive": true,
     "strings": {

data/fields/spacing.json

@@ -0,0 +1,10 @@
+{
+    "key": "spacing",
+    "type": "number",
+    "label": "Distance Between Barriers (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}

data/fields/sport.json

@@ -51,6 +51,7 @@
             "shooting": "Shooting",
             "skateboard": "Skateboard",
             "skiing": "Skiing",
+            "ski_jumping": "Ski Jumping",
             "soccer": "Soccer",
             "softball": "Softball",
             "speedway": "Motorcycle Speedway",

data/fields/surface.json

@@ -6,20 +6,26 @@
         "options": {
             "artificial_turf": "Artificial Turf",
             "asphalt": "Asphalt",
+            "clay": "Clay",
             "compacted": "Compacted",
             "concrete": "Concrete",
+            "concrete:lanes": "Concrete Lanes",
+            "concrete:plates": "Concrete Plates",
             "dirt": "Dirt",
             "fine_gravel": "Fine Gravel",
             "grass": "Grass",
+            "grass_paver": "Grass Paver",
             "gravel": "Gravel",
             "ground": "Ground",
             "metal": "Metal",
             "mud": "Persistently Muddy",
             "paved": "Paved",
             "paving_stones": "Paving Stones",
+            "pebblestone": "Pebblestone",
             "salt": "Salt",
             "sand": "Sand",
             "sett": "Sett",
+            "tartan": "Tartan",
             "unhewn_cobblestone": "Cobblestone (uncut, rounded stones)",
             "unpaved": "Unpaved",
             "wood": "Wood",

data/fields/tunnel.json

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

data/fields/vending.json

@@ -10,6 +10,7 @@
             "coffee": "Coffee",
             "condoms": "Condoms",
             "drinks": "Drinks",
+            "e-cigarettes": "E-Cigarettes",
             "eggs": "Eggs",
             "electronics": "Electronics",
             "elongated_coin": "Souvenir Coins",

data/presets/@templates/README.md

@@ -0,0 +1,13 @@
+# About `@templates`
+
+Presets in `@templates` are a convention for a _virtual_ presets that are only used from inside other presets.
+
+The only property that really matter for these special presets are the `fields`.
+
+All other properties can be copied from existing template presets and ignored. They are default values that are meant to match all cases where they might be referenced.
+
+## How to use
+
+Inside another preset, reference the template – or any other preset - like `"{@templates/internet_access}"` in `fields` or  `moreFields`. This will "copy" all the listed fields from the file `data/presets/@templates/internet_access.json`.
+
+You can only "copy" (template) `fields` to (preset) `fields` and (template) `moreFields` to (preset) `moreFields`.

data/presets/@templates/crossing/bicycle_more.json

@@ -0,0 +1,23 @@
+{
+    "moreFields": [
+        "oneway",
+        "access",
+        "segregated"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/bicycle_more"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}

data/presets/@templates/crossing/defaults.json

@@ -0,0 +1,23 @@
+{
+    "fields": [
+        "crossing/island",
+        "crossing_raised"
+    ],
+    "geometry": [
+        "point",
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/defaults"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}

data/presets/@templates/crossing/geometry_way_more.json

@@ -0,0 +1,22 @@
+{
+    "moreFields": [
+        "smoothness",
+        "lit"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/geometry_way_more"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}

data/presets/@templates/crossing/markings.json

@@ -6,7 +6,8 @@
         "crossing/markings-PL"
     ],
     "geometry": [
-        "point"
+        "point",
+        "line"
     ],
     "tags": {
         "@template": "crossing/markings"

data/presets/@templates/crossing/markings_yes.json

@@ -6,7 +6,8 @@
         "crossing/markings_yes-PL"
     ],
     "geometry": [
-        "point"
+        "point",
+        "line"
     ],
     "tags": {
         "@template": "crossing/markings_yes"

data/presets/@templates/crossing/surfacequality.json

@@ -0,0 +1,22 @@
+{
+    "fields": [
+        "surface",
+        "smoothness"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/surfacequality"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}

data/presets/@templates/crossing/traffic_signal.json

@@ -0,0 +1,24 @@
+{
+    "fields": [
+        "button_operated",
+        "traffic_signals/sound",
+        "traffic_signals/vibration"
+    ],
+    "geometry": [
+        "point",
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/traffic_signal"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}

data/presets/@templates/crossing/traffic_signal_more.json

@@ -0,0 +1,24 @@
+{
+    "moreFields": [
+        "traffic_signals/arrow",
+        "traffic_signals/countdown",
+        "traffic_signals/minimap"
+    ],
+    "geometry": [
+        "point",
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/traffic_signal_more"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}

data/presets/aeroway/helipad.json

@@ -5,6 +5,7 @@
         "ref",
         "operator",
         "surface",
+        "maxweight",
         "lit"
     ],
     "moreFields": [

data/presets/amenity/bench.json

@@ -2,11 +2,12 @@
     "icon": "temaki-bench",
     "fields": [
         "backrest",
+        "armrest",
         "material",
-        "seats",
-        "colour"
+        "seats"
     ],
     "moreFields": [
+        "colour",
         "access_simple",
         "direction",
         "height",

data/presets/amenity/bicycle_rental.json

@@ -12,7 +12,8 @@
     "moreFields": [
         "{@templates/poi}",
         "address",
-        "covered"
+        "covered",
+        "ref"
     ],
     "geometry": [
         "point",

data/presets/amenity/bicycle_repair_station.json

@@ -28,7 +28,8 @@
         "bike tools",
         "cycle pump",
         "cycle repair",
-        "cycling"
+        "cycling",
+        "compressed air"
     ],
     "tags": {
         "amenity": "bicycle_repair_station"

data/presets/amenity/boat_rental.json

@@ -21,5 +21,8 @@
     "tags": {
         "amenity": "boat_rental"
     },
+    "terms": [
+        "boat hire"
+    ],
     "name": "Boat Rental"
 }

data/presets/amenity/cafe.json

@@ -26,6 +26,7 @@
         "drive_through",
         "highchair",
         "min_age",
+        "organic",
         "reservation",
         "smoking",
         "takeaway",

data/presets/amenity/community_centre.json

@@ -1,6 +1,7 @@
 {
     "icon": "maki-town-hall",
     "fields": [
+        "community_centre",
         "name",
         "operator",
         "operator/type",

data/presets/amenity/community_centre/club_home.json

@@ -0,0 +1,24 @@
+{
+    "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "club",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "community_centre",
+        "community_centre": "club_home"
+    },
+    "reference": {
+        "key": "community_centre",
+        "value": "club_home"
+    },
+    "name": "Club Home"
+}

data/presets/amenity/community_centre/community_hall.json

@@ -0,0 +1,26 @@
+{
+    "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "community center"
+    ],
+    "tags": {
+        "amenity": "community_centre",
+        "community_centre": "community_hall"
+    },
+    "reference": {
+        "key": "community_centre",
+        "value": "community_hall"
+    },
+    "name": "Community Hall"
+}

data/presets/amenity/community_centre/cultural_centre.json

@@ -0,0 +1,23 @@
+{
+    "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "community_centre",
+        "community_centre": "cultural_centre"
+    },
+    "reference": {
+        "key": "community_centre",
+        "value": "cultural_centre"
+    },
+    "name": "Cultural Centre"
+}

data/presets/amenity/community_centre/family_centre.json

@@ -0,0 +1,23 @@
+{
+    "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "community_centre",
+        "community_centre": "family_centre"
+    },
+    "reference": {
+        "key": "community_centre",
+        "value": "family_centre"
+    },
+    "name": "Family Centre"
+}

data/presets/amenity/community_centre/lgbtq.json

@@ -1,5 +1,12 @@
 {
     "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/amenity/community_centre/parish_hall.json

@@ -0,0 +1,26 @@
+{
+    "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "parish center"
+    ],
+    "tags": {
+        "amenity": "community_centre",
+        "community_centre": "parish_hall"
+    },
+    "reference": {
+        "key": "community_centre",
+        "value": "parish_hall"
+    },
+    "name": "Parish Hall"
+}

data/presets/amenity/community_centre/village_hall.json

@@ -0,0 +1,26 @@
+{
+    "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "village community center"
+    ],
+    "tags": {
+        "amenity": "community_centre",
+        "community_centre": "village_hall"
+    },
+    "reference": {
+        "key": "community_centre",
+        "value": "village_hall"
+    },
+    "name": "Village Hall"
+}

data/presets/amenity/community_centre/youth_centre.json

@@ -1,5 +1,12 @@
 {
     "icon": "maki-town-hall",
+    "fields": [
+        "community_centre",
+        "{amenity/community_centre}"
+    ],
+    "moreFields": [
+        "{amenity/community_centre}"
+    ],
     "geometry": [
         "point",
         "area"
@@ -13,5 +20,9 @@
         "amenity": "community_centre",
         "community_centre": "youth_centre"
     },
+    "reference": {
+        "key": "community_centre",
+        "value": "youth_centre"
+    },
     "name": "Youth Center"
 }

data/presets/amenity/fast_food.json

@@ -22,9 +22,11 @@
         "capacity",
         "delivery",
         "highchair",
+        "organic",
         "outdoor_seating",
         "smoking",
         "takeaway",
+        "toilets",
         "fhrs/id-GB",
         "website/menu"
     ],

data/presets/amenity/fast_food/chinese.json

@@ -0,0 +1,19 @@
+{
+    "icon": "maki-restaurant-noodle",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "dim sum"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "chinese"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "chinese"
+    },
+    "name": "Chinese Fast Food"
+}

data/presets/amenity/funeral_hall.json

@@ -3,6 +3,7 @@
     "fields": [
         "name",
         "operator",
+        "building_area_yes",
         "address"
     ],
     "moreFields": [

data/presets/amenity/ice_cream.json

@@ -14,6 +14,7 @@
         "diet_multi",
         "drive_through",
         "opening_hours/drive_through",
+        "organic",
         "takeaway",
         "fhrs/id-GB",
         "website/menu"

data/presets/amenity/marketplace.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-store",
     "fields": [
         "name",
         "operator",

data/presets/amenity/motorcycle_parking.json

@@ -14,5 +14,8 @@
     "tags": {
         "amenity": "motorcycle_parking"
     },
+    "terms": [
+        "motorbike parking"
+    ],
     "name": "Motorcycle Parking"
 }