diff --git a/DATA_SOURCES.md b/DATA_SOURCES.md index d121ddff05..695eb478c1 100644 --- a/DATA_SOURCES.md +++ b/DATA_SOURCES.md @@ -432,7 +432,7 @@ The [Bhote Koshi event pack](public/events/bhote-koshi-2026/README.md), under `p | **Yale Bright Star Catalogue** (9,096 stars, sky background) | `sky/` | **Public domain** | ✅ (no restrictions) | "Yale Bright Star Catalogue (Hoffleit & Warren, via CDS)" (courtesy credit) | | **ESO Milky Way panorama** (eso0932a, blurred cube map, sky background) | `sky/` | **CC BY 4.0** | ✅ (attribution; changes stated) | "ESO/S. Brunier" | | **CCTV ground heights** (3,445 cameras) | `cctv_ground_heights/` | Precomputed camera placement heights, aligned to work with Google Photorealistic 3D Tiles (folder README) | — | — | -| **CCTV Camera Database** model-enrichment extract v2.26.0 + v2.29.0 (20 camera-model records) | `src/layers/cctv/modelSpecs.js` | **CC0-1.0** (public domain dedication) | ✅ (no restrictions) | "Specs: cctv-database.com" (courtesy — not legally required) | +| **CCTV Camera Database** model-enrichment extract v2.26.0 + v2.29.0 (20 CCTV and 15 ALPR camera-model records) | `src/layers/cctv/modelSpecs.js`, `src/layers/alpr/modelSpecs.js` | **CC0-1.0** (public domain dedication) | ✅ (no restrictions) | "Specs: cctv-database.com" (courtesy — not legally required) | ### ⚠️ TeleGeography is bundled but NonCommercial @@ -458,6 +458,17 @@ commercial use with attribution and applicable database share-alike/access obligations; it does not license the application code. Trimmed test-only tile fixtures retain their provenance in `src/data/fixtures/README.md`. +A mapped `model` tag that names datasheet hardware adds a spec line to the +selected card. The specs are 16 CC0-1.0 records from the CCTV Camera Database +model-enrichment extract (v2.29.0): 15 compiled into +`src/layers/alpr/modelSpecs.js`, with the bare product codes mappers tag added +as aliases and the SharpV G3 and SharpX XGA titles naming their variant, plus +the CCTV layer's Bosch MIC-7522-Z30 record. Nothing is fetched at runtime, and +an unrecognised tag is never displayed. The default hourly extract does not +carry `model` yet, so the line appears only with a source that supplies it: an +Overpass-backed source or a custom adapter whose records include the optional +`model` field. + ### CCTV Camera Database (`src/layers/cctv/modelSpecs.js`) The CCTV layer's hardware-model specs are a small extract (v2.26.0, plus the Bosch MIC diff --git a/changelog.d/1360-alpr-model-specs.md b/changelog.d/1360-alpr-model-specs.md new file mode 100644 index 0000000000..a7db9817c5 --- /dev/null +++ b/changelog.d/1360-alpr-model-specs.md @@ -0,0 +1,7 @@ +- Mapped ALPR cameras whose OpenStreetMap `model` tag names known hardware + (Motorola Solutions Vigilant, Genetec AutoVu, Axis, Verkada, Bosch MIC) show + a datasheet spec line on their card, from 16 vendored CCTV Camera Database + records, when their source supplies `model` (an Overpass-backed source or an + integration adapter; the default hourly extract does not yet); unknown, + generation-ambiguous or mis-attributed models show nothing + (bassem chagra, @ch-bas, #1360). diff --git a/changelog.d/1808-cctv-camera-counts.md b/changelog.d/1808-cctv-camera-counts.md new file mode 100644 index 0000000000..7c87538cd1 --- /dev/null +++ b/changelog.d/1808-cctv-camera-counts.md @@ -0,0 +1,8 @@ +- Zoomed out, a CCTV ground cell with two or more cameras is now one round + marker with a camera icon and the count (`999`, `1.7K`, `12K` in every + language). It grows with the count, merges with markers it would overlap, + takes in a lone camera right beside it, and zooms in on click until the + group splits. Idle cameras and markers are green. The active camera stays + amber and video cameras violet. Cameras on one mount draw side by side, and + a camera the terrain height service never answered for stands on the drawn + terrain (gekh, #1808). diff --git a/changelog.d/1857-zoom-freeze-under-icons.md b/changelog.d/1857-zoom-freeze-under-icons.md new file mode 100644 index 0000000000..6816fdfa88 --- /dev/null +++ b/changelog.d/1857-zoom-freeze-under-icons.md @@ -0,0 +1,3 @@ +- Wheel and trackpad zoom no longer freeze below 150 km while an aircraft or + vessel icon is under the centre of the view: icons drawn over depth write a + depth of exactly 0, which the camera's depth pick ignores (asturksever, #1857). diff --git a/changelog.d/1861-bare-address-defaults.md b/changelog.d/1861-bare-address-defaults.md new file mode 100644 index 0000000000..77faf35c49 --- /dev/null +++ b/changelog.d/1861-bare-address-defaults.md @@ -0,0 +1,4 @@ +- Opening the bare address starts with the default layers again, instead of + bringing back the last session's: a link still restores everything it + carries, so clearing the address always resets the view (samehkhamis, + #1861). diff --git a/changelog.d/1862-kit-sweep-chat-voice.md b/changelog.d/1862-kit-sweep-chat-voice.md new file mode 100644 index 0000000000..511c798fcb --- /dev/null +++ b/changelog.d/1862-kit-sweep-chat-voice.md @@ -0,0 +1,2 @@ +- The AI chat panel's and voice control's buttons and glyphs are now kit + controls (manjunath22466, samehkhamis, #1862). diff --git a/changelog.d/1863-kit-sweep-draw.md b/changelog.d/1863-kit-sweep-draw.md new file mode 100644 index 0000000000..4822dd8265 --- /dev/null +++ b/changelog.d/1863-kit-sweep-draw.md @@ -0,0 +1,2 @@ +- Draw's and Import's buttons and glyphs are now kit controls + (manjunath22466, samehkhamis, #1863). diff --git a/changelog.d/1864-kit-sweep-missions-radio.md b/changelog.d/1864-kit-sweep-missions-radio.md new file mode 100644 index 0000000000..9f2c26b390 --- /dev/null +++ b/changelog.d/1864-kit-sweep-missions-radio.md @@ -0,0 +1,2 @@ +- Space Missions', Contacts', Radio's, the RTL-SDR card's and key setup's + buttons and glyphs are now kit controls (manjunath22466, samehkhamis, #1864). diff --git a/changelog.d/1865-kit-sweep-bhote-koshi.md b/changelog.d/1865-kit-sweep-bhote-koshi.md new file mode 100644 index 0000000000..d10cab97b7 --- /dev/null +++ b/changelog.d/1865-kit-sweep-bhote-koshi.md @@ -0,0 +1,3 @@ +- The Bhote Koshi panel's buttons are kit controls, CINEMATIC's pressed + state is Vue state, and its media cards are a Vue view (manjunath22466, + samehkhamis, #1865). diff --git a/changelog.d/1866-no-focus-zoom.md b/changelog.d/1866-no-focus-zoom.md new file mode 100644 index 0000000000..231f5721f4 --- /dev/null +++ b/changelog.d/1866-no-focus-zoom.md @@ -0,0 +1,3 @@ +- Tapping the search box or any other text field on an iPhone no longer leaves + the page zoomed in: the page stays at its own scale and the map does the + zooming (samehkhamis, #1866). diff --git a/changelog.d/1867-start-layers.md b/changelog.d/1867-start-layers.md new file mode 100644 index 0000000000..d617556057 --- /dev/null +++ b/changelog.d/1867-start-layers.md @@ -0,0 +1,4 @@ +- An application can name the layers a bare address starts with + (`startLayers` on `createApplicationControls`; none by default): they turn on + without being saved as the user's own choice, and a link's own layers always + win (samehkhamis, #1867). diff --git a/changelog.d/1868-kit-sweep-photo-viewer.md b/changelog.d/1868-kit-sweep-photo-viewer.md new file mode 100644 index 0000000000..811a3fa3ae --- /dev/null +++ b/changelog.d/1868-kit-sweep-photo-viewer.md @@ -0,0 +1,3 @@ +- Street Level's photo viewer is a Vue view with kit step buttons, and a + provider switch always gets a fresh panorama canvas (manjunath22466, + samehkhamis, #1868). diff --git a/changelog.d/1869-kit-sweep-final-scan.md b/changelog.d/1869-kit-sweep-final-scan.md new file mode 100644 index 0000000000..bcdfc9d9ff --- /dev/null +++ b/changelog.d/1869-kit-sweep-final-scan.md @@ -0,0 +1,3 @@ +- The view scan now forbids any hand-written button, Material glyph, + checkbox or range in the views, and any control built in script + (manjunath22466, samehkhamis, #1869). diff --git a/changelog.d/1870-find-it.md b/changelog.d/1870-find-it.md new file mode 100644 index 0000000000..6e70db31ca --- /dev/null +++ b/changelog.d/1870-find-it.md @@ -0,0 +1,4 @@ +- A selected vessel or aircraft can be found again from its card: while it is + off screen or has left its feed (the clock moved, or the view moved away), + Find it flies back to it, looking it up where it was at the clock's time + when the feed no longer has it (samehkhamis, #1870). diff --git a/changelog.d/1871-street-level-photo-followups.md b/changelog.d/1871-street-level-photo-followups.md new file mode 100644 index 0000000000..e68357f915 --- /dev/null +++ b/changelog.d/1871-street-level-photo-followups.md @@ -0,0 +1,3 @@ +- Street Level's photo viewer settles every open and mount, draws one + viewer at a time and states its view contract (manjunath22466, + samehkhamis, #1871). diff --git a/changelog.d/1872-omnibar-centred.md b/changelog.d/1872-omnibar-centred.md new file mode 100644 index 0000000000..d41b20d91e --- /dev/null +++ b/changelog.d/1872-omnibar-centred.md @@ -0,0 +1,3 @@ +- On a phone the search field is centred when no language picker sits beside + it, instead of keeping the picker's room empty on its right (samehkhamis, + #1872). diff --git a/changelog.d/1873-weather-texture-limit.md b/changelog.d/1873-weather-texture-limit.md new file mode 100644 index 0000000000..fdb351c1a2 --- /dev/null +++ b/changelog.d/1873-weather-texture-limit.md @@ -0,0 +1,4 @@ +- Satellite clouds draw again in a built app instead of showing "Weather + imagery unavailable": the weather shell read its texture limit in a + parameter default, which esbuild compiles for older browsers into code that + throws. A test now refuses the form under `src/` (samehkhamis, #1873). diff --git a/changelog.d/1875-imagery-shows.md b/changelog.d/1875-imagery-shows.md new file mode 100644 index 0000000000..7c5feeb2c2 --- /dev/null +++ b/changelog.d/1875-imagery-shows.md @@ -0,0 +1,3 @@ +- Weather imagery and shells say what they show (`shows`, such as + `'clouds'`), so a renderer can tell such a layer apart; nothing draws + differently (samehkhamis, #1875). diff --git a/changelog.d/1876-search-dock-above-timeline.md b/changelog.d/1876-search-dock-above-timeline.md new file mode 100644 index 0000000000..50c810776d --- /dev/null +++ b/changelog.d/1876-search-dock-above-timeline.md @@ -0,0 +1,2 @@ +- On desktop the search dock sits above the World Timeline, which takes the + dock's floor (Sameh Khamis, @samehkhamis, #1876). diff --git a/changelog.d/1877-landed-aircraft-on-ground.md b/changelog.d/1877-landed-aircraft-on-ground.md new file mode 100644 index 0000000000..a53cf27fb0 --- /dev/null +++ b/changelog.d/1877-landed-aircraft-on-ground.md @@ -0,0 +1,4 @@ +- A plane that lands and is reported on the ground with no altitude stays on + the ground, instead of hanging at its approach height until it takes off + or its 3D model appears; its labels read "On the ground" (samehkhamis, + #1877). diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 51dd971fe0..cdac3d27b5 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -10,6 +10,20 @@ or an older position from another feed) and one reported slower than 2 m/s give no course and keep the last; an aircraft with no course at all faces north. +A selected vessel, aircraft or military aircraft can be found again from its +Context card. While it is off screen, behind the globe or out of its layer's +feed (the clock jumped to a time the feed lacks it, or the view moved away +from it), the card's header shows Find it (`store.locate()`, +`src/ui/stores/entityCard.js`). One still in its feed is flown to (an +aircraft followed). One out of its feed is looked up at the layer's time on +its own track (`locate` on the vessels, flights and military layers, through +`locateOnTrack` in `src/data/locate.js`): the newest point at or before the +world clock's time while the layer follows the clock, else the newest. The card +moves to it and says how old that reading is, and the camera flies there. Once +the feed has it again, its layer selects it again (an aircraft is followed). +With no point at or before the time, the card says there is no reading then and +the camera stays. A followed item is never counted as off screen. + While anything moves (a layer in motion, the camera, a followed contact), the globe draws at the display's own refresh rate; there is no fixed 60 FPS cap. The render governor (`src/renderGovernor.js`) caps a parked scene at @@ -93,6 +107,16 @@ settling. Oblique views below 300 km are left alone. `QA_BASE_URL=http://localhost:4173 node scripts/qa-zoom-out-guard.mjs` exercises the real browser controller at desktop and phone widths with keyless fixtures. +Below 150 km Cesium sizes a wheel or pinch zoom step from the depth it picks at +the canvas centre. Icons drawn over depth (aircraft, vessels and most markers: +`disableDepthTest: Infinity`) sit on the near plane and write a depth of +exactly 0 there (`src/render/cesium/iconSetPrimitive.js`), which that pick +reads as nothing drawn, so it keeps the ground under the icon. Any depth past +the near plane would be taken for a surface a near plane's distance from the +camera, and the zoom would stop while an icon is under the centre. +`QA_BASE_URL=http://localhost:5173 node scripts/qa-zoom-under-icon.mjs` checks +this against a dev server (`npm run dev`). + Cesium's free look (Shift+drag, which turns the camera in place) works only below 1,000 km. Above that height a few drags could turn the whole planet out of frame and leave only stars, so Shift+drag does nothing there. Cesium also turns @@ -1191,9 +1215,11 @@ every width, right to left it takes the bottom right at every width, and `src/ui/creditLineHeight.js` keeps its height in `--credit-line-height`: the coordinates (and, right to left, the Tactical readout) stay 6px above it however many lines it wraps onto, and the dock and World Timeline rise when -it is taller than their usual clearance. Narrower than 1120px the dock leaves -no room between the corners, so the coordinates and the readout sit above -the dock, and above the World Timeline while it shows. Outside that layout +it is taller than their usual clearance. The World Timeline takes the dock's +floor and the dock (with the Omnibar's field) sits above it, rising by the +bar's height while it shows, as the plain dock does. Narrower than 1120px the +dock leaves no room between the corners, so the coordinates and the readout +sit above the dock. Outside that layout Cesium's credit box wraps from 1200px, as before; the phone shell, clean view, recording and scene playback lay the line out themselves. The left rail treats the centered World Timeline and voice control as @@ -1929,6 +1955,16 @@ The row count explicitly says **nearby**: loaded records can be outside the screen. Cyan camera badges use Manjunath's camera artwork; selection switches to a larger coral badge with corner brackets and an animated tactical card. Numeric mapped bearings draw illustrative 90 m direction wedges (not measured coverage). +A camera whose OSM `model` tag names known hardware (Motorola Solutions Vigilant, +Genetec AutoVu, Axis, Verkada, Bosch MIC; 408 of the 1,567 tagged cameras +in October 2026) gets a `SPEC` line on its card from vendored datasheet records +(`src/layers/alpr/modelSpecs.js`, matched with the CCTV layer's +`createModelSpecLookup`). A `manufacturer` naming another maker rejects the +match, and the raw tag text is never shown. +Unversioned `AutoVu SharpV` and `AutoVu SharpX` tags show no specs; G1/G2 +tags show the G2 (1280x960) record and G3 tags the G3 record. The default +hourly extract has no `model` field yet; an Overpass-backed source or a custom +adapter record's optional `model` fills it. The shared overlay paints gradients for at most 64 nearby cameras, promoting the selected camera; farther cameras keep native Cesium badges without wedges. Native ground-clamped wedges (a ground polyline plus a classification polygon per @@ -1991,14 +2027,33 @@ directory. Every `/api/cctv` route refuses cross-site browser requests but accepts forwarding headers, so cameras work behind a reverse proxy; a forwarded request skips the key-bearing Street View fallback and gets the placeholder. -The CCTV layer draws only the cameras on or near the screen. Zoomed out, it -keeps one camera per ground cell sized to the view, preferring a healthy feed, -and the cells are anchored to the ground so a pan keeps the same cameras. The -active camera always shows. Ground placement and coverage geometry load only -for the cameras in view, with at most two attempts per camera and view regime. -The view pass reruns while the camera moves, paced by its own cost. The camera -picker lists the cameras in view, active camera first, and closes with the -count of cameras outside the view. +The CCTV layer draws only the cameras on or near the screen. Zoomed out, a +ground cell with two or more cameras shows one marker at their mean position. A +green camera pictogram sits under its top edge and the count just below its +middle. The marker grows with the count and paints on the world overlay at +callout resolution. The count covers the whole cell up to the horizon, including +its off-screen cameras. Overlapping markers merge and add their counts. A lone +camera whose icon would touch a marker joins the nearest one, unless the HUD +hides the merged marker. In that case the lone camera keeps its icon and the +count stays where it was before the merge. If the marker there would still cover +the icon, the camera stays in its count when the label fits. The active camera +keeps its own icon beside any marker that would cover it and stays out of the +count. A click on a marker zooms in on its group, at least halving the distance +each time. If halving would leave the group wider or taller than the frame, the +view zooms in on the nearest of the group's ground cells with two or more +cameras. The cockpit or a tracked object holds the view in place. Ambient cards +and coverage attach only to +cameras drawn as icons. On a globe map a marker stands on the drawn terrain. A +camera the height batch never answered for takes the drawn terrain as its ground +once it is near the screen. It reads that height again from much closer, once +the terrain in view has loaded, or when the terrain source changes. A later +Re:Earth answer replaces it. A fallback preserves it. Close up every camera +shows. Cameras on one mount draw side by side and their records keep the mount. +Ground placement has at most two attempts per camera and view regime. The view +pass reruns while the camera moves, paced by its own cost, and when the terrain +in view finishes loading. The camera picker lists the active camera first, then +one camera per visible cell, preferring healthy feeds. It ends with the count of +catalog cameras missing from the list. Traffic owns its rendered-surface observer only while enabled, removes it on disable/destroy, and rebuilds no cached heights on frames where the surface identity is unchanged. Its dots and heat-lines are two renderer draw sets, it animates on the frame port's preRender, and it follows the camera through the camera port at its own 5% threshold rather than the shared `percentageChanged` ledger. The surface identity is the globe port's `surfaceVersion()` and tile readiness its `isSettled('surface')`, so the layer no longer reaches Cesium. Heat-lines are always asked for draped: where the Cesium renderer cannot drape (no depth textures) its draw port draws them (and every other draped line) over the surface, in their colour where the surface hides them and hidden past the horizon, recolouring a line in place when only its colour changes, rather than the layer dropping them. @@ -2117,7 +2172,10 @@ trail, a route. A layer under another layer's card or label (`isUnderOtherCard`) does nothing: it neither acts on its item there nor treats the click as empty space, so a tracked aircraft stays tracked and a selection stays selected. Context (`src/ui/entityContextBridge.js`) names -nothing under a card. With no card on top, the scene rules are unchanged. +nothing under a card. A layer can claim a target it paints outside the overlay's +entries (`registerClickClaim`) where no card or label is on top. A CCTV count +claims each click that zooms to it, so a tracked aircraft stays tracked. +With no card or claim on top, the scene rules are unchanged. World-overlay hit rectangles are what is painted on screen until the next paint: an overlay change (a click subscriber publishing its selection card) no longer clears them mid-click, and a paint that draws nothing clears them @@ -6304,7 +6362,17 @@ caption has no place name (KartaView's is where the drive began) and links to the full-size photo through the image proxy, since kartaview.org's photo pages fail for signed-out visitors. The viewer itself is `photoViewer.js`, shared with Panoramax: each provider hands it a `PhotoSources` table (first -and sharper flat and panorama URLs, and the caption fields). +and sharper flat and panorama URLs, and the caption fields). It builds no +element: it presents the viewer through the layer's +`subscribePhotoViewer()`, which the application shell publishes to the +`gev-street-level-photo` store, and `StreetLevelPhotoViewer` draws it in the +viewer host and hands back the canvas the panorama is drawn on (a fresh one +after a lost context). Each mount and each canvas has a key of its own, so +a viewer never draws on another one's elements, and of two viewers +mounting at once only the later one is drawn (`photoViewers.js`): the +earlier one's mount closes. A view may draw at once or later; what it +reads (`mountKey`, `actions.supersede()`) is `ViewerAdapter.subscribeView` +in `registry.js`. Without a subscribed view these photos cannot open. Panoramax (`providers/panoramax/`) is keyless and browser-side: the meta-catalogue `api.panoramax.xyz` (CORS open) federates every instance, and @@ -7516,7 +7584,7 @@ silently demoting every later lookup for the session. ground clamp now lifts the cap _center_ only so the wireframe stays a true pyramid welded to the plane (was a flattened fan / the ~47.5 m divergence — RESOLVED), re-selecting the active camera is a no-op (killed a click-flash), and texture swaps gate on canvas content (killed a - periodic white flash). Camera icons are cyan for stills, violet for cameras with a video feed, and amber for the active camera. Coverage is now **metro-wide: 250 cameras** (`CCTV_AUSTIN_MAX_SOURCES` + periodic white flash). Camera icons are green for stills, violet for cameras with a video feed, and amber for the active camera. Coverage is now **metro-wide: 250 cameras** (`CCTV_AUSTIN_MAX_SOURCES` default 36 → 250, hard bound 300), filtered to `camera_status === TURNED_ON` (~815 live of 1,003 rows). City packs (2026-07-04): Caltrans (districts 4/7/11/3 — SF, LA, San Diego, Sacramento; cap 300) and TfL London JamCams (cap 250) join Austin (cap 250) as keyless default @@ -8562,7 +8630,7 @@ pins and share links already supply complete boxes. - Vessels, Transit and Rail draw fleet models under the same DISPLAY rail `3D` toggle, at the same altitude ceiling, caps and 3 km add/keep radii as the aircraft, at true size (`FLEET_MODEL_POLICY`, `src/layers/flights/policy.js`; `createFleetModelLayer`, `src/data/fleetModelInstances.js`). A vessel's model follows its AIS ship type and is drawn at its reported length and beam (AIS static dimensions A+B and C+D, now carried on vessel rows as `length` and `beam`), standing at the sea surface, heading by true heading then course. An aid to navigation is not a hull: a vessel record whose type names a buoy, beacon, mark, RACON or light, or whose MMSI is an aid-to-navigation station's (`99MIDxxxx`), is `isAidToNavigation` (`src/data/vesselTypes.js`) and is drawn as the set's `buoys` model of the IALA mark its type names (`aidToNavigationModel`, `src/data/fleetModels.js`: cardinal N/E/S/W, port or starboard hand, preferred channel by its side, safe water, isolated danger, special mark; a beacon, light, light vessel, RACON or reference point with no mark of its own is the special mark), else a red can (`DEFAULT_AID_MODEL`), at its built size and facing north whatever heading it reports. A type is an aid's when it is one of the 32 kinds an aid report names or uses a word for one (buoy, beacon, cardinal, safe water, RACON, lighthouse and so on); a vessel that works on aids (`Buoy Tender`, `Buoy Layer`) is not one. Its icon is the buoy sprite, tinted bone white (`AID_TO_NAVIGATION_STYLE`, `src/data/vesselLabels.js`), upright and never turned, and its card, selected card and HUD readout (`src/layers/vessels/cards.js`) show its kind alone, whole, in that colour: no speed or heading, since a fixed mark has neither. AISStream subscribes to `AidsToNavigationReport` (message 21) by default, and the server names each report's aid type code (0 to 31) as its kind (`aidToNavigationTypeName`: `20` is `Cardinal Mark N`) rather than reading it as a ship type, and its name runs on into the report's `NameExtension`. A virtual aid (the report's `VirtualAtoN` flag: a mark broadcast where nothing physical stands) carries `virtual: true` on its row, and on its vessel source record (the live-source contract's `virtual`, `src/sources/live/contract.js`, false unless a source says true; any source may set it). It keeps its buoy sprite but never gets a model (`vesselModelSpec` returns null for it, and the vessel layer gathers no model item for it), and its card and readout add `VIRTUAL` after its kind. `aisStreamRows` (`server/providers/vessels/ais-store.js`) puts every vessel ahead of every aid, so a capped request (the layer asks for 12,000 rows) never gives up a ship for a buoy. The `vessels_in_area` tool (and the brief built on it) counts ships only: it leaves aids out of its rows, counts, breakdowns and speed stats. A transit vehicle's model follows its route's GTFS `route_type` when its record carries one and that type is a kind of the vehicle's mode (`types.json` `transit.route_types`: 200 a coach, 101 a high-speed set, 106 a regional DMU, 710 a double-decker), else its layer mode (`transit.modes`: bus, trolleybus, tram, cable car, subway, monorail, rail, funicular, gondola or ferry; a vehicle of `unknown` mode keeps its icon); a fleet hint that overrules the route (a bus on a tram route) leaves the type unused. A monorail and a gondola are raised by their `transit.elevation` lifts. A train's model follows its rail category and mode (rail, metro or tram). The bundled GTFS-Realtime proxy carries no route type, so its vehicles draw their mode's model; a source that adds `routeType` reaches the finer ones. Both stand on the road or rail top they are drawn on, without the 1.5 m `GROUND_FLOOR_LIFT_M` their icons carry, and are painted in their mode or category colour where the model's `_TINT` attribute marks it. A vessel model is clipped at its waterline (one clipping plane per model, at the model origin's horizontal plane), so its hull below the water never shows through a plain globe, which Cesium does not depth-test models against. Under the NVG/FLIR styles (the Flights `irBoost` parameter) these models render unlit flat white, as aircraft models do. Each vehicle's icon stays the visual until its model is loaded, ready and placed; a model is picked as its icon is, and a vehicle drawn as its model keeps its selection card and its place in the detection overlay. - **Aircraft models skip Cesium's dynamic environment map (2026-10-24).** Flights, Military Flights and Local ADS-B pass `environmentMapOptions: AIRCRAFT_ENVIRONMENT_MAP_OPTIONS` (`{ enabled: false }`, `src/data/aircraftModelLighting.js`) to every drawn model. Otherwise each `Model` renders the sky around it and reads it back from the GPU (`readPixels`) when it is first placed, and again whenever it moves more than 1 km, the scene's atmosphere settings change, or (under sunlight dynamic lighting) an hour of scene time passes (`DynamicEnvironmentMapManager`, Cesium 1.138). The models are lit from Cesium's default spherical harmonics instead, with no specular environment map, so the sky's model-lighting cube map no longer reaches aircraft. `src/data/aircraftModelLighting.test.mjs` pins the option at every drawn model call; every model is built from the fleet set loaded up front, so there is no separate preload. - The DISPLAY-rail `3D` toggle is the user-facing activation path for both aircraft layers. Their small approved GLBs build their render resources without Cesium's frame-spread job queue, preventing continuous Photorealistic 3D Tiles streaming from starving model readiness; model caps, tracking, camera, and fallback billboards are unchanged. -- **The `3D` toggle DEFAULTS ON in `proximity` on a first run.** Proximity is itself the budget — models appear only within 3 km of the camera and only for the nearest `MODEL_MAX` — so the default costs nothing at globe scale, and `all` remains a deliberate opt-in. A fresh boot runs NO layer-state restoration (`LayerStateCoordinator.start()` returns early with neither a share payload nor stored state), so four independent initializers decide what a first-run operator sees and must agree: `booleanOption('models3d', 'e', true)` in `src/data/layerState.js`, `_models3dEnabled = true` in BOTH flight layers, `this._models3dEnabled = true` in `src/ui/aircraftDisplay.js`, and the `active` / `visible` classes on `#models3d-toggle` / `#models3d-mode-row` in `index.html`. All four are pinned together in `src/data/layerState.test.mjs`. Explicit state still wins: because the codec omits default-valued options, `models3d: false` is now what travels in a link (`lo=…f.e.0`) and restores OFF at both aircraft layers. **Consequence for returning users:** a stored `gev:layer-state:v2` blob is a FULL options snapshot, so a session that wrote one before this change carries `models3d:false` and keeps 3D off until the operator flips it (or clears the key) — the durable snapshot is treated as the recipient's own state, by design. +- **The `3D` toggle DEFAULTS ON in `proximity` on a first run.** Proximity is itself the budget — models appear only within 3 km of the camera and only for the nearest `MODEL_MAX` — so the default costs nothing at globe scale, and `all` remains a deliberate opt-in. A fresh boot runs NO layer-state restoration (`LayerStateCoordinator.start()` returns early with neither a share payload nor stored state), so four independent initializers decide what a first-run operator sees and must agree: `booleanOption('models3d', 'e', true)` in `src/data/layerState.js`, `_models3dEnabled = true` in BOTH flight layers, `this._models3dEnabled = true` in `src/ui/aircraftDisplay.js`, and the `active` / `visible` classes on `#models3d-toggle` / `#models3d-mode-row` in `index.html`. All four are pinned together in `src/data/layerState.test.mjs`. Explicit state still wins: because the codec omits default-valued options, `models3d: false` is now what travels in a link (`lo=…f.e.0`) and restores OFF at both aircraft layers. Start-up never reads a stored `gev:layer-state:v2` blob back: a bare URL starts from these defaults and a link from its hash (`src/ui/shareRestoration.js`, `allowLocalState: false`), so clearing the address always resets the view. - Civilian and military 2D aircraft use the established distance scale: `3×` near the camera and a `0.5×` floor from 8,000 km outward. A standard 20 px ambient icon therefore remains about 10 px at globe altitude while retaining the @@ -8805,13 +8873,18 @@ that era's default (`scf` → 35, `ko` → 5). Every link since carries both fie explicitly, because the generator always writes them, so no era whose default later changed depends on a fallback either way. -**They do NOT all persist the same way, and only one of them persists at all.** +**None of them comes back from storage on a bare URL; only the hash carries them.** Worth stating plainly, because "a default you can override" and "a default that remembers" are different promises: -- **3D models** have durable storage — `gev:layer-state:v2` in local storage, - written by `LayerStateCoordinator` on explicit intent. A session that stored a - snapshot keeps whatever it stored, across tabs and restarts. +- **3D models** are written to `gev:layer-state:v2` in local storage by + `LayerStateCoordinator` on explicit intent, but start-up never reads it back: + a link restores what its hash carries, and a bare URL starts with the default + layers and options (`src/ui/shareRestoration.js` passes + `allowLocalState: false`), so clearing the address always resets the view. + A host may name the layers a bare URL starts with (`startLayers` on + `createApplicationControls`, e.g. `['flights', 'satellites']`); they are + restored passively, never written to storage, and a link's own layers win. - **Detection mode/density and scope feather have NO storage key at all.** Their only durable carrier is the URL hash (`dm`/`dd`, `scf`), written on a 500 ms debounce. A same-URL reload therefore keeps them only if that debounce already diff --git a/docs/I18N.md b/docs/I18N.md index 4799cded25..efad640373 100644 --- a/docs/I18N.md +++ b/docs/I18N.md @@ -107,6 +107,7 @@ Call it before views render. `onLocaleChange` listeners word their text again at - **Translate the label, not the value.** Layer ids, enums, share-link parameters, API fields, voice tool schemas and feed data (callsigns, vessel and place names) stay as they are; translate only the text shown for them. - **No `t()` at module top level.** Keep the English in `msg()` and call `t()` when rendering. - **Numbers and dates** go through `formatNumber`, `formatDate`, `formatRelativeTime` and `formatUtcDayMonth` from `src/i18n/index.js`, which follow the active language. + Compact CCTV count badges painted on the map use Latin digits, a decimal point and a `K` suffix for thousands (`999`, `1.7K`, `12K`). Each badge keeps its width and reads the same across locales. Format these badges only with `formatCameraCount` in `src/data/cctvCellCounts.js`. - **Identical English means identical translation,** unless you give it a context: `t('CLEAR', { context: 'action' })` (a button) is its own catalog entry, `action|CLEAR`, while `t('CLEAR')` (the sky) stays separate. English output is the same. - **Text that should stay English** (a brand, a code, a unit symbol) is simply not wrapped. diff --git a/docs/VUE-MIGRATION.md b/docs/VUE-MIGRATION.md index 2dcedab29f..aa2909df10 100644 --- a/docs/VUE-MIGRATION.md +++ b/docs/VUE-MIGRATION.md @@ -84,21 +84,43 @@ Home and End), since each of Core's groups keeps its own keyboard policy, and once and asks for a change only when it lands on another option. Every segmented group in Core is a `UiSegmented`; the old `segmentedControl.js` adapter is gone. +No view hand-writes a control the kit has: every button in an SFC outside +the kit is a `UiButton`, `UiCloseButton` or another kit control, every +Material Symbols glyph a `UiIcon`, every checkbox a `UiCheckbox`, every +select a `UiSelect`, and every range a `UiSlider` except the radio +tuner's and the world timeline's, for the reasons given below. No module +outside the kit, and no SFC's script, builds a button, select, field or +Material glyph in script or writes one as markup in a string, apart from +the globe panel's standalone page (`src/tools/globePanel.js`), plain HTML +a host serves with no Vue or kit, whose Expand and Open buttons are +written as markup (`src/ui/kit/viewControls.test.mjs` pins all of it). +The native fields left are the text, number, password and file inputs +and the two text areas (the chat's message box and the scene dialog's +multiline field) the kit has no control for, and the search fields whose +surfaces this document names. The scene dialog's single-line field takes +its type from its caller, which passes text-like types only. `UiButton` adds `pressedClass`, Core's class on a pressed toggle (most use `active`); its pressed classes toggle through `classList`, so a class other code adds (a voice highlight) survives a press. Every pressed toggle (a control with `aria-pressed`) in the views is a `UiButton` with `pressed` -except two that keep their own `aria-pressed`: Bhote Koshi's cinematic -button, whose state the event layer writes into the attributes its panel -renders, and Explore's story cards, which are `role="button"` elements, -not buttons (`src/ui/kit/viewControls.test.mjs` pins it). Where the +except Explore's story cards, which keep their own `aria-pressed` since +they are `role="button"` elements, not buttons +(`src/ui/kit/viewControls.test.mjs` pins it). Where the converted buttons draw Material symbols (the tilt-map button, the Context header's search and expand, the imported files' row actions and the rail chips' icons), the glyphs are `UiIcon`s with `:size="null"`, so the site rules still size them. Core's pressable chips and pills (the rail cards' chips and action chips, Recent Imagery's day chips, SWAP and ZOOM IN, map -sources, cities and places, and the view context's place and layer chips) -are `UiButton`s too; the key setup chip is still a plain button. `UiChip` +sources, cities and places, the view context's place and layer chips and +the key setup chip) are `UiButton`s too. `UiChip` is a non-interactive +label chip, used by the voice card. +header's search and expand, Draw, Import, the imported files' and drawn +shapes' row actions and the rail chips' icons), the glyphs are `UiIcon`s +with `:size="null"`, so the site rules still size them. Core's pressable +chips and pills (the rail cards' chips and action chips, Recent Imagery's +day chips, SWAP and ZOOM IN, map sources, cities and places, and the view +context's place and layer chips) are `UiButton`s too; the key setup chip +is still a plain button. `UiChip` is a non-interactive label chip, used by the voice card. The welcome card's buttons (SKIP, the three start tiles, BROWSE STORIES, BACK and the main NEXT / ENTER GOD MODE action) are ghost `UiButton`s: @@ -192,6 +214,51 @@ while a query is typed. The Filter button opens a disclosure and carries a `UiIcon` with `:size="null"`, so `layer-finder.css` still sizes them (`src/ui/kit/layerFinderControls.test.mjs` pins it); the search field's magnifier is `UiSearchField`'s own span. +The Space Missions panel's buttons (a mission's roster row, FOCUS, +REPLAY ASCENT, the replay's pause, PREV, NEXT and SHOW ALL / DESELECT), +the Contacts panel's (PREV, FOCUS, NEXT and a contact's row), the Radio +panel's (Enable, PREV, PLAY, NEXT and STOP), the RTL-SDR card's (Connect, +Locate, Change device, FM, ADS-B, Tune and the two seeks) and the key +setup's (the POWER UP chip, a key's REMOVE, the voice auth toggle and +SAVE KEYS) are ghost `UiButton`s. Radio's Enable and the card's Connect, +FM and ADS-B are pressed toggles with `active`; PLAY and Locate keep +their own `active` class without `aria-pressed`, since their words say +what they will do or have done. The chip's bolt is a `UiIcon` with +`:size="null"`, so provider-settings.css still sizes it +(`src/ui/kit/missionsRadioControls.test.mjs` pins it). The card's FM +frequency stays a native number field, which the kit has no control for, +and the replay's pause, the roster's chevron and the compass arrows are +text characters, not Material symbols. +Utilities' Draw and Import are on the kit. Draw (a pressed toggle with +`active`), Clear and Import are ghost `UiButton`s, their glyphs `UiIcon`s +with `pp-icon` and `:size="null"`. Draw's five colour swatches, in the +toolbar and in a drawn shape's row, are ghost `UiButton`s with +`role="radio"`: they say they are chosen with `aria-checked` and their own +`active` class, never `aria-pressed`. A drawn shape's row (its swatch, +show/hide, the application's row actions and fly to, beside its remove +`UiCloseButton`) is on the kit too, its glyphs `UiIcon`s with +`:size="null"`, so `controls.css` still sizes them; show/hide says what it +does in its name (Show …, Hide …) rather than being pressed. The Street +Level panel's controls already were kit controls; its EXPAND ⤢ ⤡ and its +errors' ⚠ are text characters and stay text +(`src/ui/kit/drawControls.test.mjs` pins it). +The AI chat panel's and the voice control's buttons are ghost +`UiButton`s: the chat's Settings, quick prompts, attachment removes, +Attach layer, Attach a file, Expand conversation, command suggestions, +Expand chat, Add attachment and Send (a submit button that turns into +Stop reply), and the voice control's Open AI chat, Back to chat, Back to +voice, its Preview and Settings tabs and the error tray's DISMISS, beside +the tier button, the mic and the dock and minimize buttons, which already +were. The tier button and dock are pressed toggles; the mic is one only +while its owner has a state for it; the tabs keep `role="tab"` and +`aria-selected`. DISMISS is a text button, not a cross, so it is not a +`UiCloseButton`. The Settings and tab glyphs are `UiIcon`s with +`:size="null"`, so voice-cost.css and voice-card.css still size them +(`src/ui/kit/chatVoiceControls.test.mjs` pins it). The chat bubble, +globe, attach, send and stop, expand and Back glyphs stay inline SVG, +since no Material symbol the page loads draws them the same, and the +message box, file picker and inactivity minutes stay native fields, which +the kit has none of. The voice modules build no controls in script. The small surfaces' buttons are ghost `UiButton`s: the locale picker's button, the phone tab bar's tabs, the globe actions' Clear, Share, Reset and north-up compass, the imagery divider's handle, the scene sharing @@ -208,6 +275,36 @@ targets in its template, as many as `view.subRings` says, rather than building them in script; the Omnibar's one other `material-symbols-outlined` is a stylesheet selector, and the layer disclosure only names a button in a comment (`src/ui/kit/smallSurfacesControls.test.mjs` pins it). +The Street Level photo viewer of KartaView and Panoramax (the photo, the +panorama canvas and the ‹ › buttons) is `StreetLevelPhotoViewer`, drawn +from what the photo viewer presents rather than built in script. Its ‹ and +› are ghost `UiButton`s, not pressed toggles, whose glyphs are text +characters; the viewer builds no element, and the street-level layer it +belongs to needs no Vue (`src/ui/kit/streetLevelPhotoControls.test.mjs` +pins it). The notice the God's Eye View panel page shows when it loses its +3D graphics (`#status`, in `src/app/globePanelRuntime.js`) stays built in +script: that script is sent to the host as source text and runs in the +host's panel page before the app loads, so it can import nothing. +The Bhote Koshi reconstruction panel's buttons (previous and next beat, +Play, Play scene, Cinematic, Full story, Open original, Lower gorge, the +field reports and Open public map) are ghost `UiButton`s that keep their +`data-action` hooks. Cinematic is a pressed toggle with no pressed class, +since bhote-koshi.css reads its `aria-pressed`: the event layer presents +its state as the record's `pressed`, which the panel passes to the +button, instead of writing an `aria-pressed` attribute. The ‹ and › +arrows are text characters. The event's embedded media cards (each +anchored witness clip's frame, leader line, title, status and original +link, and the hidden YouTube preload) are drawn by +`BhoteKoshiMediaCards`, which `src/data/bhoteKoshiEmbeddedMedia.js` +renders into its overlay root with `h()` and `render()` on every change, +words again on a locale change, and places after each frame; they hold +no control, and the original link stays a link. The script still builds +the provider SDKs' script and preconnect tags, the overlay root, and the +Facebook player node: that node is warmed hidden before its card exists +and carried, loaded, into the card's player, where the SDK replaces its +contents, so a template could only rebuild it and reload the player; the +X post is likewise built by its SDK inside the player +(`src/ui/kit/bhoteKoshiControls.test.mjs` pins it). `UiSelect` renders the bare native select (Core's labels sit outside it or come as an `aria-label`) with `v-model`, `options` and `disabled`; options that carry their own attributes come through the slot, a caller's @@ -388,7 +485,20 @@ slot whenever its view is drawn. (done: `RecentImageryReadout` and its day cards, the same way), Street level (done: `StreetLevelPanel` renders the `gev-street-level` store that `StreetLevelControls` publishes to; the controls keep their - listeners, EXPAND, focus and resizing), CCTV (done: `CctvPanel` renders + listeners, EXPAND, focus and resizing; `StreetLevelPhotoViewer`, beside + it in the layer panels, teleports into the viewer host the photo viewer + KartaView and Panoramax mount there, which `createPhotoViewer()` + presents through the layer's `subscribePhotoViewer()` and the + application shell publishes to the `gev-street-level-photo` store, so + the portable `./layers/street-level` entries need no Vue; the viewer + keeps every decision, the photo loading, keys, drag and zoom, and draws + its panorama on the canvas the view hands back, a fresh one after a lost + WebGL context; each mount and canvas is keyed, so no viewer reuses + another's elements, and of two viewers mounting at once only the later + is drawn while the earlier one's mount closes; with no view + subscribed, as when the layer runs without the application shell, a + KartaView or Panoramax photo cannot mount), + CCTV (done: `CctvPanel` renders the whole panel from the `gev-cctv` store, including the camera picker, the inline pose editor, the frame preview, source badge and typed summary; `CctvControls` keeps its listeners, the frame requests and the @@ -490,7 +600,8 @@ slot whenever its view is drawn. reconstruction panel (`BhoteKoshiPanel`, last in the context rail, renders what the event layer publishes to the `gev-bhote-koshi-panel` store: each control's text, hidden, disabled, value and attributes as - the layer writes them, unchanged frames sending nothing; the rail takes + the layer writes them, and the cinematic button's pressed state, + unchanged frames sending nothing; the rail takes `bhote-event-active` while it shows), the full-globe celestial ring (`CelestialRing` teleports into the globe container what `CelestialRing` in `src/celestialRing.js` publishes to the `gev-celestial-ring` store and diff --git a/index.html b/index.html index ded159f2c9..ed18f8e240 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + God's Eye View /g, ''); +// An opening tag's attributes, quoted values may hold `>` (`() => x`). +const ATTRS = String.raw`(?:[^>"']|"[^"]*"|'[^']*')*`; +const tags = (markup, name) => + markup.match(new RegExp(String.raw`<${name}\b${ATTRS}>`, 'g')) ?? []; +// An attribute's name, outside the quoted values. +const names = (attrs) => attrs.replace(/"[^"]*"|'[^']*'/g, '""'); + +const PANEL = 'ui/views/panels/BhoteKoshiPanel.vue'; +const CARDS = 'ui/bhoteKoshi/BhoteKoshiMediaCards.vue'; +// Per file: its UiButtons, UiCloseButtons, UiSliders and UiIcons. +const SURFACES = { + // Previous and next beat, Play, Play scene, Cinematic, Full story, Open + // original, Lower gorge, a field report (one tag, one per report) and Open + // public map; Close; the split and progress sliders. + [PANEL]: [10, 1, 2, 0], + // The media cards: a frame, a leader, a footer and the original link. + [CARDS]: [0, 0, 0, 0], +}; + +test('the Bhote Koshi views hand-write no button; each is a kit button', () => { + for (const [file, [buttons, closes, sliders]] of Object.entries(SURFACES)) { + const markup = template(file); + assert.deepEqual(markup.match(/ { + for (const [file, [, , , icons]] of Object.entries(SURFACES)) { + const markup = template(file); + assert.deepEqual(markup.match(/material-symbols/g) ?? [], [], file); + const found = tags(markup, 'UiIcon'); + assert.equal(found.length, icons, file); + for (const icon of found) assert.match(icon, /\s:size="null"/, file); + } +}); + +test('the cinematic button takes the kit pressed state', () => { + for (const file of Object.keys(SURFACES)) + for (const [tag, attrs] of template(file).matchAll( + new RegExp(String.raw`<[A-Za-z][\w-]*\b(${ATTRS})>`, 'g'), + )) { + assert.doesNotMatch( + names(attrs), + /(?:^|\s)(?::|v-bind:)?aria-pressed(?=[\s=/]|$)/, + tag, + ); + assert.doesNotMatch( + attrs, + /(?:^|\s)(?:v-bind|:)=(?:"[^"]*aria-?pressed[^"]*"|'[^']*aria-?pressed[^']*')/i, + tag, + ); + } + const pressed = tags(template(PANEL), 'UiButton').filter((tag) => + /\s:pressed=/.test(tag), + ); + assert.equal(pressed.length, 1); + assert.match( + pressed[0], + /^ { + const source = read('data/bhoteKoshiEmbeddedMedia.js'); + assert.doesNotMatch(source, /innerHTML|insertAdjacentHTML|createElementNS/); + // Provider scripts and preconnects, the overlay root, and the Facebook + // embed node and its warm host. + assert.deepEqual( + [...source.matchAll(/createElement\('(\w+)'\)/g)].map((m) => m[1]), + ['script', 'script', 'script', 'link', 'div', 'div', 'div'], + ); + assert.match(source, /renderVue\(\s*h\(BhoteKoshiMediaCards,/); + const cards = template(CARDS); + const opening = (name, attribute) => + new RegExp(String.raw`<${name}\b${ATTRS}\s${attribute}${ATTRS}>`); + for (const part of [ + opening('iframe', 'class="bhote-embedded-media-warmup"'), + opening('section', 'class="bhote-embedded-callout"'), + opening('svg', 'class="bhote-embedded-callout-leader"'), + opening('div', 'class="bhote-embedded-callout-body" data-overlay-input'), + opening('small', 'role="status"'), + opening('a', 'target="_blank" rel="noopener noreferrer"'), + ]) + assert.match(cards, part); +}); diff --git a/src/ui/kit/chatVoiceControls.test.mjs b/src/ui/kit/chatVoiceControls.test.mjs new file mode 100644 index 0000000000..b1716157ca --- /dev/null +++ b/src/ui/kit/chatVoiceControls.test.mjs @@ -0,0 +1,150 @@ +// The AI chat panel's and the voice control's buttons and Material glyphs +// are the kit's: neither their templates nor the voice card and panel +// layout buttons they render hand-write a ';")); + assert.ok( + !sees(STRING_MARKUP, "''".replace('', '')), + ); + + const sources = scriptSources(); + assert.ok( + sources.some(({ file }) => file === 'src/ui/views/panels/ChatPanel.vue'), + ); + const found = []; + for (const { file, source } of sources) { + found.push( + ...hits(file, source, SCRIPT_CONTROL), + ...hits(file, source, SCRIPT_GLYPH), + ); + if (!STRING_MARKUP_PAGES.has(file)) + found.push(...hits(file, uncommented(source), STRING_MARKUP)); + } + assert.deepEqual(found, []); + for (const file of STRING_MARKUP_PAGES) { + const page = sources.find((s) => s.file === file); + assert.ok( + page && hits(file, page.source, STRING_MARKUP).length, + `${file} no longer writes markup`, + ); + } +}); diff --git a/src/ui/radioPanel.test.mjs b/src/ui/radioPanel.test.mjs index 0fb910b25c..7a91fa69a4 100644 --- a/src/ui/radioPanel.test.mjs +++ b/src/ui/radioPanel.test.mjs @@ -68,7 +68,7 @@ test('before RadioControls renders, the panel shows its initial markup', (t) => assert.equal($('radio-filter').options.length, 1); assert.equal($('radio-filter').options[0].value, 'all'); assert.equal($('radio-filter').options[0].textContent, 'All'); - assert.equal($('radio-play-btn').getAttribute('class'), null); + assert.equal(coreClasses($('radio-play-btn')), ''); assert.equal($('radio-play-btn').disabled, true); assert.equal($('radio-volume').value, '80'); assert.equal($('radio-volume-value').textContent, '80%'); @@ -120,7 +120,7 @@ test('the panel renders the presented directory, station, transport and playback assert.equal($('radio-station-homepage').getAttribute('href'), 'https://example.org/'); assert.equal($('radio-station-homepage').hidden, false); const play = $('radio-play-btn'); - assert.equal(play.className, 'active'); + assert.equal(coreClasses(play), 'active'); assert.equal(play.textContent, 'PAUSE'); assert.equal(play.getAttribute('aria-label'), 'Pause selected radio station'); assert.equal($('radio-prev-btn').disabled, false); @@ -128,7 +128,7 @@ test('the panel renders the presented directory, station, transport and playback assert.equal($('radio-playback-state').textContent, 'Playing KJAZ'); await render({ audioState: 'error', filter: 'all' }); - assert.equal(play.className, ''); + assert.equal(coreClasses(play), ''); assert.equal($('radio-playback-state').className, 'radio-playback-state error'); assert.equal($('radio-station-homepage').hasAttribute('href'), false); assert.equal($('radio-station-homepage').hidden, true); diff --git a/src/ui/shareRestoration.js b/src/ui/shareRestoration.js index 73d368566a..0b34ffbd55 100644 --- a/src/ui/shareRestoration.js +++ b/src/ui/shareRestoration.js @@ -167,7 +167,10 @@ export class ShareRestoration { feedback, updateFeedback, applyFollowOffset = null, + startLayers = [], }) { + // The layers a bare address starts with; a link names its own. + this._startLayers = startLayers; Object.assign(this, { viewer, navigation, @@ -417,9 +420,11 @@ export class ShareRestoration { this._layerStateRestorePromise = this._layerStateCoordinator.start({ shareLayerState: this._initialShareState?.layerState || null, shareCreatedAtMs: this._initialShareState?.sharedAtMs ?? null, - // Any valid camera/style share isolates recipient-local preferences, - // including legacy and malformed-v2 layer payloads. - allowLocalState: !this._initialShareState, + // A link restores what it carries; a bare address is a clean start + // with the default layers. Saved layer choices never come back on + // their own, so clearing the address always resets the view. + allowLocalState: false, + startLayerIds: this._initialShareState ? [] : this._startLayers, }); if (this._initialShareSelectionSuperseded) { this._layerStateCoordinator.cancelPendingShareTracking( diff --git a/src/ui/stores/bhoteKoshiPanel.js b/src/ui/stores/bhoteKoshiPanel.js index c3d1e4fd0d..f7f9cc55fa 100644 --- a/src/ui/stores/bhoteKoshiPanel.js +++ b/src/ui/stores/bhoteKoshiPanel.js @@ -13,7 +13,8 @@ export const useBhoteKoshiPanelStore = defineStore( /** * `{owner, sceneBeat, refs, beforeDate, afterDate, reports}`, or null while * the event layer is off. Each entry of `refs` holds one control's - * `textContent`, `hidden`, `disabled`, `value` and `attributes`. + * `textContent`, `hidden`, `disabled`, `value` and `attributes`; the + * cinematic button's also holds `pressed`. */ const panel = shallowRef(null); diff --git a/src/ui/stores/entityCard.js b/src/ui/stores/entityCard.js index a0186fea2c..9fd63cdb3e 100644 --- a/src/ui/stores/entityCard.js +++ b/src/ui/stores/entityCard.js @@ -93,6 +93,26 @@ export const useEntityCardStore = defineStore('gev-entity-card', () => { const lost = ref(false); /** Bumped on each refresh, so ages shown on the card tick. */ const tick = ref(0); + /** + * True while the item is not to be seen: out of its feed, off screen or + * behind the globe. The card then offers to find it. + */ + const away = ref(false); + /** + * Finding the item again (see locate): `'idle'`, `'finding'` while its + * layer looks it up, or `'none'` when it has no reading at the time. + */ + const finding = ref('idle'); + /** + * Where an item out of its feed was found (see locate): + * `{lat, lon, altitudeM, observedAtMs, atMs}`, or null. + */ + const located = shallowRef(null); + /** The track reference of the card's item, kept for when it leaves its feed. */ + let reference = null; + let locating = null; + /** An aircraft found again is followed once it is back in its feed. */ + let followWhenBack = false; /** * What the camera shows, for the panel to describe when nothing is picked: * `{center: {lat, lon}, rect: {west, south, east, north}, heightM}`. @@ -229,12 +249,105 @@ export const useEntityCardStore = defineStore('gev-entity-card', () => { // Keep showing the last reading when the item drops out of its feed. if (!next || next.key !== current.key || next.basis !== 'record') { lost.value = current.basis === 'record'; + away.value = lost.value || !shown(current); tick.value++; return; } + const wasLost = lost.value; card.value = markRaw(next); lost.value = false; + // The camera follows it where it is drawn, which can be ahead of its last + // reading; one being followed is always in view. + away.value = !isFollowing() && !shown(next); tick.value++; + if (wasLost) back(next); + } + + /** Whether the camera shows the item; true when the shell cannot tell. */ + function shown(current) { + const test = shell.value?.onScreen; + return typeof test === 'function' ? test(current) !== false : true; + } + + /** + * The item is back in its feed: its layer selects it again, as the click + * that picked it did, and an aircraft just found is followed. + */ + function back(current) { + const follows = followWhenBack; + // A lookup still running is no longer needed: the feed has it. + stopLocating(); + reference = + layerOf(current.layerId)?.referenceOf?.(current.identity?.id) ?? + reference; + shell.value?.reselect?.(current, { follow: follows }); + } + + const layerOf = (layerId) => + shell.value?.dataManager?.()?.layers?.get?.(layerId)?.module ?? null; + + /** + * Take the camera back to the item. One the camera can see or one still in + * its feed is flown to (an aircraft followed); one out of its feed is + * looked up at the layer's time (the world clock's while it follows the + * clock) on its own track, shown there and flown to, and its layer picks + * it up again once its feed has it. + * @returns {Promise} + */ + async function locate() { + const current = card.value; + if (!current) return; + if (!lost.value) { + if (canFollow()) follow(); + else flyTo(); + return; + } + const layer = layerOf(current.layerId); + if (typeof layer?.locate !== 'function') { + flyTo(); + return; + } + locating?.abort(); + const controller = new AbortController(); + locating = controller; + finding.value = 'finding'; + let result; + try { + result = await layer.locate(current.identity?.id, { + reference, + signal: controller.signal, + }); + } catch { + result = { status: 'none' }; + } + if (locating !== controller) return; + locating = null; + const now = card.value; + if (!now || now.key !== current.key) return; + if (result?.status !== 'found') { + finding.value = 'none'; + return; + } + finding.value = 'idle'; + located.value = markRaw({ ...result }); + card.value = markRaw({ + ...now, + lat: result.lat, + lon: result.lon, + altitudeM: Number.isFinite(result.altitudeM) + ? result.altitudeM + : now.altitudeM, + }); + followWhenBack = canFollow(); + shell.value?.flyTo?.(card.value); + } + + function stopLocating() { + locating?.abort(); + locating = null; + finding.value = 'idle'; + located.value = null; + followWhenBack = false; } /** @@ -261,6 +374,11 @@ export const useEntityCardStore = defineStore('gev-entity-card', () => { */ function select(identity, { fly = false, follow: autoFollow = true } = {}) { if (!read(identity)) return false; + stopLocating(); + away.value = false; + reference = + layerOf(identity.layerId)?.referenceOf?.(card.value?.identity?.id) ?? + null; clearInterval(timer); timer = setInterval(refresh, REFRESH_MS); shell.value?.openPanel?.(); @@ -292,6 +410,9 @@ export const useEntityCardStore = defineStore('gev-entity-card', () => { timer = null; card.value = null; lost.value = false; + away.value = false; + reference = null; + stopLocating(); } const flyTo = () => card.value && shell.value?.flyTo?.(card.value); @@ -324,6 +445,10 @@ export const useEntityCardStore = defineStore('gev-entity-card', () => { card, lost, tick, + away, + finding, + located, + locate, connect, select, clear, diff --git a/src/ui/stores/entityCardLocate.test.mjs b/src/ui/stores/entityCardLocate.test.mjs new file mode 100644 index 0000000000..3200bb316e --- /dev/null +++ b/src/ui/stores/entityCardLocate.test.mjs @@ -0,0 +1,154 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { createPinia } from 'pinia'; +import { useEntityCardStore } from './entityCard.js'; + +/** + * A vessels layer whose one vessel can leave its feed, and a shell that + * records what the card asks of it. + */ +function setup({ found = true } = {}) { + const vessel = { + id: 'v1', + name: 'ARCADIA', + lat: 1, + lon: 10, + reference: 'vessel:v1', + }; + let inFeed = true; + const asked = []; + const module = { + getAnalystRecords: () => (inFeed ? [{ ...vessel }] : []), + referenceOf: (id) => (id === 'v1' && inFeed ? vessel.reference : null), + async locate(id, { reference }) { + asked.push({ id, reference }); + return found + ? { + status: 'found', + lat: 5, + lon: 50, + altitudeM: null, + observedAtMs: 1_000, + atMs: 61_000, + } + : { status: 'none' }; + }, + }; + const dataManager = { + isEnabled: () => true, + layers: new Map([['ais-live-vessels', { module }]]), + getAll: () => [], + }; + const shell = { + flown: [], + followed: [], + reselected: [], + visible: true, + dataManager: () => dataManager, + openPanel() {}, + flyTo(card) { + shell.flown.push([card.lat, card.lon]); + }, + follow(card) { + shell.followed.push(card.key); + }, + reselect(card, options) { + shell.reselected.push([card.identity.id, options.follow]); + }, + onScreen: () => shell.visible, + canFollow: () => false, + }; + const store = useEntityCardStore(createPinia()); + store.connect(shell); + return { + store, + shell, + asked, + leave: () => (inFeed = false), + come: () => (inFeed = true), + }; +} + +test('a vessel out of its feed is looked up, shown where it was and flown to', async (t) => { + const { store, shell, asked, leave, come } = setup(); + t.after(() => store.clear()); + assert.equal(store.select({ layerId: 'ais-live-vessels', id: 'v1' }), true); + assert.equal(store.away, false, 'on screen and in its feed'); + + leave(); + store.refresh(); + assert.equal(store.lost, true); + assert.equal(store.away, true, 'out of its feed: the card offers to find it'); + + await store.locate(); + assert.deepEqual( + asked, + [{ id: 'v1', reference: 'vessel:v1' }], + 'by the reference it had', + ); + assert.equal(store.card.lat, 5); + assert.equal(store.card.lon, 50); + assert.deepEqual(shell.flown, [[5, 50]]); + assert.equal(store.located.observedAtMs, 1_000); + assert.equal(store.finding, 'idle'); + + come(); + store.refresh(); + assert.equal(store.lost, false, 'back in its feed'); + assert.equal(store.located, null); + assert.deepEqual( + shell.reselected, + [['v1', false]], + 'its layer selects it again', + ); +}); + +test('a vessel with no reading at the time says so and stays put', async (t) => { + const { store, shell, leave } = setup({ found: false }); + t.after(() => store.clear()); + store.select({ layerId: 'ais-live-vessels', id: 'v1' }); + leave(); + store.refresh(); + await store.locate(); + assert.equal(store.finding, 'none'); + assert.deepEqual(shell.flown, [], 'the camera stays'); + assert.equal(store.card.lat, 1, 'the card keeps its last reading'); +}); + +test('an item in its feed but off screen is flown to without a lookup', async (t) => { + const { store, shell, asked } = setup(); + t.after(() => store.clear()); + store.select({ layerId: 'ais-live-vessels', id: 'v1' }); + shell.visible = false; + store.refresh(); + assert.equal(store.away, true, 'off screen'); + await store.locate(); + assert.deepEqual(asked, []); + assert.deepEqual(shell.flown, [[1, 10]]); +}); + +test('an item the camera follows is never away, wherever its last reading is', (t) => { + const { store, shell } = setup(); + t.after(() => store.clear()); + store.select({ layerId: 'ais-live-vessels', id: 'v1' }); + shell.visible = false; + store.following = store.card.key; + store.refresh(); + assert.equal(store.away, false); +}); + +test('a lookup still running when the item comes back is dropped', async (t) => { + const { store, shell, leave, come } = setup(); + t.after(() => store.clear()); + store.select({ layerId: 'ais-live-vessels', id: 'v1' }); + leave(); + store.refresh(); + const pending = store.locate(); + come(); + store.refresh(); + await pending; + assert.equal(store.lost, false); + assert.equal(store.located, null, 'no old reading on a live card'); + assert.equal(store.card.lat, 1, 'the card keeps its live position'); + assert.deepEqual(shell.flown, [], 'the camera stays'); +}); diff --git a/src/ui/stores/streetLevelPhoto.js b/src/ui/stores/streetLevelPhoto.js new file mode 100644 index 0000000000..b9498452b3 --- /dev/null +++ b/src/ui/stores/streetLevelPhoto.js @@ -0,0 +1,29 @@ +import { defineStore } from 'pinia'; +import { markRaw, shallowRef } from 'vue'; + +/** + * The Street Level photo viewer (KartaView, Panoramax) as its view renders + * it. The street-level layer presents it through `subscribePhotoViewer()` + * and the application shell publishes each presentation here. + */ +export const useStreetLevelPhotoStore = defineStore( + 'gev-street-level-photo', + () => { + /** + * `{host, mountKey, providerId, label, alt, kind, src, fit, canvasKey, + * dragging, prevLabel, prevDisabled, nextLabel, nextDisabled, actions}`, + * or null while no photo viewer is mounted. Of the viewers mounting in + * the host, only the one mounted last (the largest `mountKey`) is + * published; `actions.supersede()` tells the others they are not drawn + * (see `ViewerAdapter.subscribeView` in src/layers/streetLevel/registry.js). + */ + const photo = shallowRef(null); + + /** @param {?object} next A fresh presentation; every publish re-renders. */ + function publish(next) { + photo.value = next && markRaw(next); + } + + return { photo, publish }; + }, +); diff --git a/src/ui/styles/entity-card.css b/src/ui/styles/entity-card.css index 223acca6e2..4d4a9d01c9 100644 --- a/src/ui/styles/entity-card.css +++ b/src/ui/styles/entity-card.css @@ -104,6 +104,33 @@ font-size: 1rem; } +/* Find it: shown while the selected item is off screen or out of its feed. */ +.entity-card__find { + display: grid; + flex: none; + place-items: center; + width: 1.9rem; + height: 1.9rem; + color: #36dcff; + background: rgba(29, 69, 81, 0.35); + border: 1px solid rgba(48, 194, 224, 0.55); + border-radius: 7px; +} + +.entity-card__find:hover, +.entity-card__find:focus-visible { + color: #fff; + background: rgba(48, 194, 224, 0.3); +} + +.entity-card__find:disabled { + opacity: 0.55; +} + +.entity-card__find .material-symbols-outlined { + font-size: 1.1rem; +} + .entity-card__title { margin: 0.55rem 0 0.1rem; overflow-wrap: anywhere; @@ -2180,7 +2207,11 @@ border-radius: 3px; } -.entity-hero:is([data-hero='flight'], [data-hero='satellite'], [data-hero='photo']) { +.entity-hero:is( + [data-hero='flight'], + [data-hero='satellite'], + [data-hero='photo'] +) { height: 168px; background: radial-gradient( ellipse 55% 60% at 50% 55%, diff --git a/src/ui/styles/omnibar-dock.css b/src/ui/styles/omnibar-dock.css index e9faafcdb2..6df613977f 100644 --- a/src/ui/styles/omnibar-dock.css +++ b/src/ui/styles/omnibar-dock.css @@ -8,11 +8,15 @@ body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( /* Clear of the attribution line under it, however many lines it wraps onto (--credit-line-height, src/ui/creditLineHeight.js). */ --omnibar-credits-clear: calc(1rem + var(--credit-line-height, 28px) + 6px); - /* The dock, and the World Timeline and narrow corners placed from it, + /* The World Timeline, and the dock and narrow corners placed from it, rise over a line wrapped taller than its usual one or two lines. */ --omnibar-dock-bottom: max(74px, calc(var(--omnibar-credits-clear) + 2px)); + /* The dock sits above the World Timeline, rising by its height + (--world-timeline-lift, world-timeline.css) as the plain dock does. */ + --omnibar-dock-raised: calc( + var(--omnibar-dock-bottom) + var(--world-timeline-lift, 0px) + ); --omnibar-coordinates-bottom: max(4.25rem, var(--omnibar-credits-clear)); - --world-timeline-lift: 0px; #intel-hud:is([data-variant='tactical'], [data-variant='minimal']) :is(.hud-top-left, .hud-top-right) { @@ -32,23 +36,14 @@ body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( } #world-timeline { - bottom: calc(var(--omnibar-dock-bottom) + 66px); + bottom: var(--omnibar-dock-bottom); width: var(--omnibar-dock-width); } - &:has(#gev-chat-panel:not([hidden]), #gev-voice-panel:not([hidden])) - #world-timeline, - &:has(#gev-omnibar.has-results):not( - :has(#gev-voice-control[data-assistant-mode='voice']) - ) - #world-timeline { - visibility: hidden; - } - #command-dock { --dock-voice-width: var(--omnibar-dock-width); top: auto; - bottom: var(--omnibar-dock-bottom); + bottom: var(--omnibar-dock-raised); z-index: 149; width: var(--omnibar-dock-width); max-width: none; @@ -197,7 +192,7 @@ body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( #gev-omnibar { top: auto; - bottom: calc(var(--omnibar-dock-bottom) + 11px); + bottom: calc(var(--omnibar-dock-raised) + 11px); left: 50%; width: calc(var(--omnibar-dock-width) - 120px); transform: translateX(-50%); @@ -235,7 +230,7 @@ body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( bottom: calc(100% + 11px); max-height: min( 360px, - max(0px, calc(100dvh - var(--omnibar-dock-bottom) - 144px)) + max(0px, calc(100dvh - var(--omnibar-dock-raised) - 144px)) ); overflow: auto; border-radius: 18px 18px 0 0; @@ -365,16 +360,9 @@ body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( rise above the dock. */ @media (max-width: 1119px) { --omnibar-coordinates-bottom: max( - calc(var(--omnibar-dock-bottom) + 56px + 10px), + calc(var(--omnibar-dock-raised) + 56px + 10px), var(--omnibar-credits-clear) ); - /* And above the World Timeline (42px tall) over the dock. */ - &:has(#world-timeline) { - --omnibar-coordinates-bottom: max( - calc(var(--omnibar-dock-bottom) + 66px + 42px + 10px), - var(--omnibar-credits-clear) - ); - } #intel-hud[data-variant='tactical'] .hud-bottom-right, &:where(html[dir='rtl'] *):not(.context-docked) #intel-hud[data-variant='tactical'] diff --git a/src/ui/views/LayerPanelsView.vue b/src/ui/views/LayerPanelsView.vue index f19e24a4db..63826a0b84 100644 --- a/src/ui/views/LayerPanelsView.vue +++ b/src/ui/views/LayerPanelsView.vue @@ -12,6 +12,7 @@ import SceneOptions from './SceneOptions.vue'; import SceneShotList from './SceneShotList.vue'; import CctvPanel from './panels/CctvPanel.vue'; import StreetLevelPanel from './panels/StreetLevelPanel.vue'; +import StreetLevelPhotoViewer from './panels/StreetLevelPhotoViewer.vue'; import DrawControls from './panels/DrawControls.vue'; import GeoImport from './panels/GeoImport.vue'; import UiSelect from '../kit/UiSelect.js'; @@ -71,6 +72,7 @@ async function importChosen(event) { + diff --git a/src/ui/views/ProviderSettingsView.vue b/src/ui/views/ProviderSettingsView.vue index f6862c266e..e11341ef06 100644 --- a/src/ui/views/ProviderSettingsView.vue +++ b/src/ui/views/ProviderSettingsView.vue @@ -8,7 +8,9 @@ import { vStatusText } from '../rail/statusText.js'; import { useLocaleStore } from '../stores/locale.js'; import { useProviderSettingsStore } from '../stores/providerSettings.js'; import LocalePicker from './panels/LocalePicker.vue'; +import UiButton from '../kit/UiButton.vue'; import UiCloseButton from '../kit/UiCloseButton.vue'; +import UiIcon from '../kit/UiIcon.vue'; const { picker } = storeToRefs(useLocaleStore()); // The key setup owner (src/keySetup.js) presents the chip, the dialog and its @@ -39,10 +41,10 @@ const removeTitle = (title) =>
- +
diff --git a/src/ui/views/panels/ChatPanel.vue b/src/ui/views/panels/ChatPanel.vue index 66ef87b1e2..5ce50a460f 100644 --- a/src/ui/views/panels/ChatPanel.vue +++ b/src/ui/views/panels/ChatPanel.vue @@ -5,6 +5,8 @@ import { t } from '../../../i18n/index.js'; import { useVoiceStore } from '../../stores/voice.js'; import { ASSISTANT_NAME } from '../../../voice/control.js'; import PanelLayoutButtons from './PanelLayoutButtons.vue'; +import UiButton from '../../kit/UiButton.vue'; +import UiIcon from '../../kit/UiIcon.vue'; import UiCloseButton from '../../kit/UiCloseButton.vue'; import UiSelect from '../../kit/UiSelect.js'; @@ -67,7 +69,7 @@ const quickPrompts = () => [t('Fly to Tokyo'), t('Show live flights')];
{{ t('GEV CHAT') }}

{{ t('Ask about the map. Tell it where to go.') }}

- +
@@ -76,7 +78,7 @@ const quickPrompts = () => [t('Fly to Tokyo'), t('Show live flights')];

{{ t('Explore with a question') }}

{{ t('Find a place, explore live data, or change your view.') }}

- + {{ prompt }}
{{ message.role === 'user' ? t('YOU') : ASSISTANT_NAME }}{{ message.text }} @@ -86,7 +88,7 @@ const quickPrompts = () => [t('Fly to Tokyo'), t('Show live flights')];

{{ props.view.chat.authNote }}

- + {{ item.name }} ×
@@ -95,27 +97,27 @@ const quickPrompts = () => [t('Fly to Tokyo'), t('Show live flights')]; - + {{ t('Attach layer') }}
- + {{ t('Attach a file') }}

{{ t('TXT, Markdown, CSV, JSON or GeoJSON · up to 10 KB in total. Attachments are sent to your AI provider with your message.') }}

{{ group.label }} - + {{ command }}
- - + + - +
diff --git a/src/ui/views/panels/DrawControls.vue b/src/ui/views/panels/DrawControls.vue index bcb8a5bcac..7cc76ccfdb 100644 --- a/src/ui/views/panels/DrawControls.vue +++ b/src/ui/views/panels/DrawControls.vue @@ -3,6 +3,7 @@ import { storeToRefs } from 'pinia'; import { computed } from 'vue'; import { t } from '../../../i18n/index.js'; import UiButton from '../../kit/UiButton.vue'; +import UiIcon from '../../kit/UiIcon.vue'; import UiSegmented from '../../kit/UiSegmented.vue'; import { useDisplayStore } from '../../stores/display.js'; import DrawMarkList from './DrawMarkList.vue'; @@ -27,7 +28,7 @@ const shapeOptions = computed(() => [