mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 01:02:23 +00:00
Sprites for helicopters, ground vehicles, stations and vessel types; history to live without an empty map; model parts in Cesium
Aircraft icons are one size; helicopters turn a three-frame rotor while airborne or moving; ADS-B ground vehicles share one amber sprite and stations/obstacles one mast; vessels get hull sprites by type and one buoy. Going live keeps contacts until the first live answer and replaces them by id; fast playback holds before the loaded positions end and prefetches ahead. Cesium models move their parts from the optional model part state.
This commit is contained in:
1 parent
624c229bc2
commit
7186f720df
97 files changed
+6586
-343
No files matched your search
@@ -13,6 +13,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconAtlas.js",
|
||||
"src/data/iconSet.js",
|
||||
@@ -285,6 +286,7 @@
|
||||
"src/ui/views/panels/SatelliteGroundView.vue",
|
||||
"src/data/vesselTypes.js",
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/ui/views/panels/AircraftModelHero.vue"
|
||||
],
|
||||
"external": ["vue", "pinia", "vue-i18n"]
|
||||
@@ -1150,6 +1152,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/motionModel.js",
|
||||
"src/data/iconAtlas.js",
|
||||
@@ -1344,6 +1347,7 @@
|
||||
"src/data/bundledJson.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/motionModel.js",
|
||||
"src/geo/julian.js",
|
||||
@@ -1733,6 +1737,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/motionModel.js",
|
||||
"src/data/iconSet.js",
|
||||
@@ -1872,10 +1877,13 @@
|
||||
"civil-flights": {
|
||||
"exports": ["./layers/flights"],
|
||||
"modules": [
|
||||
"src/data/rotorFrames.js",
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/vesselTypes.js",
|
||||
"src/data/fleetTrailAnchors.js",
|
||||
"src/data/fleetModelInstances.js",
|
||||
"src/data/modelPartDrivers.js",
|
||||
"src/data/headingDegrees.js",
|
||||
"src/i18n/marker.js",
|
||||
"src/cyberSonar.js",
|
||||
@@ -2018,12 +2026,15 @@
|
||||
"military-flights": {
|
||||
"exports": ["./layers/military"],
|
||||
"modules": [
|
||||
"src/data/rotorFrames.js",
|
||||
"src/layers/flights/modelSpec.js",
|
||||
"src/layers/flights/policy.js",
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/vesselTypes.js",
|
||||
"src/data/fleetTrailAnchors.js",
|
||||
"src/data/fleetModelInstances.js",
|
||||
"src/data/modelPartDrivers.js",
|
||||
"src/data/headingDegrees.js",
|
||||
"src/i18n/marker.js",
|
||||
"src/cyberSonar.js",
|
||||
@@ -2198,10 +2209,15 @@
|
||||
"vessel-layer": {
|
||||
"exports": ["./layers/vessels"],
|
||||
"modules": [
|
||||
"src/data/units.js",
|
||||
"src/render/color.js",
|
||||
"src/data/vesselSprites.js",
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftClass.js",
|
||||
"src/i18n/marker.js",
|
||||
"src/data/fleetModelInstances.js",
|
||||
"src/data/modelPartDrivers.js",
|
||||
"src/data/aircraftModelLighting.js",
|
||||
"src/data/modelEligibility.js",
|
||||
"src/data/fleetTrailAnchors.js",
|
||||
@@ -2393,6 +2409,7 @@
|
||||
"src/data/iconAtlas.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/render/motion/iconMotion.js",
|
||||
"src/render/cesium/heights.js",
|
||||
"src/render/baseTilesets.js",
|
||||
@@ -2451,6 +2468,7 @@
|
||||
"src/render/cesium/tileRequests.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/motionModel.js",
|
||||
"src/geo/julian.js",
|
||||
@@ -2616,6 +2634,7 @@
|
||||
"src/render/cesium/drawQuads.js",
|
||||
"src/render/cesium/drawMeshes.js",
|
||||
"src/render/cesium/drawModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/render/recession.js",
|
||||
"src/geo/polyline.js",
|
||||
"src/render/cesium/gpuIcons.js",
|
||||
@@ -2714,6 +2733,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/geo/horizon.js",
|
||||
@@ -2805,6 +2825,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/motionModel.js",
|
||||
"src/geo/julian.js",
|
||||
@@ -2905,6 +2926,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconAtlas.js",
|
||||
"src/data/motionModel.js",
|
||||
@@ -3133,6 +3155,7 @@
|
||||
"src/render/rendererOf.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/geo/horizon.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
@@ -3322,6 +3345,7 @@
|
||||
"src/render/cesium/drawQuads.js",
|
||||
"src/render/cesium/drawMeshes.js",
|
||||
"src/render/cesium/drawModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/render/recession.js",
|
||||
"src/geo/polyline.js",
|
||||
"src/render/cesium/gpuIcons.js",
|
||||
@@ -3415,6 +3439,7 @@
|
||||
"src/render/cesium/credits.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/geo/horizon.js",
|
||||
@@ -3647,6 +3672,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/geo/horizon.js",
|
||||
@@ -3850,6 +3876,7 @@
|
||||
"src/render/baseTilesets.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/geo/horizon.js",
|
||||
@@ -4061,6 +4088,9 @@
|
||||
"./standalone/catalog"
|
||||
],
|
||||
"modules": [
|
||||
"src/data/units.js",
|
||||
"src/data/vesselSprites.js",
|
||||
"src/data/rotorFrames.js",
|
||||
"src/render/stub/viewRectangle.js",
|
||||
"src/render/stub/math.js",
|
||||
"src/render/cesium/controlledCamera.js",
|
||||
@@ -4076,8 +4106,10 @@
|
||||
"src/data/aircraftIconLayer.js",
|
||||
"src/data/fixCurve.js",
|
||||
"src/data/aircraftModelLayer.js",
|
||||
"src/data/modelPartDrivers.js",
|
||||
"src/data/aircraftMotionRegime.js",
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/fleetTrailAnchors.js",
|
||||
"src/data/fleetModelInstances.js",
|
||||
"src/app/layers/fleetModels.js",
|
||||
@@ -5462,14 +5494,19 @@
|
||||
"application-layer-construction": {
|
||||
"exports": ["./application/layers"],
|
||||
"modules": [
|
||||
"src/data/units.js",
|
||||
"src/data/vesselSprites.js",
|
||||
"src/data/rotorFrames.js",
|
||||
"src/layers/flights/icons.js",
|
||||
"src/data/aircraftIconLayer.js",
|
||||
"src/data/fixCurve.js",
|
||||
"src/data/aircraftModelLayer.js",
|
||||
"src/data/modelPartDrivers.js",
|
||||
"src/data/aircraftMotionRegime.js",
|
||||
"src/geo/julian.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/data/iconSegment.js",
|
||||
"src/data/iconAtlas.js",
|
||||
@@ -6309,6 +6346,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/geo/horizon.js",
|
||||
@@ -6468,6 +6506,7 @@
|
||||
"src/render/cesium/camera.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/iconSet.js",
|
||||
"src/geo/horizon.js",
|
||||
@@ -6678,6 +6717,7 @@
|
||||
"src/data/aircraftClass.js",
|
||||
"src/data/aircraftEmergency.js",
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/vesselTypes.js",
|
||||
"src/data/fleetTrailAnchors.js",
|
||||
"src/data/courseFromFixes.js"
|
||||
@@ -7095,10 +7135,12 @@
|
||||
"exports": ["./layers/transit/standalone"],
|
||||
"modules": [
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/vesselTypes.js",
|
||||
"src/data/aircraftClass.js",
|
||||
"src/i18n/marker.js",
|
||||
"src/data/fleetModelInstances.js",
|
||||
"src/data/modelPartDrivers.js",
|
||||
"src/data/modelEligibility.js",
|
||||
"src/data/fleetTrailAnchors.js",
|
||||
"src/data/aircraftModelLighting.js",
|
||||
@@ -7248,8 +7290,10 @@
|
||||
"modules": [
|
||||
"src/i18n/marker.js",
|
||||
"src/data/fleetModels.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/vesselTypes.js",
|
||||
"src/data/fleetModelInstances.js",
|
||||
"src/data/modelPartDrivers.js",
|
||||
"src/data/aircraftClass.js",
|
||||
"src/data/aircraftModelLighting.js",
|
||||
"src/data/fleetTrailAnchors.js",
|
||||
@@ -7637,6 +7681,7 @@
|
||||
"src/render/cesium/drawHit.js",
|
||||
"src/render/cesium/iconSetPrimitive.js",
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js",
|
||||
"src/data/aircraftRecession.js",
|
||||
"src/data/motionModel.js",
|
||||
"src/data/iconSet.js",
|
||||
@@ -8051,6 +8096,7 @@
|
||||
"./render/vectorBase",
|
||||
"./render/iconSegment",
|
||||
"./render/recession",
|
||||
"./render/modelParts",
|
||||
"./render/windStreamlines",
|
||||
"./geo/screenCluster"
|
||||
],
|
||||
@@ -8073,6 +8119,7 @@
|
||||
"src/render/input/wheel.js",
|
||||
"src/render/conformance/expect.js",
|
||||
"src/render/conformance/checks/ports.js",
|
||||
"src/render/conformance/partsModel.js",
|
||||
"src/render/stub/math.js",
|
||||
"src/geo/index.js",
|
||||
"src/geo/julian.js",
|
||||
@@ -8101,7 +8148,8 @@
|
||||
"src/data/motionModel.js",
|
||||
"src/layers/wind/streamlines.js",
|
||||
"src/layers/wind/model.js",
|
||||
"src/render/recession.js"
|
||||
"src/render/recession.js",
|
||||
"src/render/modelParts.js"
|
||||
],
|
||||
"external": ["pbf", "@mapbox/vector-tile", "kdbush"]
|
||||
},
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
* E4 diversity : ≥5 distinct glyph data-URIs displayed ambiently after
|
||||
* enrichment (expected: 8)
|
||||
* E5 glyphs : every billboard's image === aircraftIcon(classify(typeCode))
|
||||
* E6 scales : every billboard's scale === CLASS_SCALE_2D[klass]
|
||||
* E6 scales : every billboard's scale === 1, whatever its class
|
||||
* E7 bounds : ≤4 concurrent requests, ≥185 ms between dispatches (≤5/s
|
||||
* drip), total ≤300 (budget ceiling)
|
||||
* E8 next poll : another poll neither reverts glyphs nor re-requests hexes
|
||||
@@ -53,7 +53,7 @@
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import puppeteer from 'puppeteer';
|
||||
import { classifyAircraft, CLASS_SCALE_2D } from '../src/data/aircraftClass.js';
|
||||
import { classifyAircraft } from '../src/data/aircraftClass.js';
|
||||
import { aircraftIcon } from '../src/data/aircraftIcons.js';
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -362,7 +362,7 @@ async function main() {
|
||||
const bb = beforeById.get(hex);
|
||||
if (!bb) baselineBad.push(`${hex}:missing`);
|
||||
else if (bb.image !== AIRLINER_ICON) baselineBad.push(`${hex}:not-default-glyph`);
|
||||
else if (Math.abs(bb.scale - (CLASS_SCALE_2D.airliner || 1)) > 1e-9) baselineBad.push(`${hex}:scale=${bb.scale}`);
|
||||
else if (Math.abs(bb.scale - 1) > 1e-9) baselineBad.push(`${hex}:scale=${bb.scale}`);
|
||||
}
|
||||
record('E2 baseline: all 12 category-0 planes default to the airliner glyph',
|
||||
baselineBad.length === 0,
|
||||
@@ -415,13 +415,13 @@ async function main() {
|
||||
for (const [hex, klass] of expected) {
|
||||
const bb = afterById.get(hex);
|
||||
const wantImg = aircraftIcon(klass);
|
||||
const wantScale = CLASS_SCALE_2D[klass] || 1;
|
||||
const wantScale = 1;
|
||||
if (!bb || bb.image !== wantImg) glyphBad.push(`${hex}(${klass})${bb ? ':wrong-image' : ':missing'}`);
|
||||
if (bb && Math.abs(bb.scale - wantScale) > 1e-9) scaleBad.push(`${hex}: ${bb.scale} != ${wantScale}`);
|
||||
}
|
||||
record('E5 glyphs: every billboard matches aircraftIcon(classify(typeCode))',
|
||||
glyphBad.length === 0, glyphBad.length ? glyphBad.join(' ') : `${expected.size} matched (incl. the found:false miss staying airliner)`);
|
||||
record('E6 scales: every billboard has its per-class CLASS_SCALE_2D',
|
||||
record('E6 scales: every billboard has the one fleet scale',
|
||||
scaleBad.length === 0, scaleBad.length ? scaleBad.join(' ') : 'all scales exact (composes with scaleByDistance)');
|
||||
|
||||
await page.screenshot({ path: path.join(SHOT_DIR, 'enrich-after-diverse.png') });
|
||||
@@ -469,7 +469,7 @@ async function main() {
|
||||
for (const [hex, klass] of expected) {
|
||||
const bb = afterPollById.get(hex);
|
||||
if (!bb || bb.image !== aircraftIcon(klass)) pollBad.push(`${hex}(${klass})${bb ? ':reverted' : ':missing'}`);
|
||||
else if (Math.abs(bb.scale - (CLASS_SCALE_2D[klass] || 1)) > 1e-9) pollBad.push(`${hex}:scale-reverted`);
|
||||
else if (Math.abs(bb.scale - 1) > 1e-9) pollBad.push(`${hex}:scale-reverted`);
|
||||
}
|
||||
const noReRequests = afterPoll.starts === Object.keys(TYPES).length;
|
||||
record('E8 next poll: enriched glyphs persist and no hex is re-requested',
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
* B1 ingest : both layers ingest the synthetic planes
|
||||
* B2 billboards : every fleet billboard carries EXACTLY the expected
|
||||
* per-class glyph (image data-URI === aircraftIcon(klass),
|
||||
* imported from src) and per-class scale (flights:
|
||||
* CLASS_SCALE_2D; military: 0.7 × CLASS_SCALE_2D)
|
||||
* imported from src) and one scale for every class
|
||||
* (flights: 1; military: 0.7)
|
||||
* B3 models : with 3D on, fleet Cesium.Model.scale === the life-size
|
||||
* scale of the fleet model the aircraft's type or category
|
||||
* selects (aircraftModelSpec) per icao; tracked too
|
||||
@@ -33,7 +33,7 @@ import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import puppeteer from 'puppeteer';
|
||||
import { stubPlanespotters } from './qa-photo-stub.mjs';
|
||||
import { classifyAircraft, CLASS_SCALE_2D } from '../src/data/aircraftClass.js';
|
||||
import { classifyAircraft } from '../src/data/aircraftClass.js';
|
||||
import { aircraftModelSpec } from '../src/data/fleetModels.js';
|
||||
// Every aircraft draws its fleet model life size: its type's length over the
|
||||
// model's built length, chosen by type code (military) or category (flights).
|
||||
@@ -381,14 +381,14 @@ async function main() {
|
||||
for (const [id, klass] of expectedFlights) {
|
||||
const bb = bbById.get(id);
|
||||
const wantImg = aircraftIcon(klass);
|
||||
const wantScale = CLASS_SCALE_2D[klass] || 1;
|
||||
const wantScale = 1;
|
||||
if (!bb || bb.image !== wantImg) glyphBad.push(`${id}(${klass})${bb ? ':wrong-image' : ':missing'}`);
|
||||
if (bb && Math.abs(bb.scale - wantScale) > 1e-9) scaleBad.push(`${id}: ${bb.scale} != ${wantScale}`);
|
||||
}
|
||||
for (const [id, klass] of expectedMilitary) {
|
||||
const bb = bbById.get(id);
|
||||
const wantImg = aircraftIcon(klass);
|
||||
const wantScale = MIL_BILLBOARD_SCALE * (CLASS_SCALE_2D[klass] || 1);
|
||||
const wantScale = MIL_BILLBOARD_SCALE;
|
||||
if (!bb || bb.image !== wantImg) glyphBad.push(`${id}(${klass})${bb ? ':wrong-image' : ':missing'}`);
|
||||
if (bb && Math.abs(bb.scale - wantScale) > 1e-9) scaleBad.push(`${id}: ${bb.scale} != ${wantScale}`);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user