Merge pull request #7221 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Disable incorrect Style/ArrayIntersect rubocop suggestion

Support false positive from rubocop

https://github.com/rubocop/rubocop/issues/15437

Merge remote-tracking branch 'upstream/pull/7219'

Merge remote-tracking branch 'upstream/pull/7218'

Merge remote-tracking branch 'upstream/pull/7217'

Bump the dependencies group with 5 updates

Bumps the dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [terser](https://github.com/ahorek/terser-ruby) | `1.2.7` | `1.2.8` |
| [doorkeeper-openid_connect](https://github.com/doorkeeper-gem/doorkeeper-openid_connect) | `1.10.3` | `1.10.4` |
| [aasm](https://github.com/aasm/aasm) | `5.5.2` | `6.0.0` |
| [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-ruby) | `0.34.0` | `0.34.1` |
| [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-ruby) | `1.12.0` | `1.12.1` |

Updates `terser` from 1.2.7 to 1.2.8
- [Release notes](https://github.com/ahorek/terser-ruby/releases)
- [Changelog](https://github.com/ahorek/terser-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ahorek/terser-ruby/compare/1.2.7...1.2.8)

Updates `doorkeeper-openid_connect` from 1.10.3 to 1.10.4
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/compare/v1.10.3...v1.10.4)

Updates `aasm` from 5.5.2 to 6.0.0
- [Changelog](https://github.com/aasm/aasm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aasm/aasm/compare/v5.5.2...v6.0.0)

Updates `opentelemetry-exporter-otlp` from 0.34.0 to 0.34.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-exporter-otlp/v0.34.0...opentelemetry-exporter-otlp/v0.34.1)

Updates `opentelemetry-sdk` from 1.12.0 to 1.12.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-sdk/v1.12.0...opentelemetry-sdk/v1.12.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-version: 1.2.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: doorkeeper-openid_connect
  dependency-version: 1.10.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: aasm
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: opentelemetry-exporter-otlp
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: opentelemetry-sdk
  dependency-version: 1.12.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump rubocop from 1.88.1 to 1.88.2 in the rubocop group

Bumps the rubocop group with 1 update: [rubocop](https://github.com/rubocop/rubocop).

Updates `rubocop` from 1.88.1 to 1.88.2
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.88.1...v1.88.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.88.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump ruby/setup-ruby from 1.315.0 to 1.316.0 in the dependencies group

Bumps the dependencies group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby).

Updates `ruby/setup-ruby` from 1.315.0 to 1.316.0
- [Release notes](https://github.com/ruby/setup-ruby/releases)
- [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb)
- [Commits](https://github.com/ruby/setup-ruby/compare/0dafeac902942906541bc140009cdbf32665b601...d45b1a4e94b71acab930e56e79c6aa188764e7f9)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.316.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #7216 from hlfan/maplibre-zoom

Add MapLibre zoom conversion

Add getZoom override to convert MapLibre's zoom level to OSM's format

Merge pull request #7156 from opengeofiction-net/make-gps-traces-optional

Make traces feature optional via traces_disabled setting

Merge pull request #7212 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge pull request #7210 from tomhughes/maplibre-dom-util

Split maplibre/dom_util.js into two better named files

Split maplibre/dom_util.js into two better named files

Merge remote-tracking branch 'upstream/pull/7188'

Add autoPan-ing for draggin markers on the diary adding page

Merge remote-tracking branch 'upstream/pull/7206'

Add support for secondary Wikimedia Commons links

Co-authored-by: r4f <3826906+r4f@users.noreply.github.com>

Merge remote-tracking branch 'upstream/pull/7197'

Merge remote-tracking branch 'upstream/pull/7183'

Merge remote-tracking branch 'upstream/pull/7198'

Merge remote-tracking branch 'upstream/pull/7204'

Merge pull request #7203 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Split space-separated event handlers into individual .on() calls

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/7202'

Merge remote-tracking branch 'upstream/pull/7201'

Merge remote-tracking branch 'upstream/pull/7200'

Merge remote-tracking branch 'upstream/pull/7199'

Bump annotaterb from 4.22.0 to 4.23.0 in the dependencies group

Bumps the dependencies group with 1 update: [annotaterb](https://github.com/drwl/annotaterb).

Updates `annotaterb` from 4.22.0 to 4.23.0
- [Changelog](https://github.com/drwl/annotaterb/blob/main/CHANGELOG.md)
- [Commits](https://github.com/drwl/annotaterb/compare/v4.22.0...v4.23.0)

---
updated-dependencies:
- dependency-name: annotaterb
  dependency-version: 4.23.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [tag2link](https://github.com/JOSM/tag2link) and [eslint](https://github.com/eslint/eslint).

Updates `tag2link` from 2026.5.21 to 2026.6.26
- [Release notes](https://github.com/JOSM/tag2link/releases)
- [Commits](https://github.com/JOSM/tag2link/compare/2026.5.21...2026.6.26)

Updates `eslint` from 10.5.0 to 10.6.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v10.5.0...v10.6.0)

---
updated-dependencies:
- dependency-name: tag2link
  dependency-version: 2026.6.26
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: eslint
  dependency-version: 10.6.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump rubocop from 1.88.0 to 1.88.1 in the rubocop group

Bumps the rubocop group with 1 update: [rubocop](https://github.com/rubocop/rubocop).

Updates `rubocop` from 1.88.0 to 1.88.1
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.88.0...v1.88.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-version: 1.88.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump ruby/setup-ruby from 1.314.0 to 1.315.0 in the dependencies group

Bumps the dependencies group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby).

Updates `ruby/setup-ruby` from 1.314.0 to 1.315.0
- [Release notes](https://github.com/ruby/setup-ruby/releases)
- [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb)
- [Commits](https://github.com/ruby/setup-ruby/compare/9eb537ca036ebaed86729dcb9309076e4c5c3b74...0dafeac902942906541bc140009cdbf32665b601)

---
updated-dependencies:
- dependency-name: ruby/setup-ruby
  dependency-version: 1.315.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Fix LocationEvent handling

Use media-breakpoint-up for map layouts

Closes #6739

Refactor distance unit handling in directions output

Merge pull request #4540 from tomhughes/delete-own-diary

Allow users to delete their own diary entries

Merge pull request #7195 from Firefishy/fix-cdngi-link

Update CD:NGI link to correct department

Update CD:NGI link to correct department

CD:NGI is part of the Department of Land Reform and Rural Development (dlrrd), which was previously known as Department of Agriculture, Land Reform and Rural Development (DALRRD). The ngi sub-domain changed domains when the department was renamed.

Make traces feature optional via traces_disabled setting

Adds an optional traces_disabled setting to allow alternative deployments to disable the traces/tracks feature entirely. When absent (the default) traces are enabled; set to true to disable.

When disabled, all trace routes are removed via a routing constraint so requests return 404. Navigation links to traces in the header and user profile are conditionally hidden. CanCan abilities for Trace respect the setting.

Allow users to delete their own diary entries

Fixes #4175

Merge remote-tracking branch 'upstream/pull/7192'

Merge remote-tracking branch 'upstream/pull/7193'

Localisation updates from https://translatewiki.net.

update iD to v2.41.2

Merge pull request #7191 from CommanderStorm/fix-attribution-listener-leak

Fix listener leak in the link update listener of MapLibre.AttributionControl

Merge remote-tracking branch 'upstream/pull/7190'

Fix moveend listener leak in MapLibre AttributionControl

Merge remote-tracking branch 'upstream/pull/7136'

Make PaginationMethods work with subclasses of a common AR model

Merge pull request #7189 from CommanderStorm/refactoring-for-maplibre

Refactor some code to be ready to accept the new maplibre main map

move isDark to OSM.isDark

Move feature labeling code to its own module to be ready for a second connsumer in maplibres data layer

Fix one code duplication

Make sure to not use the space separated event listeners anywhere

Remove secondary wiki prefix list

Merge remote-tracking branch 'upstream/pull/7177'

Merge pull request #7182 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/7181'

Merge remote-tracking branch 'upstream/pull/7180'

Merge remote-tracking branch 'upstream/pull/7179'

Merge remote-tracking branch 'upstream/pull/7178'

Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [doorkeeper-openid_connect](https://github.com/doorkeeper-gem/doorkeeper-openid_connect) and [cgi](https://github.com/ruby/cgi).

Updates `doorkeeper-openid_connect` from 1.10.1 to 1.10.3
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/compare/v1.10.1...v1.10.3)

Updates `cgi` from 0.5.1 to 0.5.2
- [Release notes](https://github.com/ruby/cgi/releases)
- [Commits](https://github.com/ruby/cgi/compare/v0.5.1...v0.5.2)

---
updated-dependencies:
- dependency-name: doorkeeper-openid_connect
  dependency-version: 1.10.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: cgi
  dependency-version: 0.5.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump the rubocop group with 2 updates

Bumps the rubocop group with 2 updates: [rubocop-capybara](https://github.com/rubocop/rubocop-capybara) and [rubocop-rails](https://github.com/rubocop/rubocop-rails).

Updates `rubocop-capybara` from 2.23.0 to 3.0.0
- [Release notes](https://github.com/rubocop/rubocop-capybara/releases)
- [Changelog](https://github.com/rubocop/rubocop-capybara/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-capybara/compare/v2.23.0...v3.0.0)

Updates `rubocop-rails` from 2.35.4 to 2.35.5
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.35.4...v2.35.5)

---
updated-dependencies:
- dependency-name: rubocop-capybara
  dependency-version: 3.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: rubocop
- dependency-name: rubocop-rails
  dependency-version: 2.35.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: rubocop
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump globals from 17.6.0 to 17.7.0 in the dependencies group

Bumps the dependencies group with 1 update: [globals](https://github.com/sindresorhus/globals).

Updates `globals` from 17.6.0 to 17.7.0
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](https://github.com/sindresorhus/globals/compare/v17.6.0...v17.7.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-version: 17.7.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [ruby/setup-ruby](https://github.com/ruby/setup-ruby).

Updates `actions/checkout` from 6.0.3 to 7.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/df4cb1c069e1874edd31b4311f1884172cec0e10...9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0)

Updates `ruby/setup-ruby` from 1.313.0 to 1.314.0
- [Release notes](https://github.com/ruby/setup-ruby/releases)
- [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb)
- [Commits](https://github.com/ruby/setup-ruby/compare/89f90524b88a01fe6e0b732220432cc6142926af...9eb537ca036ebaed86729dcb9309076e4c5c3b74)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: ruby/setup-ruby
  dependency-version: 1.314.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

Keep linkification regexps in memory

I was playing with [derailed_benchmarks](https://github.com/zombocom/derailed_benchmarks) today and noticed that history pages were spending a long time in `Regexp#initialize`. Example:

```
$ PATH_TO_HIT=/node/29/history be derailed exec perf:stackprof
Booting: production
(...)
Method: GET
Endpoint: "/node/29/history"
(...)
==================================
  Mode: cpu(1000)
  Samples: 3716 (15.58% miss rate)
  GC: 343 (9.23%)
==================================
     TOTAL    (pct)     SAMPLES    (pct)     FRAME
       529  (14.2%)         529  (14.2%)     Regexp#initialize
       230   (6.2%)         230   (6.2%)     (marking)
       165   (4.4%)         165   (4.4%)     Dir.glob
       163   (4.4%)         163   (4.4%)     Zlib::Inflate#inflate
       113   (3.0%)         113   (3.0%)     (sweeping)
        88   (2.4%)          78   (2.1%)     String#gsub
(...)
```

Note that this is measured while running the app in production mode.

I went poking and saw that the [18 patterns (as of these lines)](https://github.com/openstreetmap/openstreetmap-website/blob/5053e2e76b82031b54cba71944d50128929459b7/config/settings.yml#L146-L182) used to detect text to linkify are being used to instantiate `Regexp` every time that linkification takes place. Looks like this takes a significant amount of time.

This PR moves the instantiation to a class method where the result is memoized. This is the result, for comparison:

```
$ PATH_TO_HIT=/node/29/history be derailed exec perf:stackprof
Booting: production
(...)
Method: GET
Endpoint: "/node/29/history"
(...)
==================================
  Mode: cpu(1000)
  Samples: 3521 (19.50% miss rate)
  GC: 329 (9.34%)
==================================
     TOTAL    (pct)     SAMPLES    (pct)     FRAME
       226   (6.4%)         226   (6.4%)     (marking)
       184   (5.2%)         184   (5.2%)     Zlib::Inflate#inflate
       131   (3.7%)         119   (3.4%)     String#gsub
       102   (2.9%)         102   (2.9%)     (sweeping)
        79   (2.2%)          67   (1.9%)     Set#initialize
        60   (1.7%)          60   (1.7%)     PG::Connection#exec_prepared
```

Or in terms of requests per second, this is the code currently in master:

```
$ PATH_TO_HIT=/node/29/history bundle exec derailed exec perf:ips
Booting: production
(...)
Database 'openstreetmap' already exists
Method: GET
Endpoint: "/node/29/history"
ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +YJIT +PRISM [x86_64-linux]
Warming up --------------------------------------
                 ips     1.000 i/100ms
Calculating -------------------------------------
                 ips     23.713 (±25.3%) i/s   (42.17 ms/i) -    119.000 in   5.018360s
```

And this is this PR:

```
> PATH_TO_HIT=/node/29/history bundle exec derailed exec perf:ips
Booting: production
(...)
Method: GET
Endpoint: "/node/29/history"
ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +YJIT +PRISM [x86_64-linux]
Warming up --------------------------------------
                 ips     1.000 i/100ms
Calculating -------------------------------------
                 ips     30.870 (±25.9%) i/s   (32.39 ms/i) -    155.000 in   5.021047s
```

So that's from ~24 ips to ~30 ips, or 25% more requests per second.

Caveat: the tests for `RichText` set up custom patterns, assuming no
memoization. To work around this, I have added a `RichText.reset_state`
method that is run before each relevant test.

Merge remote-tracking branch 'upstream/pull/7176'

Reorder stubbing calls

Merge remote-tracking branch 'upstream/pull/6811'

Merge remote-tracking branch 'upstream/pull/7174'

Remove dangling top-level block

Remove history submodules from OSM scope

Remove directions submodules from OSM scope

Collapse OSM.Directions namespace

Rescope ContextMenu

Merge pull request #7173 from tomhughes/module-includes

Move module includes to group them with the modules that use them

Move includes for directions module to index_modules

Move include for history module to index_modules

Merge remote-tracking branch 'upstream/pull/7147'

Remove jQuery throttle-debounce dependency

Merge remote-tracking branch 'upstream/pull/7172'

update iD to v2.41.1

Merge remote-tracking branch 'upstream/pull/7171'

Bump nokogiri from 1.19.3 to 1.19.4

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.19.3...v1.19.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.19.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Migrate js controllers to lazy loaded modules

Collect initializations outside of modules

Collect module paths in dict

Reduce redundancy in router navigation handling

Merge pull request #7170 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/7169'

Replace marker shadow image with vector graphic

Merge pull request #7164 from openstreetmap/dependabot/bundler/dependencies-0493874874

Bump the dependencies group with 6 updates

Merge pull request #7166 from openstreetmap/translatewiki

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.