Format the files this branch wrote or broke with Prettier

This commit is contained in:
German Khokhlov committed 2026-11-03 23:02:04 +04:00
1 parent 227e3c2051
commit 8d7f055572
90 files changed
+1408 -640

No files matched your search

+7 -2
View File
@@ -320,7 +320,9 @@ export function createAnimation({
// Jam heat-lines throb (~1.6 s period) — one shared material uniform for
// the whole jam batch, no geometry rebuild. Null outside live heatline mode.
if (layerState._native && layerState._heatJamPrim) {
layerState._heatJamPrim.setAlpha(HEAT_JAM_BASE_ALPHA + HEAT_JAM_PULSE_ALPHA * Math.sin(now / 260));
layerState._heatJamPrim.setAlpha(
HEAT_JAM_BASE_ALPHA + HEAT_JAM_PULSE_ALPHA * Math.sin(now / 260),
);
}
if (layerState._heatJamPrim?.appearance) {
layerState._heatJamPrim.appearance.material.uniforms.color.alpha =
@@ -353,7 +355,10 @@ export function createAnimation({
/** Remove all point primitives and reset dot/road arrays and counters. */
function clearDots() {
services.credits?.hideOsmCredit?.(layerState._engine ?? layerState._viewer, 'traffic');
services.credits?.hideOsmCredit?.(
layerState._engine ?? layerState._viewer,
'traffic',
);
parts.retention.clear();
if (layerState._dots.length) layerState._motion.rebuilds++;
if (layerState._pointCollection) layerState._pointCollection.removeAll();
+12 -4
View File
@@ -87,7 +87,10 @@ export function createFlow({ state: layerState, services, parts, source }) {
layerState._flowStatusKnown = true;
if (layerState._liveMode) {
console.log('[Data:Traffic] TomTom key present — live flow mode');
registerDynamicCredit(layerState._engine ?? layerState._viewer, TOMTOM_CREDIT);
registerDynamicCredit(
layerState._engine ?? layerState._viewer,
TOMTOM_CREDIT,
);
}
})
.catch((e) => {
@@ -236,7 +239,8 @@ export function createFlow({ state: layerState, services, parts, source }) {
return false;
if (layerState._waitForScene) {
await layerState._waitForScene;
if (generation !== layerState._loadGeneration || signal?.aborted) return false;
if (generation !== layerState._loadGeneration || signal?.aborted)
return false;
}
const revision = (layerState._surfaceRevision || 0) + 1;
layerState._surfaceRevision = revision;
@@ -384,7 +388,9 @@ export function createFlow({ state: layerState, services, parts, source }) {
maxX = -Infinity,
maxY = -Infinity;
for (const point of road.waypoints) {
const screen = scene.project ? scene.project(point, {}) : Cesium.SceneTransforms.worldToWindowCoordinates(scene, point);
const screen = scene.project
? scene.project(point, {})
: Cesium.SceneTransforms.worldToWindowCoordinates(scene, point);
if (!screen) continue;
minX = Math.min(minX, screen.x);
maxX = Math.max(maxX, screen.x);
@@ -411,7 +417,9 @@ export function createFlow({ state: layerState, services, parts, source }) {
roadDotBudget(altitude),
);
const admitted = selected.filter((r, i) => budgets[i] > 0);
const camera = (layerState._engine?.camera.livePosition ?? layerState._viewer?.camera?.positionWC);
const camera =
layerState._engine?.camera.livePosition ??
layerState._viewer?.camera?.positionWC;
if (camera)
admitted.sort(
(a, b) =>
+3 -1
View File
@@ -102,7 +102,9 @@ export function createReticleFootprint() {
dlon -= 360 * Math.round(dlon / 360);
dx = dlon * 111.195 * Math.cos(nadir.latitude);
} else {
const picked = engine ? camera.pickRay(p) : camera.getPickRay(p, (ray ??= new Cesium.Ray())) || ray;
const picked = engine
? camera.pickRay(p)
: camera.getPickRay(p, (ray ??= new Cesium.Ray())) || ray;
if (!picked) continue;
const d = picked.direction;
dx =
+7 -5
View File
@@ -275,11 +275,13 @@ export function createIngestion({
let estimated = services.ground?.cachedGroundFloor?.(centerLat, centerLon);
if (!Number.isFinite(estimated)) {
try {
estimated = scene?.engine ? scene.sampleHeight(location) : scene?.globe?.show
? scene.globe.getHeight?.(location)
: scene?.sampleHeightSupported
? scene.sampleHeight(location, [layerState._pointCollection])
: undefined;
estimated = scene?.engine
? scene.sampleHeight(location)
: scene?.globe?.show
? scene.globe.getHeight?.(location)
: scene?.sampleHeightSupported
? scene.sampleHeight(location, [layerState._pointCollection])
: undefined;
} catch {
/* the local mesh can still be loading */
}
+114 -40
View File
@@ -21,10 +21,12 @@ export function createLifecycle({
}
function bindScene() {
const viewer = layerState._viewer, engine = layerState._engine;
const viewer = layerState._viewer,
engine = layerState._engine;
const camera = engine?.camera ?? viewer.camera;
const frames = engine?.frames ?? viewer.scene;
if (viewer) layerState._surfaceFrameRemover = observeTrafficSurface(viewer.scene);
if (viewer)
layerState._surfaceFrameRemover = observeTrafficSurface(viewer.scene);
layerState._pointCollection.show = true;
layerState._lastAnimTime = 0;
parts.animation.syncRenderDemand();
@@ -36,11 +38,17 @@ export function createLifecycle({
parts.timing.clearTrafficTimingEntries();
layerState._trafficTimingCurrentAnchor = null;
layerState._trafficTimingPostRenderRemovers = new Set();
layerState._trafficTimingMoveEndRemover = camera.moveEnd.addEventListener(parts.timing.markTrafficTimingMoveEnd);
layerState._trafficTimingMoveEndRemover = camera.moveEnd.addEventListener(
parts.timing.markTrafficTimingMoveEnd,
);
}
layerState._cameraRemover = camera.changed.addEventListener(parts.viewport.onCameraChanged);
layerState._arrivalRemover = camera.moveEnd.addEventListener(() => parts.viewport.onCameraChanged({immediate:true}));
claimCameraSensitivity(engine ?? camera,'traffic',0.05);
layerState._cameraRemover = camera.changed.addEventListener(
parts.viewport.onCameraChanged,
);
layerState._arrivalRemover = camera.moveEnd.addEventListener(() =>
parts.viewport.onCameraChanged({ immediate: true }),
);
claimCameraSensitivity(engine ?? camera, 'traffic', 0.05);
}
function unbindScene() {
@@ -48,15 +56,22 @@ export function createLifecycle({
layerState._surfaceFrameRemover?.();
layerState._preRenderRemover?.();
layerState._trafficTimingMoveEndRemover?.();
for (const remove of layerState._trafficTimingPostRenderRemovers || []) remove();
for (const remove of layerState._trafficTimingPostRenderRemovers || [])
remove();
layerState._trafficTimingPostRenderRemovers = null;
layerState._trafficTimingCurrentAnchor = null;
layerState._cameraRemover?.();
// Some legacy camera events do not return a remover.
if (!layerState._cameraRemover) camera?.changed?.removeEventListener?.(parts.viewport.onCameraChanged);
if (!layerState._cameraRemover)
camera?.changed?.removeEventListener?.(parts.viewport.onCameraChanged);
layerState._arrivalRemover?.();
layerState._surfaceFrameRemover = layerState._preRenderRemover = layerState._cameraRemover = layerState._arrivalRemover = layerState._trafficTimingMoveEndRemover = null;
releaseCameraSensitivity(layerState._engine ?? camera,'traffic');
layerState._surfaceFrameRemover =
layerState._preRenderRemover =
layerState._cameraRemover =
layerState._arrivalRemover =
layerState._trafficTimingMoveEndRemover =
null;
releaseCameraSensitivity(layerState._engine ?? camera, 'traffic');
}
const methods = {
@@ -99,8 +114,12 @@ export function createLifecycle({
layerState._stylePreset =
document?.documentElement?.dataset?.gevStyle || 'normal';
if (!layerState._styleListenerBound) {
layerState._styleListener = (e) => parts.style.setStylePreset(e?.detail?.style);
window.addEventListener('gev:style-change', layerState._styleListener);
layerState._styleListener = (e) =>
parts.style.setStylePreset(e?.detail?.style);
window.addEventListener(
'gev:style-change',
layerState._styleListener,
);
layerState._styleListenerBound = true;
}
}
@@ -108,25 +127,42 @@ export function createLifecycle({
console.log('[Data:Traffic] Initialized');
},
attachRenderer(viewer, {engine=null,waitForCameraRestore=false}={}) {
attachRenderer(
viewer,
{ engine = null, waitForCameraRestore = false } = {},
) {
layerState._restoringViewport = waitForCameraRestore;
layerState._viewer = viewer;
layerState._engine = engine;
layerState._native = !viewer && engine ? services.nativeRenderer(engine) : null;
layerState._native =
!viewer && engine ? services.nativeRenderer(engine) : null;
layerState._heatSupported = null;
const points = layerState._native?.points ?? new Cesium.PointPrimitiveCollection({blendOption: Cesium.BlendOption.TRANSLUCENT});
const points =
layerState._native?.points ??
new Cesium.PointPrimitiveCollection({
blendOption: Cesium.BlendOption.TRANSLUCENT,
});
if (viewer) viewer.scene.primitives.add(points);
layerState._pointCollection = points;
for(const dot of layerState._dots) dot.point = points.add(dot.point);
for (const dot of layerState._dots) dot.point = points.add(dot.point);
points.show = layerState._enabled;
if (!waitForCameraRestore) readyForSurfaceWork();
if (layerState._enabled) {
bindScene();
parts.rendering.rebuildHeatLines(layerState._roads);
if (layerState._dots.length && layerState._roads.some(r=>!r.directFlow))
services.credits?.showOsmCredit?.(engine ?? viewer,'traffic',{openMapTiles:true});
if (layerState._liveMode) services.credits?.registerDynamicCredit?.(engine ?? viewer, services.credits.TOMTOM_CREDIT);
parts.viewport.onCameraChanged({immediate:true});
if (
layerState._dots.length &&
layerState._roads.some((r) => !r.directFlow)
)
services.credits?.showOsmCredit?.(engine ?? viewer, 'traffic', {
openMapTiles: true,
});
if (layerState._liveMode)
services.credits?.registerDynamicCredit?.(
engine ?? viewer,
services.credits.TOMTOM_CREDIT,
);
parts.viewport.onCameraChanged({ immediate: true });
}
},
resumeViewport() {
@@ -136,40 +172,70 @@ export function createLifecycle({
if (!layerState._enabled) return;
if (layerState._populationPending) parts.retention.resume();
const previous = layerState._surfaceInput;
if (previous && !layerState._fetching && layerState._lastBounds === previous.bounds) {
if (
previous &&
!layerState._fetching &&
layerState._lastBounds === previous.bounds
) {
// A completed pass, not a refinement: the incoming globe often still
// shows coarse tiles, so it samples provisionally and refines once its
// surface has loaded ('Handoff refined'). A refinement here never
// refined again and left vehicles on those coarse heights.
void parts.flow.applyFlowThenRender(previous.roads, previous.bounds, layerState._loadGeneration,
parts.viewport.getCameraAltitude(), 'Handoff').catch(error => {
if (error?.name !== 'AbortError') console.warn('[Data:Traffic] Surface refresh failed', error);
void parts.flow
.applyFlowThenRender(
previous.roads,
previous.bounds,
layerState._loadGeneration,
parts.viewport.getCameraAltitude(),
'Handoff',
)
.catch((error) => {
if (error?.name !== 'AbortError')
console.warn('[Data:Traffic] Surface refresh failed', error);
});
}
parts.viewport.onCameraChanged({immediate:true});
parts.viewport.onCameraChanged({ immediate: true });
},
detachRenderer() {
if(!layerState._pointCollection)return;
if (!layerState._pointCollection) return;
unbindScene();
clearTimeout(layerState._fetchTimeout);
layerState._surfaceRefineRemove?.();
layerState._surfaceRefineRemove = null;
layerState._surfaceRevision = (layerState._surfaceRevision || 0)+1;
layerState._surfaceRevision = (layerState._surfaceRevision || 0) + 1;
layerState._preparedRoads?.clear();
parts.rendering.removeHeatLines();
services.credits?.hideOsmCredit?.(layerState._engine ?? layerState._viewer,'traffic');
for(const dot of layerState._dots) {
const p=dot.point;
dot.point={position:Cesium.Cartesian3.clone(p.position),pixelSize:p.pixelSize,color:p.color,show:p.show,
outlineColor:p.outlineColor,outlineWidth:p.outlineWidth,scaleByDistance:p.scaleByDistance,
translucencyByDistance:p.translucencyByDistance,disableDepthTestDistance:0};
services.credits?.hideOsmCredit?.(
layerState._engine ?? layerState._viewer,
'traffic',
);
for (const dot of layerState._dots) {
const p = dot.point;
dot.point = {
position: Cesium.Cartesian3.clone(p.position),
pixelSize: p.pixelSize,
color: p.color,
show: p.show,
outlineColor: p.outlineColor,
outlineWidth: p.outlineWidth,
scaleByDistance: p.scaleByDistance,
translucencyByDistance: p.translucencyByDistance,
disableDepthTestDistance: 0,
};
}
layerState._viewer?.scene.primitives.remove(layerState._pointCollection);
layerState._native?.destroy();
if(layerState._renderHeld)services.render.releaseContinuousRender('traffic');
layerState._renderHeld=false;
layerState._pointCollection=layerState._viewer=layerState._engine=layerState._native=null;
layerState._waitForScene ??= new Promise(resolve=>{layerState._sceneReady=resolve;});
if (layerState._renderHeld)
services.render.releaseContinuousRender('traffic');
layerState._renderHeld = false;
layerState._pointCollection =
layerState._viewer =
layerState._engine =
layerState._native =
null;
layerState._waitForScene ??= new Promise((resolve) => {
layerState._sceneReady = resolve;
});
},
/**
@@ -220,7 +286,10 @@ export function createLifecycle({
disable(viewer) {
layerState._enabled = false;
layerState._surfaceInput = null;
services.credits?.hideOsmCredit?.(layerState._engine ?? layerState._viewer, 'traffic');
services.credits?.hideOsmCredit?.(
layerState._engine ?? layerState._viewer,
'traffic',
);
parts.animation.syncRenderDemand();
clearTimeout(layerState._fetchTimeout);
clearInterval(layerState._enableKickTimer);
@@ -255,7 +324,9 @@ export function createLifecycle({
destroy(viewer) {
this.disable(viewer);
if (layerState._pointCollection) {
layerState._viewer?.scene.primitives.remove(layerState._pointCollection);
layerState._viewer?.scene.primitives.remove(
layerState._pointCollection,
);
layerState._native?.destroy();
layerState._native = null;
layerState._pointCollection = null;
@@ -263,7 +334,10 @@ export function createLifecycle({
parts.rendering.removeHeatLines();
layerState._tileCache.clear();
if (layerState._styleListenerBound && typeof window !== 'undefined') {
window.removeEventListener('gev:style-change', layerState._styleListener);
window.removeEventListener(
'gev:style-change',
layerState._styleListener,
);
layerState._styleListenerBound = false;
}
layerState._sceneReady?.();
+1 -2
View File
@@ -144,8 +144,7 @@ export const HEAT_JAM_COLOR = rgbaFromCss('#e05252');
/** @const {Cesium.Color} Slow corridor color (bucket amber, faint + static). */
export const HEAT_SLOW_COLOR =
rgbaFromCss('#f0b23e').withAlpha(0.2);
export const HEAT_SLOW_COLOR = rgbaFromCss('#f0b23e').withAlpha(0.2);
/** @const {number} Far-distance scale floor for jam dots (shipped: 0.3). */
+28 -8
View File
@@ -129,9 +129,20 @@ export function createRendering({
: HEAT_SLOW_COLOR;
if (layerState._native) {
const roadsFor = bucket => kept.filter(item=>item.bucket===bucket).map(item=>item.road);
layerState._heatJamPrim = layerState._native.makeHeat(roadsFor('jam'), jamLineColor, HEAT_LINE_JAM_WIDTH, HEAT_JAM_BASE_ALPHA);
layerState._heatSlowPrim = layerState._native.makeHeat(roadsFor('slow'), slowLineColor, HEAT_LINE_SLOW_WIDTH, slowLineColor.alpha);
const roadsFor = (bucket) =>
kept.filter((item) => item.bucket === bucket).map((item) => item.road);
layerState._heatJamPrim = layerState._native.makeHeat(
roadsFor('jam'),
jamLineColor,
HEAT_LINE_JAM_WIDTH,
HEAT_JAM_BASE_ALPHA,
);
layerState._heatSlowPrim = layerState._native.makeHeat(
roadsFor('slow'),
slowLineColor,
HEAT_LINE_SLOW_WIDTH,
slowLineColor.alpha,
);
layerState._heatLineCount = kept.length;
parts.animation.syncRenderDemand();
return;
@@ -228,7 +239,8 @@ export function createRendering({
areaDist = Math.max(
areaDist,
Cesium.Cartesian3.distance(
layerState._engine?.camera.livePosition ?? layerState._viewer.camera.positionWC,
layerState._engine?.camera.livePosition ??
layerState._viewer.camera.positionWC,
wp,
),
);
@@ -247,10 +259,18 @@ export function createRendering({
: null;
parts.retention.reconcile(filteredRoads, altitude, replace);
if (layerState._dots.length && filteredRoads.some((r) => !r.directFlow))
services.credits?.showOsmCredit?.(layerState._engine ?? layerState._viewer, 'traffic', {
openMapTiles: true,
});
else services.credits?.hideOsmCredit?.(layerState._engine ?? layerState._viewer, 'traffic');
services.credits?.showOsmCredit?.(
layerState._engine ?? layerState._viewer,
'traffic',
{
openMapTiles: true,
},
);
else
services.credits?.hideOsmCredit?.(
layerState._engine ?? layerState._viewer,
'traffic',
);
parts.model.recolorDotsInPlace(label);
const renderMetrics = state
+11 -2
View File
@@ -217,7 +217,8 @@ export function createRetention({ state, parts }) {
const blend = Math.min(1, dt * 12);
const scene = state._trafficScene?.() ?? state._viewer?.scene;
const canProject =
scene?.canvas?.clientHeight && (scene.project || (scene.camera && scene.frameState));
scene?.canvas?.clientHeight &&
(scene.project || (scene.camera && scene.frameState));
state._heightPending = false;
for (let r = 0; r < state._roads.length; r++) {
const road = state._roads[r];
@@ -300,5 +301,13 @@ export function createRetention({ state, parts }) {
state._populationPending = false;
state._heightPending = false;
}
return { reconcile, retarget, easeHeights, finishHeights, clear, refreshCounts, resume: schedule };
return {
reconcile,
retarget,
easeHeights,
finishHeights,
clear,
refreshCounts,
resume: schedule,
};
}
+2 -2
View File
@@ -18,8 +18,8 @@ export function createState({ services }) {
layerState._viewer = null;
layerState._engine = null;
layerState._native = null;
layerState._trafficScene = () => layerState._native?.surface ?? layerState._viewer?.scene;
layerState._trafficScene = () =>
layerState._native?.surface ?? layerState._viewer?.scene;
/** @type {Cesium.PointPrimitiveCollection|null} */
+6 -3
View File
@@ -50,7 +50,7 @@ export function observeTrafficSurface(scene) {
}
function currentRenderedFrame(scene) {
if (scene.engine) return {ready:scene.ready};
if (scene.engine) return { ready: scene.ready };
if (!scene.postRender?.addEventListener || !scene.camera?.viewMatrix)
return { ready: surfaceTilesReady(scene) };
const frame = renderedFrames.get(scene);
@@ -280,7 +280,9 @@ export async function prepareRoadSurfaces(
cache = { surface, heights: new Map() };
sceneCaches.set(scene, cache);
}
const cameraCarto = scene.engine?.camera.pose().cartographic ?? scene.camera?.positionCartographic;
const cameraCarto =
scene.engine?.camera.pose().cartographic ??
scene.camera?.positionCartographic;
const cameraLon = cameraCarto
? Cesium.Math.toDegrees(cameraCarto.longitude)
: 0;
@@ -345,7 +347,8 @@ export async function prepareRoadSurfaces(
if (validHeight(sampled)) metrics.depthHits++;
}
if (
!scene.engine && !scene.globe?.show &&
!scene.engine &&
!scene.globe?.show &&
!validHeight(sampled) &&
scene.sampleHeightSupported
) {
+31 -8
View File
@@ -24,7 +24,9 @@ export function createViewport({ state: layerState, services, parts, source }) {
*/
function getCameraAltitude() {
const carto = layerState._engine?.camera.pose().cartographic ?? layerState._viewer?.camera.positionCartographic;
const carto =
layerState._engine?.camera.pose().cartographic ??
layerState._viewer?.camera.positionCartographic;
return carto ? carto.height : Infinity;
}
@@ -35,7 +37,9 @@ export function createViewport({ state: layerState, services, parts, source }) {
*/
function getViewBounds() {
const rect = layerState._engine?.camera.viewRectangle() ?? layerState._viewer?.camera.computeViewRectangle();
const rect =
layerState._engine?.camera.viewRectangle() ??
layerState._viewer?.camera.computeViewRectangle();
if (!rect) return null;
return {
south: geo.math.toDegrees(rect.south),
@@ -60,18 +64,23 @@ export function createViewport({ state: layerState, services, parts, source }) {
*/
function getFetchCenter() {
const carto = layerState._engine?.camera.pose().cartographic ?? layerState._viewer?.camera.positionCartographic;
const carto =
layerState._engine?.camera.pose().cartographic ??
layerState._viewer?.camera.positionCartographic;
if (!carto) return null;
const nadirLat = geo.math.toDegrees(carto.latitude);
const nadirLon = geo.math.toDegrees(carto.longitude);
let hitLat;
let hitLon;
const canvas = layerState._engine?.host.canvas ?? layerState._viewer.scene.canvas;
const canvas =
layerState._engine?.host.canvas ?? layerState._viewer.scene.canvas;
const width = canvas.clientWidth || canvas.width;
const height = canvas.clientHeight || canvas.height;
if (width > 0 && height > 0) {
const hit = (layerState._engine?.camera ?? layerState._viewer.camera).pickEllipsoid(
const hit = (
layerState._engine?.camera ?? layerState._viewer.camera
).pickEllipsoid(
geo.cartesian2.create(width / 2, height / 2),
Cesium.Ellipsoid.WGS84,
);
@@ -174,7 +183,12 @@ export function createViewport({ state: layerState, services, parts, source }) {
/** Debounce camera events and sample the actual settled view, including final flight steps. */
function onCameraChanged(options) {
if (!layerState._enabled || layerState._waitForScene || layerState._restoringViewport) return;
if (
!layerState._enabled ||
layerState._waitForScene ||
layerState._restoringViewport
)
return;
clearTimeout(layerState._fetchTimeout);
if (getCameraAltitude() > ACTIVATION_ALTITUDE) {
clearTimeout(layerState._retryTimer);
@@ -197,10 +211,19 @@ export function createViewport({ state: layerState, services, parts, source }) {
: null;
layerState._fetchTimeout = setTimeout(
() => {
if (!layerState._enabled || layerState._waitForScene || layerState._restoringViewport) return;
if (
!layerState._enabled ||
layerState._waitForScene ||
layerState._restoringViewport
)
return;
const alt = getCameraAltitude();
if (alt > ACTIVATION_ALTITUDE) return onCameraChanged();
const footprint = reticleFootprint(layerState._viewer, alt, layerState._engine);
const footprint = reticleFootprint(
layerState._viewer,
alt,
layerState._engine,
);
const bounds = footprint || getViewBounds();
if (!bounds) return;
const center = footprint ? null : getFetchCenter();