Merge branch 'main' into patch-48

Author: tyrasd

.github/dependabot.yml

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

.github/workflows/deploy-preview.yml

@@ -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}`);

CHANGELOG.md

@@ -23,6 +23,72 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@xxxx]: https://github.com/xxxx
 -->
 
+# 6.13.3
+##### 2025-Oct-30
+
+* Introduce placeholder presets for still upstream-referenced presets
+
+
+# 6.13.1
+##### 2025-Oct-23
+
+#### New Presets
+* Create unsearchable preset for associatedStreet (#997, thanks @serhii-muchychka)
+* Preset: shop=mobile\_phone\_accessories (#1406, thanks @UKChris-osm)
+* Add Fish Farm / Hatchery preset and `aquaculture=*` field (#1517, thanks @arch0345)
+* Add Ceremonial Gate and related presets (#1693, thanks @novolife)
+* Add preset for `device_charging_station` (#1611, thanks @paulklie)
+#### New and Changed Fields
+* Add "Cabins" field to Camp Site preset (#1683, thanks @kjonosm)
+* added wood provided field (#1738, thanks @paulklie)
+* Update roof shape field to add missing wiki suggestions (#1654, thanks @Shrinks99)
+* Add option `container` to `building`field (#1524, thanks @tordans)
+* Add `self_checkout` field to shop=supermarket (#1649, thanks @Dimitar5555)
+* Add translatable strings to playground field (#1004, thanks @kjonosm)
+* Support education tag per approved proposal (#1472, thanks @quincylvania)
+* Add strings for `house=` field and disable Taginfo suggestions (#1412, thanks @Dimitar5555)
+* Add `groundwater` option to `water_source` field (#1561, thanks @chaos-baum)
+* Reference payment\_multi to 'payment:\*' for correct wiki link (#1701, thanks @srujanaelicherla)
+#### Changed Presets
+* use temaki-paifang icon for Paifang preset (#1767, thanks @novolife)
+* add access and fee field to observation tower (#1726, thanks @paulklie)
+* Restore optional fields of Bakery preset (#1554, thanks @novolife)
+* Standardize `aerialway` preset terms (#1753, thanks @FloEdelmann)
+* Add fields to attraction preset (#1713, thanks @srujanaelicherla)
+* add terms to shop=water (#1740, thanks @matkoniecz)
+* Add toilets related fields to different presets (#1533, thanks @andrewharvey)
+* Add term "street fitness" for `leisure=fitness_station` preset (#1660, thanks @Dimitar5555)
+* add icon for `tower:construction=dish` (#1716, thanks @k-yle)
+* Add icon for fitness station sign preset (#1709, thanks @paulklie)
+* Add icon to fitness parallel bars preset (#1710, thanks @paulklie)
+* Add icon to push up station preset (#1711, thanks @paulklie)
+* Fix missing tag for `memorial=blue_plaque` preset (#1689, thanks @hb0nd)
+* Fix icon for Framing Shop preset (#1707, thanks @arch0345)
+* Make Kebab Fast Food findable by terms "Doner/Döner" (#1640, thanks @matkoniecz)
+* Do not add implicit `sport=disc_golf` to `leisure=disc_golf_course` features (#1639, thanks @Hufkratzer)
+* More strictly match historic=building preset (#1677, thanks @tyrasd)
+* Remove redundant `internet_access` from preset `aerodrome` (#1676, thanks @tordans)
+* Add `inscription` field to `tourism=artwork` (#1664, thanks @kjonosm)
+* Add river preset to water category (#1567, thanks @novolife)
+* Improve reference for Amphitheater preset (#1647, thanks @arch0345)
+#### Regional Presets and Fields
+* Restrict Sand Bath field to Japan (#1754, thanks @novolife)
+* added wood provided field (#1738, thanks @paulklie)
+* Change the default placeholder for `phone` numbers to a country code that no other country uses. (#1491, thanks @youssefelzedy)
+* Add charging point terms to charging station (#1698, thanks @FloEdelmann)
+#### Bug Fixes
+* Fix missing tag for `memorial=blue_plaque` preset (#1689, thanks @hb0nd)
+* Do not add implicit `sport=disc_golf` to `leisure=disc_golf_course` features (#1639, thanks @Hufkratzer)
+#### Documentation and Other Changes
+* CI: Configure dependabot to update package.json (#1255, thanks @tordans)
+* Docs: Update wording "Data item", "OSM Wiki data item" (#1506, thanks @tordans)
+* Standardize field terms (#1760, thanks @FloEdelmann)
+* Cleanup presets and fields to adhere to stricter schema (#1759, thanks @FloEdelmann)
+* Standardize preset terms (#1758, thanks @FloEdelmann)
+#### Dependencies
+* Bump netlify-cli from 22.3.0 to 23.9.3 (#1771, thanks @[dependabot[bot]](https://github.com/apps/dependabot))
+
+
 
 # 6.12.0
 ##### 2025-Jul-23

CONTRIBUTING.md

@@ -50,10 +50,10 @@ Icons from different sources (_icon sets_) can be used in the tagging schema. He
 
 ### Info-`i`
 
-![Screenshot of a preset in iD with the information details open.](https://github.com/openstreetmap/id-tagging-schema/assets/111561/13549318-cd7c-4dd1-9948-7a2d84662f04)
+<img alt="Screenshot of a preset in iD with the information details open." src="https://github.com/openstreetmap/id-tagging-schema/assets/111561/13549318-cd7c-4dd1-9948-7a2d84662f04" width="400" />
 
 iD and other tools provide users with a way to learn more about the main tag of a preset. It is important to provide good information in this information panel. Here are a few notes on how to do this:
-- Does your tag have a Wikibase entry? Click the small pencil icon next to the text to open the Wikibase item on the OSM wiki. Improve this wording if needed. If the Wikibase item is missing, [learn more about how to add it in "Current methods for creating new items"](https://wiki.openstreetmap.org/wiki/Data_items#Item_creation_process).
+- Does your tag have a OSM Wiki data item? Click the small pencil icon next to the text to open the data item on the OSM Wiki. Improve this wording if needed. If the data item is missing, [learn more about how to add it in "Current methods for creating new items"](https://wiki.openstreetmap.org/wiki/Data_items#Item_creation_process).
 - Does your tag have a Wiki page with a good image?
 - Your preset might need [a `reference` property](https://github.com/ideditor/schema-builder?tab=readme-ov-file#reference) to force the system to use a specific tag for the information section.
 

GUIDELINES.md

@@ -49,7 +49,7 @@ In addition, the deprecated tag must have reasonably high usage to be considered
 
 Deprecation rules work such that the user sees a message with suggestions and can act only when editing the given element. This makes them well-suited for gradual, human-reviewed updates of taggings like crossings. However, they are not suitable for cleaning up incorrect tagging from the database, especially for low-volume changes.
 
-There are, however, alternatives to consider: 
+There are, however, alternatives to consider:
 - Your cleanup task might be eligible for an automated (bot) edit. [Please learn more on the wiki…](https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct)
 - If your task is small enough, a few [editing sessions in JOSM](https://wiki.openstreetmap.org/wiki/JOSM) will often do the trick. However, mass-replacing without checking each object is still considered an automated edit, so the [guidelines apply](https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct). Please consult other mappers first.
 - A good way to work down a list of tasks is to create [a MapRoulette Challenge](https://maproulette.org/).
@@ -65,7 +65,7 @@ The user interface must be clear, concise, and easy to use, leaving no room for
 - Check the search functionality to ensure other presets do not cause confusion.
 - Select an icon or start the process to create a new one.
 - Define which fields to show (`fields`) and suggest (`moreFields`), considering the order of fields.
-- Check the `(i)` documentation and add or update the [OSM Wikibase item](https://wiki.openstreetmap.org/wiki/Data_items) if needed to provide a helpful short text.
+- Check the [`(i)` documentation](./CONTRIBUTING.md#info-i) and add or update the OSM Wiki data item if needed to provide a helpful short text.
 - Use the PR preview to add test cases with deep links to OSM objects that demonstrate the preset in use.
 
 ## 3. Implement
@@ -75,3 +75,19 @@ If you are familiar with `JSON`, you can implement the preset or field yourself.
 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.
+
+### File Name Conventions and Directory Structure
+
+The folder structure and file names of the presets and fields closely follows the main `tags` of the respective files.
+* For example, the preset for `natural=tree` is defined in the file `tree.json` in the directory `data/presets/natural`.
+* For presets with more than one tag, the directory structure is nested: e.g. the preset for `highway=service + service=driveway` is included as `highway/service/driveway.json`.
+* Unsearchable presets are defined in a file name starting with an underscore.
+* Regional presets or fields should be suffixed with a dash and the respective region codes where they are applied, the "default" preset for the rest of the world is kept without a suffix (e.g. `royal_cypher-GB.json`).
+* If reasonable, avoid renaming or moving files when altering the tags of a presets: because translations and some external datasets (e.g. [NSI](https://github.com/osmlab/name-suggestion-index)) are referencing presets by their file and directory name as an identifier, every time a preset or field file is renamed or moved, existing translations are lost and external references potentially broken. If a file name really need to be changed, consider the following approach to limit the impact of the identifier change: 
+  1. add a placeholder preset with the file name and directory as the preset's previous version that is:
+    * not searchable
+    * references the strings and fields of the new preset or field
+    * has a low matchscore
+  2. after the id-tagging-schema release that includes the id change: notify upstream consumers of the data (e.g. NSI) about the change and ask them to update their ids to the new ids
+  3. delete the placeholder presets some time after all relevant upstream data was updated and released
+

data/deprecated.json

@@ -1257,102 +1257,6 @@
     "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"}
@@ -2103,5 +2007,13 @@
   {
      "old": {"cycleway:left": "opposite"},
      "replace": {"oneway:bicycle": "no", "cycleway:left": "no"}
+  },
+  {
+    "old": {"man_made": "torii"},
+    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "torii"}
+  },
+  {
+    "old": {"man_made": "paifang"},
+    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "paifang"}
   }
 ]

data/fields/address.json

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

data/fields/bath/sand_bath-JP.json

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

data/fields/bath/sand_bath.json

@@ -0,0 +1,5 @@
+{
+    "key": "boat",
+    "type": "combo",
+    "label": "Boat Access"
+}