test: re-vendor osm-testdata grid at 98a9b32, drop redundant unit test - #781
Merged
Merged
Conversation
Upstream osm-testdata now carries grid fixture 7/769 ("Multipolygon with
one outer and one inner ring, inner touching outer in two nodes,
splitting the outer into two components"), the one geometry case our
delta analysis against nimix/osm_conv_tests found the grid set lacked
(added in #643 as a standalone unit test, and submitted upstream at the
same time).
Re-vendor grid/data at osmcode/osm-testdata master
(98a9b32aafe8798523d8b3819c33199eee6d5687) to pick up 7/769 -- the only
fixture change since the previously-vendored ecfdeb0d -- and delete
polygon_assembler's inner_touching_outer_at_two_points_splits_it_into_two_pieces,
which existed only to cover that gap. The grid harness now exercises the
case against 7/769's default MULTIPOLYGON oracle via the production
GeometryBuilder path.
The other polygon_assembler tests that mirror grid fixtures stay: they
were written as deliberate unit-level checks of PolygonAssembler's API,
not as gap-fillers.
SBOM needs no change -- generate-sbom.sh reads the commit from VENDORED.md.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MqAiLYcfXhVmDGxXgwYHGj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context
When we vendored the osm-testdata
gridfixtures (#529, #535), a delta analysis againstnimix/osm_conv_teststurned up exactly one geometry case the grid set lacked: a multipolygon whose inner ring touches the outer ring at two nodes, splitting the outer into two disjoint components. We covered that two ways — a standalone unit test inpolygon_assembler.rs(#643), and a PR to upstream osm-testdata adding the case as a real fixture.That upstream PR has landed.
osmcode/osm-testdatamaster (98a9b32) now carries grid test 769 ("Multipolygon with one outer and one inner ring, inner touching outer in two nodes, splitting the outer into two components"), with a validdefaultMULTIPOLYGON oracle.Changes
tests/test_data/osm-testdata-grid/at98a9b32aafe8798523d8b3819c33199eee6d5687. The diff from the previously-vendoredecfdeb0dis only fixture7/769/plus the regeneratedall.osm/tests.jsonaggregates — nothing else upstream changed.polygon_assembler::tests::inner_touching_outer_at_two_points_splits_it_into_two_pieces. It existed only to fill the gap that7/769now fills; the grid harness exercises the case against7/769's oracle through the productionGeometryBuilderpath.polygon_assemblertests that mirror grid fixtures (7/707/708/733/749,7/790,7/792,7/795) stay — those were written as deliberate unit-level checks ofPolygonAssembler's API, not gap-fillers.scripts/sbom/generate-sbom.shreads the commit fromVENDORED.md.Verification
geometry::grid_tests::grid_multipolygon_testspasses with7/769now exercised;no_oracle_fixtures_are_still_unverifiablepasses (769correctly stays out ofNO_ORACLE_FIXTURES).cargo testgreen (lib, integration, doctests).cargo clippy— only pre-existing warnings insrc/pipeline/osm/assemble.rs, untouched here.🤖 Generated with Claude Code