Merge branch 'openstreetmap:main' into trees-wikidata

Author: riwnodennyk

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

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

.github/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/deploy-preview.yml

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

.github/workflows/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

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

CHANGELOG.md

@@ -23,6 +23,163 @@ _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