An interactive overlay entry is a card that takes every click from what is
drawn under it, so a base's label kept an aircraft or vessel under it from
being selected. The labels are no longer interactive entries. The layer
claims a click on a label box through the pick registry's click claim, as
CCTV counts do, only where nothing another layer draws is under it; over
the map or the layer's own dots and fills the label takes it, and another
layer's card painted over the label keeps its click. The label box is read
from the box the overlay painted for it (overlayHost.paintRect).
Conflicts: the locale catalogs and package boundaries are three-way merges
(no message changed differently on both sides); zh-Hant is regenerated
from zh-CN. bhoteKoshiEmbeddedMedia.js keeps main's card counter and the
branch's shared YouTube loader (youtubeApi.js), so the media file builds
one script element fewer. The Cockpit briefing's LIVE tab and the orbital
NADIR/RESET button are main's UiButton.
The picker no longer keeps a hidden, disabled copy of the opening camera.
That copy could be re-picked with ArrowDown on a closed list, could show
twice in the iOS picker, and left Firefox without an accessible value.
The list now selects the camera's own option, as before. A native list
sends no change for the option it already shows, so FOCUS (or NEAREST,
when that camera is the nearest) keeps the shown camera. Closing the list
without a choice keeps automatic selection.
While a user pick kept first claim on the slot of an empty automatic
day, a click or an arrow key onto a card already confirmed empty dropped
that pick but left the hand-over waiting for the next probe result. Until
then the map stayed blank and the Esri lease stayed held, where main
showed the next ranked day.
focus() and preview() now hand the slot over at once when no pick is
left. An arrow key onto an empty card no longer follows that day, as a
click already did, so focus stays on the card the user chose.
The previous change skipped the hand-over for good while a user pick was
pending. When that pick then probed empty, failed with a terminal error,
or lost its source, nothing previewed and the slot stayed blank, where
main would have draped the next ranked day. During the arrow-key
debounce the empty slot also handed the Esri lease back and took it
again 250 ms later.
The hand-over is now deferred: the pick keeps first claim on the slot
while its probe can still settle, and the next ranked day takes over as
soon as the pick turns out empty, errors or loses its source. Turning a
source off also drops a followed pick of that source. The layer keeps
the current basemap while a deferred pick waits, and Escape releases it.
Six tests cover both answer orders, the source toggle, a terminal error,
the debounce and the lease.
A grounded row with no altitude fell back to the aircraft's sticky
altitude, which straight after a landing is still the approach height.
Military contacts then hung there for as long as they stayed on the
ground (the grounded floor only ever raises a height); civil contacts
held it until the ground cell under them warmed, which for a contact far
from the viewer is never. The 3D model is ground-snapped on its own, so
the plane dropped when the model took over.
A grounded contact with no altitude now uses only an altitude it gave
on the ground, else the ground fallback. Labels, the tracked readout
and the follow distance read "On the ground" / no flight level instead
of the approach altitude.
An imagery spec and a raster shell take an optional `shows`, such as
'clouds' or 'radar'. Drawing never depends on it; a renderer may use it
to tell such a layer apart. The weather layer sets it for every product,
'clouds' for both cloud products.
esbuild compiles an optional method call reached through an optional chain
(`a?.b?.()`) in a parameter's default, for browsers it lowers optional
chaining for (Chrome and Edge before 91), into code that reads a variable out
of its scope. The weather shell's texture limit was read that way, so every
satellite frame threw a ReferenceError in the built app and the layer showed
"Weather imagery unavailable"; the leader and card reveal took their default
time the same way. A test now refuses the form anywhere under src/.
A canvas the panorama moved off (a second view drew its own) is no longer
ignored for good: its draws are counted, so an open waiting on one goes on,
and once a single view is left its canvas is taken back. Before, after the
second view left, the next 360° open waited forever and the panorama stayed
on the departed view's canvas.
A mount whose view unmounts it inside its first draw now fails as closed,
as every other unmounted mount does, rather than with a TypeError.
Both found in review; each new test fails without its fix.
Co-authored-by: Manjunath Paparaju <[email protected]>
Second review follow-ups:
- A mount woken without being drawn unmounts only its own presentation:
an earlier mount overtaken by a second mount of the same viewer fails
as closed and leaves the second one mounted and presented.
- A mount whose last view left fails only if no view has subscribed
since; one subscribed in the same tick draws it.
- Mount keys come from photoViewers.js's nextViewKey(), and a keyless
presentation is stamped from the same counter when any picker first
sees it, kept until it presents null: its rank no longer depends on the
picker's lifetime or the order it subscribes in.
- A canvas handed back while a panorama's open waits on its draw takes
the panorama: the open builds its renderer there instead of falling
back to the front view. A canvas the panorama moved off is not moved
back to, so two views drawing their own cannot take it in turns.
- The guard test also refuses compound writes (+=, ||=, ??=, &&=…),
destructuring writes to properties, Object.assign (other than onto a
new Error), Object.defineProperty and Reflect.set, and a catch binding
that shadows loadImage's image.
Nothing changes in the running app.
Co-authored-by: Manjunath Paparaju <[email protected]>
Review follow-ups to the previous commit:
- photoViewers.js ranks a presentation without a mountKey as mounted when
it began presenting (after the latest key seen, before any later mount),
so a photo viewer mounting while a keyless one shows is drawn and the
keyless one superseded; supersede is queued whenever more than one
presents after any change, not only when the pick changes.
- A panorama's open still waiting on a draw when the last view leaves
fails as closed and leaves no photo shown, instead of uploading to a
canvas never drawn. A mount waiting on its first draw then also fails as
closed and is unmounted, so a view subscribing later sees nothing.
- A view handing back another canvas element than the renderer's drops
the renderer and draws the panorama again on the new one, as after a
lost context.
- The guard test allows a .src write in loadImage only on the one `image`
binding, created by new Image() and never rebound or shadowed, and
refuses `(expr).src =` and bracket property writes anywhere.
- The test fakes' shared view is reset before each test
(resetPhotoView), so a viewer left by an earlier test is neither drawn
with nor superseded by a later test's.
Nothing changes in the running app.
Co-authored-by: Manjunath Paparaju <[email protected]>
Follow-ups to the photo viewer's move to a Vue view (#1868):
- A panorama's open waits for a draw of the canvas counted from before it
is shown, so a view that draws at once inside its listener no longer
leaves the open pending; and when the last view unsubscribes, an open
waiting on a draw goes on instead of hanging.
- photoViewers.js supersedes the mounts not drawn on a microtask, after
the winning presentation has reached every subscriber: a second
subscriber sees the earlier mount, then the later one, never null
between.
- A presentation without a mountKey counts as the latest mount (among
several without, the one that began presenting last), and one without
actions or supersede is passed over without throwing. Both fields are
documented on ViewerAdapter.subscribeView in registry.js and in the
store's comment.
- The guard test also refuses .width, .height, .ariaLabel, .id and .value
writes in photoViewer.js, and .src writes outside loadImage, where only
the off-page Image it creates may take one.
- The test fakes draw every viewer through one shared view behind
photoViewers.js's picker, as the application does, so provider and
layer tests see supersede.
Nothing changes in the running app.
Co-authored-by: Manjunath Paparaju <[email protected]>
While a selected vessel, aircraft or military aircraft is off screen, behind
the globe or out of its layer's feed, its Context card shows Find it. One
still in its feed is flown to (an aircraft followed). One out of its feed is
looked up on its own track at the layer's time (the world clock's while the
layer follows it), the card moves to that reading and says how old it is, and
the camera flies there; once the feed has it again its layer selects it again.
With no reading at or before the time the card says so and the camera stays.
A vessel its layer announces is named by its own id, as a click names it,
not by the context store's.
- The flight after a count click checks the frame on both axes and at the
height of the highest mount, so a group on a slope or in a very wide
window stays in view; when it cannot, it flies to the nearest cell with
two or more cameras, never to a lone camera that joined the count.
- A count takes a click over a background fill no layer owns (earthquake
discs, fire perimeters), and still yields to a scene item another layer
registered.
- A count crossing the HUD edge refreshes the view only when the active
icon or a lone camera depends on it, and never mid-motion, so panning no
longer runs extra full view passes.
- A count restored at the HUD edge keeps the lone cameras its outline
covers, and leaves the others as icons.
Fixes from review of the move to StreetLevelPhotoViewer:
- Each mount and each panorama canvas now takes a key no viewer reuses,
and the view keys its root by the mount. Before, switching KartaView and
Panoramax in one tick let Vue patch the old viewer's canvas, whose
destroyed renderer had lost its context, into the new one, so 360°
photos fell back to their front view.
- Of the viewers mounting in the host, the view draws the one mounted
last, by mount key (photoViewers.js, which subscribePhotoViewer() now
uses), whatever order they present in. A viewer still mounting when a
later one is drawn is superseded: it unmounts and its mount fails as
closed, rather than staying pending and being drawn once the later one
goes.
- A panorama's first image is uploaded once the view has drawn its canvas
shown (the view hands the canvas back on every draw), so it is never
sized into a hidden canvas.
- The tests' fake view now draws as Vue does: once per tick with the final
value, keeping elements while their keys are unchanged and handing every
element back on each draw. StreetLevelPhotoViewer.test.mjs covers the
switch in one tick and the overtaken mount with the real view.
- The guard test's check that the photo viewer writes no DOM covers
inserting, moving, removing and replacing elements, attributes, classes,
styles and the hidden, disabled and text properties.
Co-authored-by: Manjunath Paparaju <[email protected]>
The photo viewer KartaView and Panoramax share (photoViewer.js) no longer
builds its root, picture, panorama canvas and ‹ › buttons in script. It
presents them through subscribeView(), which the street-level layer
gathers in subscribePhotoViewer(); the application shell publishes that
to the gev-street-level-photo store, and StreetLevelPhotoViewer, beside
the Street Level panel in the layer panels, teleports the viewer into the
viewer host with the same classes, data attributes, labels and order. Its
‹ and › are ghost UiButtons. The view forwards keys, pointers, wheel, the
step clicks and a lost WebGL context to the viewer and hands each element
back: the canvas the panorama is drawn on (a fresh, keyed one after a lost
context, which an open now waits for), and the frame, picture, root and
buttons the viewer measures and keeps focus with. The viewer keeps every
decision: loading, upgrades, size limits, keys, drag, pinch, zoom, Esc on
the viewer's box and focus when a step button disables. The street-level
layer still needs no Vue; with no view subscribed these photos cannot
mount, which docs/VUE-MIGRATION.md records.
The provider and viewer tests draw the viewer with a fake view in
kartaViewFakes.mjs; StreetLevelPhotoViewer.test.mjs runs the real view on
a page, and streetLevelPhotoControls.test.mjs pins the kit controls. The
panel page's lost-graphics notice in globePanelRuntime.js stays built in
script, as the document now says.
Co-authored-by: Manjunath Paparaju <[email protected]>
The picker preselected the active camera, and a native select fires no
change for the option it already shows. So while CCTV was still following
the view, choosing the camera the picker showed did nothing, and the next
pan switched to another camera.
The layer now reports whether the active camera is the opening one
(activeCameraProvisional). While it is, the picker shows that camera from
a hidden, disabled first option, so choosing it from the list is a change
and ends automatic selection; closing the list keeps it. A same-camera
pick that ends the opening pick notifies listeners so the picker drops the
hidden option, and reopenNearestCamera passes { opening: true } so its own
notification already carries the opening state.
docs/CURRENT-STATE.md now says when automatic selection ends. Tests cover
the hidden option, confirming and dismissing the picker before a pan, the
notification, and focusNearestToPoint, which is now on main.
A card click on an unprobed day follows that day while the automatic
preview stays on the map. If the automatic day then probed empty, the
hand-over to the next ranked day overwrote that follow, so neither the
picked day nor the successor draped when their probes came back
present. The hand-over now leaves the slot to a day the user picked that
is still being probed or waiting out the arrow-key debounce.
Also covers the off-screen successor with empty days shown: once the
visible days probe empty, the successor's probe is queued (the re-request
that came with the merge from main) and the day drapes when present.
- The Cockpit's orbital view counts a site's own label as its own, not
another layer's card, so clicking it focuses the site again; the test
now sets the overlay hit test the way the world overlay does.
- The ISS Sun position under the station is "Underneath", with its own
translations; "Below" stays the ground under a satellite.
- OpenCC turns 问天后侧 into 問天后側 ("empress"); a correction makes it 後.
- The changelog says a label takes the click from a vehicle drawn under it.
Conflicts: the locale catalogs, package boundaries and format scope are
three-way merges (entries main removed, such as displayPanelScroll.js,
stay removed); applicationShell.js and ContextView.vue keep main's Space
Missions panel and the STATION and LIVE wiring, moved back into
_initGlobalContextPanel; installations take main's feedback module, and
their label box joins main's card-on-top click rule; ports.test.mjs lists
modelParts and modelNodes; CURRENT-STATE.md keeps both edits.
zh-Hant is regenerated from zh-CN, as main now requires. "Below" keeps
main's translations.
The fallback keeps the catalog position but takes heading, field of view
and pitch from the request again, as before, clamped as before. A catalog
camera with no pose (every world-cameras row on main) otherwise asked
Google for heading 0, pitch 0, FOV 80 while the browser draws it at the
id-hash heading, pitch -17 and FOV 74, and a calibrated camera lost its
calibration. Cost and the per-IP budget are unchanged.
- The Street View budget is built per proxy, so tests no longer depend on
GEV_RATELIMIT_GOOGLE_PER_MIN in the shell; the fixture pins it.
- New tests: a pose-less catalog camera, and the per-IP budget (no call
without a key, the cap, a separate budget per address).
- The client no longer sends lat/lon on /frame.
- CURRENT-STATE, the changelog fragment and SECURITY.md say the fallback
has its own per-client limit, and that unlisted (seed) cameras get the
placeholder.
Each Tarktee DATEX feed now reads its body as soon as its headers arrive, so a
failed or oversized body aborts the other request at once instead of waiting
for its headers up to the shared 30 s deadline. Status and redirect errors
name the feed again.
Ontario failures log the error class and system code, never the key-bearing
URL or upstream text. DATA_SOURCES.md and the camera licence field use the
Open Government Licence – Ontario statement the credit shows, and a test pins
that credit.
The focus-release rendering test now uses main's icon renderer and its
isVideoFeedCamera contract. The Tarktee cancellation tests disable the 30 s
deadline and time out after 2 s, so a regression fails fast instead of passing
late or hanging; a duplicated older test and an unused import are gone.
This PR's notes move into changelog.d/1266-cctv-shared-fix-batch.md: the 1133
fragment described main's tracking probe and terrain check, not this branch.
- Name the G3 record "AutoVu SharpV G3" and the SharpX record "XGA", so a
bare SharpV or SharpX tag shows no specs without a separate wrapper.
- Reuse the CCTV layer's Bosch MIC-7522-Z30 record instead of a copy.
- Drop the brand from the SPEC line when the equipment line already names
it, so long lines fit the card; pass the summary to entity properties.
- Fall back to the OSM `brand` tag when `manufacturer` is missing.
- Reject non-string or overlong model/manufacturer values before matching.
- Remove the unused `brandAliases` parameter; shorten JSDoc and comments.
- Cover the tile `model` path and the megapixel summary in tests; fold
duplicate tests into existing ones.
- Docs and changelog: the default hourly extract has no `model`; any
source that supplies it shows the SPEC line.
Main released #1228 and #1233 and deleted their changelog fragments, so they
stay deleted here. Main also rewrote the tracking arrival probe in
scripts/track-regression.mjs, which supersedes this branch's version; main's
file is kept unchanged.
- A count click stands aside when an overlay label or another layer's card
already took the click, and CCTV now claims a count click in the shared
pick registry, so the flights layer no longer reads it as an empty-map
click and keeps tracking its aircraft.
- The flight to a group halves the distance only while the group stays in
frame; otherwise it flies to the nearest ground cell of the group, so a
tilted click no longer ends with no camera on screen.
- Counts hidden under the HUD no longer push the active icon aside, and a
lone camera that would move a merged count under the HUD leaves the
original count and its icon as they were.
- Cameras on one mount are spread before counts merge, so a spread icon no
longer slides under a neighbouring count.
- The ground module comment says how a camera without a batch height takes
the drawn terrain.
The test's camera and rendering doubles now carry what focusing a mission
uses, so without the cockpit guard the test fails on the camera flight
rather than on a missing double.
Co-authored-by: Manjunath Paparaju <[email protected]>
Focusing a mission does nothing in the cockpit, so the layer row's arrows
select the next mission without moving the camera, as its label and dot
already do.
Co-authored-by: Manjunath Paparaju <[email protected]>
The cockpit holds the camera: the mission dot, like its label, selects the
mission there without flying to it, and a mission picked in the cockpit is
not flown to when the active satellite lookup returns.
Co-authored-by: Manjunath Paparaju <[email protected]>
Under the card-on-top rule a mission label is the card on top for the
cockpit too, so the label no longer steps aside there: it selects its
mission without moving the camera the cockpit holds. Tests and docs no
longer claim a covered click reaches what lies under the label, and the
busy-restore note says an explicit Satellites action lets the saved state
go.
Co-authored-by: Manjunath Paparaju <[email protected]>
Main's single click rule (the card or label on top takes the click, read
once per click through clickCard and isUnderOtherCard in
src/data/pickRegistry.js) covers a click on a Space Missions label: a
mission marker label is an interactive world-overlay entry, so the
host's hit test names it as the card on top for every other layer. The
per-layer label guards in CCTV, Drone Airspace, FIRMS, Ghost Maps, News,
Perimeters, Shipwrecks, Vessels, Wildlife Sightings, ALPR, Local ADS-B
and the cockpit orbital focus are dropped for main's versions.
The mission-label tests are kept on main's API: fakeInputUnderLabel now
also names the label as the card on top, and each test shows a click on
the label never acts on the card, camera, vessel, fire, reader, aircraft
or report under it, and leaves the selection as it is. A launches test
checks that a mission label is interactive and is the card on top for
every other layer. Docs, changelog and the dispatcher's `overlay` note
describe the merged behaviour.
Co-authored-by: Manjunath Paparaju <[email protected]>
Resolves conflicts with main: a world focus target's own range past its
framed radius replaces the kind's range (#1832), so a quake asks for its
own range only past M6 and the earthquake framing stays its floor; FIRMS
keeps main's marker stand-in under the card-on-top rule; launches keep
main's label click and also read the card on top through the pick
registry.
Review fixes for #1781:
- One rule for cards: the world-overlay host hands its hit test to the
pick registry, and every click handler reads the topmost interactive
card or label once per click (`clickCard`, `isUnderOtherCard` in
src/data/pickRegistry.js), so all handlers agree in any listener order.
A layer whose own card or label is on top acts on it whatever is drawn
under it; a layer under another layer's card neither acts nor treats
the click as empty space (a tracked aircraft stays tracked, a selection
stays selected); Context names nothing under a card. A selected news
card over a vessel no longer opens the link and selects the vessel.
- With one rule, the per-owner arbitration options are no longer read
and are removed: `passive`, `expanded` and `declinesClick` pick owners,
`rememberClickPickActions`, `isActedOnByOtherLayer`, card backgrounds
and `cardKeepsClick`. The dispatcher is unchanged from main.
- A drag that ends on a quake disc, label or card does nothing; opening
the USGS page or clearing the selection needs a clean click.
- A click on the map under another layer's card opens no Street Level
ground image.
- A CCTV card that is going away is still not the scene under it.
- Docs and changelog describe the new rule.