202604 upstream merge

.github/workflows/build.yml

@@ -25,9 +25,9 @@ jobs:
           - { v: 24, isLatest: yes }
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Use Node.js ${{ matrix.node-version.v }}
-      uses: actions/setup-node@v6
+      uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         node-version: ${{ matrix.node-version.v }}
     - run: npm clean-install
@@ -37,7 +37,7 @@ jobs:
 
     - name: '[PR Preview] Upload dist folder'
       if: ${{github.event_name == 'pull_request' && matrix.node-version.isLatest}}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: dist
         path: |
@@ -52,7 +52,7 @@ jobs:
 
     - name: '[PR Preview] Upload PR metadata'
       if: ${{github.event_name == 'pull_request' && matrix.node-version.isLatest}}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: pr_metadata
         path: ./pr_metadata.ini

ACCESSIBILITY.md

@@ -192,7 +192,6 @@ translated to one or more languages.
 | 🟠 | Locator overlay | This layer shows feature labels in their local languages | [#7737](https://github.com/openstreetmap/iD/issues/7737) |
 | ✅ | OSM community index | | |
 | ✅ | iD validation issues | | |
-| ✅ | KeepRight issues | | |
 | ✅ | Osmose issues | Translated strings are [provided by Osmose](https://app.transifex.com/openstreetmap-france/osmose/) itself, not iD | |
 
 ### Language Coverage

CHANGELOG.md

@@ -36,7 +36,44 @@ _Breaking developer changes, which may affect downstream projects or sites that
 -->
 
 
-# Unreleased (2.39.0-dev)
+# 2.39.4
+##### 2026-03-23
+
+* Fix regression where some strings (like some section headings) are not rendered correctly ([#12083])
+
+[#12083]: https://github.com/openstreetmap/iD/issues/12083
+
+
+# 2.39.4
+##### 2026-03-23
+
+* Fix title of preset search results not updating correctly ([#12050], thanks [@bhavyaKhatri2703])
+* Fix user images and upload help text from showing up as duplicates in upload dialog ([#12063])
+* Fix crash when a checkbox-field is rendered using a custom (non-`yes/no`) value ([#12078])
+
+[#12050]: https://github.com/openstreetmap/iD/issues/12050
+[#12063]: https://github.com/openstreetmap/iD/issues/12063
+[#12078]: https://github.com/openstreetmap/iD/issues/12078
+
+
+# 2.39.3
+##### 2026-03-21
+
+* Revert: When changing presets, delete tags from the old preset which are not in the new preset ([#12068])
+
+[#12068]: https://github.com/openstreetmap/iD/issues/12068
+
+
+# 2.39.2
+##### 2026-03-19
+
+* Fix a bug where iD would crash when the "Style Options" submenu is expanded during startup ([0241c765])
+
+[0241c765]: https://github.com/openstreetmap/iD/commit/0241c7653d4a93692f59b7aa1021242e63a3de72)
+
+
+# 2.39.0
+##### 2026-03-19
 
 #### :sparkles: Usability & Accessibility
 * Increase number of displayed _recently used presets_ to 8 (from 4) ([#9545], thanks [@k-yle])
@@ -67,8 +104,6 @@ _Breaking developer changes, which may affect downstream projects or sites that
 #### :earth_asia: Localization
 * Support territory-level phone hints ([#10904], thanks [@Vectorial1024])
 * Add phone and address format for Moldova ([#11965], [#11976], thanks [@Oni-DOS])
-#### :hourglass: Performance
-#### :mortar_board: Walkthrough / Help
 #### :rocket: Presets
 * When changing presets, delete tags from the old preset which are not in the new preset ([#11696], thanks [@k-yle])
 #### :hammer: Development
@@ -77,6 +112,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Replace `lodash` with `es-toolkit` ([#12016], thanks [@tordans])
 * Replace `fast-deep-equals` with `fast-equals` ([#12021], thanks [@tordans])
 * Add type definitions to some util functions ([#11993], thanks [@k-yle])
+* Localizer module: allow string replacements to use callback functions ([#11347])
 
 
 [#8265]: https://github.com/openstreetmap/iD/issues/8265
@@ -93,6 +129,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#11017]: https://github.com/openstreetmap/iD/issues/11017
 [#11052]: https://github.com/openstreetmap/iD/pull/11052
 [#11329]: https://github.com/openstreetmap/iD/issues/11329
+[#11347]: https://github.com/openstreetmap/iD/pull/11347
 [#11388]: https://github.com/openstreetmap/iD/pull/11388
 [#11645]: https://github.com/openstreetmap/iD/pull/11645
 [#11661]: https://github.com/openstreetmap/iD/pull/11661
@@ -115,9 +152,10 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@Oni-DOS]: https://github.com/Oni-DOS
 [@sezerbozbiyik]: https://github.com/sezerbozbiyik
 [@mykh-hailo]: https://github.com/mykh-hailo
+[@Sembauke]: https://github.com/Sembauke
 
 
-# 2.38.0-dev
+# 2.38.0
 ##### 2026-03-02
 
 #### :sparkles: Usability & Accessibility
@@ -166,6 +204,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Replace deprecated `document.createEvent`/`initEvent` with modern Event constructor ([#11871], thanks [@JaiswalShivang])
 * Fix crash in country combo field when entering unrecognized ISO country codes ([#11904], thanks [@JaiswalShivang])
 * Upgrade clipboard functionality with modern Clipboard API ([#11869], thanks [@tulavamsidheeraj])
+* Ensure the recent presets list is always full by filtering for location before limiting the count. ([#11405], thanks [@Razen04])
 
 
 [#8464]: https://github.com/openstreetmap/iD/issues/8464
@@ -205,6 +244,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [ffc7e2135]: https://github.com/openstreetmap/iD/commit/ffc7e2135
 [be0a20e59]: https://github.com/openstreetmap/iD/commit/be0a20e59
 [b06496780]: https://github.com/openstreetmap/iD/commit/b06496780
+[#11405]: https://github.com/openstreetmap/iD/issues/11405
 [#id-tagging-schema/pull/1507]: https://github.com/openstreetmap/id-tagging-schema/pull/1507
 [@ilias52730]: https://github.com/ilias52730
 [@Razen04]: https://github.com/Razen04

RELEASING.md

@@ -21,8 +21,8 @@ on the iD project, and then create this file with contents like
 
 ```bash
 git checkout develop
+npm install --save-dev editor-layer-index --omit=dev
 npm clean-install
-npm install editor-layer-index
 npm run imagery
 npm run all
 git add . && git commit -m 'npm run imagery'
@@ -56,6 +56,7 @@ git push origin -f release "v$ID_VERSION"
 #### Push release to npm
 
 ```bash
+npm login
 npm publish
 ```
 

css/20_map.css

@@ -36,8 +36,7 @@
 
 /* No interactivity except what we specifically allow */
 .data-layer.osm *,
-.data-layer.notes *,
-.data-layer.keepRight * {
+.data-layer.notes * {
     pointer-events: none;
 }
 

css/65_data.css

@@ -2,7 +2,6 @@
 /* OSM Notes and QA Layers */
 
 .qa-header-icon .qaItem-fill,
-.layer-keepRight .qaItem .qaItem-fill,
 .layer-osmose .qaItem .qaItem-fill {
     stroke: #333;
     stroke-width: 1.3px;  /* NOTE: likely a better way to scale the icon stroke */
@@ -53,79 +52,6 @@
     justify-content: center;
 }
 
-/* Keep Right Issues
-------------------------------------------------------- */
-.keepRight.itemType-20,     /* multiple nodes on same spot */
-.keepRight.itemType-40,     /* impossible oneways */
-.keepRight.itemType-210,    /* self intersecting ways */
-.keepRight.itemType-270,    /* unusual motorway connection */
-.keepRight.itemType-310,    /* roundabout issues */
-.keepRight.itemType-320,    /* improper _link */
-.keepRight.itemType-350 {   /* improper bridge tag */
-    color: #ff9;
-}
-
-.keepRight.itemType-50 {    /* almost junctions */
-    color: #88f;
-}
-
-.keepRight.itemType-60,     /* deprecated tags */
-.keepRight.itemType-70,     /* tagging issues */
-.keepRight.itemType-90,     /* motorway without ref */
-.keepRight.itemType-100,    /* place of worship without religion */
-.keepRight.itemType-110,    /* poi without name */
-.keepRight.itemType-150,    /* railway crossing without tag */
-.keepRight.itemType-220,    /* misspelled tag */
-.keepRight.itemType-380 {   /* non-physical sport tag */
-    color: #5d0;
-}
-
-.keepRight.itemType-130 {   /* disconnected ways */
-    color: #fa3;
-}
-
-.keepRight.itemType-170 {   /* FIXME tag */
-    color: #ff0;
-}
-
-.keepRight.itemType-190 {   /* intersection without junction */
-    color: #f33;
-}
-
-.keepRight.itemType-200 {   /* overlapping ways */
-    color: #fdbf6f;
-}
-
-.keepRight.itemType-160,    /* railway layer conflict */
-.keepRight.itemType-230 {   /* layer conflict */
-    color: #b60;
-}
-
-.keepRight.itemType-280 {   /* boundary issues */
-    color: #5f47a0;
-}
-
-.keepRight.itemType-180,    /* relation without type */
-.keepRight.itemType-290 {   /* turn restriction issues */
-    color: #ace;
-}
-
-.keepRight.itemType-300,    /* missing maxspeed */
-.keepRight.itemType-390 {   /* missing tracktype */
-    color: #090;
-}
-
-.keepRight.itemType-360,    /* language unknown */
-.keepRight.itemType-370,    /* doubled places */
-.keepRight.itemType-410 {   /* website issues */
-    color: #f9b;
-}
-
-.keepRight.itemType-120,    /* way without nodes */
-.keepRight.itemType-400 {   /* geometry / turn angles */
-    color: #c35;
-}
-
 /* Custom Map Data (geojson, gpx, kml, vector tile) */
 .layer-mapdata {
     pointer-events: none;

css/80_app.css

@@ -2406,11 +2406,8 @@ input.date-selector {
     user-select: none;
 }
 
-.restriction-help span {
-    margin: 2px;
-}
-
 .restriction-help .qualifier {
+    margin: 2px;
     color: #666;
     font-weight: bold;
 }
@@ -5062,7 +5059,7 @@ img.tile-debug {
     margin-left: 5px;
 }
 
-.user-list a:not(:last-child):after {
+.user-list a:not(:last-of-type):after {
     content: ', ';
 }