leaflet-city-mapper 0.0.3 → 0.0.5

package/src/traffic/fetchTrafficLanes.js

@@ -1,10 +1,10 @@
 export async function fetchTrafficLanes(state, time, signal) {
-  const href = new URL(state.url, document.baseURI).href;
+  const href = /* alloc */ new URL(state.url, document.baseURI).href;
   if (/\.m?js(?:[?#]|$)/i.test(state.url)) return (await import(href)).default(time, state.layer, signal);
   if (!state.file) {
-    const response = await fetch(href, { signal });
-    if (!response.ok) throw new Error(`HTTP ${response.status}`);
+    const response = await fetch(href, /* alloc */ { signal });
+    if (!response.ok) throw /* alloc */ new Error(`HTTP ${response.status}`);
     state.file = await response.json();
   }
   return state.file;
-}
+}

package/src/traffic/groundTraffic.js

@@ -1,12 +1,16 @@
-import { getElevation } from '../terrain/getElevation.js';
+import { rootByLayer } from '../weakmaps/rootByLayer.js';
+
+import { readyTerrainOf } from '../terrain/readyTerrainOf.js';
+import { mapElevationOf } from '../terrain/mapElevationOf.js';
 
 export function groundTraffic(state) {
   const { layer, lanes } = state;
-  const terrain = layer._map._terrain3D?._terrainReady && layer._map._terrain3D, base = layer.root.position[1];
+  const terrain = readyTerrainOf(layer._map);
+  const base = rootByLayer.get(layer).position[1];
   let lane, i, elevation;
   for (lane of lanes) {
     for (i = 0; i < lane.points.length; i++) {
-      elevation = terrain && (lane.elevation ?? getElevation(terrain, lane.latlngs[i]));
+      elevation = terrain && (lane.elevation ?? mapElevationOf(layer._map, lane.latlngs[i]));
       lane.points[i][2] = Number.isFinite(elevation) && Number.isFinite(base) ? elevation - base : 0;
     }
   }

package/src/traffic/initTraffic.js

@@ -1,54 +1,66 @@
-/**
- * Vehicles moving along GeoJSON lanes; a compute pass places them on the GPU every frame.
- * Source options:
- * - `url`: GeoJSON (Multi)LineStrings, or a JS module whose default export `(time, layer, signal)` returns them (time-dependent data);
- * - `vehicle`: 'car' (default), 'boat', 'bus', 'tram', 'metro', 'bicycle' or 'pedestrian'; `side`: offset right of the lane centreline in metres (vehicle default);
- * - `speed`: m/s of `flow` lanes; `outline`: draw the lanes.
- * Lane properties: `flow` (vehicles/h) or `timetable` (see scheduledTrips.js), optional fixed `elevation`
- * in metres, `name`/`description` for the default tooltip. The status line (count and vehicle type) sits under the layer's entry in the layers control.
- * L.Control.Time on the same map drives the time; without one, vehicles run live.
- */
-import { build } from '../geometry/build.js';
-import { init3D } from '../scene/init3D.js';
-import { tooltip } from './tooltip.js';
-import { speed } from '../constants/speed.js';
-import { vehicles } from '../constants/vehicles.js';
-import { trafficShader } from '../constants/trafficShader.js';
+import { L } from '../globals/L.js';
+import { speed as sharedSpeed } from '../globals/speed.js';
+import { trafficEmptyOptions } from '../globals/trafficEmptyOptions.js';
+import { vehicles } from '../globals/vehicles.js';
+import { trafficShader } from '../globals/trafficShader.js';
+import { trafficByLayer } from '../weakmaps/trafficByLayer.js';
+
+
+/**
+ * Vehicles moving along GeoJSON lanes; a compute pass places them on the GPU every frame.
+ * Source options:
+ * - `url`: GeoJSON (Multi)LineStrings, or a JS module whose default export `(time, layer, signal)` returns them (time-dependent data);
+ * - `vehicle`: 'car' (default), 'boat', 'bus', 'tram', 'metro', 'bicycle' or 'pedestrian'; `side`: offset right of the lane centreline in metres (vehicle default);
+ * - `speed`: m/s of `flow` lanes; `outline`: draw the lanes.
+ * Lane properties: `flow` (vehicles/h) or `timetable` (see scheduledTrips.js), optional fixed `elevation`
+ * in metres, `name`/`description` for the default tooltip. The status line (count and vehicle type) sits under the layer's entry in the layers control.
+ * L.Control.Time on the same map drives the time; without one, vehicles run live.
+ */
+import { build } from '../geometry/buildGeometryParts.js';
+import { init3D } from '../scene/init3D.js';
+import { tooltip } from './trafficTooltip.js';
+
+
+
 import { addTraffic } from './addTraffic.js';
 import { placeTraffic } from './placeTraffic.js';
 import { removeTraffic } from './removeTraffic.js';
 import { readyTraffic } from './readyTraffic.js';
 import { tickTraffic } from './tickTraffic.js';
 import { updateTraffic } from './updateTraffic.js';
-import { updateTrafficTerrain } from './updateTrafficTerrain.js';
-
-export function initTraffic(layer, { url, vehicle = 'car', side, outline, speed: velocity = speed, ...options } = {}) {
-  const { model, lights, side: defaultSide } = vehicles[vehicle];
-  side ??= defaultSide;
-  init3D(layer, {
-    tooltip,
-    nightLight: Boolean(lights),
-    ...options,
-  });
-  const status = L.DomUtil.create('small', 'traffic-status');
-  status.style.cssText = 'display:block;max-width:200px;margin:0 0 4px 20px;color:#555;';
-  const template = build(model(0)), stride = template.position.length, vertices = stride / 3;
-  const params = new ArrayBuffer(16), paramFloats = new Float32Array(params), paramInts = new Uint32Array(params);
-  const state = {
-    layer, url, model, lights, side, outline, velocity, vehicle, status, template, stride, vertices,
-    params, paramFloats, paramInts,
-    ready: false, frame: undefined, request: undefined, lanes: [], tripsKey: undefined,
-    mesh: undefined, route: undefined, litAt: -Infinity,
-    trips: [], rebasedAt: 0, nextCheck: -Infinity, elapsed: 0, gpu: null,
-    lanesDirty: true, stale: false, loaded: undefined, file: undefined,
-  };
-  // Lane points are [x, z, ground, cumulative length]. Mirrors along() and place().
-  state.shader = trafficShader;
-  state.tick = tickTraffic.bind(null, state);
-  state.update = updateTraffic.bind(null, state);
-  state.terrain = updateTrafficTerrain.bind(null, state);
-  layer._beforeRaycast = placeTraffic.bind(null, state);
-  layer.on('ready', readyTraffic.bind(null, state));
-  layer.on('add', addTraffic.bind(null, state));
-  layer.on('remove', removeTraffic.bind(null, state));
-}
+import { updateTrafficTerrain } from './updateTrafficTerrain.js';
+
+export function initTraffic(layer, { url, vehicle = 'car', side, outline, speed: velocity = sharedSpeed, ...options } = trafficEmptyOptions) {
+  const { model, lights, side: defaultSide } = vehicles[vehicle];
+  side ??= defaultSide;
+  init3D(layer, /* alloc */ {
+    tooltip,
+    nightLight: Boolean(lights),
+    ...options,
+  });
+  const status = L.DomUtil.create('small', 'traffic-status');
+  status.style.cssText = 'flex:0 1 auto;padding:1px 5px;border-radius:3px;background:#00000008;color:#555;';
+  status.title = vehicle;
+  status.textContent = `${vehicle}: loading…`;
+  const template = build(model(0)), stride = template.position.length, vertices = stride / 3;
+  const params = /* alloc */ new ArrayBuffer(16);
+  const paramFloats = /* alloc */ new Float32Array(params);
+  const paramInts = /* alloc */ new Uint32Array(params);
+  const state = /* alloc */ {
+    layer, url, model, lights, side, outline, velocity, vehicle, status, template, stride, vertices,
+    params, paramFloats, paramInts,
+    ready: false, frame: undefined, request: undefined, lanes: /* alloc */ [], tripsKey: undefined,
+    mesh: undefined, route: undefined, litAt: -Infinity,
+    trips: /* alloc */ [], rebasedAt: 0, nextCheck: -Infinity, elapsed: 0, gpu: null,
+    lanesDirty: true, stale: false, loaded: undefined, file: undefined,
+  };
+  // Lane points are [x, z, ground, cumulative length]. Mirrors along() and place().
+  state.shader = trafficShader;
+  state.tick = tickTraffic.bind(null, state);
+  state.update = updateTraffic.bind(null, state);
+  state.terrain = updateTrafficTerrain.bind(null, state);
+  trafficByLayer.set(layer, state);
+  layer.on('ready', readyTraffic.bind(null, state));
+  layer.on('add', addTraffic.bind(null, state));
+  layer.on('remove', removeTraffic.bind(null, state));
+}

package/src/traffic/loadTraffic.js

@@ -3,13 +3,13 @@ import { fetchTrafficLanes } from './fetchTrafficLanes.js';
 import { loadedTrafficLanes } from './loadedTrafficLanes.js';
 import { failedTrafficLoad } from './failedTrafficLoad.js';
 
-export function loadTraffic(state) {
-  const { time } = trafficNow(state);
-  if (!Number.isFinite(time?.getTime())) return;
-  state.request?.abort();
-  const { signal } = state.request = new AbortController();
-  fetchTrafficLanes(state, time, signal).then(
-    loadedTrafficLanes.bind(null, state, signal),
-    failedTrafficLoad.bind(null, state, signal),
-  );
+export function loadTraffic(state) {
+  const { time } = trafficNow(state);
+  if (!Number.isFinite(time?.getTime())) return;
+  state.request?.abort();
+  const { signal } = state.request = /* alloc */ new AbortController();
+  fetchTrafficLanes(state, time, signal).then(
+    loadedTrafficLanes.bind(null, state, signal),
+    failedTrafficLoad.bind(null, state, signal),
+  );
 }

package/src/traffic/loadedTrafficLanes.js

@@ -1,4 +1,4 @@
-import { toLanes } from './toLanes.js';
+import { toLanes } from './featuresToTrafficLanes.js';
 import { prepareTraffic } from './prepareTraffic.js';
 
 export function loadedTrafficLanes(state, signal, data) {

package/src/traffic/locateTraffic.js

@@ -1,9 +1,11 @@
-import { along } from './along.js';
-
-export function locateTraffic(state, trip) {
+import { along } from '../geometry/interpolateRoute.js';
+
+export function locateTraffic(state, trip, target) {
   const { points, lengths, length } = trip.lane;
   let distance = trip.distance + state.elapsed * trip.speed;
   distance -= length * Math.floor(distance / length);
-  const { x, y, z, dx, dz } = along(points, lengths, distance);
-  return { x: x - dz * state.side, y, z: z + dx * state.side, dx, dz };
-}
+  const position = along(points, lengths, distance, target);
+  position.x -= position.dz * state.side;
+  position.z += position.dx * state.side;
+  return position;
+}

package/src/traffic/moveTraffic.js

@@ -10,6 +10,6 @@ export function moveTraffic(state, seconds) {
   pass.setBindGroup(0, state.gpu.bindGroup);
   pass.dispatchWorkgroups(state.trips.length);
   pass.end();
-  device.queue.submit([encoder.finish()]);
+  device.queue.submit(/* alloc */ [encoder.finish()]);
   state.stale = true;
-}
+}

package/src/traffic/placeTraffic.js

@@ -4,10 +4,11 @@ export function placeTraffic(state) {
   if (!state.mesh || !state.stale) return;
   state.stale = false;
   const { position, normal } = state.mesh.geometry.attributes;
+  const target = state.position ||= /* alloc */ {};
   let i, trip, cx, y, cz, dx, dz, k, o, lx, lz, nx, nz;
   for (i = 0; i < state.trips.length; i++) {
     trip = state.trips[i];
-    ({ x: cx, y, z: cz, dx, dz } = locateTraffic(state, trip));
+    ({ x: cx, y, z: cz, dx, dz } = locateTraffic(state, trip, target));
     for (k = 0, o = i * state.stride; k < state.stride; k += 3, o += 3) {
       lx = state.template.position[k], lz = state.template.position[k + 2], nx = state.template.normal[k], nz = state.template.normal[k + 2];
       position.data[o] = cx - lx * dz - lz * dx;

package/src/traffic/prepareTraffic.js

@@ -1,18 +1,24 @@
+import { locationByLayer } from '../weakmaps/locationByLayer.js';
+
+import { radians } from '../globals/radians.js';
+import { L } from '../globals/L.js';
+
+
 import { disposeTrafficObject } from './disposeTrafficObject.js';
 import { groundTraffic } from './groundTraffic.js';
 
 export function prepareTraffic(state) {
   const { layer, lanes } = state;
-  const crs = layer._map.options.crs, origin = crs.project(layer.location);
-  const metres = Math.cos(layer.location.lat * Math.PI / 180);
+  const crs = layer._map.options.crs, origin = crs.project(locationByLayer.get(layer));
+  const metres = Math.cos(locationByLayer.get(layer).lat * radians);
   let lane, lat, lng, point, i;
   for (lane of lanes) {
-    lane.points = [];
+    lane.points = /* alloc */ [];
     for ([lat, lng] of lane.latlngs) {
-      point = crs.project(new L.LatLng(lat, lng));
-      lane.points.push([(point.x - origin.x) * metres, -(point.y - origin.y) * metres, 0]);
+      point = crs.project(/* alloc */ new L.LatLng(lat, lng));
+      lane.points.push(/* alloc */ [(point.x - origin.x) * metres, -(point.y - origin.y) * metres, 0]);
     }
-    lane.lengths = [0];
+    lane.lengths = /* alloc */ [0];
     for (i = 1; i < lane.points.length; i++) {
       lane.lengths.push(lane.lengths[i - 1] + Math.hypot(lane.points[i][0] - lane.points[i - 1][0], lane.points[i][1] - lane.points[i - 1][1]));
     }

package/src/traffic/rebaseTraffic.js

@@ -1,39 +1,35 @@
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+
+
+
 import { destroyTrafficGpu } from './destroyTrafficGpu.js';
 import { trafficStorage } from './trafficStorage.js';
+import { uploadTrafficLanes } from './uploadTrafficLanes.js';
 
 export function rebaseTraffic(state) {
-  const { device } = state.layer.renderer;
+  const { device } = rendererByLayer.get(state.layer);
   if (state.gpu?.device !== device) {
     destroyTrafficGpu(state);
-    state.gpu = {
+    const template = /* alloc */ new Float32Array(
+      state.template.position.length + state.template.normal.length);
+    template.set(state.template.position);
+    template.set(state.template.normal, state.template.position.length);
+    state.gpu = /* alloc */ {
       device,
-      pipeline: device.createComputePipeline({ layout: 'auto', compute: { module: device.createShaderModule({ code: state.shader }), entryPoint: 'main' } }),
-      params: device.createBuffer({ size: 16, usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST }),
-      template: trafficStorage(device, new Float32Array([...state.template.position, ...state.template.normal])),
+      pipeline: device.createComputePipeline(/* alloc */ {
+        layout: 'auto', compute: /* alloc */ {
+          module: device.createShaderModule(/* alloc */ { code: state.shader }), entryPoint: 'main',
+        },
+      }),
+      params: device.createBuffer(/* alloc */ { size: 16, usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST }),
+      template: trafficStorage(device, template),
     };
     state.lanesDirty = true;
   }
-  let lane, i, point, trip, binding;
-  if (state.lanesDirty) {
-    let count = 0;
-    for (lane of state.lanes) count += lane.points.length;
-    const data = new Float32Array(count * 4);
-    let offset = 0;
-    for (lane of state.lanes) {
-      lane.start = offset / 4;
-      for (i = 0; i < lane.points.length; i++) {
-        point = lane.points[i];
-        data[offset++] = point[0];
-        data[offset++] = point[1];
-        data[offset++] = point[2];
-        data[offset++] = lane.lengths[i];
-      }
-    }
-    state.gpu.points?.destroy();
-    state.gpu.points = trafficStorage(device, data);
-    state.lanesDirty = false;
-  }
-  const data = new Float32Array(state.trips.length * 4), index = new Uint32Array(data.buffer);
+  let i, trip, binding;
+  if (state.lanesDirty) uploadTrafficLanes(state, device);
+  const data = /* alloc */ new Float32Array(state.trips.length * 4);
+  const index = /* alloc */ new Uint32Array(data.buffer);
   for (i = 0; i < state.trips.length; i++) {
     trip = state.trips[i];
     index[i * 4] = trip.lane.start;
@@ -48,10 +44,17 @@ export function rebaseTraffic(state) {
     state.gpu.vehicles = trafficStorage(device, data);
   }
   const { position, normal } = state.mesh.geometry.attributes;
-  const buffers = [state.gpu.params, state.gpu.template, state.gpu.points, state.gpu.vehicles, position.buffer, normal.buffer];
-  const entries = [];
-  for (binding = 0; binding < buffers.length; binding++) entries.push({ binding, resource: { buffer: buffers[binding] } });
-  state.gpu.bindGroup = device.createBindGroup({
+  const entries = /* alloc */ [];
+  let buffer;
+  for (binding = 0; binding < 6; binding++) {
+    buffer = binding === 0 ? state.gpu.params : binding === 1 ? state.gpu.template
+      : binding === 2 ? state.gpu.points : binding === 3 ? state.gpu.vehicles
+        : binding === 4 ? position.buffer : normal.buffer;
+    entries.push(/* alloc */ {
+      binding, resource: /* alloc */ { buffer },
+    });
+  }
+  state.gpu.bindGroup = device.createBindGroup(/* alloc */ {
     layout: state.gpu.pipeline.getBindGroupLayout(0),
     entries,
   });

package/src/traffic/rebuildTrafficMesh.js

@@ -1,27 +1,31 @@
-import { build } from '../geometry/build.js';
+import { trafficEmptyOptions } from '../globals/trafficEmptyOptions.js';
+import { build } from '../geometry/buildGeometryParts.js';
 import { createTrafficMesh } from './createTrafficMesh.js';
 import { disposeTrafficObject } from './disposeTrafficObject.js';
 import { trafficBounds } from './trafficBounds.js';
 
+
 export function rebuildTrafficMesh(state) {
   const { trips, model, vertices } = state;
   disposeTrafficObject(state, state.mesh);
   state.mesh = null;
   if (!trips.length) return;
-  const color = [], featureFaces = [];
+  const color = /* alloc */ [];
+  const featureFaces = /* alloc */ [];
   let i, trip, component;
   for (i = 0; i < trips.length; i++) {
     trip = trips[i];
     for (component of build(model(i, trip.properties)).color) color.push(component);
-    featureFaces.push({
+    featureFaces.push(/* alloc */ {
       id: trip.id, properties: trip.properties, faceStart: i * vertices / 3, faceEnd: (i + 1) * vertices / 3,
       vertexStart: i * vertices, vertexEnd: (i + 1) * vertices
     });
   }
   const count = color.length / 3;
-  state.mesh = createTrafficMesh(state, {
-    position: new Array(color.length).fill(0), normal: new Array(color.length).fill(0), color,
-  }, featureFaces, {}, GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC);
+  state.mesh = createTrafficMesh(state, /* alloc */ {
+    position: /* alloc */ new Array(color.length).fill(0),
+    normal: /* alloc */ new Array(color.length).fill(0), color,
+  }, featureFaces, trafficEmptyOptions, GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC);
   state.mesh.geometry.drawRange.count = count;
   state.mesh.extras.dynamicLights = true;
   trafficBounds(state);

package/src/traffic/refreshTrafficTrips.js

@@ -0,0 +1,32 @@
+import { tripsAt } from './tripsAt.js';
+import { failTraffic } from './failTraffic.js';
+import { drawTrafficRoute } from './drawTrafficRoute.js';
+import { rebuildTrafficMesh } from './rebuildTrafficMesh.js';
+import { rebaseTraffic } from './rebaseTraffic.js';
+import { trafficStatusText } from './trafficStatusText.js';
+
+export function refreshTrafficTrips(state, time, ms, valid) {
+  let text;
+  try {
+    if (valid) state.trips = tripsAt(time, state.lanes, state.velocity);
+    else state.trips.length = 0;
+    text = trafficStatusText(state, valid);
+  } catch (error) {
+    failTraffic(state, error);
+    return;
+  }
+  state.rebasedAt = ms;
+  state.nextCheck = ms + 1000;
+  let key = '', trip;
+  for (trip of state.trips) key += `${key ? ',' : ''}${trip.id}`;
+  const routeNeeded = state.outline && !state.route && state.lanes.length;
+  const changed = key !== state.tripsKey || Boolean(routeNeeded);
+  if (routeNeeded) drawTrafficRoute(state);
+  if (key !== state.tripsKey) { rebuildTrafficMesh(state); state.tripsKey = key; }
+  if (state.mesh) rebaseTraffic(state);
+  if (!state.error) {
+    if (state.status.textContent !== text) state.status.textContent = text;
+    state.status.removeAttribute('role');
+  }
+  return changed;
+}

package/src/traffic/removeTraffic.js

@@ -1,17 +1,20 @@
+import { trafficByLayer } from '../weakmaps/trafficByLayer.js';
+
+
 import { disposeTrafficObject } from './disposeTrafficObject.js';
 import { destroyTrafficGpu } from './destroyTrafficGpu.js';
 
-export function removeTraffic(state) {
-  state.request?.abort();
-  cancelAnimationFrame(state.frame);
-  state.frame = undefined;
-  state.layer._map.off('simulationtimechange layerremove', state.update).off('terrainchange', state.terrain);
-  disposeTrafficObject(state, state.mesh);
-  disposeTrafficObject(state, state.route);
-  state.mesh = state.route = null;
-  delete state.layer._beforeRaycast;
-  destroyTrafficGpu(state);
-  state.lanes = [];
-  state.trips = [];
-  state.tripsKey = state.loaded = null;
+export function removeTraffic(state) {
+  state.request?.abort();
+  cancelAnimationFrame(state.frame);
+  state.frame = undefined;
+  state.layer._map.off('simulationtimechange layerremove', state.update).off('terrainchange', state.terrain);
+  disposeTrafficObject(state, state.mesh);
+  disposeTrafficObject(state, state.route);
+  state.mesh = state.route = null;
+  trafficByLayer.delete(state.layer);
+  destroyTrafficGpu(state);
+  state.lanes.length = 0;
+  state.trips.length = 0;
+  state.tripsKey = state.loaded = null;
 }

package/src/traffic/routeColor.js

@@ -1,6 +1,6 @@
 export function routeColor(properties) {
   const color = properties?.route_color;
-  if (!/^[\da-f]{6}$/i.test(color)) return [0.1, 0.55, 0.65];
+  if (!/^[\da-f]{6}$/i.test(color)) return /* alloc */ [0.1, 0.55, 0.65];
   const value = Number.parseInt(color, 16);
-  return [(value >> 16 & 255) / 255, (value >> 8 & 255) / 255, (value & 255) / 255];
-}
+  return /* alloc */ [(value >> 16 & 255) / 255, (value >> 8 & 255) / 255, (value & 255) / 255];
+}

package/src/traffic/scheduledTrips.js

@@ -1,6 +1,8 @@
+import { trafficClocks } from '../globals/trafficClocks.js';
 import { clockMinutes } from './clockMinutes.js';
 import { compareDepartures } from './compareDepartures.js';
 
+
 /**
  * Trips of a frequency-based timetable (like GTFS frequencies.txt) underway at `date`, in the timetable's local time.
  * @param {{timeZone: string, duration: number, services: Array<{from: string, to: string, every?: number, months?: number[], weekdays?: number[]}>}} timetable
@@ -9,28 +11,37 @@ import { compareDepartures } from './compareDepartures.js';
  */
 
 export function scheduledTrips(date, { timeZone, duration, services }) {
-  const time = new Date(date);
-  if (!Number.isFinite(time.getTime())) throw new Error('Invalid date');
-  const clock = new Intl.DateTimeFormat('en-GB', {
-    timeZone, year: 'numeric', month: '2-digit', day: '2-digit',
-    hour: '2-digit', minute: '2-digit', second: '2-digit', hourCycle: 'h23',
-  });
-  const parts = {};
+  const time = date instanceof Date ? date
+    : /* alloc */ new Date(date);
+  if (!Number.isFinite(time.getTime())) throw /* alloc */ new Error('Invalid date');
+  let clock = trafficClocks.get(timeZone);
+  if (!clock) {
+    clock = /* alloc */ new Intl.DateTimeFormat('en-GB',
+      /* alloc */ {
+        timeZone, year: 'numeric', month: '2-digit', day: '2-digit',
+        hour: '2-digit', minute: '2-digit', second: '2-digit', hourCycle: 'h23',
+      });
+    if (trafficClocks.size >= 32) {
+      trafficClocks.delete(trafficClocks.keys().next().value);
+    }
+    trafficClocks.set(timeZone, clock);
+  }
+  const parts = /* alloc */ {};
   let part, from, to, every, months, weekdays, departure;
   for (part of clock.formatToParts(time)) {
     if (part.type !== 'literal') parts[part.type] = Number(part.value);
   }
   const minute = parts.hour * 60 + parts.minute + (parts.second + time.getUTCMilliseconds() / 1000) / 60;
-  const weekday = new Date(Date.UTC(parts.year, parts.month - 1, parts.day)).getUTCDay();
-  const departures = [];
+  const weekday = ((Math.floor(Date.UTC(parts.year, parts.month - 1, parts.day) / 86400000) + 4) % 7 + 7) % 7;
+  const departures = /* alloc */ [];
   for ({ from, to, every = Infinity, months, weekdays } of services) {
     if (months?.includes(parts.month) === false || weekdays?.includes(weekday) === false) continue;
     for (departure = clockMinutes(from); departure <= clockMinutes(to); departure += every) departures.push(departure);
   }
   departures.sort(compareDepartures);
-  const trips = [];
+  const trips = /* alloc */ [];
   for (departure of departures) {
-    if (minute >= departure && minute < departure + duration) trips.push({
+    if (minute >= departure && minute < departure + duration) trips.push(/* alloc */ {
       id: `${parts.year}-${parts.month}-${parts.day}-${departure}`,
       departure: `${String(Math.floor(departure / 60)).padStart(2, '0')}:${String(departure % 60).padStart(2, '0')}`,
       progress: (minute - departure) / duration,

package/src/traffic/startTraffic.js

@@ -1,4 +1,4 @@
-import { underEntry } from '../scene/underEntry.js';
+import { underEntry } from '../layer-controls/underEntry.js';
 
 export function startTraffic(state) {
   state.layer._map.off('simulationtimechange layerremove', state.update).on('simulationtimechange layerremove', state.update);

package/src/traffic/tickTraffic.js

@@ -1,57 +1,27 @@
-import { update as updateScene } from '../scene/update.js';
-import { tripsAt } from './tripsAt.js';
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+
+
+
+import { update as updateScene } from '../scene/scheduleSceneUpdate.js';
 import { trafficNow } from './trafficNow.js';
-import { failTraffic } from './failTraffic.js';
-import { drawTrafficRoute } from './drawTrafficRoute.js';
-import { rebuildTrafficMesh } from './rebuildTrafficMesh.js';
-import { rebaseTraffic } from './rebaseTraffic.js';
-import { moveTraffic } from './moveTraffic.js';
-import { locateTraffic } from './locateTraffic.js';
+import { refreshTrafficTrips } from './refreshTrafficTrips.js';
+import { updateTrafficPose } from './updateTrafficPose.js';
 
 export function tickTraffic(state) {
   state.frame = undefined;
   if (!state.ready || !state.layer._map) return;
-  if (!state.layer.renderer) { state.frame = requestAnimationFrame(state.tick); return; }
+  if (!rendererByLayer.get(state.layer)) { state.frame = requestAnimationFrame(state.tick); return; }
   if (state.mesh && !(state.mesh.geometry.attributes.position.buffer.usage & GPUBufferUsage.STORAGE)) {
     state.tripsKey = null;
     state.nextCheck = -Infinity;
   }
   const { live, time } = trafficNow(state), ms = time?.getTime(), valid = Number.isFinite(ms);
   let changed = false;
-  let trip, x, y, z, dx, dz, lx, ly, lz, light;
   if (!live || !valid || !(ms >= state.rebasedAt && ms < state.nextCheck)) {
-    let text;
-    try {
-      state.trips = valid ? tripsAt(time, state.lanes, state.velocity) : [];
-      text = !valid ? 'Select a valid simulation date' : !state.loaded ? 'Loading…' :
-        `${state.trips.length} ${state.vehicle === 'boat' ? 'boats' : state.vehicle}`;
-    } catch (error) { return failTraffic(state, error); }
-    state.rebasedAt = ms;
-    state.nextCheck = ms + 1000;
-    const ids = [];
-    for (trip of state.trips) ids.push(trip.id);
-    const key = ids.join();
-    changed = key !== state.tripsKey || (state.outline && !state.route && state.lanes.length);
-    if (state.outline && !state.route && state.lanes.length) drawTrafficRoute(state);
-    if (key !== state.tripsKey) { rebuildTrafficMesh(state); state.tripsKey = key; }
-    if (state.mesh) rebaseTraffic(state);
-    if (!state.error) {
-      if (state.status.textContent !== text) state.status.textContent = text;
-      state.status.removeAttribute('role');
-    }
-  }
-  if (state.mesh) moveTraffic(state, (ms - state.rebasedAt) / 1000);
-  if (state.mesh && state.lights && (!live || !(performance.now() - state.litAt < 100))) {
-    state.litAt = performance.now();
-    const lights = [];
-    for (trip of state.trips) {
-      ({ x, y, z, dx, dz } = locateTraffic(state, trip));
-      for ({ position: [lx, ly, lz], ...light } of state.lights) {
-        lights.push({ ...light, position: [x - lx * dz - lz * dx, y + ly, z + lx * dx - lz * dz] });
-      }
-    }
-    state.mesh.extras.lights = lights;
+    changed = refreshTrafficTrips(state, time, ms, valid);
+    if (changed === undefined) return;
   }
+  updateTrafficPose(state, ms, live);
   if (state.mesh || changed) updateScene(state.layer);
   if (live && valid) state.frame = requestAnimationFrame(state.tick);
 }

package/src/traffic/trafficBounds.js

@@ -7,11 +7,15 @@ export function trafficBounds(state) {
     radius = Math.max(radius, Math.hypot(state.template.position[i], state.template.position[i + 2]) + Math.abs(state.side));
     height = Math.max(height, state.template.position[i + 1]);
   }
-  const data = [];
+  const data = /* alloc */ [];
   for (lane of state.lanes) {
     for ([x, z, y] of lane.points) data.push(x - radius, y, z - radius, x + radius, y + height, z + radius);
   }
-  const extent = { attributes: { position: { data } } };
+  const extent = /* alloc */ {
+    attributes: /* alloc */ {
+      position: /* alloc */ { data },
+    },
+  };
   computeBounds(extent);
   state.mesh.geometry.bounds = extent.bounds;
 }

package/src/traffic/trafficNow.js

@@ -1,4 +1,11 @@
+import { timeControlByMap } from '../weakmaps/timeControlByMap.js';
+
+
+
 export function trafficNow(state) {
-  const control = state.layer._map?._timeControl || { live: true };
-  return { live: control.live, time: control.live ? new Date() : control.time };
-}
+  const control = timeControlByMap.get(state.layer._map);
+  const live = control ? control.live : true;
+  return /* alloc */ {
+    live, time: live ? /* alloc */ new Date() : control.time,
+  };
+}