Merge from upstream v2.42.2 by 1ec5 · Pull Request #263 · OpenHistoricalMap/iD

1ec5 · 2026-10-12T02:25:30Z

Merged the upstream v2.42.2 tag into the latest OHM staging branch. Upstream is undergoing a piecemeal conversion from JavaScript to TypeScript, introducing merge conflicts that needed more manual review.

…map#12448) Bumps the types group with 1 update: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node). Updates `@types/node` from 25.9.1 to 25.9.2 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-version: 25.9.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.28.0 to 0.28.1. - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](evanw/esbuild@v0.28.0...v0.28.1) --- updated-dependencies: - dependency-name: esbuild dependency-version: 0.28.1 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…nstreetmap#12439

see openstreetmap#12366

…ap#12412) landuse=plant_nursery is more similar to landuse=orchard and landuse=vineyard (cultivated agricultural areas) than to natural vegetation like forest/grass. This moves it to the 'Light Green things' group so it renders with a lighter green/yellowish color.

…nstreetmap#12452) Bumps the eslint group with 1 update: [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint). Updates `typescript-eslint` from 8.60.1 to 8.61.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.61.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-version: 8.61.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…le (openstreetmap#12453) * Apply a proper intended logic fix for openstreetmap#12129 / openstreetmap#12128 * add test to check intersection-prevention algorithm --------- Co-authored-by: Martin Raifer <martin@raifer.tech>

…map#8724 when multiple primary tags are presence, and only the non-highway one is implying oneway-ness. e.g. for `highway=track + piste:type=downhill` the oneway only applies to the piste sense of the feature, not when interpreted as a highway.

* Add track grade-based styling * Change track styling to be based on grade-only (and not surface) * Increase track casing color lightness slightly * Tweak unpaved roads, bridges and tunnels --------- Co-authored-by: Martin Raifer <martin@raifer.tech>

…map#12406) * Fix uiField not considering sub-tags for multiCombo fields * Fix uiField revert and isModified functions not considering prior matching tags for multiCombo * Add tests for multiCombo field modified checks and undo operation * Add tests for multiCombo field remove operation

see openstreetmap/openstreetmap-website#6811 (comment)

…enstreetmap#12467 fixes a crash when hovering over another way while cancelling the drawing of a new way, when the other way has a field that relies on correct contents in `context.selectedIDs`, which are then still containing the outdated reference to the then cancelled way entity

1ec5 · 2026-10-12T02:31:44Z

 /** @type {import("geojson").FeatureCollection} */
 const sources = JSON.parse(
-  fs.readFileSync(require.resolve('ohm-editor-layer-index/imagery.json'), 'utf8')
+  fs.readFileSync(require.resolve('@openstreetmap/editor-layer-index/imagery.geojson'), 'utf8')
 );
+/** @type {import("geojson").FeatureCollection} */
+const ohmSources = JSON.parse(
+  fs.readFileSync(require.resolve('ohm-editor-layer-index/imagery.geojson'), 'utf8')
+);
+sources.features.push(...ohmSources.features);


@mradamcox and I think we haven’t been running this script for many releases, if we’ve ever run it. As it was, the script would clobber any upstream imagery in favor of ohm-editor-layer-index build products (which are out of date with respect to the repository’s main branch). Since there was a merge conflict here, I wound up accepting both to combine both upstream and downstream repositories together. This only works because the downstream was eviscerated early on to serve as an overlay of sorts. If we redo that repository to be a more typical fork, then we would need to revisit this code. Either way, we’ll need to rebuild that repository’s build products to reflect the last couple years of PRs merged.

1ec5 · 2026-10-20T14:05:18Z

Netlify doesn’t seem to associate the deployment with the OHM account there. I would’ve expected the subdomain to reference OHM instead of a randomized slug.

Edit: Ah OK, that’s just the Netlify comment. Maybe we can customize that. But the GitHub deployment action also links to https://pr-263--ideditor.netlify.app/ instead of https://pr-263--openhistoricalmap-ideditor.netlify.app/.

mradamcox · 2026-10-20T18:36:56Z

Ah OK, that’s just the Netlify comment.

This comment comes from the deployment I made from my own netlify account actually, the glistening-truffle site, sorry I mucked things up--totally didn't understand the other deploy was running from github actions. So currently there are two different builds going on: mine and the one that is triggered by the workflow, that one being hosted at https://openhistoricalmap-ideditor.netlify (with deploy previews prefixed pr-<pr number>--).

I think I should just fully delete my deploy, right? Then we'll be back to having the single workflow deployment for previews, but I don't think that integration will provide us with comments on PRs like you see above.

1ec5 · 2026-10-20T18:38:35Z

Correct, all we’ll get is a GitHub deployment event like #263 (comment) and the “branch was successfully deployed” box below.

mradamcox · 2026-10-20T18:45:45Z

Ah, interesting, so that comment comes from this script,

iD/scripts/pr_preview.js

Line 25 in 8b54242

environment_url: `https://pr-${pr}--ideditor.netlify.app`,

which is run as the final step in the deploy preview workflow:

iD/.github/workflows/deploy-pr-preview.yml

Line 48 in 8b54242

    
                       const { afterDeploy } = await import('${{github.workspace}}/scripts/pr_preview.js');

and, as you can see, the original netlify id is hard-coded in there. That's why the "View deployment" button goes to the wrong site.

mradamcox · 2026-10-20T19:03:07Z

So I'm going to go ahead and delete my Netlify integration, and then on your end you can update that pr_preview.js line to be openhistoricalmap-ideditor.netlify.app. Then when you commit and push, we'll see what the preview rebuild and comment look like.

1ec5 · 2026-10-20T21:04:27Z

OK, the latest deployment status is still busted, but I think that’s only because we haven’t merged this PR yet. Otherwise, can y’all take https://pr-263--openhistoricalmap-ideditor.netlify.app/ for a spin before we merge? Thanks!

k-yle · 2026-10-21T08:36:21Z

+
+  _this.title = () => {
+    // @ts-expect-error -- blocked by OHM-specific id-tagging-schema
+    if (field.index) {


source:1 and source:2 look a bit broken. will take a look. other than that, it seems to work well

3a7b61f has my fix, I commited it to a separate branch for now. Once we've setup the OHM-specific id-tagging-schema, we won't need this code anyway

Ah, #258 removed similar code in favor of resolving stringsCrossReference slightly later on, in an attempt to make it more data-driven. We can pull in your fix though; whatever works in the short term.

@k-yle are you able to cherry-pick that commit to this branch? If not, I'd say we should complete this merge and then you can make a quick branch just to snag that commit (I know @1ec5 is traveling this week).

sure, done. this LGTM to me now

mradamcox

Looks great guys, so sorry I missed this review request last week and held us up. Let's do it!

k-yle · 2026-10-27T10:22:28Z

+
+  _this.title = () => {
+    // @ts-expect-error -- blocked by OHM-specific id-tagging-schema
+    if (field.index) {


sure, done. this LGTM to me now

tyrasd and others added 30 commits June 15, 2026 14:24

add openstreetmap#12446 to changelog

694b502

make sure entityIDs is never set to undefined

1aa0385

convert note id to number before loading, fixes openstreetmap#12442

34f080e

don't autocomplete if the input node is not active anymore, fixes ope…

975552d

…nstreetmap#12439

bump id-tagging-schema

d7f653e

npm run imagery

4c757c1

npm run translations

53a79b8

v2.41.0

090473a

add missing changelog entry

02b00d1

Set development version number

3952cdb

show field label (or tag key) in invalid URL validation message

d437af4

see openstreetmap#12366

Fix tests for node 26 (openstreetmap#12401)

651b7ce

delete field.overrideLabel (openstreetmap#12397)

6dcb819

rerender sidebar when it is toggled, fixes openstreetmap#12454

cf619e6

improve rendering of mixed rtl/ltr text, closes openstreetmap#8713

be39e78

make context.ui().hash available right after init()

8651335

see openstreetmap/openstreetmap-website#6811 (comment)

Add pattern for landuse=flowerbed areas (openstreetmap#12458)

f26b8e9

don't explicitly include 'chai' library (openstreetmap#12463)

c75ce46

remove the 'sinon' library (openstreetmap#12462)

7589f9b

remove the 'happen' library (openstreetmap#12461)

9eee978

remove redundant global variable in unit tests (openstreetmap#12465)

0abf4f4

1ec5 added the upstream label Oct 12, 2026

This comment was marked as outdated.

Sign in to view

1ec5 commented Oct 12, 2026

View reviewed changes

k-yle reviewed Oct 13, 2026

View reviewed changes

Comment thread .cspell/custom-dictionary.txt

fix failing tests, typechecking, and lint

bd66cfb

This comment was marked as outdated.

Sign in to view

github-actions Bot deployed to pr-preview-263 October 20, 2026 10:35

View deployment

This comment was marked as resolved.

Sign in to view

1ec5 added 2 commits October 20, 2026 13:45

Merge branch 'staging' into 1ec5-merge-v2.42.2

64cca90

Fixed deployment status link

ab0a6ca

github-actions Bot deployed to pr-preview-263 October 20, 2026 20:48

View deployment

1ec5 requested review from k-yle and mradamcox October 20, 2026 21:04

Build before publishing to NPM

3e36928

github-actions Bot deployed to pr-preview-263 October 20, 2026 21:11

View deployment

k-yle reviewed Oct 21, 2026

View reviewed changes

temporary workaround to replace stringsCrossReference

3a7b61f

mradamcox approved these changes Oct 26, 2026

View reviewed changes

mradamcox requested a review from k-yle October 26, 2026 15:27

k-yle approved these changes Oct 27, 2026

View reviewed changes

github-actions Bot deployed to pr-preview-263 October 27, 2026 10:25

View deployment

1ec5 merged commit 7319fde into staging Oct 27, 2026
9 checks passed

1ec5 deleted the 1ec5-merge-v2.42.2 branch October 27, 2026 14:08

Conversation

1ec5 commented Oct 12, 2026

Uh oh!

This comment was marked as outdated.

Uh oh!

1ec5 Oct 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as outdated.

1ec5 commented Oct 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

mradamcox commented Oct 20, 2026

Uh oh!

1ec5 commented Oct 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mradamcox commented Oct 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mradamcox commented Oct 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

1ec5 commented Oct 20, 2026

Uh oh!

k-yle Oct 21, 2026

Choose a reason for hiding this comment

Uh oh!

k-yle Oct 21, 2026

Choose a reason for hiding this comment

Uh oh!

1ec5 Oct 22, 2026

Choose a reason for hiding this comment

Uh oh!

mradamcox Oct 26, 2026

Choose a reason for hiding this comment

Uh oh!

k-yle Oct 27, 2026

Choose a reason for hiding this comment

Uh oh!

mradamcox left a comment

Choose a reason for hiding this comment

Uh oh!

k-yle Oct 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This branch was successfully deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

1ec5 commented Oct 20, 2026 •

edited

Loading

1ec5 commented Oct 20, 2026 •

edited

Loading

mradamcox commented Oct 20, 2026 •

edited

Loading

mradamcox commented Oct 20, 2026 •

edited

Loading