leaflet-city-mapper 0.0.3 → 0.0.5

package/src/geometry/terrainBuffers.js

@@ -0,0 +1,29 @@
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+import { terrainGridsByLayer } from '../weakmaps/terrainGridsByLayer.js';
+
+import { demBuffer } from '../globals/demBuffer.js';
+import { terrainGrid } from './terrainGrid.js';
+
+export function terrainBuffers(layer, divisions) {
+  const device = rendererByLayer.get(layer).device
+  let attributes = terrainGridsByLayer.get(layer).get(divisions);
+  if (!attributes) {
+    attributes = terrainGrid(divisions);
+    let name, attribute;
+    for ([name, attribute] of Object.entries(attributes)) {
+      attribute.size ||= 1;
+      attribute.count = attribute.data.length / attribute.size;
+      attribute.indexFormat = 'uint16';
+      attribute.buffer = device.createBuffer((
+        demBuffer.size = Math.max(4, attribute.data.byteLength),
+        demBuffer.usage = name === 'index'
+          ? GPUBufferUsage.INDEX | GPUBufferUsage.COPY_DST
+          : GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST,
+        demBuffer
+      ));
+      device.queue.writeBuffer(attribute.buffer, 0, attribute.data);
+    }
+    terrainGridsByLayer.get(layer).set(divisions, attributes);
+  }
+  return attributes;
+}

package/src/geometry/terrainGrid.js

@@ -0,0 +1,32 @@
+/** Unit tile grid; the vertex shader supplies the elevation. */
+
+export function terrainGrid(divisions) {
+  const vertices = (divisions + 1) ** 2;
+  const positions = /* alloc */ new Float32Array(vertices * 3);
+  const normals = /* alloc */ new Float32Array(vertices * 3);
+  const uvs = /* alloc */ new Float32Array(vertices * 2);
+  const indices = /* alloc */ new Uint16Array(divisions * divisions * 6);
+  let row, column, a, b, c, d, vertex = 0, index = 0;
+  for (row = 0; row <= divisions; row++) {
+    for (column = 0; column <= divisions; column++) {
+      positions[vertex * 3] = column / divisions;
+      positions[vertex * 3 + 2] = row / divisions;
+      normals[vertex * 3 + 1] = 1;
+      uvs[vertex * 2] = column / divisions;
+      uvs[vertex * 2 + 1] = row / divisions;
+      vertex++;
+      if (row < divisions && column < divisions) {
+        a = row * (divisions + 1) + column;
+        b = a + 1, c = a + divisions + 1, d = c + 1;
+        indices[index++] = a; indices[index++] = c; indices[index++] = b;
+        indices[index++] = b; indices[index++] = c; indices[index++] = d;
+      }
+    }
+  }
+  return /* alloc */ {
+    position: /* alloc */ { size: 3, data: positions },
+    normal: /* alloc */ { size: 3, data: normals },
+    uv: /* alloc */ { size: 2, data: uvs },
+    index: /* alloc */ { data: indices },
+  };
+}

package/src/geometry/terrainTileGeometry.js

@@ -0,0 +1,19 @@
+import { demByLayer } from '../weakmaps/demByLayer.js';
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+import { terrainOriginElevationByLayer } from '../weakmaps/terrainOriginElevationByLayer.js';
+
+
+export function terrainTileGeometry(layer, attributes, sizeX, sizeZ) {
+  const base = terrainOriginElevationByLayer.get(layer)
+  const bottom = Math.min(demByLayer.get(layer).low, base) - base, top = Math.max(demByLayer.get(layer).high, base) - base;
+  return /* alloc */ {
+    device: rendererByLayer.get(layer).device,
+    attributes,
+    drawRange: /* alloc */ { start: 0, count: attributes.index.count },
+    // Bounds must cover the DEM-displaced tile, although picking uses the flat grid.
+    bounds: /* alloc */ {
+      min: /* alloc */ [0, bottom, 0], max: /* alloc */ [1, top, 1], center: /* alloc */ [0.5, (bottom + top) / 2, 0.5],
+      radius: Math.hypot(sizeX, top - bottom, sizeZ) / 2 / Math.max(sizeX, 1, sizeZ),
+    },
+  };
+}

package/src/geometry/treeGeometry.js

@@ -1,17 +1,16 @@
-import { roundProfile } from '../constants/roundProfile.js';
-import { parseColor } from "../utils/parseColor.js";
-import { ring } from './treeRing.js';
+import { roundProfile } from '../globals/roundProfile.js';
+
+
+import { parseColor } from "../colors/parseColor.js";
+import { ring } from './createTreeRing.js';
 import { surface } from './surface.js';
+import { validateTree } from './validateTree.js';
 
 /** Low-poly tree, sharing the source block's buffers, picking and terrain offset. */
 
 export function treeGeometry(point, style, addTriangle) {
   const { top, bottom = 0, trunkRadius, crownRadius, crownBottom, crownShape = 'round' } = style;
-  if (!Number.isFinite(trunkRadius) || !Number.isFinite(crownRadius) || !Number.isFinite(crownBottom) ||
-    trunkRadius <= 0 || crownRadius < trunkRadius || crownBottom <= bottom || crownBottom >= top ||
-    !['round', 'cone'].includes(crownShape)) {
-    throw new Error('Invalid tree dimensions or crown shape');
-  }
+  validateTree(trunkRadius, crownRadius, crownBottom, bottom, top, crownShape);
   const trunk = parseColor(style.trunkColor ?? 0x72513a);
   const crown = parseColor(style.color ?? 0x4f823b);
   surface(point, addTriangle, trunkRadius, bottom, trunkRadius, crownBottom + (top - crownBottom) * 0.25, trunk);

package/src/geometry/triangle.js

@@ -1,12 +1,13 @@
 export function triangle(position, normal, color, a, b, c, tint) {
-  const u = [], v = [];
-  let i, point, value;
-  for (i = 0; i < b.length; i++) u.push(b[i] - a[i]);
-  for (i = 0; i < c.length; i++) v.push(c[i] - a[i]);
-  const n = [u[1] * v[2] - u[2] * v[1], u[2] * v[0] - u[0] * v[2], u[0] * v[1] - u[1] * v[0]], length = Math.hypot(...n);
-  for (point of [a, b, c]) {
+  const ux = b[0] - a[0], uy = b[1] - a[1], uz = b[2] - a[2];
+  const vx = c[0] - a[0], vy = c[1] - a[1], vz = c[2] - a[2];
+  const nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx;
+  const length = Math.hypot(nx, ny, nz);
+  let i, point;
+  for (i = 0; i < 3; i++) {
+    point = i === 0 ? a : i === 1 ? b : c;
     position.push(...point);
-    for (value of n) normal.push(value / length);
+    normal.push(nx / length, ny / length, nz / length);
     color.push(...tint);
   }
 }

package/src/geometry/validateTree.js

@@ -0,0 +1,7 @@
+export function validateTree(trunkRadius, crownRadius, crownBottom, bottom, top, crownShape) {
+  if (!Number.isFinite(trunkRadius) || !Number.isFinite(crownRadius) || !Number.isFinite(crownBottom) ||
+    trunkRadius <= 0 || crownRadius < trunkRadius || crownBottom <= bottom || crownBottom >= top ||
+    crownShape !== 'round' && crownShape !== 'cone') {
+    throw /* alloc */ new Error('Invalid tree dimensions or crown shape');
+  }
+}

package/src/geometry/vertexNormals.js

@@ -2,28 +2,22 @@
 
 export function vertexNormals(p, indices) {
   // Accumulate area-weighted face normals for shared vertices, then normalize.
-  const normals = new Float32Array(p.length);
-  let i, a, b, c, u, v, j, n, index, length;
+  const normals = /* alloc */ new Float32Array(p.length);
+  let i, a, b, c, ux, uy, uz, vx, vy, vz, j, nx, ny, nz, index, length;
   for (i = 0; i < (indices?.length || p.length / 3); i += 3) {
     a = indices ? indices[i] : i, b = indices ? indices[i + 1] : i + 1, c = indices ? indices[i + 2] : i + 2;
-    u = [], v = [];
+    ux = p[b * 3] - p[a * 3], uy = p[b * 3 + 1] - p[a * 3 + 1], uz = p[b * 3 + 2] - p[a * 3 + 2];
+    vx = p[c * 3] - p[a * 3], vy = p[c * 3 + 1] - p[a * 3 + 1], vz = p[c * 3 + 2] - p[a * 3 + 2];
+    nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx;
     for (j = 0; j < 3; j++) {
-      u.push(p[b * 3 + j] - p[a * 3 + j]);
-      v.push(p[c * 3 + j] - p[a * 3 + j]);
-    }
-    n = [
-      u[1] * v[2] - u[2] * v[1],
-      u[2] * v[0] - u[0] * v[2],
-      u[0] * v[1] - u[1] * v[0]
-    ];
-    for (index of [a, b, c]) {
-      for (j = 0; j < 3; j++) {
-        normals[index * 3 + j] += n[j];
-      }
+      index = j === 0 ? a : j === 1 ? b : c;
+      normals[index * 3] += nx;
+      normals[index * 3 + 1] += ny;
+      normals[index * 3 + 2] += nz;
     }
   }
   for (i = 0; i < normals.length; i += 3) {
-    length = Math.hypot(...normals.subarray(i, i + 3)) || 1;
+    length = Math.hypot(normals[i], normals[i + 1], normals[i + 2]) || 1;
     for (j = 0; j < 3; j++) {
       normals[i + j] /= length;
     }

package/src/geometry/{visit.js → visitNativeCoordinates.js}

@@ -1,9 +1,10 @@
+import { L } from '../globals/L.js';
 import { polygon } from './polygon.js';
 
 export function visit(context, coordinates, closed) {
   if (!coordinates.length) return;
   let child;
-  if (coordinates[0] instanceof L.LatLng) polygon(context, [coordinates], closed);
+  if (coordinates[0] instanceof L.LatLng) polygon(context, /* alloc */ [coordinates], closed);
   else if (closed && coordinates[0][0] instanceof L.LatLng) polygon(context, coordinates, closed);
   else for (child of coordinates) visit(context, child, closed);
 }

package/src/{constants → globals}/CELL.js

@@ -1,4 +1,3 @@
 // Walls (non-horizontal triangles) of a mesh in world space, bucketed by 8 m cells; `origin` is the world translation
 // at build time, since layer roots only move vertically with the terrain afterwards.
-
 export const CELL = 8;

package/src/globals/Compass.js

@@ -0,0 +1 @@
+export const Compass = { value: undefined };

package/src/globals/ContainerResize.js

@@ -0,0 +1 @@
+export const ContainerResize = { value: undefined };

package/src/{constants → globals}/HEIGHT.js

@@ -1 +1 @@
-export const HEIGHT = 8;
+export const HEIGHT = 8;

package/src/globals/L.js

@@ -0,0 +1 @@
+export const L = globalThis.L;

package/src/globals/PitchDrag.js

@@ -0,0 +1 @@
+export const PitchDrag = { value: undefined };

package/src/globals/ShiftRotate.js

@@ -0,0 +1 @@
+export const ShiftRotate = { value: undefined };

package/src/globals/TouchMode.js

@@ -0,0 +1 @@
+export const TouchMode = { value: undefined };

package/src/globals/alphaBlend.js

@@ -0,0 +1,12 @@
+export const alphaBlend = {
+  color: {
+    srcFactor: 'src-alpha',
+    dstFactor: 'one-minus-src-alpha',
+    operation: 'add'
+  },
+  alpha: {
+    srcFactor: 'one',
+    dstFactor: 'one-minus-src-alpha',
+    operation: 'add'
+  },
+};

package/src/globals/archiveDecoder.js

@@ -0,0 +1 @@
+export const archiveDecoder = new TextDecoder();

package/src/globals/archiveNorthWest.js

@@ -0,0 +1 @@
+export const archiveNorthWest = [0, 0];

package/src/globals/archiveSouthEast.js

@@ -0,0 +1 @@
+export const archiveSouthEast = [0, 0];

package/src/globals/atmosphereColor.js

@@ -0,0 +1 @@
+export const atmosphereColor = [0, 0, 0];

package/src/globals/atmosphereStops.js

@@ -0,0 +1,22 @@
+export const atmosphereStops = [
+  [-18, [3, 7, 20],
+    [17, 28, 54],
+    [0.025, 0.04, 0.09]
+  ],
+  [-6, [37, 53, 84],
+    [182, 106, 86],
+    [0.12, 0.10, 0.14]
+  ],
+  [0, [101, 131, 171],
+    [246, 170, 115],
+    [0.38, 0.24, 0.18]
+  ],
+  [10, [74, 147, 208],
+    [197, 221, 237],
+    [0.80, 0.75, 0.68]
+  ],
+  [25, [53, 144, 213],
+    [223, 238, 250],
+    [1, 1, 1]
+  ],
+];

package/src/globals/blobParts.js

@@ -0,0 +1 @@
+export const blobParts = [null];

package/src/globals/cameraAngles.js

@@ -0,0 +1 @@
+export const cameraAngles = [1, 0, 1, 0];

package/src/globals/cameraAnimatedOptions.js

@@ -0,0 +1,3 @@
+export const cameraAnimatedOptions = Object.freeze({
+  animate: true
+});

package/src/globals/cameraAnimationFrame.js

@@ -0,0 +1 @@
+export const cameraAnimationFrame = { value: null };

package/src/globals/cameraAnimations.js

@@ -0,0 +1 @@
+export const cameraAnimations = new Map();

package/src/globals/cameraBearingSensitivity.js

@@ -0,0 +1 @@
+export const cameraBearingSensitivity = Object.freeze([0.8, 0]);

package/src/globals/cameraDragSensitivity.js

@@ -0,0 +1 @@
+export const cameraDragSensitivity = Object.freeze([0.8, 0.5]);

package/src/globals/cameraDrags.js

@@ -0,0 +1 @@
+export const cameraDrags = { value: new Set() };

package/src/globals/cameraEmptyOptions.js

@@ -0,0 +1 @@
+export const cameraEmptyOptions = Object.freeze({});

package/src/globals/cameraFocusOptions.js

@@ -0,0 +1,3 @@
+export const cameraFocusOptions = Object.freeze({
+  preventScroll: true
+});

package/src/globals/cameraFov.js

@@ -0,0 +1,3 @@
+import { degrees } from './degrees.js';
+
+export const cameraFov = 2 * Math.atan(1 / 3) * degrees;

package/src/globals/cameraListenerOptions.js

@@ -0,0 +1,4 @@
+export const cameraListenerOptions = Object.freeze({
+  capture: true,
+  passive: false
+});

package/src/globals/cameraTouchStates.js

@@ -0,0 +1 @@
+export const cameraTouchStates = new Set();

package/src/globals/cameraZeroPadding.js

@@ -0,0 +1 @@
+export const cameraZeroPadding = Object.freeze([0, 0]);

package/src/globals/cogTags.js

@@ -0,0 +1 @@
+export const cogTags = [256, 257, 258, 259, 262, 277, 284, 317, 322, 323, 324, 325, 339, 33550, 33922, 34735];

package/src/globals/colorLayout.js

@@ -0,0 +1,8 @@
+export const colorLayout = Object.freeze({
+  arrayStride: 12,
+  attributes: Object.freeze([Object.freeze({
+    shaderLocation: 2,
+    offset: 0,
+    format: 'float32x3'
+  })])
+});

package/src/globals/coreEventTypes.js

@@ -0,0 +1,4 @@
+export const coreEventTypes = new Set([
+  'click', 'preclick', 'dblclick', 'contextmenu', 'mousedown', 'mouseup', 'mousemove', 'mouseover', 'mouseout',
+  'pointerdown', 'pointerup', 'pointermove', 'pointerover', 'pointerout',
+]);

package/src/globals/coreMatrixKeys.js

@@ -0,0 +1,4 @@
+export const coreMatrixKeys = Object.freeze([
+  'm11', 'm12', 'm13', 'm14', 'm21', 'm22', 'm23', 'm24',
+  'm31', 'm32', 'm33', 'm34', 'm41', 'm42', 'm43', 'm44',
+]);

package/src/globals/coreQuadIndices.js

@@ -0,0 +1 @@
+export const coreQuadIndices = Object.freeze([0, 2, 1, 1, 2, 3]);

package/src/globals/coreQuadUV.js

@@ -0,0 +1 @@
+export const coreQuadUV = Object.freeze([0, 0, 1, 0, 0, 1, 1, 1]);

package/src/globals/coreSampler.js

@@ -0,0 +1,4 @@
+export const coreSampler = Object.freeze({
+  minFilter: 'linear',
+  magFilter: 'linear'
+});

package/src/globals/coreWhite.js

@@ -0,0 +1 @@
+export const coreWhite = Object.freeze([1, 1, 1]);

package/src/globals/cosObliquity.js

@@ -0,0 +1,3 @@
+import { radians } from './radians.js';
+
+export const cosObliquity = Math.cos(23.4397 * radians);

package/src/globals/coverageTiles.js

@@ -0,0 +1 @@
+export const coverageTiles = new Map();

package/src/globals/defaultMaterial.js

@@ -0,0 +1 @@
+export const defaultMaterial = Object.freeze({});

package/src/globals/degrees.js

@@ -0,0 +1 @@
+export const degrees = 180 / Math.PI;

package/src/globals/demBuffer.js

@@ -0,0 +1,4 @@
+export const demBuffer = {
+  size: null,
+  usage: null
+};

package/src/globals/demLayout.js

@@ -0,0 +1,3 @@
+export const demLayout = {
+  bytesPerRow: null
+};

package/src/globals/demSize.js

@@ -0,0 +1 @@
+export const demSize = [null, null];

package/src/globals/demTarget.js

@@ -0,0 +1,3 @@
+export const demTarget = {
+  texture: null
+};

package/src/globals/demTexture.js

@@ -0,0 +1,5 @@
+export const demTexture = {
+  size: [null, null],
+  format: 'r32float',
+  usage: null
+};

package/src/globals/depthBindGroup.js

@@ -0,0 +1,9 @@
+export const depthBindGroup = {
+  layout: null,
+  entries: [{
+    binding: 0,
+    resource: {
+      buffer: null
+    }
+  }]
+};

package/src/globals/depthTexture.js

@@ -0,0 +1,5 @@
+export const depthTexture = {
+  size: [null, null],
+  format: 'depth24plus',
+  usage: null
+};

package/src/globals/directoryReader.js

@@ -0,0 +1,4 @@
+export const directoryReader = {
+  bytes: null,
+  cursor: 0
+};

package/src/globals/disabledShadow.js

@@ -0,0 +1 @@
+export const disabledShadow = new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0]);

package/src/globals/drawEntries.js

@@ -0,0 +1 @@
+export const drawEntries = [];

package/src/globals/drawFrameEntry.js

@@ -0,0 +1,7 @@
+export const drawFrameEntry = {
+  binding: 1,
+  resource: {
+    buffer: null,
+    size: 240
+  }
+};

package/src/globals/drawMeshEntry.js

@@ -0,0 +1,7 @@
+export const drawMeshEntry = {
+  binding: 0,
+  resource: {
+    buffer: null,
+    size: 160
+  }
+};

package/src/globals/drawSamplerEntries.js

@@ -0,0 +1,18 @@
+export const drawSamplerEntries = [{
+    binding: null,
+    resource: null
+  }, {
+    binding: null,
+    resource: null
+  }, {
+    binding: null,
+    resource: null
+  },
+  {
+    binding: null,
+    resource: null
+  }, {
+    binding: null,
+    resource: null
+  },
+];

package/src/globals/drawTerrainEntry.js

@@ -0,0 +1,4 @@
+export const drawTerrainEntry = {
+  binding: 2,
+  resource: null
+};

package/src/globals/drawTextureEntries.js

@@ -0,0 +1,18 @@
+export const drawTextureEntries = [{
+    binding: null,
+    resource: null
+  }, {
+    binding: null,
+    resource: null
+  }, {
+    binding: null,
+    resource: null
+  },
+  {
+    binding: null,
+    resource: null
+  }, {
+    binding: null,
+    resource: null
+  },
+];

package/src/globals/earthCirc.js

@@ -0,0 +1 @@
+export const earthCirc = 2 * Math.PI * 6378137;

package/src/{constants → globals}/elevationWGSL.js

@@ -2,7 +2,7 @@
  * WGSL twin of getElevation for the vertex shader: bilinear DEM pixels, or the first valid
  * neighbour near no-data (stored as -1e9), else `base`. Expects `dem: texture_2d<f32>`.
  */
-export const elevationWGSL = /* wgsl */ `
+export const elevationWGSL = /* wgsl */`
   fn demSample(pixel: vec2<i32>) -> f32 {
     if (any(pixel < vec2<i32>(0)) || any(pixel >= vec2<i32>(textureDimensions(dem)))) { return -1e9; }
     return textureLoad(dem, pixel, 0).r;

package/src/globals/fragmentShader.js

@@ -0,0 +1,3 @@
+export const fragmentShader = {
+  code: null
+};

package/src/globals/frameBuffer.js

@@ -0,0 +1,4 @@
+export const frameBuffer = {
+  size: null,
+  usage: null
+};

package/src/globals/frameCommands.js

@@ -0,0 +1 @@
+export const frameCommands = [null];

package/src/globals/frameLayoutEntry.js

@@ -0,0 +1,7 @@
+export const frameLayoutEntry = {
+  binding: 1,
+  visibility: null,
+  buffer: {
+    type: 'uniform'
+  }
+};

package/src/globals/geometryDecoder.js

@@ -0,0 +1 @@
+export const geometryDecoder = new TextDecoder();

package/src/globals/geometryEmpty.js

@@ -0,0 +1 @@
+export const geometryEmpty = [];

package/src/globals/geometryImageOptions.js

@@ -0,0 +1,4 @@
+export const geometryImageOptions = {
+  premultiplyAlpha: 'none',
+  colorSpaceConversion: 'none'
+};

package/src/globals/geometryPixelStates.js

@@ -0,0 +1 @@
+export const geometryPixelStates = [];

package/src/globals/geometryQuaternion.js

@@ -0,0 +1 @@
+export const geometryQuaternion = [0, 0, 0, 1];

package/src/globals/geometryScale.js

@@ -0,0 +1 @@
+export const geometryScale = [1, 1, 1];

package/src/globals/geometrySemantics.js

@@ -0,0 +1,5 @@
+export const geometrySemantics = [
+  ['POSITION', 'position'],
+  ['NORMAL', 'normal'],
+  ['TEXCOORD_0', 'uv']
+];

package/src/globals/geometryTranslation.js

@@ -0,0 +1 @@
+export const geometryTranslation = [0, 0, 0];

package/src/globals/geometryWorkerUrl.js

@@ -0,0 +1,3 @@
+export const geometryWorkerUrl = import.meta?.url
+  ? new URL('../workers/geometryWorker.js', import.meta.url).href
+  : new URL('leaflet-city-mapper-worker.js', document.currentScript?.src || document.baseURI).href;

package/src/globals/gridEvents.js

@@ -0,0 +1 @@
+export const gridEvents = { value: undefined };

package/src/globals/gridFadeFrame.js

@@ -0,0 +1 @@
+export const gridFadeFrame = { value: null };

package/src/globals/halfRadians.js

@@ -0,0 +1 @@
+export const halfRadians = Math.PI / 360;

package/src/globals/headerBounds.js

@@ -0,0 +1 @@
+export const headerBounds = ['minLon', 'minLat', 'maxLon', 'maxLat'];

package/src/globals/headerFlags.js

@@ -0,0 +1 @@
+export const headerFlags = ['clustered', 'internalCompression', 'tileCompression', 'tileType', 'minZoom', 'maxZoom'];

package/src/globals/headerOffsets.js

@@ -0,0 +1,5 @@
+export const headerOffsets = [
+  'rootDirectoryOffset', 'rootDirectoryLength', 'jsonMetadataOffset', 'jsonMetadataLength',
+  'leafDirectoryOffset', 'leafDirectoryLength', 'tileDataOffset', 'tileDataLength',
+  'numAddressedTiles', 'numTileEntries', 'numTileContents',
+];

package/src/globals/hull.js

@@ -0,0 +1,10 @@
+export const hull = [
+  [-5.5, 30],
+  [5.5, 30],
+  [5.5, -20],
+  [4, -26],
+  [1.5, -30],
+  [-1.5, -30],
+  [-4, -26],
+  [-5.5, -20]
+];