que01/osmWorkflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use live V2X vehicles only in preview

Browse Source
This commit is contained in:
que01
2026-08-24 14:42:31 +08:00
parent ee273c5cd6
commit b7031f145a
10 changed files with 240 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/build-area.js
View File

@@ -16,7 +16,6 @@ const {
} = require("./lib/scene-layers");
const { digest: glbDigest } = require("./glb-digest");
const { buildVehicleRoute: buildPreviewVehicleRoute } = require("./lib/vehicle-route");
const { buildNativeTrafficSimulation } = require("./lib/native-preview-traffic-simulation");
const { writePreviewVehicleLibrary } = require("./lib/vehicle-library");
const { readTrafficSignals } = require("./lib/traffic-signals");
const {
@@ -576,11 +575,9 @@ function writeCesiumPreview(area, roadProvider) {
});
} else {
Object.assign(previewInputs, nativeRoadRecords(area));
const simulation = buildNativeTrafficSimulation(area);
fs.mkdirSync(path.dirname(area.outputs.trafficSimulation), { recursive: true });
fs.writeFileSync(area.outputs.trafficSimulation, `${JSON.stringify(simulation, null, 2)}\n`);
previewInputs.trafficSimulation = fileRecord(area.outputs.trafficSimulation);
routeArtifact = area.outputs.trafficSimulation;
// This operational preview intentionally has no synthetic vehicle source.
// A stale descriptor from an older build must not resurrect simulated routes.
fs.rmSync(area.outputs.trafficSimulation, { force: true });
}
const htmlPath = area.outputs.cesiumPreview;
const started = Date.now();
@@ -592,18 +589,18 @@ function writeCesiumPreview(area, roadProvider) {
// Do not let a route from an earlier legacy preview survive into native output.
fs.rmSync(area.outputs.vehicleRoute, { force: true });
}
const vehicleModelNames = writeVehicleModel(area);
const vehicleModelNames = [];
writeCesiumPreviewSupportFiles(path.dirname(htmlPath));
const glbName = "package/manifest.json";
const metadataName = "package/manifest.json";
const routeName = vehicleRoute || routeArtifact
? previewRelativePath(area.outputs.areaDir, vehicleRoute ? area.outputs.vehicleRoute : routeArtifact)
: null;
const vehicleModelName = previewRelativePath(area.outputs.areaDir, area.outputs.vehicleModel);
const descriptor = { routeName, vehicleModelName: previewRelativePath(area.outputs.areaDir, area.outputs.vehicleModel), vehicleModelNames: vehicleModelNames.map((name) => `_preview/${name}`), trafficSignalsName: "package/runtime/traffic-signals.json", assets: [] };
const vehicleModelName = null;
const descriptor = { routeName, vehicleModelName, vehicleModelNames, trafficSignalsName: "package/runtime/traffic-signals.json", assets: [] };
fs.mkdirSync(area.outputs.previewDir, { recursive: true });
fs.writeFileSync(area.outputs.previewDescriptor, `${JSON.stringify(descriptor, null, 2)}\n`);
fs.writeFileSync(htmlPath, cesiumPreviewHtml(glbName, metadataName, routeName, vehicleModelName, area.id, vehicleModelNames.map((name) => `_preview/${name}`), "package/runtime/traffic-signals.json", "_preview/descriptor.json", area.v2xPreview));
fs.writeFileSync(htmlPath, cesiumPreviewHtml(glbName, metadataName, routeName, vehicleModelName, area.id, vehicleModelNames, "package/runtime/traffic-signals.json", "_preview/descriptor.json", area.v2xPreview));
console.log(`Cesium preview: ${htmlPath}`);
const finished = Date.now();
writeStageManifest(area, {

30
scripts/lib/cesium-preview.js
View File

@@ -48,7 +48,6 @@
const metadata = await fetchJson(config.metadataName);
const descriptor = config.previewDescriptorName ? await fetchOptionalJson(config.previewDescriptorName) : null;
adaptPackageManifest(metadata, descriptor);
const routeData = await fetchOptionalJson(config.routeName);
const signalData = await fetchOptionalJson(config.trafficSignalsName);
const placement = scenePlacement(metadata);
const viewer = createViewer();
@@ -56,7 +55,7 @@
const assets = await loadSceneAssets(viewer, metadata, placement);
const trafficStart = Cesium.JulianDate.now();
const trafficSignals = addTrafficSignals(viewer, signalData, trafficStart, assets);
const cruise = addVehicleCruises(viewer, routeData, signalData, trafficStart, config.vehicleModelNames, config.vehicleModelName);
const cruise = createLiveVehicleState();
const cameras = createCameraPresets(viewer, metadata, placement, cruise);
const v2xOverlay = typeof window.createV2xCesiumOverlay === "function"
? window.createV2xCesiumOverlay({ viewer, metadata, placement, config })
@@ -66,7 +65,7 @@
buildSemanticToggles(viewer, assets, placement);
bindRuntimeControls(viewer, assets, cruise, cameras, placement, trafficSignals);
bindVehicleInfoCard(viewer, cruise);
startDiagnostics(viewer, metadata, assets, cruise, placement, trafficSignals);
startDiagnostics(viewer, metadata, assets, cruise, placement, trafficSignals, v2xOverlay);
cameras.overview();
baseStatus = summaryText(metadata, assets, cruise);
setStatus(baseStatus);
@@ -590,6 +589,7 @@
baseSpeed: speed,
state: { selectedIndex: 0 },
simulation,
usingLiveData: false,
};
syncSelectedRouteVisibility(cruise);
return cruise;
@@ -597,10 +597,20 @@
function syncSelectedRouteVisibility(cruise) {
for (let index = 0; index < cruise.vehicles.length; index += 1) {
cruise.vehicles[index].routeEntity.show = toggleRoutes.checked && index === cruise.state.selectedIndex;
cruise.vehicles[index].routeEntity.show = !cruise.usingLiveData && toggleRoutes.checked && index === cruise.state.selectedIndex;
}
}
function createLiveVehicleState() {
return {
vehicles: [],
baseSpeed: 0,
state: { selectedIndex: 0 },
simulation: null,
usingLiveData: true,
};
}
function addTrafficSignals(viewer, signalData, start, assets) {
const dynamic = assets.find((asset) => asset.category === "dynamic" && asset.model);
const countdownModels = new Map(assets
@@ -1324,7 +1334,7 @@
// Camera-dependent readouts have to track the camera, so refresh off the
// render loop rather than a fixed timer, throttled to stay off the hot path.
function startDiagnostics(viewer, metadata, assets, cruise, placement, trafficSignals) {
function startDiagnostics(viewer, metadata, assets, cruise, placement, trafficSignals, v2xOverlay) {
const center = placement.position;
const stats = metadata.scene_stats || {};
const failed = assets.filter((asset) => asset.error);
@@ -1345,11 +1355,9 @@
"Trees: " + Number(stats.trees || 0),
"Road layer source: " + (metadata.source_geojson ? "osm2streets" : "OSM fallback")
];
if (cruise.simulation) {
const simulation = cruise.simulation.diagnostics();
lines.push("Simulation: native-preview-traffic-simulation/v1");
lines.push("Stopped: " + simulation.stoppedVehicles);
lines.push("Queue: " + simulation.queueLength);
if (v2xOverlay?.state) {
lines.push("Vehicle data: " + (v2xOverlay.state.vehicleSource === "live" ? "live V2X" : "waiting for live V2X"));
lines.push("Live vehicles: " + v2xOverlay.state.vehicles.size);
}
if (failed.length) {
lines.push("Failed assets: " + failed.map((asset) => asset.url).join(", "));
@@ -1371,7 +1379,7 @@
return [
config.areaId,
liveAssets(assets).map((asset) => asset.url).join(", "),
cruise.vehicles.length ? "vehicles " + cruise.vehicles.length : "no drivable route",
"live V2X vehicles only",
"buildings " + Number(stats.buildings || 0),
"trees " + Number(stats.trees || 0)
].filter(Boolean).join(" | ");

131
scripts/lib/v2x-cesium-overlay.js
View File

@@ -13,11 +13,13 @@
const state = {
token: sessionStorage.getItem(TOKEN_KEY) || "",
entities: [],
vehicles: new Map(),
linkPhases: new Map(),
socket: null,
sockets: [],
status: "Sign in to load live V2X data.",
crossCode: settings.crossCode || "",
metrics: null,
vehicleSource: "waiting",
};
const ui = buildUi(state, settings);
@@ -29,14 +31,25 @@
function clearEntities() {
state.entities.forEach((entity) => context.viewer.entities.remove(entity));
state.entities = [];
state.vehicles.forEach((vehicle) => {
context.viewer.entities.remove(vehicle.entity);
context.viewer.entities.remove(vehicle.trace);
});
state.vehicles.clear();
state.linkPhases.clear();
}
function disconnect() {
if (state.socket) state.socket.close();
state.socket = null;
state.sockets.forEach((socket) => socket.close());
state.sockets = [];
}
function useLiveVehicles() {
if (state.vehicleSource === "live") return;
state.vehicleSource = "live";
}
state.activateLiveVehicles = useLiveVehicles;
async function request(path) {
const response = await fetch(joinUrl(settings.apiBaseUrl || "/api", path), {
headers: state.token ? { Authorization: state.token } : {},
@@ -77,6 +90,7 @@
function signOut(message) {
disconnect();
clearEntities();
state.vehicleSource = "waiting";
state.token = "";
sessionStorage.removeItem(TOKEN_KEY);
ui.form.hidden = false;
@@ -92,6 +106,7 @@
}
state.crossCode = crossCode;
clearEntities();
state.vehicleSource = "waiting";
setStatus("Loading live V2X intersection data...");
const results = await Promise.allSettled([
request(`/network/api/link/network/queryCrossLinkInfo/${encodeURIComponent(crossCode)}`),
@@ -111,25 +126,55 @@
const targetCount = deviceConfig.status === "fulfilled" ? arrayValue(deviceConfig.value?.deviceConfig?.target).length : 0;
state.metrics = flow.status === "fulfilled" ? flow.value : null;
if (flow.status !== "fulfilled") warnings.push("traffic metrics unavailable");
connectSignalSocket();
connectLiveSockets(deviceConfig.status === "fulfilled" ? deviceConfig.value : null);
const linkCount = links.status === "fulfilled" ? arrayValue(links.value?.inLinkList).length : 0;
const metricCount = arrayValue(state.metrics).length;
setStatus(`Live V2X: ${linkCount} links, ${deviceCount} devices, ${poleCount} poles, ${targetCount} configured targets, ${metricCount} flow metrics. GCJ-02 -> WGS84 once.${warnings.length ? ` ${warnings.join(", ")}.` : ""}`);
}
function connectSignalSocket() {
function connectLiveSockets(deviceConfig) {
disconnect();
const socketUrl = toWebSocketUrl(joinUrl(settings.wsBaseUrl || "/websocket", "/network/ws/network/signal"), state.token);
connectSignalSocket();
connectObuSocket();
connectTargetSocket(deviceConfig);
}
function openSocket(path, onOpen, onMessage, unavailable) {
const socketUrl = toWebSocketUrl(joinUrl(settings.wsBaseUrl || "/websocket", path), state.token);
try {
state.socket = new WebSocket(socketUrl);
state.socket.onopen = () => state.socket?.send(JSON.stringify({ junctionId: state.crossCode }));
state.socket.onmessage = (event) => updateSignalPhases(event.data, state);
state.socket.onerror = () => setStatus(`${state.status} Signal WebSocket unavailable.`);
const socket = new WebSocket(socketUrl);
state.sockets.push(socket);
socket.onopen = () => onOpen?.(socket);
socket.onmessage = (event) => onMessage(event.data);
socket.onerror = () => setStatus(`${state.status} ${unavailable}.`);
return socket;
} catch (_) {
setStatus(`${state.status} Signal WebSocket unavailable.`);
setStatus(`${state.status} ${unavailable}.`);
return null;
}
}
function connectSignalSocket() {
openSocket("/network/ws/network/signal", (socket) => socket.send(JSON.stringify({ junctionId: state.crossCode })),
(value) => updateSignalPhases(value, state), "Signal WebSocket unavailable");
}
function connectObuSocket() {
openSocket("/network/ws/network/obuPosition", null, (value) => {
const vehicle = normalizeObuVehicle(value);
if (vehicle) updateLiveVehicle(context.viewer, vehicle, state);
}, "OBU vehicle WebSocket unavailable");
}
function connectTargetSocket(deviceConfig) {
openSocket("/network/ws/network/targetPosition", (socket) => {
const targetIds = arrayValue(deviceConfig?.deviceConfig?.target);
socket.send(JSON.stringify({ deviceId: targetIds.length ? targetIds.join(",") : null }));
}, (value) => {
normalizeTargetVehicles(value).forEach((vehicle) => updateLiveVehicle(context.viewer, vehicle, state));
}, "Target vehicle WebSocket unavailable");
}
ui.form.addEventListener("submit", async (event) => {
event.preventDefault();
try {
@@ -147,13 +192,13 @@
ui.live.hidden = false;
loadLiveData().catch((error) => setStatus(error.message || "Live V2X data unavailable"));
}
return { state, load: loadLiveData, signOut, dispose: () => { disconnect(); clearEntities(); ui.root.remove(); } };
return { state, load: loadLiveData, signOut, dispose: () => { disconnect(); clearEntities(); state.vehicleSource = "waiting"; ui.root.remove(); } };
}
function buildUi(state, settings) {
const root = document.createElement("aside");
root.id = "v2xPanel";
root.innerHTML = `<div class="v2x-heading"><strong>Live V2X Overlay</strong><span>Native: WGS84/ENU | V2X: GCJ-02</span></div>
root.innerHTML = `<div class="v2x-heading"><strong>Live V2X Data</strong><span>Native: WGS84/ENU | V2X: GCJ-02</span></div>
<form id="v2xLoginForm"><label>Username<input name="userName" autocomplete="username" required></label><label>Password<input name="password" type="password" autocomplete="current-password" required></label><button type="submit">Sign in</button></form>
<div id="v2xLiveControls" hidden><label>Intersection code<input name="crossCode" value="${escapeAttribute(settings.crossCode || "")}" required></label><div><button type="button" data-action="reload">Refresh</button><button type="button" data-action="signout">Sign out</button></div></div>
<output id="v2xStatus"></output>`;
@@ -202,6 +247,64 @@
});
}
function updateLiveVehicle(viewer, vehicle, state) {
const [longitude, latitude] = gcj02ToWgs84([vehicle.longitude, vehicle.latitude]);
if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) return;
state.activateLiveVehicles?.();
const position = Cesium.Cartesian3.fromDegrees(longitude, latitude, .65);
let record = state.vehicles.get(vehicle.id);
if (!record) {
const tracePositions = [position];
record = {
tracePositions,
entity: viewer.entities.add({
name: vehicle.label,
position,
point: { pixelSize: 10, color: vehicle.kind === "obu" ? Cesium.Color.LIME : Cesium.Color.ORANGE, outlineColor: Cesium.Color.BLACK, outlineWidth: 1 },
label: { text: vehicle.label, font: "11px sans-serif", fillColor: Cesium.Color.WHITE, outlineColor: Cesium.Color.BLACK, outlineWidth: 2, style: Cesium.LabelStyle.FILL_AND_OUTLINE, pixelOffset: new Cesium.Cartesian2(0, -16) },
}),
trace: viewer.entities.add({
name: `${vehicle.label} live trace`,
polyline: { positions: new Cesium.CallbackProperty(() => tracePositions, false), width: 3, material: vehicle.kind === "obu" ? Cesium.Color.LIME : Cesium.Color.ORANGE, arcType: Cesium.ArcType.NONE },
}),
};
state.vehicles.set(vehicle.id, record);
} else {
record.entity.position = position;
record.tracePositions.push(position);
if (record.tracePositions.length > 24) record.tracePositions.shift();
}
}
function parseSocketJson(value) {
if (typeof value !== "string" || value.includes('"heartBeat":"pong"')) return null;
try { return JSON.parse(value); } catch (_) { return null; }
}
function normalizeObuVehicle(value) {
const source = parseSocketJson(value);
const longitude = Number(source?.lon);
const latitude = Number(source?.lat);
const code = source?.carCode || source?.obuCode;
if (!code || !Number.isFinite(longitude) || !Number.isFinite(latitude)) return null;
return { id: `obu-${code}`, label: source.plateNumber || String(code), kind: "obu", longitude, latitude, angle: Number(source.angle) || 0, speed: Number(source.speed) || 0 };
}
function normalizeTargetVehicles(value) {
const source = parseSocketJson(value);
const devices = source?.data;
if (!devices || typeof devices !== "object" || Array.isArray(devices)) return [];
return Object.keys(devices).flatMap((deviceId) => arrayValue(devices[deviceId]).map((target) => {
const longitude = Number(target?.longitude);
const latitude = Number(target?.latitude);
if (!target?.id || !Number.isFinite(longitude) || !Number.isFinite(latitude)) return null;
const type = target.type || 1;
const subType = target.subType || 1;
return { id: `${deviceId}-${target.id}-${type}${subType}`, label: target.plate || `${deviceId}-${target.id}`, kind: "target", longitude, latitude, angle: Number(target.angle) || 0, speed: Number(target.speed) || 0 };
}).filter(Boolean));
}
function updateSignalPhases(value, state) {
let lamps;
try { lamps = JSON.parse(value).lamps; } catch (_) { return; }
@@ -275,6 +378,6 @@
function rotate(value, count) { return (value << count) | (value >>> (32 - count)); }
function hex(value) { let output = ""; for (let index = 0; index < 4; index += 1) output += (`0${(value >>> (index * 8) & 255).toString(16)}`).slice(-2); return output; }
createV2xCesiumOverlay.utils = { gcj02ToWgs84, joinUrl, md5, toWebSocketUrl };
createV2xCesiumOverlay.utils = { gcj02ToWgs84, joinUrl, md5, toWebSocketUrl, normalizeObuVehicle, normalizeTargetVehicles };
window.createV2xCesiumOverlay = createV2xCesiumOverlay;
}());

11
scripts/test-preview-assets.js
View File

@@ -267,7 +267,8 @@ assert.match(html, /id="semanticToggles" class="control-subgroup hidden"/);
const previewRuntime = fs.readFileSync(path.join(__dirname, "lib", "cesium-preview.js"), "utf8");
const v2xRuntime = fs.readFileSync(path.join(__dirname, "lib", "v2x-cesium-overlay.js"), "utf8");
const buildAreaSource = fs.readFileSync(path.join(__dirname, "build-area.js"), "utf8");
assert.match(buildAreaSource, /vehicleModelNames\.map\(\(name\) => `_preview\/\$\{name\}`\)/);
assert.match(buildAreaSource, /const vehicleModelNames = \[\];/);
assert.doesNotMatch(buildAreaSource, /buildNativeTrafficSimulation/);
const countdownFont = path.join(__dirname, "..", "assets", "fonts", "7LED-1.ttf");
assert.ok(fs.existsSync(countdownFont), "7LED countdown font must be versioned with the project");
assert.doesNotMatch(previewRuntime, /cylinder: \{ length: 6\.7/);
@@ -278,7 +279,11 @@ assert.match(v2xRuntime, /\/facilities\/api\/sys\/login/);
assert.match(v2xRuntime, /sessionStorage/);
assert.match(v2xRuntime, /GCJ-02 -> WGS84 once/);
assert.match(v2xRuntime, /\/network\/ws\/network\/signal/);
assert.match(v2xRuntime, /\/network\/ws\/network\/obuPosition/);
assert.match(v2xRuntime, /\/network\/ws\/network\/targetPosition/);
assert.match(v2xRuntime, /gcj02ToWgs84/);
assert.match(previewRuntime, /createLiveVehicleState\(\)/);
assert.doesNotMatch(previewRuntime, /const cruise = addVehicleCruises\(/);
assert.match(previewRuntime, /new Cesium\.ScreenSpaceEventHandler/);
assert.match(previewRuntime, /vehicleId: record\.id/);
assert.match(previewRuntime, /status === "breakdown"\s+\? "vehicle-breakdown\.png"/);
@@ -289,9 +294,7 @@ assert.match(previewRuntime, /\(\) => record\?\.status === "normal"/);
assert.match(previewRuntime, /Cesium\.SceneTransforms\.worldToWindowCoordinates/);
assert.match(previewRuntime, /TrafficSignalDynamic_/);
assert.match(previewRuntime, /TrafficSignalDynamic_\$\{nodeKey\}_countdown_\$\{String\(value\)\.padStart\(2, "0"\)\}/);
assert.match(previewRuntime, /native-preview-traffic-simulation\/v1/);
assert.match(previewRuntime, /leader-gap/);
assert.match(previewRuntime, /stopReason = "traffic-signal"/);
assert.doesNotMatch(previewRuntime, /native-preview-traffic-simulation\/v1/);
assert.match(previewRuntime, /ColorBlendMode\.REPLACE/);
assert.match(previewRuntime, /setBuildingGhost/);
assert.match(previewRuntime, /fetch\(url, \{ cache: "no-store" \}\)/);

9
scripts/test-v2x-cesium-overlay.js
View File

@@ -15,7 +15,7 @@ const context = {
};
vm.runInNewContext(source, context, { filename: "v2x-cesium-overlay.js" });
const { gcj02ToWgs84, joinUrl, md5, toWebSocketUrl } = context.window.createV2xCesiumOverlay.utils;
const { gcj02ToWgs84, joinUrl, md5, toWebSocketUrl, normalizeObuVehicle, normalizeTargetVehicles } = context.window.createV2xCesiumOverlay.utils;
assert.equal(md5(""), "d41d8cd98f00b204e9800998ecf8427e");
assert.equal(md5("password"), "5f4dcc3b5aa765d61d8327deb882cf99");
assert.equal(joinUrl("/api/", "/facilities/api/sys/login"), "/api/facilities/api/sys/login");
@@ -27,5 +27,12 @@ const reference = referenceGcj02ToWgs84([114.12864875054062, 30.460485279762146]
assert.ok(Math.abs(converted[0] - reference[0]) < 1e-12);
assert.ok(Math.abs(converted[1] - reference[1]) < 1e-12);
assert.deepEqual(gcj02ToWgs84([Infinity, 30]), [NaN, NaN]);
assert.deepEqual(normalizeObuVehicle(JSON.stringify({ carCode: "car-7", plateNumber: "A12345", lon: 114.12865, lat: 30.46049, angle: 90, speed: 12 })), {
id: "obu-car-7", label: "A12345", kind: "obu", longitude: 114.12865, latitude: 30.46049, angle: 90, speed: 12,
});
assert.deepEqual(normalizeTargetVehicles(JSON.stringify({ data: { "8": [{ id: 9, longitude: 114.12866, latitude: 30.4605, type: 1, subType: 2, angle: 180, speed: 5 }] } })), [{
id: "8-9-12", label: "8-9", kind: "target", longitude: 114.12866, latitude: 30.4605, angle: 180, speed: 5,
}]);
assert.equal(normalizeObuVehicle('{bad json'), null);
console.log("V2X Cesium overlay tests passed.");