Merge branch 'openstreetmap:develop' into develop

.editorconfig

@@ -5,15 +5,15 @@ trim_trailing_whitespace = true
 insert_final_newline = false
 
 
-[*.{js,json,css,html}]
+[*.{js,mjs,json,css,html}]
 indent_style = space
 indent_size = 4
 
 
 # EOL for ESLint
 # newline follows Airbnb style guide
 # mix of indent size between ES5 and ES6 syntax files
-[*.js]
+[*.{js,mjs}]
 end_of_line = lf
 insert_final_newline = true
-indent_size = tab_width
+indent_size = tab_width

.gitattributes

@@ -1,3 +1,4 @@
 * text=auto
 *.bat eol=crlf
 *.js eol=lf
+*.mjs eol=lf

API.md

@@ -38,6 +38,8 @@ of iD (e.g. `https://ideditor-release.netlify.app`), the following parameters ar
   _Example:_ `map=20.00/38.90085/-77.02271`
 * __`maprules`__ - A path to a [MapRules](https://github.com/radiant-maxar/maprules) service endpoint for enhanced tag validation.<br/>
   _Example:_ `maprules=https://path/to/file.json`
+* __`notes`__ - Enables the notes layer by default.<br/>
+  _Example:_ `notes=true`
 * __`offset`__ - Background imagery alignment offset in meters, formatted as `east,north`.<br/>
   _Example:_ `offset=-10,5`
 * __`photo_overlay`__ - The street-level photo overlay layers to enable.<br/>
@@ -77,6 +79,7 @@ _Example:_ `https://www.openstreetmap.org/edit?editor=id#gpx=https://gist.github
 * __`hashtags`__
 * __`locale`__
 * __`maprules`__
+* __`notes`__
 * __`offset`__
 * __`photo`__
 * __`photo_dates`__

CHANGELOG.md

@@ -47,13 +47,19 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Fix unsolvable validator error triggered by regional presets ([#10459])
 * Render highway direction cones only on matching parent ways ([#9013])
 * Prevent edit menu from being covered up by street level imagery or other map overlay panels ([#10495])
-* Fix grid lines from showing up on background map tiles in certain situations (semi-transparent tiles or fractional browser zoom level) ([#10594], thanks [@Nekzuris]) 
+* Fix grid lines from showing up on background map tiles in certain situations (semi-transparent tiles or fractional browser zoom level) ([#10594], thanks [@Nekzuris])
+* Prevent search results from sometimes getting stuck in the highlighted state when mouse-hovering the list of search results while typing ([#10661])
+* Allow tiles in minimap to be slightly underzoomed, preventing them from blacking out on low map zoom levels ([#10653])
+* Fix confusing behaviour after logging out in the standalone build of iD ([#10683], thanks [@k-yle])
+* Fix editor being stuck in a disabled state when login popup window is closed prematurely ([#10651])
 #### :earth_asia: Localization
 * Update Sinitic languages in the Multilingual Names field ([#10488], thanks [@winstonsung])
 * Update the list of languages in the Wikipedia field ([#10489])
 * Add Ladin (language code `lld`) as an available option for multilingual names
+* Add 30 indigenous languages as dropdown options for multilingual names ([#10684], thanks [@k-yle])
 #### :hourglass: Performance
 #### :mortar_board: Walkthrough / Help
+* Fix walkthrough from showing tooltips on wrong location under certain circumstances ([#10650], [#10624], [#10634])
 #### :rocket: Presets
 #### :hammer: Development
 * Migrate unit tests from karma to vitest ([#10452])
@@ -66,6 +72,13 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#10495]: https://github.com/openstreetmap/iD/issues/10495
 [#10508]: https://github.com/openstreetmap/iD/pull/10508
 [#10594]: https://github.com/openstreetmap/iD/pull/10594
+[#10624]: https://github.com/openstreetmap/iD/issues/10624
+[#10634]: https://github.com/openstreetmap/iD/issues/10634
+[#10650]: https://github.com/openstreetmap/iD/issues/10650
+[#10651]: https://github.com/openstreetmap/iD/issues/10651
+[#10653]: https://github.com/openstreetmap/iD/issues/10653
+[#10683]: https://github.com/openstreetmap/iD/issues/10683
+[#10684]: https://github.com/openstreetmap/iD/pull/10684
 [@winstonsung]: https://github.com/winstonsung/
 [@Nekzuris]: https://github.com/Nekzuris
 [@michaelabon]: https://github.com/michaelabon

README.md

@@ -22,7 +22,7 @@ if you're looking for something to do.
 
 Come on in, the water's lovely. More help? Ping `Martin Raifer`/`tyr_asd` or `bhousel` on:
 * [OpenStreetMap US Slack](https://slack.openstreetmap.us/) (`#id` channel)
-* [OpenStreetMap Discord](https://discord.gg/openstreetmap) (`#id` channel)
+* [OpenStreetMap Discord](https://discord.com/invite/openstreetmap) (`#id-and-rapid` channel)
 * [OpenStreetMap IRC](https://wiki.openstreetmap.org/wiki/IRC) (`irc.oftc.net`, in `#osm-dev`)
 * [OpenStreetMap `dev` mailing list](https://wiki.openstreetmap.org/wiki/Mailing_lists)
 
@@ -52,4 +52,4 @@ iD also bundles portions of the following open source software.
 
 ## Thank you
 
-Initial development of iD was made possible by a [grant of the Knight Foundation](https://www.mapbox.com/blog/knight-invests-openstreetmap/).
+Initial development of iD was made possible by a [grant of the Knight Foundation](https://blog.mapbox.com/large-investment-in-openstreetmap-from-knight-foundation-cf7aa00534db).

css/30_highways.css

@@ -408,25 +408,21 @@ path.line.casing.tag-road {
 }
 
 /* service roads */
-path.line.stroke.tag-highway-service,
-path.line.stroke.tag-service {
+path.line.stroke.tag-highway-service {
     stroke: #fff;
 }
-path.line.casing.tag-highway-service,
-path.line.casing.tag-service {
+path.line.casing.tag-highway-service {
     stroke: #666;
 }
 
 /* special service roads and bus guideways */
 /* with `service=* tag`  (e.g. parking_aisle, alley, drive-through) */
 path.line.stroke.tag-highway-bus_guideway,
-path.line.stroke.tag-highway-service.tag-service,
-path.line.stroke.tag-service.tag-service {
+path.line.stroke.tag-highway-service.tag-service {
     stroke: #dca;
 }
 path.line.casing.tag-highway-bus_guideway,
-path.line.casing.tag-highway-service.tag-service,
-path.line.casing.tag-service.tag-service {
+path.line.casing.tag-highway-service.tag-service {
     stroke: #666;
 }
 
@@ -515,7 +511,7 @@ path.line.stroke.tag-highway-path.tag-bridge-boardwalk {
     fill: #fff;
 }
 path.line.stroke.tag-highway-footway,
-path.line.stroke.tag-highway_bus_stop,
+path.line.stroke.tag-highway-bus_stop,
 .preset-icon-container path.casing.tag-highway-footway {
     stroke: #988;
 }

css/40_railways.css

@@ -76,3 +76,11 @@ path.line.casing.tag-railway-subway {
 path.line.stroke.tag-railway-subway {
     stroke: #bbb;
 }
+
+/* railways with `service=* tag` (e.g. sidings, crossovers, etc.) */
+path.line.stroke.tag-railway.tag-service {
+    stroke: #dca;
+}
+path.line.casing.tag-railway.tag-service {
+    stroke: #666;
+}

css/80_app.css

@@ -4365,7 +4365,7 @@ img.tile {
     -webkit-user-drag: none;
 
     opacity: 1;
-    transition: opacity 120ms linear;
+    transition: opacity 250ms linear;
 
     /* prevent brief flickering of "broken image" on tile loading errors, see https://zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement/ */
     text-indent: 100%;
@@ -4374,22 +4374,24 @@ img.tile {
 }
 
 /* Workaround to remove visible grid around tile borders on Chrome
-   Only works with browser zoom multiple of 25 (75%, 100%, 125%...) 
+   Only works with browser zoom multiple of 25 (75%, 100%, 125%...)
    Should be removed when https://issues.chromium.org/issues/40084005 is resolved.
    See https://github.com/openstreetmap/iD/pull/10594 */
 @media (-webkit-device-pixel-ratio = 1) or (-webkit-device-pixel-ratio = 1.25) or (-webkit-device-pixel-ratio = 1.5) or (-webkit-device-pixel-ratio = 1.75)
     or (-webkit-device-pixel-ratio = 2) or (-webkit-device-pixel-ratio = 2.25) or (-webkit-device-pixel-ratio = 2.5) or (-webkit-device-pixel-ratio = 2.75)
     or (-webkit-device-pixel-ratio = 3) or (-webkit-device-pixel-ratio = 3.25) or (-webkit-device-pixel-ratio = 3.5) or (-webkit-device-pixel-ratio = 3.75)
-    or (-webkit-device-pixel-ratio = 4) or (-webkit-device-pixel-ratio = 4.25) or (-webkit-device-pixel-ratio = 4.5) or (-webkit-device-pixel-ratio = 4.75) 
+    or (-webkit-device-pixel-ratio = 4) or (-webkit-device-pixel-ratio = 4.25) or (-webkit-device-pixel-ratio = 4.5) or (-webkit-device-pixel-ratio = 4.75)
     or (-webkit-device-pixel-ratio = 5) or (-webkit-device-pixel-ratio = 0.25) or (-webkit-device-pixel-ratio = 0.5) or (-webkit-device-pixel-ratio = 0.75) {
-    .layer-background img.tile {
+    .layer-background img.tile,
+    .map-in-map-background img.tile {
         mix-blend-mode: plus-lighter;
     }
 }
 
 img.tile-removing {
     opacity: 0;
     z-index: 1;
+    mix-blend-mode: normal;
 }
 
 .tile-label-debug {
@@ -5787,6 +5789,7 @@ li.hide + li.version .badge .tooltip .popover-arrow {
     border: solid transparent;
     border-width: 3px 3px 3px 4px;
     border-radius: 6px;
+    cursor: auto;
 }
 ::-webkit-scrollbar-track:active {
     background-color: rgba(0,0,0,.05);

data/address_formats.json

@@ -153,7 +153,8 @@
   {
     "countryCodes": ["kr"],
     "format": [
-      ["province", "city", "district"],
+      ["province", "city"],
+      ["district", "town", "subdistrict"],
       ["street", "housenumber", "unit"],
       ["postcode"]
     ]