.github/PULL_REQUEST_TEMPLATE.md

@@ -25,7 +25,7 @@ Follow these steps to test your PR yourself and make it a lot easier and faster
 
 **This is how it works:**
 1. After you submit your PR, the system will create a preview and comment on your PR:
-   > 🍱 Your pull request preview is ready.
+   > 🍱 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.

.github/dependabot.yml

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

.github/release-drafter.yml

@@ -1,62 +0,0 @@
-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@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
       - run: npm clean-install
       - run: npm run dist
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           repository: openstreetmap/iD
           path: './iD'

.github/workflows/deploy-preview.yml

@@ -8,18 +8,17 @@ 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/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version: '18'
-      - run: npm clean-install
+      - run: npm install --global netlify-cli@6
+      - run: npm install unzipper@0.10
 
       - name: Get pull request number
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         id: pull-request-number
         with:
           result-encoding: string
@@ -46,22 +45,21 @@ jobs:
             const file = directory.files.find(d => d.path === 'pr_number');
             const content = await file.buffer();
             return content.toString();
-      - uses: dawidd6/action-download-artifact@v8
+      - uses: dawidd6/action-download-artifact@v2
         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}}
+        run: netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
 
       - name: Add comment to pull request
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         with:
           script: |
             const pullRequestNumber = parseInt(${{steps.pull-request-number.outputs.result}}, 10);
@@ -80,14 +78,14 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: pullRequestNumber,
-                body: `${start} **[Your pull request preview is ready](https://pr-${pullRequestNumber}--ideditor-presets-preview.netlify.app/id/dist/#locale=en&map=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.`
+                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).`
               });
             } else {
               console.log(`Preview URL comment already added to PR #${pullRequestNumber}`);
             }
 
       - name: Clean up artifact
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         with:
           result-encoding: string
           script: |

.github/workflows/deploy.yml

@@ -12,15 +12,15 @@ jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
-    if: github.repository == 'openstreetmap/id-tagging-schema'
+    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.
+        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.
         with:
           persist-credentials: false
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
 
@@ -31,7 +31,7 @@ jobs:
         run: npm run build
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4
+        uses: JamesIves/github-pages-deploy-action@v4.6.1
         with:
-          branch: interim # The branch the action should deploy to.
-          folder: interim # The folder the action should deploy.
+          BRANCH: interim # The branch the action should deploy to.
+          FOLDER: interim # The folder the action should deploy.

.github/workflows/lint.yml

@@ -5,7 +5,7 @@ jobs:
     name: Check file endings
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - run: |
           disallowedFiles=`find data/ -type f -not -iname "*.json" -not -iname "*.md"`
           for f in $disallowedFiles
@@ -18,8 +18,8 @@ jobs:
     name: Check for code formatting mistakes
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
       - run: npm clean-install
@@ -29,10 +29,10 @@ jobs:
     name: Check for spelling errors
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: codespell-project/actions-codespell@v2
+      - uses: actions/checkout@v3
+      - uses: codespell-project/actions-codespell@master
         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"
+          skip: ./.git,./dist,./data/deprecated.json,./data/discarded.json
+          ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te"
           only_warn: 1

.github/workflows/release-drafter.yml

@@ -1,21 +0,0 @@
-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

@@ -1,57 +0,0 @@
-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

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

.gitignore

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

CHANGELOG.md

@@ -23,201 +23,44 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@xxxx]: https://github.com/xxxx
 -->
 
-
-# 6.12.0
-##### 2025-Jul-23
-
-#### New Presets
-* Add preset for `climbing=route` point, way and relation ([#1598], thanks [@harahu])
-* Add preset for `climbing=crag` point and relation ([#1597], thanks [@harahu])
-* Add preset for `memorial=blue_plaque` ([#1601], thanks [@hb0nd])
-* Add preset for `climbing=route_bottom` ([#1590], thanks [@zbycz])
-* Add historic=aircraft Preset ([#1556], thanks [@novolife])
-* Create teahouse preset ([#1555], thanks [@novolife])
-#### New and Changed Fields
-* Add bridge to the structure field of canal ([#1587], thanks [@novolife])
-* Add preset for `climbing=area` ([#1596], thanks [@harahu])
-* Add "Suitable For Dogs" field to `amenity=drinking_water` preset ([#1584], thanks [@codeinabox])
-* Add roof shape and roof height fields to building presets ([#1552], thanks [@trs998])
-* Fix fields of `historic=aircraft` ([#1566], thanks [@novolife])
-#### Changed Presets
-* Add terms to `shop=fabric` ([#1619], thanks [@matkoniecz])
-* Add term "solicitor" to  lawyer preset ([#1604], thanks [@hb0nd])
-* Add terms to `amenity=toilets` preset ([#1583], thanks [@matkoniecz])
-* Add `direction` field to Observation Tower preset ([#1575], thanks [@zbycz])
-* Add terms to `amenity=telephone` ([#1574], thanks [@matkoniecz])
-* Make `social_facility` more findable ([#1576], thanks [@matkoniecz])
-* Add term "apparel" to `shop=clothes` preset ([#1382], thanks [@matkoniecz])
-* Add term to `shop=stationery` to prevent misspelling ([#1514], thanks [@matkoniecz])
-* Add `ref` key to `natural=tree` `moreFields` ([#1398], thanks [@gy-mate])
-#### Regional Presets and Fields
-* Add preset for `memorial=blue_plaque` ([#1601], thanks [@hb0nd])
-#### Documentation and Other Changes
-* Docs: Update broken transifex links ([#1630], thanks [@homersimpsons])
-* Docs/Governance: Add closing of abandoned PRs to responsibilities of the the triage role ([#1603], thanks [@matkoniecz])
-* Docs: Add detailed information on integration testing ([#1593], thanks [@harahu])
-* Docs: Streamline wording of PR preview ([#1606], thanks [@tordans])
-
-[#1382]: https://github.com/openstreetmap/id-tagging-schema/pull/1382
-[#1398]: https://github.com/openstreetmap/id-tagging-schema/pull/1398
-[#1514]: https://github.com/openstreetmap/id-tagging-schema/pull/1514
-[#1552]: https://github.com/openstreetmap/id-tagging-schema/pull/1552
-[#1555]: https://github.com/openstreetmap/id-tagging-schema/pull/1555
-[#1556]: https://github.com/openstreetmap/id-tagging-schema/pull/1556
-[#1566]: https://github.com/openstreetmap/id-tagging-schema/pull/1566
-[#1574]: https://github.com/openstreetmap/id-tagging-schema/pull/1574
-[#1575]: https://github.com/openstreetmap/id-tagging-schema/pull/1575
-[#1576]: https://github.com/openstreetmap/id-tagging-schema/pull/1576
-[#1583]: https://github.com/openstreetmap/id-tagging-schema/pull/1583
-[#1584]: https://github.com/openstreetmap/id-tagging-schema/pull/1584
-[#1587]: https://github.com/openstreetmap/id-tagging-schema/pull/1587
-[#1590]: https://github.com/openstreetmap/id-tagging-schema/pull/1590
-[#1593]: https://github.com/openstreetmap/id-tagging-schema/pull/1593
-[#1596]: https://github.com/openstreetmap/id-tagging-schema/pull/1596
-[#1597]: https://github.com/openstreetmap/id-tagging-schema/pull/1597
-[#1598]: https://github.com/openstreetmap/id-tagging-schema/pull/1598
-[#1601]: https://github.com/openstreetmap/id-tagging-schema/pull/1601
-[#1603]: https://github.com/openstreetmap/id-tagging-schema/pull/1603
-[#1604]: https://github.com/openstreetmap/id-tagging-schema/pull/1604
-[#1606]: https://github.com/openstreetmap/id-tagging-schema/pull/1606
-[#1619]: https://github.com/openstreetmap/id-tagging-schema/pull/1619
-[#1630]: https://github.com/openstreetmap/id-tagging-schema/pull/1630
-[@homersimpsons]: https://github.com/@homersimpsons
-[@hb0nd]: https://github.com/@hb0nd
-[@novolife]: https://github.com/@novolife
-[@codeinabox]: https://github.com/@codeinabox
-[@trs998]: https://github.com/@trs998
-[@zbycz]: https://github.com/@zbycz
-
-
-# 6.11.0
-##### 2025-May-12
-
-#### New Presets
-* Add `crossing=informal` as unsearchable preset for point and line geometries ([#1140], thanks [@mikaeldui])
-#### New and Changed Fields
-* Remove `source` field by marking it as a field to be used on changesets (only) ([#1508], thanks [@tordans])
-#### Changed Presets
-* Add `ref` field to `amenity=bicycle_rental` ([#1519], thanks [@kjonosm])
-* Update reference tags for recycling containers and centres ([#1497], thanks [@Dimitar5555])
-* Add search term "empty" to Vacant Shop preset ([#1499], thanks [@matkoniecz])
-#### Deprecated Tags
-* Remove `highway=ford` deprecation ([#1492], thanks [@quincylvania])
-#### Bug Fixes
-* Fix broken "Address" documentation link ([#1489], thanks [@Vectorial1024])
-#### Documentation and Other Changes
-* Consistently use term "Wikibase" for data items also in contribution guidelines ([#1504], thanks [@matkoniecz])
-* Clarify term "Wikibase" for data items in the OSM wiki ([#1502], thanks [@matkoniecz])
-* Set up `release-drafter` ([#1503])
-
-[#1140]: https://github.com/openstreetmap/id-tagging-schema/pull/1140
-[#1508]: https://github.com/openstreetmap/id-tagging-schema/pull/1508
-[#1519]: https://github.com/openstreetmap/id-tagging-schema/pull/1519
-[#1497]: https://github.com/openstreetmap/id-tagging-schema/pull/1497
-[#1499]: https://github.com/openstreetmap/id-tagging-schema/pull/1499
-[#1492]: https://github.com/openstreetmap/id-tagging-schema/pull/1492
-[#1489]: https://github.com/openstreetmap/id-tagging-schema/pull/1489
-[#1504]: https://github.com/openstreetmap/id-tagging-schema/pull/1504
-[#1502]: https://github.com/openstreetmap/id-tagging-schema/pull/1502
-[#1503]: https://github.com/openstreetmap/id-tagging-schema/pull/1503
-[@Vectorial1024]: https://github.com/Vectorial1024
-
-
-# 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])
+* 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])
 #### Changed Presets
-* Add `building` (with default value `yes`) field to Funeral Service Hall preset ([#1324], thanks [@arch0345])
+* 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
+* 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])
+* 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])
+* 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])
+* 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
+* Rework crossing presets to be better structured and easier to work with ([#1201], thanks [@tordans])
 * 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])
@@ -594,7 +437,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 vertices ([#925], thanks [@arch0345])
+* Allow Drinking Water to be mapped on verticed ([#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

@@ -17,27 +17,25 @@ Read the [GUIDELINES](./GUIDELINES.md) to help you understand what fields and ta
 
   Example: To extend the list of English terms for `shrub`, [modify the `terms`-key in the JSON file](https://github.com/openstreetmap/id-tagging-schema/blob/v3.1.0/data/presets/natural/shrub.json#L16-L19)).
 
-* **All languages** other than English (US) are managed [in the Transifex Project of the iD Editor](https://app.transifex.com/openstreetmap/id-editor/) inside the translation resource _'preset'_.
+* **All languages** other than English (US) are managed [in the Transifex Project of the iD Editor](https://www.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
+  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'` or `key:highway/living_street`
+  4. search for `key:living_street` or `translation_text:'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.
+* **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.
 
 * **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).
+* **Transifex "Developer Notes":** Use the "Developer Notes" section in Transifex to learn more about the context of a given translation string. For example, [looking at `presets.fields.direction_cardinal-US-CA-NZ.label` in Transiflex](https://www.transifex.com/openstreetmap/id-editor/translate/#en_GB/presets/406422633?q=key%3Adirection_cardinal) will give you the "Developer Notes: `direction=* | Local preset for countries "CA", "NZ", "US"`" which helps you understand that, (a) this label describes the key `direction` and (b) it is only visible in three countries, so other languages usually don't need to translate it (leave it blank or add the English translation instead).
 
 * **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.
@@ -50,33 +48,16 @@ Icons from different sources (_icon sets_) can be used in the tagging schema. He
 
 ### 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" />
+![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 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 Wikidata entry? Click the small pencil icon next to the text to open the Wikidata item on the OSM wiki. Improve this wording if needed. If the Wikidata 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
+### Code Style
 
-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`
+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.
 
 ### Installation and Testing
 
@@ -88,6 +69,4 @@ The following `npm` commands are used in this repository:
 * `npm run dist` – validates the source data and compiles output files for iD
 * `npm run translations` – fetches translations from transifex and compiles the translations files for iD
 
-### 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.
+If you have [set up](https://github.com/openstreetmap/iD#installation) your own local instance of the iD editor, you can [configure](https://github.com/openstreetmap/iD/blob/develop/API.md#environment-variables) it to use your local set of tagging presets by setting the `ID_PRESETS_CDN_URL` environment variable. If you do that, don't forget to run `npm run dist` to compile the tagging schema output, as iD will otherwise not see the changes you made.

GOVERNANCE.md

@@ -33,12 +33,11 @@ Github shows a `(Collaborator)` label next to users with any permission on this
 
 ### Triage Role
 
-* [Mateusz](https://github.com/matkoniecz) contributes to this project as a volunteer.
+(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.
-- 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.
@@ -71,13 +70,7 @@ Github shows a `(Contributor)` label next to users that previously committed to
 
 - Usually squash merge PRs to make the history simpler
 - Give the merge a meaningful description of the change
-- Add labels to the PR 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.
+- Add labels to the PR to simplify creating the changelog: `new-*`, `add-*`, `bug`
 
 ### Releases
 

GUIDELINES.md

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

data/deprecated.json

@@ -786,6 +786,10 @@
     "old": {"highway": "footway", "foot": "no"},
     "replace": {"highway": "path", "foot": "no"}
   },
+  {
+    "old": {"highway": "ford"},
+    "replace": {"ford": "*"}
+  },
   {
     "old": {"highway": "path", "ladder": "yes"},
     "replace": {"highway": "ladder"}
@@ -1628,6 +1632,10 @@
     "old": {"shop": "perfume"},
     "replace": {"shop": "perfumery"}
   },
+  {
+    "old": {"shop": "photo_studio"},
+    "replace": {"craft": "photographer"}
+  },
   {
     "old": {"shop": "real_estate"},
     "replace": {"office": "estate_agent"}
@@ -2103,13 +2111,5 @@
   {
      "old": {"cycleway:left": "opposite"},
      "replace": {"oneway:bicycle": "no", "cycleway:left": "no"}
-  },
-  {
-    "old": {"man_made": "torii"},
-    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "torii"}
-  },
-  {
-    "old": {"man_made": "paifang"},
-    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "paifang"}
   }
 ]

data/fields/address.json

@@ -1,13 +1,12 @@
 {
     "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",

data/fields/aircraft/type.json

@@ -1,16 +0,0 @@
-{
-    "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/artwork_type.json

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

data/fields/bath/sand_bath-JP.json

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

data/fields/bath/sand_bath.json

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

data/fields/bridge.json

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

data/fields/building.json

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

data/fields/cabins.json

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

data/fields/caravans.json

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

data/fields/ceremonial_gate.json

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

data/fields/check_date.json

@@ -5,7 +5,7 @@
     "placeholder": "YYYY-MM-DD",
     "universal": true,
     "terms": [
-        "last survey date",
-        "survey date"
+        "survey date",
+        "last 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

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

data/fields/climbing/grade/french.json

@@ -1,48 +0,0 @@
-{
-    "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

@@ -1,39 +0,0 @@
-{
-    "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

@@ -1,51 +0,0 @@
-{
-    "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

@@ -1,45 +0,0 @@
-{
-    "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

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

data/fields/climbing/sport.json

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

data/fields/climbing/trad.json

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

data/fields/crossing_raised.json

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

data/fields/cycle_barrier.json

@@ -1,16 +0,0 @@
-{
-    "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

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

data/fields/deflection.json

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

data/fields/descent.json

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

data/fields/diet_multi.json

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

data/fields/dog_check.json

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

data/fields/education.json

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

data/fields/entrance.json

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

data/fields/fhrs/id-GB.json

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

data/fields/fuel/fuel_multi.json

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

data/fields/gnis/feature_id-US.json

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

data/fields/hashtags.json

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

data/fields/house.json

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

data/fields/irrigation_pivot.json

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

data/fields/level_semi.json

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

data/fields/manufacturer/wikidata.json

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

data/fields/maxwidth/physical.json

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

data/fields/model/wikidata.json

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

data/fields/opening.json

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

data/fields/overlap.json

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

data/fields/payment_multi.json

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

data/fields/phone.json

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

data/fields/picnic_table.json

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

data/fields/playground.json

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

data/fields/post.json

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

data/fields/real_fire-GB-IE.json

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

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

@@ -3,14 +3,14 @@
     "type": "identifier",
     "label": "SIRET Number",
     "urlFormat": "https://annuaire-entreprises.data.gouv.fr/etablissement/{value}",
-    "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$",
+    "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]$",
     "locationSet": {
         "include": [
             "fr"
         ]
     },
     "terms": [
-        "french company identification number",
-        "siret"
+        "French company identification number",
+        "SIRET"
     ]
 }

data/fields/ref/edubase-GB.json

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

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

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

data/fields/roof/height.json

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

data/fields/roof/shape.json

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

data/fields/salt.json

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

data/fields/self_checkout.json

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

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

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

data/fields/static_caravans.json

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

data/fields/structure_canal.json

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

data/fields/tower/construction.json

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

data/fields/traffic_calming.json

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

data/fields/tunnel.json

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

data/fields/water_source.json

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

data/fields/website/menu.json

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

data/fields/wood_provided.json

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

data/preset_categories/climbing.json

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

data/preset_categories/route.json

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

data/preset_categories/water.json

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

data/presets/@templates/contact.json

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

data/presets/@templates/poi.json

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

data/presets/aerialway/j-bar.json

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

data/presets/aerialway/pylon.json

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

data/presets/aerialway/zip_line.json

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

data/presets/aeroway/aerodrome.json

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

data/presets/aeroway/jet_bridge.json

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

data/presets/aeroway/terminal.json

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

data/presets/amenity/animal_shelter.json

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

data/presets/amenity/atm.json

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

data/presets/amenity/baking_oven.json

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

data/presets/amenity/bar.json

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

data/presets/amenity/bar/lgbtq.json

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

data/presets/amenity/bench.json

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

data/presets/amenity/bicycle_parking/building.json

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

data/presets/amenity/bicycle_parking/lockers.json

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

data/presets/amenity/bicycle_parking/shed.json

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