Commit Graph
1129 Commits
Author SHA1 Message Date
Sameh Khamis 39c89d563b Draw transit vehicles as trolleybuses, cable cars, funiculars, gondolas and monorails
The transit layer knew five modes, so a trolleybus drew as a bus, a
funicular as a train and a coach as a city bus. The GTFS basic route types
are now modes of their own (trolleybus, cable_tram, monorail, funicular,
aerial_lift), each with an icon, colour, detection tier, card word, voice
name, speed ceiling and fleet model.

A vehicle record may carry its route's GTFS route_type as routeType. It
settles the mode after the feed's fleet hint and before its route hint, and
picks the finer model (a coach for 200, a high-speed set for 101) when the
type is a kind of the vehicle's mode. Retained history classifies epochs
through transitModeFor too, so trails join the live vehicle.

Route hints from each operator's routes.txt: Prague's trolleybus lines
(51-59, 232, 275) and Petrin funicular, and the trams, trolleybuses and
metro lines of Bucharest, Cluj-Napoca and Turin. A feed may also name
route corrections that outrank the route type: Le Havre's routes.txt types
its funicular (8-FUNI) as a bus, so it is corrected to a funicular.
2026-11-14 12:03:12 -08:00
Sameh Khamis 52507a0755 Draw no buoy for a virtual aid to navigation
A virtual aid (AIS message 21's VirtualAtoN flag) is a mark broadcast
where nothing physical stands, so drawing it as a buoy showed a mark
that is not there. The vessel source record now carries `virtual`
(false unless a source says true; any source may set it), AISStream
sets it from VirtualAtoN, and the vessel layer keeps such an aid's
disc: vesselModelSpec returns null for it and the layer gathers no
model item for it. Its card, selected card and readout add VIRTUAL
after its kind.
2026-11-14 11:07:13 -08:00
Sameh Khamis 6c7fe48f40 Show an aid to navigation's kind, not a speed or heading
A buoy's card, selected card and HUD readout showed "0.0KT · 135°" from
whatever its source reported. A fixed mark has neither, so they now show
its kind alone, whole ("CARDINAL MARK N", which the 14-character type cut
read as "CARDINAL MARK "), in the bone white of its disc.

isAidToNavigation now knows every kind an aid report names ("Light, with
sectors", "Fixed structure off shore" had no aid word), leaves out a
"Buoy Layer" as it does a tender, and matches each type text once: the
vessel layer asks per vessel on its rotation pass, which now skips the
aid discs it never turns.

Aid rows no longer cost ships their place: aisStreamRows lists every
vessel ahead of every aid, so the layer's 12,000-row request never drops
a ship for a buoy, and vessels_in_area (and the brief built on it)
counts ships only. An aid's name runs on into its NameExtension.
2026-11-14 10:02:59 -08:00
Sameh Khamis 866a9816f2 Merge origin/main into the renderer seam
Brings in main up to f24abfc88: cockpit subject providers, the render
failure notice, aircraft drawn in their own mesh colours, airport ground
vehicles, and an aircraft with no ground track facing its true heading.

Under the seam:
- The render failure notice lives in the Cesium adapter
  (src/render/cesium/renderFailure.js) and is the application hook
  renderFailureNotice({allowReload, store}); its private Cesium fields
  (Event's raise queue, the widget's render loop flag) are read through
  internals.js. The inline panel's timer waits while the frame port reports
  the loop stopped, and goes on after a Retry.
- Ordinary aircraft models draw white with the 'highlight' colour blend
  through the draw port; tracked and emergency colours tint the mesh.
- Held trains and transit vehicles hide their route set and markers through
  the draw port; the fleet model test fakes answer loads through the fake
  draw port instead of Cesium's glTF loader.
- The Cockpit's subject view follows and places the camera through the
  camera port.
2026-11-14 09:59:55 -08:00
Sameh Khamis 279aedb2f4 Draw aids to navigation as buoys
A buoy, beacon, RACON, light or IALA mark in the vessel feed was drawn
as a ship. A vessel record whose type names one, or whose MMSI is an
aid-to-navigation station's (99MIDxxxx), is now isAidToNavigation and
vesselModelSpec draws it as the fleet set's buoy of its mark (cardinal
N/E/S/W, port or starboard hand, safe water, isolated danger, special
mark; a red can when the type names no mark), at its built size and
flagged fixed so its model does not turn to a heading. Its icon is a
disc instead of a chevron.

AISStream now subscribes to AidsToNavigationReport by default, and the
server names each report's aid type code (0 to 31) as its kind instead
of reading it as a ship type.
2026-11-14 09:54:01 -08:00
Sameh Khamis b86014244d fix(input): no double-click follow or zoom on the map
The globe viewer's own double-click tracked a picked entity with a
position or zoomed to one without. Layers moving onto the draw port had it
re-created one by one (data/stockFollow.js); following is a click in GEV,
so the viewer's handler is removed where the viewer is made and every
re-creation goes: earthquakes, cyclones, air quality, news, perimeters,
drone airspace, ghost maps, places, radio, cables, CCTV, ALPR, launches,
bikeshare, Local ADS-B, installations, directions, trails, data packs,
annotations, the library's view and local GeoJSON. The Cockpit's own
double-click and the draw tool's finishing double-click stay.
2026-11-14 09:10:14 -08:00
Sameh Khamis e72de07dab fix(rail): the selected route splits at the train and keeps its dark rim, as before
Before, the route was one clamped polyline whose material coloured it
ahead of the train and dimmer behind it, split exactly where the train is,
with a dark rim at its edges. Through the draw port it became per-segment
colours chosen by each segment's midpoint (the split jumped from vertex to
vertex) and lost its rim.

The contract gains a draped line style `split`: `color` from `at` (a
fraction of its length) on, `behind` before it (`reverse`: the other way),
and an optional `rim` (the outer `widthFraction` of its width at `shade` of
each colour). `at`, `reverse` and the colours change in place. The Cesium
renderer draws it with one material; the rail route uses it, measuring its
split in metres on the ground (one per vertex where the scene draws over
the surface). New conformance check draw.lines.split.
2026-11-14 08:33:31 -08:00
Sameh Khamis a3611caddb Fix the Local ADS-B model test name 2026-11-14 08:25:05 -08:00
Sameh Khamis 4d81d3be3a Describe aircraft models in their mesh colours in the docs 2026-11-14 08:24:51 -08:00
Sameh Khamis 8cb096fc21 Draw aircraft models in their own mesh colours
Every aircraft model (Flights, Military Flights, Local ADS-B) mixed 94% of a
flat class colour over its mesh, so airliners drew as white silhouettes and
military ones as amber. Models now use HIGHLIGHT: white leaves the mesh's own
colours as built, and the tracked and emergency colours tint the mesh without
hiding its paint. The IR boost still draws them flat white.
2026-11-14 08:06:51 -08:00
Sameh Khamis 4f24b9a062 fix(wildlife): a tap selects only a sighting exactly under it again
A click read the scene's exact pick at the tap. Through the input
dispatcher it read the click's id, which on a touch screen comes from the
wider contact search: a tap near a sighting selected it, and one near
another layer's contact kept the selection. It reads the exact top hit
again, as the shipwrecks and Local ADS-B layers do.
2026-11-14 01:51:24 -08:00
Sameh Khamis cbc0c114eb fix(local-adsb): a tap selects only an aircraft exactly under it again
A click read the scene's exact pick and a drill at the tap. Through the
input dispatcher it read the click's id, which on a touch screen comes
from the wider contact search: a tap near a local aircraft selected it,
and one near another layer's contact kept the selection. It reads the
exact top hit again, as the shipwrecks layer does.
2026-11-14 01:49:17 -08:00
Sameh Khamis d2e161372c fix(vessels): the ship the Cockpit rides is no object in view again
In-view scanning skipped a vessel whose chevron was hidden and not drawn
as its model, which covered the ship the bridge camera rides. It now
skipped only vessels past the horizon, so the ridden ship was reported,
at the camera's own position. It is skipped again unless its model draws
it.
2026-11-14 01:46:41 -08:00
Sameh Khamis f4beb676ae fix(rail): the selected train's line draws over every network loaded before it again
Each route was a primitive added when it was drawn, so it sat over the
networks of feeds loaded until then. Its draw set was made once and kept
the slot of the first route, so a feed's network loaded after that drew
over later routes. Each route is drawn in a set made for it.
2026-11-14 01:40:41 -08:00
Sameh Khamis 0287ddb9be fix(local-adsb): the selected aircraft's trail head ends on its icon every frame again
The head was a polyline entity whose positions were read each frame. Its
draw-port line was redrawn at most every 100 ms while the aircraft flew,
so its end lagged the icon. It is drawn each frame the aircraft moves, as
the Flights trail head is; the trail still skips a head that has not
moved.
2026-11-14 01:38:50 -08:00
Sameh Khamis 6af4b08293 fix(local-adsb): a click or double-click on a UAT ring takes its aircraft again
The 978 MHz ring was a point on the aircraft's own entity, so a pick on
it was a pick on the aircraft. As a separate points set it was drawn
unpickable and a click there fell through to what is under it. The rings
are picked again and read as their aircraft.
2026-11-14 01:37:59 -08:00
Sameh Khamis 4b665147e1 fix(traffic): road lines stack as before: flow lines jam on top, heat-lines slow over jam
The lines were one ground primitive per bucket, added free, slow, jam for
flow lines and jam, slow for heat-lines, so where roads cross the later
bucket drew on top. Through the draw port they were one set in kept order
(jam first), and its glow lines draw after its solid ones, which turned
both stackings over. Flow lines are now set free, slow, jam; slow
heat-lines go in a set made after the jam lines' set.
2026-11-14 01:35:56 -08:00
Sameh Khamis 898909c245 fix(cctv): a double-click zooms to a coverage line and follows the monitor plane again
The coverage rays and cap were polyline entities, which the default
renderer's double-click zoomed to, and the monitor plane a plane entity
with a position, which it followed until the plane was removed. As
draw-port items they took no part in it. The camera icons were billboards
before, so they still take none.
2026-11-14 01:32:03 -08:00
Sameh Khamis 0dc3a1fb66 fix(bikeshare): a double-click follows the selected station again
The selected station's highlight was a point entity, which the default
renderer's double-click followed; deselecting removed it and ended the
follow. As a draw-port point it took no part in it. The station dots were
point primitives before, so they still take none.
2026-11-14 01:30:38 -08:00
Sameh Khamis 94ea9cd01d fix(submarine-cables): a double-click follows a landing point or reference and zooms to a cable again
The cables, landing points and references were entities, which the default
renderer's double-click followed (a point, or a reference at its tip) or
zoomed to (a cable or area) until the sources were replaced or hidden. As
draw-port items they took no part in it.
2026-11-14 01:24:24 -08:00
Sameh Khamis d003d9ee78 fix(news): a double-click follows a marker or zooms to an outline again
The markers and outlines were entities, which the default renderer's
double-click followed (a marker, until the markers were drawn anew) or
zoomed to (an outline or hotspot box). As draw-port items they took no part
in it.
2026-11-14 01:22:44 -08:00
Sameh Khamis 6ac8aed1b5 fix(radio): a double-click follows a station again
Each station, and the selected one's dot, was an entity, which the default
renderer's double-click followed until the stations or the selection were
drawn anew. As draw-port items they took no part in it.
2026-11-14 01:20:12 -08:00
Sameh Khamis c57a8bea83 fix(alpr): a double-click follows a camera with its card again
Each camera was an entity, which the default renderer's double-click
followed, showing its card; a camera no longer shown, or a hidden layer,
took the follow with it. As a draw-port icon it took no part in it.
2026-11-14 01:18:51 -08:00
Sameh Khamis 37a1e1500b fix(air-quality): a double-click follows a station again
The stations were entities, which the default renderer's double-click
followed, framed to fit the disc; one no longer reported took the follow
with it. As draw-port items they took no part in it.
2026-11-14 01:17:37 -08:00
Sameh Khamis fbc40ef3b6 fix(earthquakes, cyclones): an item that goes takes its double-click follow with it
Removing a followed entity ended the default renderer's follow. A disc gone
from the feed, or a storm point gone from the advisory (or a cleared one),
now ends it too.
2026-11-14 01:17:08 -08:00
Sameh Khamis def2e1ecca fix(perimeters, drone-airspace): a double-click zooms to an area again
The areas were polygon entities, which the default renderer's double-click
zoomed to. As draw-port items they took no part in it.
2026-11-14 01:16:20 -08:00
Sameh Khamis 26e8e26ba8 fix(ghostmaps): a double-click follows a pin or zooms to a line or area again
Each edition was drawn as entities, which the default renderer's
double-click followed (a pin) or zoomed to (a line or polygon); an expired
report or a replaced edition took the follow with it. drawnItemTarget reads
that rule off a draw item, for every layer that drew entities before.
2026-11-14 01:15:29 -08:00
Sameh Khamis 766cf68272 fix(local-adsb): a double-click follows a local aircraft with its card again
Each aircraft was an entity, which the default renderer's double-click
followed, showing its tracked card; an aircraft that expired took the
follow with it. As a draw-port icon it took no part in it. A double-click
follow can now carry the holder whose entity record shows the card.
2026-11-14 01:12:14 -08:00
Sameh Khamis f2983e8c1a fix(osm-places): a double-click follows a place again
The places were entities, which the default renderer's double-click
followed; new results replaced them all, which ended the follow. As
draw-port items they took no part in it.
2026-11-14 01:10:46 -08:00
Sameh Khamis fabf4439fe fix(cyclones): a double-click follows a storm's point or zooms to its track or cone again
The advisory was drawn as entities, which the default renderer's
double-click followed (centre and forecast points) or zoomed to (tracks,
cones, outlines). As draw-port items they took no part in it.
2026-11-14 01:10:16 -08:00
Sameh Khamis 50cd49cc31 fix(earthquakes): a double-click follows a disc again
The discs were entities, which the default renderer's double-click followed,
framed to fit the disc. As draw-port items they took no part in it.
2026-11-14 01:09:31 -08:00
Sameh Khamis e3cfdcf44e Tracked aircraft keep moving when reports give no speed or a stale one
A fix that moves while the reported speed is 0 or stale used to leave the
aircraft frozen, then jump it kilometres at once. The step between fixes now
measures a jump, and the drawn speed bounds the recovery.
2026-11-14 01:06:21 -08:00
Sameh Khamis 63a6595eaf fix(directions): a double-click follows an A or B marker and zooms to the route again
The markers and the route were entities, which the default renderer's
double-click followed (a marker) or zoomed to (the route). As draw-port
items they took no part in it. Directions now joins the stock double-click
as launches and imported pins do.
2026-11-14 00:44:58 -08:00
Sameh Khamis 4c7deb11dc fix(voice): point-and-ask over an ALPR camera or a local ADS-B aircraft names it again
A pick resolves to its context record through the drawn item's meta. The
ALPR and local ADS-B icons carried none, so point-and-ask got the layer
name and no position instead of the camera or aircraft and where it is.
Each icon now carries its context carrier, as before the draw port, when
the pick was the registered entity itself.
2026-11-14 00:42:34 -08:00
Sameh Khamis ca7a736456 fix(alpr): no height sample is spent without sampling, and no terrain anchor under a hidden globe
On Cesium the overlay sampled the drawn surface only where the scene
supported height sampling (depth textures), and fell back to the globe's
terrain only while the globe was shown. On the ports, a renderer without
sampling spent the paint's sample budget on misses and the refine pass
kept asking every paint, and a hidden globe's stale terrain could anchor a
marker under photoreal tiles. Both rules are back, through the renderer's
sampleHeight capability and the globe's visibility.
2026-11-14 00:35:32 -08:00
Sameh Khamis 1c036957cd fix(alpr): anchors wait for the surface heights answer from, as before
The overlay replaced floor anchors with sampled surface heights only once
the surface had settled. On Cesium that was the globe's terrain while the
globe was shown, otherwise every shown 3D tileset; on the globe port it
became the terrain and the drawn base tileset together. It now asks the
globe port for 'surface', the same rule.
2026-11-14 00:34:18 -08:00
Sameh Khamis 5f98f8bdf3 Aircraft drawn as far behind real time as their feed is late, along one curve their trail follows
Civil and military aircraft were drawn a fixed 30 s (15 s) behind real time
while anonymous feed reports arrive about 90 s old every 30 s, so every
contact dead reckoned about a minute past its newest report and snapped
when the next one landed (several km on a turn), and the tracked trail,
recorded from those drawn positions and patched as reports arrived, kinked.

- The display delay (data/displayDelay.js) is the 90th percentile of the
  newest 256 report lags plus 5 s, between the layer's floor (30 s, 15 s)
  and five minutes, slewed at most 0.2 s/s up and 0.05 s/s down. Icons,
  the renderer's live motion clock, labels, HUD, detection, the tracked
  camera and the trail read the one delay; following the world clock
  draws with none and deliveries leave it alone.
- Between two reports an aircraft flies a biarc (data/fixCurve.js) that
  passes through both and leaves each along its track, sent as contract
  arc segments; the trail is the reports joined along the same curve, so
  the icon sits on it. Nothing drawn between reports is kept.
- A report a coasting contact missed is eased onto from where it would
  have been that frame (at least 3 s, at most 30% over its speed, within
  20 s); over 5 km it jumps. Past its newest report a contact coasts
  straight on: a turn rate averaged over earlier reports outlived the turn.
- Forward synthetic fixes no longer block real reports older than them,
  and a history keeps 24 fixes.
- A feed simulation (testSupport/aircraftFeedSim.mjs) checks both layers
  against a 90 s late feed, a fallback switch, repeated reports, outages
  and the world clock.
2026-11-14 00:31:29 -08:00
Sameh Khamis 14e406002c fix(voice): the in-view scan sees News reports and Wildlife Sightings again
Voice's in-view scan projects each context record's targetPosition. News
and Wildlife Sightings still set only the entity's base position, so both
dropped out of "what am I looking at". They now pass it as targetPosition,
as GeoJSON and FIRMS do.
2026-11-14 00:23:36 -08:00
Sameh Khamis ea3b87805a Raised GeoJSON and cable polygons are lit by the sun again
The loader's entities drew a polygon with per-position heights through a
lit appearance; through the draw port it went flat. Local GeoJSON and
submarine cable fills with heights pass lit: true, as file import does.
2026-11-13 23:59:19 -08:00
Sameh Khamis 6e655b801d feat(fleet): draw airport ground vehicles by callsign and ground stations as a radio mast
Feeds carry many airport ground vehicles (type ZVEH) and ground stations
(GRND) that were drawn as the generic plane, some at the 10 km airborne
default.

- types.json gains aircraft_callsign rules: a ZVEH callsign starting FIRE is
  a fire truck, PUSH/TUG a pushback tug, DEICER/SQUID/SQB a van, else a car.
  GRND draws a new 11.8 m radio mast (other/radio_mast.glb).
- resolveAircraft and aircraftModelSpec take the callsign; a matched rule
  names the model outright, ahead of the type's class model.
- The layer spec cache keys such types by the rule matched, so it holds at
  most one entry per rule.
- These models (catalog category `other`) draw at their built size, as such
  models already do, and a
  contact with no altitude whose model is one now stands on the ground; the
  feed's own type is kept for such contacts, as no airframe lookup knows it.
- Local ADS-B passes the callsign too.
2026-11-13 21:20:16 -08:00
Sameh Khamis 6c55daf9ac fix(transit): a held vehicle's snapshot height is its drawn marker's while the frame pass places it
Near the ground the marker follows the terrain sampled between two reports,
which a straight blend of the reports' floors misses over uneven ground.
2026-11-13 18:36:42 -08:00
Sameh Khamis 4bb7b411e9 fix(cockpit): a provider's subject rides where it is drawn, and the documented provider rides a moving train
- A frame with no speedMps gets an exact anchor: an inertial one ran on at
  zero speed and closed at 0.75 m/s, so the camera fell kilometres behind a
  moving train. The docs example now passes speedMps and anchor: 'exact',
  a name for its HUD, and isEntryAllowed for a train bound to its line.
- Transit's snapshot height is the floor where playback draws the vehicle,
  not the newest report's floor uphill, and null while that floor is cold,
  so a view waits for the surface instead of standing on the ellipsoid.
- Rail's direction follows playback once it has placed the train: a report
  that runs back (a reversal, or GPS jitter) no longer turns the view
  while the drawn train still runs forward.
- A frame's id is trimmed as the candidate's is.
- A double-click on the selected vessel no longer enters an application's
  subject that took entry after it.
- The docs import from gods-eye-view/..., the package's name.
2026-11-13 18:23:50 -08:00
Sameh Khamis 7a61bf04a0 feat(selection): selecting a contact keeps its size and the camera's view: aircraft, vessels, trains and transit vehicles keep their form and size when selected (colour only); a click follows from the camera's own distance and angle, the contact gliding to the centre over one second (FollowTarget transitionS, shared rule render/camera/followTransition, conformance camera.follow.transition) 2026-11-13 15:02:28 -08:00
Sameh Khamis e3865f462f Merge origin/main into the renderer-contract branch: the procedural fleet models drawn through the renderer's model sets
Aircraft, military, local ADS-B, vessel, transit and rail models come from
the fleet model set, loaded up front and drawn life size through the draw
port's models sets; no layer touches the viewer or Cesium outside
src/render/cesium/. The models capability gains glTF bytes (gltf), a
per-axis stretch (axisScale), a colour for tinted parts (maskColor) and a
cut below the origin (clip: 'belowOrigin'), with conformance checks.

Main's rail layer and Data Library are ported to the ports; the CCTV
footprint probe keeps the globe-terrain clamp through the query port.
2026-11-13 14:14:42 -08:00
Sameh Khamis 7e45d4d989 fix(flights): a trail does not join its track history across a landing or take-off that was not seen 2026-11-13 12:53:18 -08:00
Denis Groshev 974023510f fix(rail, transit): a train or vehicle a first-person view holds draws no 3D model either, since the view's eye is inside it; let go, its model draws again
The fleet models (#1714) draw nearby trains and vehicles under the 3D toggle. A
held one now leaves out its model as it does its icon, as the Vessels layer does
for its bridge subject: its model item is hidden, and handing the visual back
to its icon keeps the icon hidden while held. Tests drive each layer with the
real fleet-model layer and a stubbed glTF loader; both fail without the fix.
2026-11-13 16:43:50 +01:00
Denis Groshev 546ac22708 Merge branch 'main' into denis/cockpit-subject-providers 2026-11-13 16:38:13 +01:00
Sameh Khamis a44c42eb94 fix(vessels, transit, rail): fleet models keep their cards and detection, stand on the floor, clip ships at the waterline and follow NVG/FLIR
- a vehicle drawn as a model keeps its selected card and stays in the detection overlay
- transit and rail models drop the 1.5 m floor lift their icons carry
- vessel models are clipped below the waterline
- models switch to an unlit white look under NVG/FLIR and back
- unknown transit modes keep their icon
- aircraft model specs are cached per set; no key-array copies per frame
2026-11-13 07:16:25 -08:00
Sameh Khamis 7b93045895 feat(vessels, transit, rail): draw fleet models under the 3D toggle
Vessels, Transit and Rail turn nearby icons into fleet models at the
aircraft layers' distances. A vessel is drawn at its AIS length and beam
(static dimensions now reach vessel rows), standing at the sea surface; a
transit vehicle or train stands on its road or rail, raised by its type's
elevation, and is painted in its mode or category colour where the model
marks it.
2026-11-13 07:16:25 -08:00
Sameh Khamis fcc44d0eaf feat(flights): aircraft draw life-size fleet models chosen by type
Flights, Military Flights and Local ADS-B draw each aircraft with the fleet
model its ICAO type, class or emitter category selects, scaled to the type's
length, built from the up-front loaded bytes. The eight third-party aircraft
models and their attribution are removed; every shipped model is now the
project's own.
2026-11-13 07:16:25 -08:00