Skip to content

Rebuild OHM customizations as logical commits on top of upstream - #448

Open
Rub21 wants to merge 13 commits into
staging-newfrom
staging-upstream
Open

Rebuild OHM customizations as logical commits on top of upstream#448
Rub21 wants to merge 13 commits into
staging-newfrom
staging-upstream

Conversation

@Rub21

@Rub21 Rub21 commented Aug 13, 2026

Copy link
Copy Markdown
Member

This PR replaces the old patch-accumulated history with 12 logical commits that contain all OHM customizations, rebuilt on top of the latest upstream master openstreetmap-website-5a02636.

This is the approach agreed in the ticket OpenHistoricalMap/issues#735 as a cleaner baseline for future development and upstream merges.

cc. @1ec5

Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net>
@github-actions

github-actions Bot commented Aug 13, 2026

Copy link
Copy Markdown
1 Warning
⚠️ Number of updated lines of code is too large to be in one PR. Perhaps it should be separated into two or more?

Generated by 🚫 Danger

@coveralls

coveralls commented Aug 13, 2026

Copy link
Copy Markdown

Coverage Report for CI Build 31808287802

Warning

No base build found for commit 5a02636 on staging-new.
Coverage changes can't be calculated without a base build.
If a base build is processing, this comment will update automatically when it completes.

Coverage: 96.63%

Details

  • Patch coverage: 21 uncovered changes across 3 files (24 of 45 lines covered, 53.33%).

Uncovered Changes

File Changed Covered %
lib/date_range.rb 21 5 23.81%
app/helpers/browse_helper.rb 5 2 40.0%
app/controllers/searches/nominatim_queries_controller.rb 12 10 83.33%
Total (9 files) 45 24 53.33%

Coverage Regressions

Requires a base build to compare against. How to fix this →


Coverage Stats

Coverage Status
Relevant Lines: 7537
Covered Lines: 7283
Line Coverage: 96.63%
Coverage Strength: 891.98 hits per line

💛 - Coveralls

@1ec5 1ec5 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking pretty good. I only inspected the code but haven’t tried running it. I haven’t gone through our issues to see if any features dropped out. It’ll be easier to detect them in testing anyways.

I included some nitpick comments, in case it’s easy enough to remove those from the diffs.1 The cleaner the diff, the less likely we are to have merge conflicts in the future. Some of the whitespace changes are probably remnants from code that we added and removed at some point.

Footnotes

  1. You can do an interactive rebase to rewrite this history. Change pick to edit, edit the file, then continue the rebase.

Comment thread app/assets/stylesheets/id.css Outdated
Comment thread app/assets/javascripts/leaflet.map.js Outdated
Comment thread vendor/assets/leaflet/leaflet.osm.js Outdated
Comment thread app/assets/javascripts/index_modules/export.js
Comment thread app/assets/javascripts/index_modules/query.js Outdated
Comment thread README.md Outdated
Comment thread app/assets/favicons/manifest.json.erb Outdated
Comment thread app/assets/images/attribution_example copy.png Outdated
Comment thread app/assets/stylesheets/common.scss Outdated
Comment thread app/views/site/ohm_privacy_policy.html.erb
Rub21 and others added 9 commits August 14, 2026 08:19
Co-authored-by: Sajjad Anwar <sajjadkm@gmail.com>
Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Jim McAndrew <jim@loc8.us>
Co-authored-by: Greg Allensworth <gregory@greeninfo.org>
Co-authored-by: Minh Nguyễn <mxn@1ec5.org>
Co-authored-by: Jim McAndrew <jim@loc8.us>
Co-authored-by: Seth Fitzsimmons <seth@mojodna.net>
Co-authored-by: Sanjay Bhangar <sanjay@developmentseed.org>
Co-authored-by: Sajjad Anwar <sajjadkm@gmail.com>
Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Jim McAndrew <jim@loc8.us>
Co-authored-by: Seth Fitzsimmons <seth@mojodna.net>
Co-authored-by: Sanjay Bhangar <sanjay@developmentseed.org>
Co-authored-by: Sajjad Anwar <sajjadkm@gmail.com>
Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Dan Rademacher <dan@greeninfo.org>
Co-authored-by: Greg Allensworth <gregory@greeninfo.org>
Co-authored-by: Jeff Meyer <jeff@gwhat.org>
Co-authored-by: Dan Rademacher <dan@greeninfo.org>
Co-authored-by: Minh Nguyễn <mxn@1ec5.org>
Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Minh Nguyễn <mxn@1ec5.org>
Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Dan Rademacher <dan@greeninfo.org>
Co-authored-by: mmd-osm <mmd.osm@gmail.com>
Co-authored-by: Jeff Meyer <jeff@gwhat.org>
Co-authored-by: Dan Rademacher <dan@greeninfo.org>
Co-authored-by: Minh Nguyễn <mxn@1ec5.org>
Co-authored-by: Eric Theise <erictheise@gmail.com>
Co-authored-by: Jim McAndrew <jim@loc8.us>
Co-authored-by: Seth Fitzsimmons <seth@mojodna.net>
Co-authored-by: Eric Theise <erictheise@gmail.com>
Rub21 and others added 3 commits August 14, 2026 16:11
@Rub21
Rub21 force-pushed the staging-upstream branch from ac99a3c to ee9fb22 Compare August 14, 2026 14:11
@Rub21

Rub21 commented Aug 14, 2026

Copy link
Copy Markdown
Member Author

Tests are passing now, the map load timing was breaking some tests, so I bumped Capybara's default_max_wait_time so it waits for the page to finish loading.

@1ec5

1ec5 commented Aug 14, 2026

Copy link
Copy Markdown
Member

Sounds good, it was failing intermittently on other branches for the same reason.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants