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.
- scripts/build-tiangong-model.py is the Blender script the model README
cites, with its paths made repository-relative (output to a folder given
after --, the ISS reference read from public/models/). Not re-run in this
commit: only its paths changed.
- The ISS textures carry the NASA insignia and the ESA, Columbus, JAXA and
Nanoracks marks as flown; the model README and DATA_SOURCES say they are
kept as flown and imply no endorsement.
Builds on the ISS 3D model (PR #1690) and brings it onto main's renderer
seam: the station models are items of a `models` draw set, posed by
heading, pitch and roll from the station's flight axes
(`headingPitchRollOfAxes`), with the camera, canvas and clicks read from
the renderer's ports; no satellites file reaches Cesium. The joint drivers
write column-major matrices into node poses the model part keeps, for a
renderer that can pose nodes; until the draw contract has that member the
models draw rigid.
- ISS joints take their angles from NASA's ISSLive telemetry, relayed by
the server behind ISS_TELEMETRY_ENABLED.
- STATION and LIVE sections of Context replace the floating command panel
and player; both collapse like the Radio section.
- Cockpit rides the ISS from mounts on its model; the LIVE page in the
Cockpit briefing.
- Tiangong as a second station model, with computed joints.
- Installations: a label-box click selects the site.
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.
The car, van, fire truck and pushback tug were stacked boxes. The car is now an
operations SUV (rounded body, glass house with a sloped windscreen, roof light
bar, grille and lamps), the van a high-roof panel van, the fire truck an airport
crash tender with roof and bumper turrets on three axles, and the pushback a low
chamfered tug with a glazed cab. All stand on the ground at their built size.
Their trail anchors are measured again.
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.
Translation files: kept both sides' new keys. DATA_SOURCES.md and
public/models/README.md are back to main's layout (the previous merge
had reflowed their tables, which put the generated Data Library section
out of date) with only the ISS lines added.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Translation files: kept both sides' new keys. public/models/README.md:
main's procedural fleet text, with a section for NASA's ISS model, the
one model outside the fleet set; DATA_SOURCES.md notes that exception.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Most live vessel feeds send no length, and the resolver then fell through
every length rule to the range's last model drawn as built, so a cruise
ship or a container ship showed as the smallest model of its range.
types.json gives each passenger, cargo, tanker, fishing and service range
a typical_len (cargo 300 m, tanker 250 m, passenger 140 m, fishing 40 m,
...); a vessel with no usable length is chosen and drawn at it.
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.
121 GLBs under public/models/fleet (about 2 MB, MIT like the code) with
catalog.json and types.json. src/data/fleetModels.js picks a model by ICAO
type, aircraft class, emitter category, AIS ship type and size, GTFS route
type, transit mode or rail category, and sizes it life size; the set loads
once, up front. Trail anchors are measured from the meshes.
The ISS model is now NASA/JSC IGOAL's current-configuration station
(Nauka, Prichal, Bishop, roll-out arrays), reduced from 96 MB to 3 MB
with its joints kept as nodes. NASA's file is a mirror image of the
station and marks 15 materials as blended; both are corrected.
Its parts move by computation, never telemetry: arrays and radiators by
the Sun (feathered in the Earth's shadow), the Ku-band dishes toward the
TDRS nominal slots, and the robotic arms as an illustrative sway.
Selecting the ISS shows a collapsed command panel: zoom to the station,
Automatic (default, with a lit/shadow status line) and Manual controls
for the Sun's position, arrays, radiators, dishes and Canadarm2.
Also: docked objects are found by comparing both orbits at one instant,
the tracked card keeps clear of the model, the model file loads only
near its range, and both ISS panels follow a language change.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Within 1,500 km of the camera the ISS (NORAD 25544) is drawn as NASA 3D
Resources' station model, at its real 109 m span with a 72 px floor, in
its usual +XVV attitude from a per-frame SGP4 sample (the follow camera's
sample while tracked). Farther out the dot stays; model and dots split
the distance range. Selecting the ISS opens a panel beside the existing
tracked card with NASA's official ISS live stream, embedded through
youtube-nocookie with a fixed video id (no page scraping).
Co-Authored-By: Claude Opus 5.5 <[email protected]>
- src/data/local_data/dams/dams.geojson held the same 704 features as
dams.geojsonl, feature for feature. Only the JSONL file is loaded
(src/sources/infrastructureData.js), so the GeoJSON copy is dropped
and the dataset README no longer mentions it.
- public/models/ship.glb is not loaded anywhere: no module, template,
stylesheet or script names it. Its row in public/models/README.md
goes with it.
Together these remove 960,345 bytes of tracked data.