chore(meta): close T-1156 wave 1 — PR #195 merged (rivers/basins/attractors on the ladder, triple review)
Tyre APPROVE after one fix round (attractor stroke-width compensation, D-226 visibility-direction capture); Hoshe APPROVE after one fix round (named default-visibility pins; execution-grade verification incl. own golden structural diff and independent revert-tests; full gate 3770/3770 at final tip); Araminta APPROVED all four captures after her District trunk-dot objection was fixed to her exact ask. Cold re-verified on MERGED main (.cache/screenshots/rivers-main/). Wave 2 (civilizational overlays) stays deferred on the re-scoped T-1156... wave-2 notes ride the ticket. Unblocked: T-1168 riparian contract, T-1170 course invention. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1711,3 +1711,4 @@ RE-SCOPED (Jeroen, 2026-07-22): ''we are aiming for not coloring in the cities a
|
||||
RE-SCOPED (Jeroen, 2026-07-22): ''we are aiming for not coloring in the cities at the moment — the nature layer (geo and wild growth) first,'' matching D-166''s outside-in order. SPLIT this ticket''s overlay set into two waves. WAVE 1 (this ticket, promoted): the NATURE overlays — gen_l1_rivers/basins/attractors onto the ladder (rivers as per-rung refining features: trunk rivers at Region, tributaries at District, streams at Quarter — the wire/derivation question of serving river skeletons windowed is the real work), plus named natural features (rivers/oceans/ranges labels) if cheap. WAVE 2 (deferred until the nature layer stands, per Jeroen): everything civilizational — city markers + sidebar, settlements/quarters footprints, roads/rail, POL/POP/CRP/gate markers. Do not port wave 2 with wave 1.
|
||||
|
||||
WAVE-2 REFACTOR NOTE (Tyre, PR #195 Q3): when the civilizational overlays land, host the whole discrete-marker family (city markers, labels, gate glyphs, click targets — all screen-space-constant) on an UNSCALED screen-space sibling Node2D (transform positions into screen space, leave .scale at 1.0) and retire per-call zoom compensation (_zs/zoom_compensated_size) — screen-space-constant becomes correct by construction instead of a per-call-site discipline that silently degrades when one site is missed (PR #195 I1 was exactly that miss). The divide-by-zoom approach shipped in wave 1 is fine once compensated, but the sibling-layer shape is the standard ''HUD annotations over a zoomed canvas'' pattern and pays for itself at wave-2 marker volume. T-1158-adjacent.', NULL, '2026-07-23 07:15:25', '2026-07-23 07:15:25.374', '2026-07-23 07:15:25.374', NULL, '55f2c203cb7e77b39d563a5aaaf1aef2', 2) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_record_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FRJD57678SVWD7XTSV9E3MSW', 'status', 'review', 'done', NULL, '2026-07-23 07:35:36', '2026-07-23 07:35:36.008', '2026-07-23 07:35:36.008', NULL, 'c624aea58ec451336f11296924898ff3', 2) ON CONFLICT(hash) DO NOTHING;
|
||||
|
||||
@@ -2513,3 +2513,8 @@ INSERT INTO tickets (record_id, type, parent_record_id, title, description, stat
|
||||
RE-SCOPED (Jeroen, 2026-07-22): ''we are aiming for not coloring in the cities at the moment — the nature layer (geo and wild growth) first,'' matching D-166''s outside-in order. SPLIT this ticket''s overlay set into two waves. WAVE 1 (this ticket, promoted): the NATURE overlays — gen_l1_rivers/basins/attractors onto the ladder (rivers as per-rung refining features: trunk rivers at Region, tributaries at District, streams at Quarter — the wire/derivation question of serving river skeletons windowed is the real work), plus named natural features (rivers/oceans/ranges labels) if cheap. WAVE 2 (deferred until the nature layer stands, per Jeroen): everything civilizational — city markers + sidebar, settlements/quarters footprints, roads/rail, POL/POP/CRP/gate markers. Do not port wave 2 with wave 1.
|
||||
|
||||
WAVE-2 REFACTOR NOTE (Tyre, PR #195 Q3): when the civilizational overlays land, host the whole discrete-marker family (city markers, labels, gate glyphs, click targets — all screen-space-constant) on an UNSCALED screen-space sibling Node2D (transform positions into screen space, leave .scale at 1.0) and retire per-call zoom compensation (_zs/zoom_compensated_size) — screen-space-constant becomes correct by construction instead of a per-call-site discipline that silently degrades when one site is missed (PR #195 I1 was exactly that miss). The divide-by-zoom approach shipped in wave 1 is fine once compensated, but the sibling-layer shape is the standard ''HUD annotations over a zoomed canvas'' pattern and pays for itself at wave-2 marker volume. T-1158-adjacent.', 'review', 'high', NULL, 'client', 'D-226', '2026-07-22 09:42:37.105', '2026-07-23 07:15:25.374', NULL, '14a9f02f7911c6fb0ed125572aaaf551', 2) ON CONFLICT(record_id) DO UPDATE SET type=excluded.type, parent_record_id=excluded.parent_record_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (record_id, type, parent_record_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('06FRJD57678SVWD7XTSV9E3MSW', 'story', '06FB0TNSRZXCHGS16BFHSSGSV4', 'Port whole-body Atlas overlays onto the zoom ladder (markers, city sidebar, POL/POP/gen overlays)', 'T-1153/T-1152 retired the AtlasViewer heightmap screen as the atlas entry; its 17-entry overlay surface did NOT carry to the Region-rung ladder view (AtlasWindowViewer has only gen_dw_temp/moisture/veg). Deferred wholesale by Stig with rationale: these overlays key off markers.json/city-names/road-graph/settlement data the DistrictWindowLayer wire shape does not carry — porting is a per-overlay design + wire question (at what rung does a settlement marker fade in? does POL make sense over a Region composite?), not a mechanical copy. Deferred set: city markers + click-to-inspect city data sidebar; roads/rail/settlements/quarter-footprint generation overlays (gen_l1_rivers/basins/attractors, gen_district, gen_l2_roads, gen_l3_settlements, gen_region_grid, gen_l4_quarters); political zones, population density, corp presence, production/stockpile toggles, gate markers, named features. The retired code survives intact and unreachable on atlas_viewer.gd — reuse it or retire it explicitly per overlay. Needs Araminta (per-rung affordance/fade rules) + Tyre/Dudley (which overlays need new wire fields vs client-side joins). Until this lands the ladder view is terrain-only — a real capability regression vs the old planetary screen, accepted knowingly in the T-1152/T-1153 batch.
|
||||
|
||||
RE-SCOPED (Jeroen, 2026-07-22): ''we are aiming for not coloring in the cities at the moment — the nature layer (geo and wild growth) first,'' matching D-166''s outside-in order. SPLIT this ticket''s overlay set into two waves. WAVE 1 (this ticket, promoted): the NATURE overlays — gen_l1_rivers/basins/attractors onto the ladder (rivers as per-rung refining features: trunk rivers at Region, tributaries at District, streams at Quarter — the wire/derivation question of serving river skeletons windowed is the real work), plus named natural features (rivers/oceans/ranges labels) if cheap. WAVE 2 (deferred until the nature layer stands, per Jeroen): everything civilizational — city markers + sidebar, settlements/quarters footprints, roads/rail, POL/POP/CRP/gate markers. Do not port wave 2 with wave 1.
|
||||
|
||||
WAVE-2 REFACTOR NOTE (Tyre, PR #195 Q3): when the civilizational overlays land, host the whole discrete-marker family (city markers, labels, gate glyphs, click targets — all screen-space-constant) on an UNSCALED screen-space sibling Node2D (transform positions into screen space, leave .scale at 1.0) and retire per-call zoom compensation (_zs/zoom_compensated_size) — screen-space-constant becomes correct by construction instead of a per-call-site discipline that silently degrades when one site is missed (PR #195 I1 was exactly that miss). The divide-by-zoom approach shipped in wave 1 is fine once compensated, but the sibling-layer shape is the standard ''HUD annotations over a zoomed canvas'' pattern and pays for itself at wave-2 marker volume. T-1158-adjacent.', 'done', 'high', NULL, 'client', 'D-226', '2026-07-22 09:42:37.105', '2026-07-23 07:35:36.008', NULL, '29b4c320dbcc5d1568efd1f6f2a1a8dd', 2) ON CONFLICT(record_id) DO UPDATE SET type=excluded.type, parent_record_id=excluded.parent_record_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
|
||||
Reference in New Issue
Block a user