Clean WAB map GeoJSON: land-only squares, fix CRS overlaps - #3467
Open
magicbug wants to merge 3 commits into
Open
Clean WAB map GeoJSON: land-only squares, fix CRS overlaps#3467magicbug wants to merge 3 commits into
magicbug wants to merge 3 commits into
Conversation
Regenerate WABSquares.geojson from master using correct grid projections (OSGB EPSG:27700, Irish Grid EPSG:29902, Channel Islands UTM EPSG:32630) and OSM land-polygons for sea filtering. Removes 55 large 100 km boundary boxes, sea-only squares, and seven Irish/GB coordinate duplicates caused by mixed CRS (e.g. D96/NS11). Retains Scottish island squares NL57, NL58, HW83 without padding entire letter prefixes. Co-authored-by: Peter Goodhall <magicbug@users.noreply.github.com>
Added `wab` to the awards route checks used by `header.php`, `mini_header.php`, and `footer.php` when deciding whether to load Leaflet scripts/styles. This ensures map-related assets are available on the WAB awards view just like other map-enabled award pages.
- Restrict to official WAB territory: GB (OSGB), Northern Ireland (Irish Grid), Channel Islands (UTM); exclude ROI and France-only coast cells - Assign grids by territory: OSGB clipped by subtracting NI/France/ROI/CI; Irish Grid clipped to NI; use OSM land for Scottish islands missed by Natural Earth admin polygons - Fix MultiLineString coordinates from [[ring]] to [ring] matching master and RFC 7946 (fixes Leaflet Invalid LatLng) - Add validate_wab_geojson.py and test_wab_geojson_leaflet.js Co-authored-by: Peter Goodhall <magicbug@users.noreply.github.com>
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
2 participants
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.
Summary
Regenerates
assets/json/WABSquares.geojsonfrommasterfor official Worked All Britain (WAB) award territory, fixing sea-only squares, France/ROI leakage, Irish/OSGB polygon overlaps, large 100 km boundary clutter, and a Leaflet regression in MultiLineString coordinate nesting.Replaces unfinished Copilot draft #3405 (not based on that branch).
WAB scope (evidence)
Per WAB Definitions and WAGI Award:
Republic of Ireland Irish Grid squares and 17 French Channel-coast OSGB cells (TW10, TW21, …) from the prior revision are removed.
Method
osbng+ Irish/UTM logic aligned with kwirk/pota-gb-map)[[ring]](4 levels) to[ring](3 levels) matchingmasterand RFC 7946Counts
masterRegression fix: Leaflet
Invalid LatLngboundary_and_point()emittedcoordinates: [[list(ring)]], nesting the entire ring as one “position” so Leaflet saw 4-tuples like(-6.31, 49.90, -6.31, 49.81).Fix:
coordinates: [ring]wherering = [[lon, lat], …]— same 3-level nesting asmaster.Validation
Generator asserts: required islands, no cross-grid overlaps, no France-only/ROI-only squares, no duplicate names/coordinates.
Verified squares
Out of scope