Conversation
…-map Resolve every Python conflict in favour of main. #33 and #38 landed the PDL-derived roster, the entity placement export and the port-to-port collapse of sea crossings, all of which this branch predates: export_bundle.py, the topology fixtures and the export contract test take main's versions unchanged, leaving the Python tree byte-identical to main. Keep the branch's route geometry, rebased onto main's bundle contract. gazetteer.ts gains EDGE_ROUTES, the four authored ocean routes stored as intermediate waypoints keyed by edge id with the endpoints taken from the resolved edge. The lane-node machinery the branch used to anchor them - SYNTHETIC_PLACEMENTS, splitLaneRoute, the lane-keyed waypoint table - is dropped, since main's collapsed edges make it redundant. GlobeView.tsx renders routed edges through a pathsData layer carrying the same halo/glow/core stack and disruption lerp as the arcs; edges without a route keep their great-circle arcs. Routes are densified so long legs follow the surface instead of cutting through the globe, and routed edge labels anchor at the route midpoint rather than an arc apex. geo.ts and tokens.ts keep the branch's densifyPolyline and path token set, which the route rendering depends on. Every other frontend file - App.tsx, types.ts, staticJsonSource.ts, source.ts, main.tsx, app.css, labels.css, dynamics.ts - takes main's version: the branch's commercial-group UI and Edge.kind have no backing in the bundle main emits, and its labels.css dropped the .sim-label--edge rule that main's edge annotations still need.
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.
Rebased onto main by merging it in.
The Python half of this branch was superseded #33 and #38 landed the PDL-derived roster, the entity placement export and the port-to-port collapse of sea crossings.
The lane-node machinery this branch originally used (
Edge.kind,SYNTHETIC_PLACEMENTS,splitLaneRoute) is dropped.