leaflet-city-mapper 0.1.0 → 0.1.1

package/src/globals/geometryWorkerUrl.js

@@ -1,8 +1,8 @@
-/**
- * Default URL of the geometry worker for module and bundled builds.
- *
- * @type {string}
- */
-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;
+/**
+ * Default URL of the geometry worker for module and bundled builds.
+ *
+ * @type {string}
+ */
+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/halfRadians.js

@@ -1,6 +1,6 @@
-/**
- * Conversion factor from degrees to half-angle radians.
- *
- * @type {number}
- */
-export const halfRadians = Math.PI / 360;
+/**
+ * Conversion factor from degrees to half-angle radians.
+ *
+ * @type {number}
+ */
+export const halfRadians = Math.PI / 360;

package/src/globals/lampDirections.js

@@ -1,13 +1,13 @@
-/**
- * Ring vertex directions and face normals for lamp geometry.
- *
- * @type {Array<Object>}
- */
-export const lampDirections = [
-  { x: Math.cos(0 * Math.PI / 3), y: Math.sin(0 * Math.PI / 3), nx: Math.cos(0.5 * Math.PI / 3), nz: -Math.sin(0.5 * Math.PI / 3) },
-  { x: Math.cos(1 * Math.PI / 3), y: Math.sin(1 * Math.PI / 3), nx: Math.cos(1.5 * Math.PI / 3), nz: -Math.sin(1.5 * Math.PI / 3) },
-  { x: Math.cos(2 * Math.PI / 3), y: Math.sin(2 * Math.PI / 3), nx: Math.cos(2.5 * Math.PI / 3), nz: -Math.sin(2.5 * Math.PI / 3) },
-  { x: Math.cos(3 * Math.PI / 3), y: Math.sin(3 * Math.PI / 3), nx: Math.cos(3.5 * Math.PI / 3), nz: -Math.sin(3.5 * Math.PI / 3) },
-  { x: Math.cos(4 * Math.PI / 3), y: Math.sin(4 * Math.PI / 3), nx: Math.cos(4.5 * Math.PI / 3), nz: -Math.sin(4.5 * Math.PI / 3) },
-  { x: Math.cos(5 * Math.PI / 3), y: Math.sin(5 * Math.PI / 3), nx: Math.cos(5.5 * Math.PI / 3), nz: -Math.sin(5.5 * Math.PI / 3) },
-];
+/**
+ * Ring vertex directions and face normals for lamp geometry.
+ *
+ * @type {Array<Object>}
+ */
+export const lampDirections = [
+  { x: Math.cos(0 * Math.PI / 3), y: Math.sin(0 * Math.PI / 3), nx: Math.cos(0.5 * Math.PI / 3), nz: -Math.sin(0.5 * Math.PI / 3) },
+  { x: Math.cos(1 * Math.PI / 3), y: Math.sin(1 * Math.PI / 3), nx: Math.cos(1.5 * Math.PI / 3), nz: -Math.sin(1.5 * Math.PI / 3) },
+  { x: Math.cos(2 * Math.PI / 3), y: Math.sin(2 * Math.PI / 3), nx: Math.cos(2.5 * Math.PI / 3), nz: -Math.sin(2.5 * Math.PI / 3) },
+  { x: Math.cos(3 * Math.PI / 3), y: Math.sin(3 * Math.PI / 3), nx: Math.cos(3.5 * Math.PI / 3), nz: -Math.sin(3.5 * Math.PI / 3) },
+  { x: Math.cos(4 * Math.PI / 3), y: Math.sin(4 * Math.PI / 3), nx: Math.cos(4.5 * Math.PI / 3), nz: -Math.sin(4.5 * Math.PI / 3) },
+  { x: Math.cos(5 * Math.PI / 3), y: Math.sin(5 * Math.PI / 3), nx: Math.cos(5.5 * Math.PI / 3), nz: -Math.sin(5.5 * Math.PI / 3) },
+];

package/src/globals/layerControlAddItem.js

@@ -1,8 +1,8 @@
-import { L } from './L.js';
-
-/**
- * Original Leaflet layers control item builder, when available.
- *
- * @type {Function|undefined}
- */
-export const layerControlAddItem = L?.LayersControl?.prototype._addItem;
+import { L } from './L.js';
+
+/**
+ * Original Leaflet layers control item builder, when available.
+ *
+ * @type {Function|undefined}
+ */
+export const layerControlAddItem = L?.LayersControl?.prototype._addItem;

package/src/globals/leafletLayer.js

@@ -1,8 +1,8 @@
-import { L } from './L.js';
-
-/**
- * Original Leaflet Layer constructor before its contract is extended.
- *
- * @type {Function|undefined}
- */
-export const leafletLayer = L?.Layer;
+import { L } from './L.js';
+
+/**
+ * Original Leaflet Layer constructor before its contract is extended.
+ *
+ * @type {Function|undefined}
+ */
+export const leafletLayer = L?.Layer;

package/src/globals/lightScale.js

@@ -1,6 +1,6 @@
-/**
- * Scale converting point light flux to renderer intensity.
- *
- * @type {number}
- */
-export const lightScale = 0.03 / (4 * Math.PI);
+/**
+ * Scale converting point light flux to renderer intensity.
+ *
+ * @type {number}
+ */
+export const lightScale = 0.03 / (4 * Math.PI);

package/src/globals/mvtTextDecoder.js

@@ -1,6 +1,6 @@
-/**
- * Strict UTF-8 decoder used for vector tile strings.
- *
- * @type {TextDecoder}
- */
-export const mvtTextDecoder = new TextDecoder('utf-8', { fatal: true });
+/**
+ * Strict UTF-8 decoder used for vector tile strings.
+ *
+ * @type {TextDecoder}
+ */
+export const mvtTextDecoder = new TextDecoder('utf-8', { fatal: true });

package/src/globals/nativeScalableStyleKeys.js

@@ -1,6 +1,6 @@
-/**
- * Native style properties that can be updated without rebuilding geometry.
- *
- * @type {Set<string>}
- */
-export const nativeScalableStyleKeys = new Set(['color', 'opacity', 'weight', 'fillColor', 'fillOpacity']);
+/**
+ * Native style properties that can be updated without rebuilding geometry.
+ *
+ * @type {Set<string>}
+ */
+export const nativeScalableStyleKeys = new Set(['color', 'opacity', 'weight', 'fillColor', 'fillOpacity']);

package/src/globals/sinObliquity.js

@@ -1,8 +1,8 @@
-import { radians } from './radians.js';
-
-/**
- * Sine of Earth's axial obliquity used in celestial position calculations.
- *
- * @type {number}
- */
-export const sinObliquity = Math.sin(23.4397 * radians);
+import { radians } from './radians.js';
+
+/**
+ * Sine of Earth's axial obliquity used in celestial position calculations.
+ *
+ * @type {number}
+ */
+export const sinObliquity = Math.sin(23.4397 * radians);

package/src/globals/tau.js

@@ -1,6 +1,6 @@
-/**
- * Full circle angle in radians.
- *
- * @type {number}
- */
-export const tau = 2 * Math.PI;
+/**
+ * Full circle angle in radians.
+ *
+ * @type {number}
+ */
+export const tau = 2 * Math.PI;

package/src/globals/vectorStyleNamedColors.js

@@ -1,13 +1,13 @@
-/**
- * Supported named vector style colors as red, green, blue and alpha values.
- *
- * @type {Object<string, Array<number>>}
- */
-export const vectorStyleNamedColors = {
-  black: [0, 0, 0, 1],
-  white: [255, 255, 255, 1],
-  gray: [128, 128, 128, 1],
-  blue: [0, 0, 255, 1],
-  red: [255, 0, 0, 1],
-  green: [0, 128, 0, 1]
-};
+/**
+ * Supported named vector style colors as red, green, blue and alpha values.
+ *
+ * @type {Object<string, Array<number>>}
+ */
+export const vectorStyleNamedColors = {
+  black: [0, 0, 0, 1],
+  white: [255, 255, 255, 1],
+  gray: [128, 128, 128, 1],
+  blue: [0, 0, 255, 1],
+  red: [255, 0, 0, 1],
+  green: [0, 128, 0, 1]
+};

package/src/globals/vectorTileEvents.js

@@ -1,6 +1,6 @@
-/**
- * Map events that schedule vector tile refreshes.
- *
- * @type {string}
- */
-export const vectorTileEvents = 'move zoom rotate pitch resize viewreset';
+/**
+ * Map events that schedule vector tile refreshes.
+ *
+ * @type {string}
+ */
+export const vectorTileEvents = 'move zoom rotate pitch resize viewreset';

package/src/globals/workerCogSource.js

@@ -1,6 +1,6 @@
-/**
- * Worker-local cache of open COG sources keyed by URL and asset.
- *
- * @type {Map}
- */
-export const workerCogSource = new Map();
+/**
+ * Worker-local cache of open COG sources keyed by URL and asset.
+ *
+ * @type {Map}
+ */
+export const workerCogSource = new Map();

package/src/gpu/initializeRendererResources.js

@@ -1,39 +1,39 @@
-import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
-import { sceneSunlightUniforms } from '../globals/sceneSunlightUniforms.js';
-import { resizeSunlight } from '../shadows/resizeSunlight.js';
-
-/**
- * Create sunlight bindings and a fallback roof texture for the layer's renderer.
- *
- * @param {L.Layer} layer Layer owning the renderer.
- * @param {GPUDevice} device Device used to create the resources.
- */
-export function initializeRendererResources(layer, device) {
-  const renderer = rendererByLayer.get(layer);
-  const layout = device.createBindGroupLayout(/* alloc */ {
-    entries: /* alloc */ [
-      /* alloc */ { binding: 0, visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT, buffer: /* alloc */ { type: 'uniform' } },
-      /* alloc */ { binding: 1, visibility: GPUShaderStage.FRAGMENT, texture: /* alloc */ { sampleType: 'depth' } },
-      /* alloc */ { binding: 2, visibility: GPUShaderStage.FRAGMENT, sampler: /* alloc */ { type: 'comparison' } },
-      /* alloc */ { binding: 3, visibility: GPUShaderStage.FRAGMENT, buffer: /* alloc */ { type: 'read-only-storage' } },
-    ]
-  });
-  const buffer = device.createBuffer(/* alloc */ { size: 80, usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST });
-  const sampler = device.createSampler(/* alloc */ { compare: 'less-equal', minFilter: 'linear', magFilter: 'linear' });
-  const lights = device.createBuffer(/* alloc */ { size: 32, usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST });
-  renderer.sunlight = /* alloc */ { layout, buffer, sampler, lights, size: 0 };
-  device.queue.writeBuffer(buffer, 0, sceneSunlightUniforms);
-  resizeSunlight(layer, 1);
-  renderer.roofFallbackTexture = /* alloc */ {
-    device,
-    texture: device.createTexture(/* alloc */ {
-      size: /* alloc */ [1, 1],
-      format: 'rgba8unorm',
-      usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT,
-    }),
-    sampler: device.createSampler(/* alloc */ {
-      addressModeU: 'clamp-to-edge', addressModeV: 'clamp-to-edge',
-    }),
-    image: null, format: 'rgba8unorm', srgb: false, uploaded: null,
-  };
-}
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+import { sceneSunlightUniforms } from '../globals/sceneSunlightUniforms.js';
+import { resizeSunlight } from '../shadows/resizeSunlight.js';
+
+/**
+ * Create sunlight bindings and a fallback roof texture for the layer's renderer.
+ *
+ * @param {L.Layer} layer Layer owning the renderer.
+ * @param {GPUDevice} device Device used to create the resources.
+ */
+export function initializeRendererResources(layer, device) {
+  const renderer = rendererByLayer.get(layer);
+  const layout = device.createBindGroupLayout(/* alloc */ {
+    entries: /* alloc */ [
+      /* alloc */ { binding: 0, visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT, buffer: /* alloc */ { type: 'uniform' } },
+      /* alloc */ { binding: 1, visibility: GPUShaderStage.FRAGMENT, texture: /* alloc */ { sampleType: 'depth' } },
+      /* alloc */ { binding: 2, visibility: GPUShaderStage.FRAGMENT, sampler: /* alloc */ { type: 'comparison' } },
+      /* alloc */ { binding: 3, visibility: GPUShaderStage.FRAGMENT, buffer: /* alloc */ { type: 'read-only-storage' } },
+    ]
+  });
+  const buffer = device.createBuffer(/* alloc */ { size: 80, usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST });
+  const sampler = device.createSampler(/* alloc */ { compare: 'less-equal', minFilter: 'linear', magFilter: 'linear' });
+  const lights = device.createBuffer(/* alloc */ { size: 32, usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST });
+  renderer.sunlight = /* alloc */ { layout, buffer, sampler, lights, size: 0 };
+  device.queue.writeBuffer(buffer, 0, sceneSunlightUniforms);
+  resizeSunlight(layer, 1);
+  renderer.roofFallbackTexture = /* alloc */ {
+    device,
+    texture: device.createTexture(/* alloc */ {
+      size: /* alloc */ [1, 1],
+      format: 'rgba8unorm',
+      usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT,
+    }),
+    sampler: device.createSampler(/* alloc */ {
+      addressModeU: 'clamp-to-edge', addressModeV: 'clamp-to-edge',
+    }),
+    image: null, format: 'rgba8unorm', srgb: false, uploaded: null,
+  };
+}

package/src/gpu/initializeSharedRenderer.js

@@ -1,59 +1,59 @@
-import { cameraByLayer } from '../weakmaps/cameraByLayer.js';
-import { layersByLayer } from '../weakmaps/layersByLayer.js';
-import { locationByLayer } from '../weakmaps/locationByLayer.js';
-import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
-import { sceneByLayer } from '../weakmaps/sceneByLayer.js';
-import { sceneOriginByLayer } from '../weakmaps/sceneOriginByLayer.js';
-import { sharedByLayer } from '../weakmaps/sharedByLayer.js';
-import { rendererDevices } from '../weakmaps/rendererDevices.js';
-import { emptyNode } from '../scene/createSceneNode.js';
-import { failAttachment } from '../scene/failAttachment.js';
-import { requestAdapter } from './requestAdapter.js';
-import { requestDevice } from './requestDevice.js';
-import { rendererDeviceError } from './rendererDeviceError.js';
-import { rendererDeviceLost } from './rendererDeviceLost.js';
-import { createSceneCamera } from '../camera/createSceneCamera.js';
-import { initializeRendererResources } from './initializeRendererResources.js';
-import { mountRenderer } from './mountRenderer.js';
-
-/**
- * Acquire a WebGPU device and initialize the shared scene, renderer and canvas.
- *
- * @param {L.Layer} layer Layer that owns the shared renderer.
- * @param {L.Map} map Map receiving the renderer.
- *
- * @returns {Promise<void>} Resolves after the renderer is mounted.
- */
-export async function initializeSharedRenderer(layer, map) {
-  const canvas = document.createElement('canvas');
-  if (!navigator.gpu) {
-    failAttachment(/* alloc */ new Error('Layer3D requires WebGPU'), layer, map);
-  }
-  const adapter = await requestAdapter(layer, map);
-  const device = await requestDevice(adapter, layer, map);
-  rendererDevices.set(device, map);
-  device.addEventListener('uncapturederror', rendererDeviceError);
-  Promise.all(/* alloc */ [device.lost, Promise.resolve(device)]).then(rendererDeviceLost);
-  const context = canvas.getContext('webgpu');
-  if (!context) {
-    device.destroy();
-    failAttachment(/* alloc */ new Error('Unable to create a WebGPU canvas context'), layer, map);
-  }
-  const format = navigator.gpu.getPreferredCanvasFormat();
-  context.configure(/* alloc */ { device, format, alphaMode: 'premultiplied' });
-  map.getContainer().querySelector('.leaflet-webgpu-warning')?.remove();
-  sharedByLayer.set(layer, layer);
-  layersByLayer.set(layer, /* alloc */ new Set());
-  sceneOriginByLayer.set(layer, locationByLayer.get(layer));
-  sceneByLayer.set(layer, emptyNode());
-  cameraByLayer.set(layer, createSceneCamera());
-  rendererByLayer.set(layer, /* alloc */ {
-    device,
-    context,
-    format,
-    canvas,
-    dpr: Math.min(window.devicePixelRatio, 2)
-  });
-  initializeRendererResources(layer, device);
-  mountRenderer(layer, map, canvas);
-}
+import { cameraByLayer } from '../weakmaps/cameraByLayer.js';
+import { layersByLayer } from '../weakmaps/layersByLayer.js';
+import { locationByLayer } from '../weakmaps/locationByLayer.js';
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+import { sceneByLayer } from '../weakmaps/sceneByLayer.js';
+import { sceneOriginByLayer } from '../weakmaps/sceneOriginByLayer.js';
+import { sharedByLayer } from '../weakmaps/sharedByLayer.js';
+import { rendererDevices } from '../weakmaps/rendererDevices.js';
+import { emptyNode } from '../scene/createSceneNode.js';
+import { failAttachment } from '../scene/failAttachment.js';
+import { requestAdapter } from './requestAdapter.js';
+import { requestDevice } from './requestDevice.js';
+import { rendererDeviceError } from './rendererDeviceError.js';
+import { rendererDeviceLost } from './rendererDeviceLost.js';
+import { createSceneCamera } from '../camera/createSceneCamera.js';
+import { initializeRendererResources } from './initializeRendererResources.js';
+import { mountRenderer } from './mountRenderer.js';
+
+/**
+ * Acquire a WebGPU device and initialize the shared scene, renderer and canvas.
+ *
+ * @param {L.Layer} layer Layer that owns the shared renderer.
+ * @param {L.Map} map Map receiving the renderer.
+ *
+ * @returns {Promise<void>} Resolves after the renderer is mounted.
+ */
+export async function initializeSharedRenderer(layer, map) {
+  const canvas = document.createElement('canvas');
+  if (!navigator.gpu) {
+    failAttachment(/* alloc */ new Error('Layer3D requires WebGPU'), layer, map);
+  }
+  const adapter = await requestAdapter(layer, map);
+  const device = await requestDevice(adapter, layer, map);
+  rendererDevices.set(device, map);
+  device.addEventListener('uncapturederror', rendererDeviceError);
+  Promise.all(/* alloc */ [device.lost, Promise.resolve(device)]).then(rendererDeviceLost);
+  const context = canvas.getContext('webgpu');
+  if (!context) {
+    device.destroy();
+    failAttachment(/* alloc */ new Error('Unable to create a WebGPU canvas context'), layer, map);
+  }
+  const format = navigator.gpu.getPreferredCanvasFormat();
+  context.configure(/* alloc */ { device, format, alphaMode: 'premultiplied' });
+  map.getContainer().querySelector('.leaflet-webgpu-warning')?.remove();
+  sharedByLayer.set(layer, layer);
+  layersByLayer.set(layer, /* alloc */ new Set());
+  sceneOriginByLayer.set(layer, locationByLayer.get(layer));
+  sceneByLayer.set(layer, emptyNode());
+  cameraByLayer.set(layer, createSceneCamera());
+  rendererByLayer.set(layer, /* alloc */ {
+    device,
+    context,
+    format,
+    canvas,
+    dpr: Math.min(window.devicePixelRatio, 2)
+  });
+  initializeRendererResources(layer, device);
+  mountRenderer(layer, map, canvas);
+}

package/src/gpu/mountRenderer.js

@@ -1,25 +1,25 @@
-import { sizeByLayer } from '../weakmaps/sizeByLayer.js';
-import { onMapChange } from '../scene/onMapChange.js';
-import { startZoom } from '../animations/startZoom.js';
-import { onZoomAnim } from '../animations/onZoomAnim.js';
-import { endZoom } from '../animations/endZoom.js';
-
-/**
- * Insert the rendering canvas and subscribe the layer to map and zoom events.
- *
- * @param {L.Layer} layer Layer receiving map events.
- * @param {L.Map} map Map receiving the canvas.
- * @param {HTMLCanvasElement} canvas WebGPU rendering canvas.
- */
-export function mountRenderer(layer, map, canvas) {
-  sizeByLayer.set(layer, null);
-  canvas.className = 'leaflet-3d';
-  canvas.style.cssText = 'position:absolute;top:0;left:0;z-index:1;pointer-events:none';
-  canvas.setAttribute('role', 'img');
-  canvas.setAttribute('aria-label', layer.options.ariaLabel ?? '3D scene');
-  map.getPane('mapPane').before(canvas);
-  map.on('move zoom rotate pitch resize viewreset layeradd layerremove', onMapChange, layer);
-  map.on('zoomstart', startZoom, layer);
-  map.on('zoomanim', onZoomAnim, layer);
-  map.on('zoomend', endZoom, layer);
-}
+import { sizeByLayer } from '../weakmaps/sizeByLayer.js';
+import { onMapChange } from '../scene/onMapChange.js';
+import { startZoom } from '../animations/startZoom.js';
+import { onZoomAnim } from '../animations/onZoomAnim.js';
+import { endZoom } from '../animations/endZoom.js';
+
+/**
+ * Insert the rendering canvas and subscribe the layer to map and zoom events.
+ *
+ * @param {L.Layer} layer Layer receiving map events.
+ * @param {L.Map} map Map receiving the canvas.
+ * @param {HTMLCanvasElement} canvas WebGPU rendering canvas.
+ */
+export function mountRenderer(layer, map, canvas) {
+  sizeByLayer.set(layer, null);
+  canvas.className = 'leaflet-3d';
+  canvas.style.cssText = 'position:absolute;top:0;left:0;z-index:1;pointer-events:none';
+  canvas.setAttribute('role', 'img');
+  canvas.setAttribute('aria-label', layer.options.ariaLabel ?? '3D scene');
+  map.getPane('mapPane').before(canvas);
+  map.on('move zoom rotate pitch resize viewreset layeradd layerremove', onMapChange, layer);
+  map.on('zoomstart', startZoom, layer);
+  map.on('zoomanim', onZoomAnim, layer);
+  map.on('zoomend', endZoom, layer);
+}

package/src/layer-controls/layerControlInputId.js

@@ -1,18 +1,18 @@
-import { L } from '../globals/L.js';
-import { layerControlAddItem } from '../globals/layerControlAddItem.js';
-
-// Leaflet 2 stores layer associations on its control, not on the input.
-if (layerControlAddItem && !L.Control.Layers) L.LayersControl.prototype._addItem = addLayerControlInputId;
-
-/**
- * Add a layer-control item and attach its layer identifier to the selector.
- *
- * @param {Object} entry Layer-control entry.
- *
- * @returns {HTMLElement} The created label.
- */
-export function addLayerControlInputId(entry) {
-  const label = layerControlAddItem.call(this, entry);
-  label.querySelector('.leaflet-control-layers-selector').layerId = L.Util.stamp(entry.layer);
-  return label;
-}
+import { L } from '../globals/L.js';
+import { layerControlAddItem } from '../globals/layerControlAddItem.js';
+
+// Leaflet 2 stores layer associations on its control, not on the input.
+if (layerControlAddItem && !L.Control.Layers) L.LayersControl.prototype._addItem = addLayerControlInputId;
+
+/**
+ * Add a layer-control item and attach its layer identifier to the selector.
+ *
+ * @param {Object} entry Layer-control entry.
+ *
+ * @returns {HTMLElement} The created label.
+ */
+export function addLayerControlInputId(entry) {
+  const label = layerControlAddItem.call(this, entry);
+  label.querySelector('.leaflet-control-layers-selector').layerId = L.Util.stamp(entry.layer);
+  return label;
+}

package/src/layer-controls/layerCountTitle.js

@@ -1,16 +1,16 @@
-import { modelUrlByLayer } from '../weakmaps/modelUrlByLayer.js';
-
-/**
- * Format a loading error or a count description for a layer-control status.
- *
- * @param {L.Layer} layer Layer whose status is described.
- * @param {string} formatted Formatted loaded count.
- * @param {number} pending Number of blocks still loading.
- * @param {Error|string} [error] Loading error, if any.
- *
- * @returns {string} Status title.
- */
-export function layerCountTitle(layer, formatted, pending, error) {
-  return error ? `Unable to load: ${typeof error === 'string' ? error : error.message}` :
-    `${formatted} loaded ${modelUrlByLayer.get(layer) ? 'models' : 'elements'} in the current area${pending ? `; ${pending} blocks loading` : ''}`;
-}
+import { modelUrlByLayer } from '../weakmaps/modelUrlByLayer.js';
+
+/**
+ * Format a loading error or a count description for a layer-control status.
+ *
+ * @param {L.Layer} layer Layer whose status is described.
+ * @param {string} formatted Formatted loaded count.
+ * @param {number} pending Number of blocks still loading.
+ * @param {Error|string} [error] Loading error, if any.
+ *
+ * @returns {string} Status title.
+ */
+export function layerCountTitle(layer, formatted, pending, error) {
+  return error ? `Unable to load: ${typeof error === 'string' ? error : error.message}` :
+    `${formatted} loaded ${modelUrlByLayer.get(layer) ? 'models' : 'elements'} in the current area${pending ? `; ${pending} blocks loading` : ''}`;
+}

package/src/layer-controls/placeEntryElement.js

@@ -1,29 +1,29 @@
-import { L } from '../globals/L.js';
-
-/**
- * Place a count, traffic status or other element next to a layer selector.
- *
- * @param {HTMLInputElement} input Layers-control selector.
- * @param {L.Layer} layer Layer associated with the selector.
- * @param {HTMLElement} element Element to place.
- */
-export function placeEntryElement(input, layer, element) {
-  const label = input.closest('label');
-  if (element.classList.contains('layer-count')) {
-    if (!input.hasAttribute('aria-label')) input.setAttribute('aria-label', label.textContent.trim());
-    element.id = `leaflet-layer-count-${L.Util.stamp(layer)}`;
-    input.setAttribute('aria-describedby', element.id);
-    label.append(element);
-  }
-  else if (element.classList.contains('traffic-status')) {
-    let group = label.nextElementSibling;
-    if (!group?.classList.contains('traffic-status-group')) {
-      group = L.DomUtil.create('div', 'traffic-status-group');
-      group.style.cssText = 'display:flex;flex-wrap:wrap;gap:4px 8px;max-width:200px;margin:2px 0 6px 20px;';
-      group.setAttribute('role', 'group');
-      group.setAttribute('aria-label', 'Traffic counts');
-      label.after(group);
-    }
-    group.append(element);
-  } else label.after(element);
-}
+import { L } from '../globals/L.js';
+
+/**
+ * Place a count, traffic status or other element next to a layer selector.
+ *
+ * @param {HTMLInputElement} input Layers-control selector.
+ * @param {L.Layer} layer Layer associated with the selector.
+ * @param {HTMLElement} element Element to place.
+ */
+export function placeEntryElement(input, layer, element) {
+  const label = input.closest('label');
+  if (element.classList.contains('layer-count')) {
+    if (!input.hasAttribute('aria-label')) input.setAttribute('aria-label', label.textContent.trim());
+    element.id = `leaflet-layer-count-${L.Util.stamp(layer)}`;
+    input.setAttribute('aria-describedby', element.id);
+    label.append(element);
+  }
+  else if (element.classList.contains('traffic-status')) {
+    let group = label.nextElementSibling;
+    if (!group?.classList.contains('traffic-status-group')) {
+      group = L.DomUtil.create('div', 'traffic-status-group');
+      group.style.cssText = 'display:flex;flex-wrap:wrap;gap:4px 8px;max-width:200px;margin:2px 0 6px 20px;';
+      group.setAttribute('role', 'group');
+      group.setAttribute('aria-label', 'Traffic counts');
+      label.after(group);
+    }
+    group.append(element);
+  } else label.after(element);
+}