leaflet-city-mapper 0.0.3 → 0.0.4

package/src/triangulation/triangulate.js

@@ -1,12 +1,10 @@
-import { isClockWise } from "./isClockWise.js";
-import { cross } from './cross.js';
-import { clean } from './clean.js';
-import { inside } from './inside.js';
-import { insideHole } from './insideHole.js';
-import { crossesBoundary } from './crossesBoundary.js';
-import { containsVertex } from './containsVertex.js';
-import { area } from './area.js';
+import { geometryEmpty } from '../globals/geometryEmpty.js';
 import { sortHoles } from './sortHoles.js';
+import { polygonRings } from './polygonRings.js';
+import { connectHole } from './connectHole.js';
+import { clipEars } from './clipEars.js';
+import { validateArea } from './validateArea.js';
+
 
 /**
  * Triangulates a polygon given as `{x, y}` points.
@@ -19,68 +17,32 @@ import { sortHoles } from './sortHoles.js';
  * @returns {number[][]} Triangles as indices in `[...contour, ...holes.flat()]`.
  */
 
-export function triangulate(contour, holes = []) {
-  const points = [contour, ...holes].flat();
-  let p, index, path, ring, hole, bridge, distance, h, a, b, d, mid, h2, p2, clipped, i, c, triangle2;
+export function triangulate(contour, holes = geometryEmpty) {
+  const paths = /* alloc */ [contour, ...holes];
+  const points = paths.flat();
+  let p, index, hole;
   for (p of points) {
-    if (!Number.isFinite(p.x) || !Number.isFinite(p.y)) throw new Error('Invalid polygon coordinates');
+    if (!Number.isFinite(p.x) || !Number.isFinite(p.y)) throw /* alloc */ new Error('Invalid polygon coordinates');
   }
   // Translate near the origin to avoid cancellation with geographic coordinates.
-  const vertices = [];
+  const vertices = /* alloc */ [];
   for (index = 0; index < points.length; index++) {
     p = points[index];
-    vertices.push({ x: p.x - contour[0].x, y: p.y - contour[0].y, index });
+    vertices.push(/* alloc */ { x: p.x - contour[0].x, y: p.y - contour[0].y, index });
   }
   // Remove zero-area corners before connecting holes; keep original vertex indices.
-  let offset = 0;
-  const rings = [], paths = [contour, ...holes];
-  for (index = 0; index < paths.length; index++) {
-    path = paths[index];
-    ring = clean(vertices.slice(offset, offset += path.length));
-    if (isClockWise(ring) !== Boolean(index)) ring.reverse();
-    rings.push(ring);
-  }
+  const rings = polygonRings(paths, vertices);
   let polygon = rings[0].slice();
   // A bridge must stay inside the outer boundary, outside every hole, and cross no edge.
   // ponytail: quadratic ear clipping for building footprints; use spatial indexing for large rings.
   const holesToConnect = sortHoles(rings.slice(1));
+  const mid = holesToConnect.length ? /* alloc */ { x: 0, y: 0 } : null;
   for (hole of holesToConnect) {
-    bridge = void 0, distance = Infinity;
-    for (h = 0; h < hole.length; h++) for (p = 0; p < polygon.length; p++) {
-      a = hole[h], b = polygon[p], d = (a.x - b.x) ** 2 + (a.y - b.y) ** 2;
-      if (d >= distance) continue;
-      mid = { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 };
-      if (!inside(mid, rings[0]) || insideHole(mid, rings)) continue;
-      if (crossesBoundary(a, b, polygon, rings)) continue;
-      bridge = [h, p]; distance = d;
-    }
-    if (!bridge) throw new Error('Unable to connect polygon hole');
-    [h2, p2] = bridge;
-    polygon = [...polygon.slice(0, p2 + 1), ...hole.slice(h2), ...hole.slice(0, h2 + 1),
-    polygon[p2], ...polygon.slice(p2 + 1)];
+    polygon = connectHole(polygon, hole, rings, mid);
   }
   // Clip a convex corner only when no other vertex is inside/on its triangle.
-  const result = [];
-  while (polygon.length > 3) {
-    clipped = false;
-    for (i = 0; i < polygon.length; i++) {
-      a = polygon[(i + polygon.length - 1) % polygon.length], b = polygon[i], c = polygon[(i + 1) % polygon.length];
-      if (cross(a, b, c) <= 1e-10) continue;
-      if (containsVertex(polygon, a, b, c)) continue;
-      result.push([a.index, b.index, c.index]); polygon.splice(i, 1); clipped = true; break;
-    }
-    if (!clipped) throw new Error('Unable to triangulate polygon: invalid or self-intersecting rings');
-  }
-  if (cross(...polygon) > 1e-10) {
-    const triangle = [];
-    for (p of polygon) triangle.push(p.index);
-    result.push(triangle);
-  }
+  const result = clipEars(polygon);
   // Reject incomplete coverage instead of silently emitting a partial roof.
-  let holeArea = 0, actual = 0;
-  for (i = 1; i < rings.length; i++) holeArea += area(rings[i]);
-  const expected = area(rings[0]) - holeArea;
-  for (triangle2 of result) actual += cross(vertices[triangle2[0]], vertices[triangle2[1]], vertices[triangle2[2]]) / 2;
-  if (expected <= 0 || Math.abs(actual - expected) > Math.max(1e-7, expected * 1e-8)) throw new Error('Polygon triangulation area mismatch');
+  validateArea(rings, vertices, result);
   return result;
 }

package/src/triangulation/validateArea.js

@@ -0,0 +1,10 @@
+import { area } from './area.js';
+import { cross } from './cross.js';
+
+export function validateArea(rings, vertices, result) {
+  let holeArea = 0, actual = 0, i, triangle;
+  for (i = 1; i < rings.length; i++) holeArea += area(rings[i]);
+  const expected = area(rings[0]) - holeArea;
+  for (triangle of result) actual += cross(vertices[triangle[0]], vertices[triangle[1]], vertices[triangle[2]]) / 2;
+  if (expected <= 0 || Math.abs(actual - expected) > Math.max(1e-7, expected * 1e-8)) throw /* alloc */ new Error('Polygon triangulation area mismatch');
+}

package/src/utils/parseColor.js

@@ -11,7 +11,7 @@ import { channel } from "./channel.js";
 export function parseColor(value) {
   if (value && typeof value === 'object' && 'h' in value) {
     const a = value.s * Math.min(value.l, 1 - value.l);
-    return {
+    return /* alloc */ {
       r: toSRGB(channel(0, value.h, value.l, a)),
       g: toSRGB(channel(8, value.h, value.l, a)),
       b: toSRGB(channel(4, value.h, value.l, a))
@@ -21,20 +21,20 @@ export function parseColor(value) {
     return value;
   }
   if (typeof value === 'number') {
-    return {
+    return /* alloc */ {
       r: (value >> 16 & 255) / 255,
       g: (value >> 8 & 255) / 255,
       b: (value & 255) / 255,
     };
   }
   if (typeof value !== 'string' || !CSS.supports('color', value)) {
-    throw new Error('Invalid 3D color');
+    throw /* alloc */ new Error('Invalid 3D color');
   }
   const context = document.createElement('canvas').getContext('2d');
   context.fillStyle = value;
   context.fillRect(0, 0, 1, 1);
   const [r, g, b] = context.getImageData(0, 0, 1, 1).data;
-  return {
+  return /* alloc */ {
     r: r / 255,
     g: g / 255,
     b: b / 255

package/src/vehicles/bicycleModel.js

@@ -1,23 +1,24 @@
+import { paints } from '../globals/paints.js';
+import { dark } from '../globals/dark.js';
+import { skin } from '../globals/skin.js';
+import { trousers } from '../globals/trousers.js';
+
 import { box } from '../geometry/box.js';
-import { skin } from '../constants/skin.js';
-import { trousers } from '../constants/trousers.js';
-import { dark } from '../constants/dark.js';
-import { paints } from '../constants/paints.js';
 
-export function bicycleModel(index) {
-  const paint = paints[index % paints.length];
-  return [
-    [box(-0.045, 0.045, -0.85, -0.25), 0.02, 0.62, dark],
-    [box(-0.045, 0.045, 0.25, 0.85), 0.02, 0.62, dark],
-    [box(-0.06, 0.06, -0.5, 0.5), 0.4, 0.65, paint],
-    [box(-0.32, 0.32, -0.58, -0.5), 0.95, 1.02, dark],
-    [box(-0.1, 0.1, 0.15, 0.4), 0.85, 0.92, dark],
-    [box(-0.18, 0.18, -0.12, 0.28), 1, 1.5, paint],
-    [box(-0.11, 0.11, -0.22, 0), 1.5, 1.72, skin],
-    [box(-0.13, 0.13, -0.23, 0.01), 1.72, 1.8, paint],
-    [box(-0.25, -0.15, -0.5, -0.05), 1, 1.25, skin],
-    [box(0.15, 0.25, -0.5, -0.05), 1, 1.25, skin],
-    [box(-0.2, -0.08, 0, 0.32), 0.3, 1, trousers],
-    [box(0.08, 0.2, -0.25, 0.07), 0.3, 1, trousers],
-  ];
+export function bicycleModel(index) {
+  const paint = paints[index % paints.length];
+  return /* alloc */ [
+    /* alloc */ [box(-0.045, 0.045, -0.85, -0.25), 0.02, 0.62, dark],
+    /* alloc */ [box(-0.045, 0.045, 0.25, 0.85), 0.02, 0.62, dark],
+    /* alloc */ [box(-0.06, 0.06, -0.5, 0.5), 0.4, 0.65, paint],
+    /* alloc */ [box(-0.32, 0.32, -0.58, -0.5), 0.95, 1.02, dark],
+    /* alloc */ [box(-0.1, 0.1, 0.15, 0.4), 0.85, 0.92, dark],
+    /* alloc */ [box(-0.18, 0.18, -0.12, 0.28), 1, 1.5, paint],
+    /* alloc */ [box(-0.11, 0.11, -0.22, 0), 1.5, 1.72, skin],
+    /* alloc */ [box(-0.13, 0.13, -0.23, 0.01), 1.72, 1.8, paint],
+    /* alloc */ [box(-0.25, -0.15, -0.5, -0.05), 1, 1.25, skin],
+    /* alloc */ [box(0.15, 0.25, -0.5, -0.05), 1, 1.25, skin],
+    /* alloc */ [box(-0.2, -0.08, 0, 0.32), 0.3, 1, trousers],
+    /* alloc */ [box(0.08, 0.2, -0.25, 0.07), 0.3, 1, trousers],
+  ];
 }

package/src/vehicles/boatBenches.js

@@ -1,8 +1,9 @@
 import { mirror } from './mirror.js';
 
 export function boatBenches() {
-  const benches = [];
+  const benches = /* alloc */ [];
   let i;
-  for (i = 0; i < 12; i++) benches.push(...mirror(0.5, 3.8, -12 + i * 3, -11.3 + i * 3, 3.9, 4.4, [0.62, 0.1, 0.1]));
+  for (i = 0; i < 12; i++) benches.push(...mirror(0.5, 3.8, -12 + i * 3, -11.3 + i * 3, 3.9, 4.4,
+    /* alloc */ [0.62, 0.1, 0.1]));
   return benches;
 }

package/src/vehicles/boatModel.js

@@ -1,27 +1,35 @@
-import { hull } from '../constants/hull.js';
+import { hull } from '../globals/hull.js';
+import { white } from '../globals/white.js';
+import { glass } from '../globals/glass.js';
+
+
 import { box } from '../geometry/box.js';
-import { glass } from '../constants/glass.js';
+
 import { mirror } from './mirror.js';
-import { white } from '../constants/white.js';
+
 import { boatBenches } from './boatBenches.js';
 
 // Panoramic river cruiser, about 60 x 11 m.
 export function boatModel() {
-  return [
-    [hull, 0, 0.8, [0.1, 0.16, 0.26]],
-    [hull, 0.8, 1.4, white],
-    [box(-5, 5, -18, 26), 1.4, 3.7, glass, box(-4.6, 4.6, -17.4, 25.6)],
-    ...mirror(4.64, 4.74, -17, 25, 3.25, 3.45, [1.6, 1.25, 0.8]),
-    [box(-4.8, 4.8, -17.8, 25.8), 3.7, 3.9, white],
+  return /* alloc */ [
+    /* alloc */ [
+      hull, 0, 0.8, /* alloc */ [0.1, 0.16, 0.26]],
+    /* alloc */ [hull, 0.8, 1.4, white],
+    /* alloc */ [box(-5, 5, -18, 26), 1.4, 3.7, glass, box(-4.6, 4.6, -17.4, 25.6)],
+    ...mirror(4.64, 4.74, -17, 25, 3.25, 3.45, /* alloc */ [1.6, 1.25, 0.8]),
+    /* alloc */ [box(-4.8, 4.8, -17.8, 25.8), 3.7, 3.9, white],
     ...boatBenches(),
     ...mirror(4.65, 4.8, -13.6, 25.8, 3.9, 4.8, white),
-    [box(-4.8, 4.8, 25.65, 25.8), 3.9, 4.8, white],
-    [box(-2.2, 2.2, -17.6, -14), 3.9, 4.7, white],
-    [box(-2.2, 2.2, -17.6, -14), 4.7, 5.5, glass],
-    [box(-2.5, 2.5, -18, -13.6), 5.5, 5.7, white],
-    [box(-2.45, -2.2, -16.2, -15.8), 5, 5.3, [2, 0.15, 0.1]],
-    [box(2.2, 2.45, -16.2, -15.8), 5, 5.3, [0.1, 2, 0.4]],
-    [box(-0.1, 0.1, -15.9, -15.7), 5.7, 6.6, white],
-    [box(-0.15, 0.15, -15.95, -15.65), 6.6, 6.8, [2, 2, 1.9]],
+    /* alloc */ [box(-4.8, 4.8, 25.65, 25.8), 3.9, 4.8, white],
+    /* alloc */ [box(-2.2, 2.2, -17.6, -14), 3.9, 4.7, white],
+    /* alloc */ [box(-2.2, 2.2, -17.6, -14), 4.7, 5.5, glass],
+    /* alloc */ [box(-2.5, 2.5, -18, -13.6), 5.5, 5.7, white],
+    /* alloc */ [
+      box(-2.45, -2.2, -16.2, -15.8), 5, 5.3, /* alloc */ [2, 0.15, 0.1]],
+    /* alloc */ [
+      box(2.2, 2.45, -16.2, -15.8), 5, 5.3, /* alloc */ [0.1, 2, 0.4]],
+    /* alloc */ [box(-0.1, 0.1, -15.9, -15.7), 5.7, 6.6, white],
+    /* alloc */ [
+      box(-0.15, 0.15, -15.95, -15.65), 6.6, 6.8, /* alloc */ [2, 2, 1.9]],
   ];
 }

package/src/vehicles/carModel.js

@@ -1,22 +1,38 @@
+import { paints } from '../globals/paints.js';
+import { tyre } from '../globals/tyre.js';
+import { glass } from '../globals/glass.js';
+import { headlight } from '../globals/headlight.js';
+import { taillight } from '../globals/taillight.js';
+
 import { box } from '../geometry/box.js';
-import { glass } from '../constants/glass.js';
-import { tyre } from '../constants/tyre.js';
+
+
 import { mirror } from './mirror.js';
-import { paints } from '../constants/paints.js';
-import { headlight } from '../constants/headlight.js';
-import { taillight } from '../constants/taillight.js';
+
+
+
 
 export function carModel(i) {
   const paint = paints[i % paints.length];
-  return [
+  return /* alloc */ [
     ...mirror(0.7, 0.92, -1.68, -1.02, 0, 0.64, tyre),
     ...mirror(0.7, 0.92, 1.02, 1.68, 0, 0.64, tyre),
-    [[[-0.9, -1.95], [-0.72, -2.25], [0.72, -2.25], [0.9, -1.95], [0.9, 2.05], [0.76, 2.25], [-0.76, 2.25], [-0.9, 2.05]],
+    /* alloc */ [
+      /* alloc */ [
+        /* alloc */ [-0.9, -1.95],
+        /* alloc */ [-0.72, -2.25],
+        /* alloc */ [0.72, -2.25],
+        /* alloc */ [0.9, -1.95],
+        /* alloc */ [0.9, 2.05],
+        /* alloc */ [0.76, 2.25],
+        /* alloc */ [-0.76, 2.25],
+        /* alloc */ [-0.9, 2.05],
+      ],
       0.28, 0.82, paint],
     // Greenhouse: the windscreen leans back, the rear window less.
-    [box(-0.84, 0.84, -0.75, 1.6), 0.82, 1.38, glass, box(-0.7, 0.7, -0.05, 1.3)],
-    [box(-0.71, 0.71, -0.06, 1.31), 1.38, 1.46, paint],
+    /* alloc */ [box(-0.84, 0.84, -0.75, 1.6), 0.82, 1.38, glass, box(-0.7, 0.7, -0.05, 1.3)],
+    /* alloc */ [box(-0.71, 0.71, -0.06, 1.31), 1.38, 1.46, paint],
     ...mirror(0.38, 0.8, -2.3, -2.16, 0.56, 0.76, headlight),
-    [box(-0.78, 0.78, 2.16, 2.3), 0.6, 0.76, taillight],
+    /* alloc */ [box(-0.78, 0.78, 2.16, 2.3), 0.6, 0.76, taillight],
   ];
 }

package/src/vehicles/carriage.js

@@ -1,19 +1,20 @@
+import { glass } from '../globals/glass.js';
+import { white } from '../globals/white.js';
+import { tyre } from '../globals/tyre.js';
+import { headlight } from '../globals/headlight.js';
+import { taillight } from '../globals/taillight.js';
+
 import { box } from '../geometry/box.js';
-import { glass } from '../constants/glass.js';
-import { tyre } from '../constants/tyre.js';
-import { white } from '../constants/white.js';
-import { headlight } from '../constants/headlight.js';
-import { taillight } from '../constants/taillight.js';
 
-export function carriage(center, length, color) {
-  const front = center - length / 2, rear = center + length / 2;
-  return [
-    [box(-1.25, 1.25, front, rear), 0.45, 1.25, color],
-    [box(-1.2, 1.2, front + 0.15, rear - 0.15), 1.25, 2.65, glass],
-    [box(-1.25, 1.25, front, rear), 2.65, 3.1, white],
-    [box(-1.15, -0.85, front + 1, front + 2), 0, 0.7, tyre],
-    [box(0.85, 1.15, rear - 2, rear - 1), 0, 0.7, tyre],
-    [box(-0.9, 0.9, front - 0.03, front), 0.8, 1.05, headlight],
-    [box(-0.9, 0.9, rear, rear + 0.03), 0.8, 1.05, taillight],
-  ];
+export function carriage(center, length, color) {
+  const front = center - length / 2, rear = center + length / 2;
+  return /* alloc */ [
+    /* alloc */ [box(-1.25, 1.25, front, rear), 0.45, 1.25, color],
+    /* alloc */ [box(-1.2, 1.2, front + 0.15, rear - 0.15), 1.25, 2.65, glass],
+    /* alloc */ [box(-1.25, 1.25, front, rear), 2.65, 3.1, white],
+    /* alloc */ [box(-1.15, -0.85, front + 1, front + 2), 0, 0.7, tyre],
+    /* alloc */ [box(0.85, 1.15, rear - 2, rear - 1), 0, 0.7, tyre],
+    /* alloc */ [box(-0.9, 0.9, front - 0.03, front), 0.8, 1.05, headlight],
+    /* alloc */ [box(-0.9, 0.9, rear, rear + 0.03), 0.8, 1.05, taillight],
+  ];
 }

package/src/vehicles/metroModel.js

@@ -2,7 +2,7 @@ import { routeColor } from '../traffic/routeColor.js';
 import { carriage } from './carriage.js';
 
 export function metroModel(index, properties) {
-  const color = routeColor(properties), parts = [];
+  const color = routeColor(properties), parts = /* alloc */ [];
   let car;
   for (car = 0; car < 5; car++) parts.push(...carriage((car - 2) * 15, 14, color));
   return parts;

package/src/vehicles/mirror.js

@@ -1,8 +1,8 @@
 import { box } from "../geometry/box.js";
 
 export function mirror(x0, x1, z0, z1, ...rest) {
-  return [
-    [box(x0, x1, z0, z1), ...rest],
-    [box(-x1, -x0, z0, z1), ...rest]
+  return /* alloc */ [
+    /* alloc */ [box(x0, x1, z0, z1), ...rest],
+    /* alloc */ [box(-x1, -x0, z0, z1), ...rest]
   ];
 }

package/src/vehicles/pedestrianModel.js

@@ -1,17 +1,18 @@
+import { parts } from '../globals/parts.js';
+import { paints } from '../globals/paints.js';
+import { trousers } from '../globals/trousers.js';
+import { skin } from '../globals/skin.js';
+
 import { box } from '../geometry/box.js';
-import { parts } from '../constants/parts.js';
-import { skin } from '../constants/skin.js';
-import { trousers } from '../constants/trousers.js';
-import { paints } from '../constants/paints.js';
 
-export function pedestrianModel(index) {
-  const model = parts.body.slice();
-  model[1] = [model[1][0], model[1][1], model[1][2], paints[index % paints.length]];
-  model.push(
-    [box(-0.16, -0.02, -0.07, 0.07), 0.08, 0.9, trousers],
-    [box(0.02, 0.16, -0.07, 0.07), 0.08, 0.9, trousers],
-    [box(-0.3, -0.2, -0.05, 0.05), 0.76, 1.42, skin],
-    [box(0.2, 0.3, -0.05, 0.05), 0.76, 1.42, skin],
-  );
-  return model;
+export function pedestrianModel(index) {
+  const model = parts.body.slice();
+  model[1] = /* alloc */ [model[1][0], model[1][1], model[1][2], paints[index % paints.length]];
+  model.push(
+    /* alloc */ [box(-0.16, -0.02, -0.07, 0.07), 0.08, 0.9, trousers],
+    /* alloc */ [box(0.02, 0.16, -0.07, 0.07), 0.08, 0.9, trousers],
+    /* alloc */ [box(-0.3, -0.2, -0.05, 0.05), 0.76, 1.42, skin],
+    /* alloc */ [box(0.2, 0.3, -0.05, 0.05), 0.76, 1.42, skin],
+  );
+  return model;
 }

package/src/vehicles/tramModel.js

@@ -2,7 +2,7 @@ import { routeColor } from '../traffic/routeColor.js';
 import { carriage } from './carriage.js';
 
 export function tramModel(index, properties) {
-  const color = routeColor(properties), parts = [];
+  const color = routeColor(properties), parts = /* alloc */ [];
   let car;
   for (car = 0; car < 5; car++) parts.push(...carriage((car - 2) * 6.5, 6, color));
   return parts;

package/src/walk/blocked.js

@@ -1,6 +1,6 @@
-import { hit } from '../picking/hit.js';
-
+import { hit } from '../picking/hit.js';
+
 export function blocked(east, north, feet) {
   const length = Math.hypot(east, north);
-  return length > 1e-6 && hit(this.layer, feet[0], feet[1], feet[2], east / length, -north / length, length + 0.3);
-}
+  return length > 1e-6 && hit(this.layer, feet[0], feet[1], feet[2], east / length, -north / length, length + 0.3, this.hitData);
+}

package/src/walk/createWalk.js

@@ -1,60 +1,66 @@
-import { init3D } from '../scene/init3D.js';
-import { onBlur } from './onBlur.js';
-import { onKey } from './onKey.js';
-import { onPointer } from './onPointer.js';
-import { onTerrain } from './onTerrain.js';
-import { start } from './start.js';
-import { step } from './step.js';
-import { stop } from './stop.js';
-import { toggle } from './toggle.js';
-
-export function createWalk(control, {
-  speed,
-  distance,
-  ...options
-} = {}) {
-  const layer = new L.Layer();
-  layer._type = 'walk';
-  init3D(layer, options);
-  const keys = new Set();
-  const container = L.DomUtil.create('div', 'leaflet-bar leaflet-control');
-  container.style.cssText = 'display:flex;align-items:center;background:#fff;';
-  const button = L.DomUtil.create('button', '', container);
-  button.type = 'button';
-  button.title = 'Walk';
-  button.setAttribute('aria-label', 'Walk');
-  button.setAttribute('aria-pressed', 'false');
-  button.textContent = '🚶';
-  button.style.cssText = 'width:30px;height:30px;padding:0;border:0;border-radius:4px;background:#fff;font-size:18px;line-height:30px;cursor:pointer;';
-  const hint = L.DomUtil.create('small', '', container);
-  hint.style.cssText = 'display:none;padding:0 8px;color:#333;white-space:nowrap;';
-  hint.textContent = 'W/S: run · A/D: turn · drag: look around · Esc: exit';
-  L.DomEvent.disableClickPropagation(container);
-
-  const context = {
-    layer,
-    speed,
-    distance,
-    keys,
-    container,
-    button,
-    hint,
-    meshes: null,
-    frame: null,
-    last: undefined,
-    swing: 0,
-    saved: null,
-    drag: null,
-    state: control.walker = layer.walker = { latlng: null, heading: 0, phase: 0 }
-  }
-  context.step = step.bind(context);
-  context.onKey = onKey.bind(context);
-  context.onBlur = onBlur.bind(context);
-  context.onPointer = onPointer.bind(context);
-  context.onTerrain = onTerrain.bind(context);
-  context.start = start.bind(context);
-  context.stop = stop.bind(context);
-  context.toggle = toggle.bind(context);
-  control._walk = context;
-  L.DomEvent.on(button, 'click', context.toggle);
-}
+import { L } from '../globals/L.js';
+import { sceneByLayer } from '../globals/sceneByLayer.js';
+
+
+import { init3D } from '../scene/init3D.js';
+import { onBlur } from './onBlur.js';
+import { onKey } from './onKey.js';
+import { onPointer } from './onPointer.js';
+import { onTerrain } from './onTerrain.js';
+import { start } from './start.js';
+import { step } from './step.js';
+import { stop } from './stop.js';
+import { toggle } from './toggle.js';
+
+export function createWalk(control, {
+  speed,
+  distance,
+  ...options
+}) {
+  const layer = /* alloc */ new L.Layer();
+  sceneByLayer.get(layer)._type = 'walk';
+  init3D(layer, options);
+  const keys = /* alloc */ new Set();
+  const container = L.DomUtil.create('div', 'leaflet-bar leaflet-control');
+  container.style.cssText = 'display:flex;align-items:center;background:#fff;';
+  const button = L.DomUtil.create('button', '', container);
+  button.type = 'button';
+  button.title = 'Walk';
+  button.setAttribute('aria-label', 'Walk');
+  button.setAttribute('aria-pressed', 'false');
+  button.textContent = '🚶';
+  button.style.cssText = 'width:30px;height:30px;padding:0;border:0;border-radius:4px;background:#fff;font-size:18px;line-height:30px;cursor:pointer;';
+  const hint = L.DomUtil.create('small', '', container);
+  hint.style.cssText = 'display:none;padding:0 8px;color:#333;white-space:nowrap;';
+  hint.textContent = 'W/S: run · A/D: turn · hold Space: ascend · drag: look around · Esc: exit';
+  L.DomEvent.disableClickPropagation(container);
+
+  const context = /* alloc */ {
+    layer,
+    speed,
+    distance,
+    keys,
+    container,
+    button,
+    hint,
+    meshes: null,
+    frame: null,
+    last: undefined,
+    swing: 0,
+    verticalSpeed: 0,
+    saved: null,
+    hitData: null,
+    local: null,
+    state: control.walker = sceneByLayer.get(layer).walker = /* alloc */ { latlng: null, heading: 0, phase: 0, height: 0 }
+  }
+  context.step = step.bind(context);
+  context.onKey = onKey.bind(context);
+  context.onBlur = onBlur.bind(context);
+  context.onPointer = onPointer.bind(context);
+  context.onTerrain = onTerrain.bind(context);
+  context.start = start.bind(context);
+  context.stop = stop.bind(context);
+  context.toggle = toggle.bind(context);
+  control._walk = context;
+  L.DomEvent.on(button, 'click', context.toggle);
+}

package/src/walk/initWalk.js

@@ -1,3 +1,4 @@
+import { L } from '../globals/L.js';
 import { initialize } from './initialize.js';
 import { onAdd } from './onAdd.js';
 import { onRemove } from './onRemove.js';

package/src/walk/initialize.js

@@ -1,3 +1,4 @@
+import { L } from '../globals/L.js';
 import { createWalk } from './createWalk.js';
 
 export function initialize(options) {

package/src/walk/land.js

@@ -0,0 +1,32 @@
+import { sceneByLayer } from '../globals/sceneByLayer.js';
+import { intersectMeshes } from '../collision/intersectMeshes.js';
+import { traverse } from '../scene/traverse.js';
+import { updateWorldMatrix } from '../scene/updateWorldMatrix.js';
+import { collectVisibleMesh } from '../picking/collectVisibleMesh.js';
+import { shouldSkipOther } from '../picking/shouldSkipOther.js';
+import { local } from './local.js';
+
+export function land(previousY) {
+  const state = sceneByLayer.get(this.layer), ray = state.raycaster;
+  const feet = local.call(this, this.local), root = state.root;
+  const x = root.position[0] + feet[0] * root.scale[0];
+  const y = root.position[1] + feet[1] * root.scale[1];
+  const z = root.position[2] + feet[2] * root.scale[2];
+  if (y > previousY || this.verticalSpeed > 0) return;
+  updateWorldMatrix(state.scene);
+  ray.origin[0] = x; ray.origin[1] = previousY + 0.01; ray.origin[2] = z;
+  ray.direction[0] = 0; ray.direction[1] = -1; ray.direction[2] = 0;
+  ray.meshes.length = 0;
+  let layer, hit;
+  for (layer of sceneByLayer.get(state._shared)._layers) {
+    if (shouldSkipOther(layer, this.layer) || sceneByLayer.get(layer).kind === 'raster' || layer.options.nightLight) continue;
+    traverse(sceneByLayer.get(layer).root, collectVisibleMesh, ray.meshes);
+  }
+  for (hit of intersectMeshes(ray, ray.meshes)) {
+    if (hit.point[1] < y - 0.001) break;
+    this.state.height += (hit.point[1] - y) / root.scale[1];
+    this.verticalSpeed = 0;
+    break;
+  }
+  ray.meshes.length = 0;
+}

package/src/walk/local.js

@@ -1,10 +1,18 @@
+import { radians } from '../globals/radians.js';
+import { sceneByLayer } from '../globals/sceneByLayer.js';
+import { cameraByMap } from '../globals/cameraByMap.js';
+
+
 import { getElevation } from '../terrain/getElevation.js';
 
-export function local() {
-  const { layer, state } = this;
-  const map = layer._map, crs = map.options.crs, origin = crs.project(layer.location);
-  const metres = Math.cos(layer.location.lat * Math.PI / 180);
-  const p = crs.project(state.latlng), terrain = map._terrain3D?._terrainReady && map._terrain3D;
-  const ground = (terrain && getElevation(terrain, state.latlng)) || 0;
-  return [(p.x - origin.x) * metres, ground - layer.root.position[1], -(p.y - origin.y) * metres];
+export function local(output) {
+  const { layer, state } = this;
+  const map = layer._map, crs = map.options.crs, origin = crs.project(sceneByLayer.get(layer).location);
+  const metres = Math.cos(sceneByLayer.get(layer).location.lat * radians);
+  const p = crs.project(state.latlng), terrain = sceneByLayer.get(cameraByMap.get(map)._terrain3D)?._terrainReady && cameraByMap.get(map)._terrain3D;
+  const ground = (terrain && getElevation(terrain, state.latlng)) || 0;
+  output[0] = (p.x - origin.x) * metres;
+  output[1] = ground + (state.height ?? 0) - sceneByLayer.get(layer).root.position[1];
+  output[2] = -(p.y - origin.y) * metres;
+  return output;
 }