leaflet-city-mapper 0.1.0 → 0.1.1

package/src/vector-style/readPaintValue.js

@@ -1,17 +1,17 @@
-import { evaluateStyle } from './evaluateStyle.js';
-
-/**
- * Evaluate a paint value or return its fallback when absent.
- *
- * @param {Object} paint Paint values.
- * @param {string} key Paint property name.
- * @param {*} fallback Default value.
- * @param {Object} properties Feature properties.
- * @param {number} zoom Current zoom.
- *
- * @returns {*} Evaluated paint value or fallback.
- */
-export function readPaintValue(paint, key, fallback, properties, zoom) {
-  if (paint[key] === undefined) return fallback;
-  return evaluateStyle(paint[key], properties, zoom);
-}
+import { evaluateStyle } from './evaluateStyle.js';
+
+/**
+ * Evaluate a paint value or return its fallback when absent.
+ *
+ * @param {Object} paint Paint values.
+ * @param {string} key Paint property name.
+ * @param {*} fallback Default value.
+ * @param {Object} properties Feature properties.
+ * @param {number} zoom Current zoom.
+ *
+ * @returns {*} Evaluated paint value or fallback.
+ */
+export function readPaintValue(paint, key, fallback, properties, zoom) {
+  if (paint[key] === undefined) return fallback;
+  return evaluateStyle(paint[key], properties, zoom);
+}

package/src/vector-style/removeTrailingCommas.js

@@ -1,19 +1,19 @@
-/**
- * Remove trailing object and array commas outside quoted JSON strings.
- *
- * @param {string} json JSON-like source.
- *
- * @returns {string} Source without trailing commas.
- */
-export function removeTrailingCommas(json) {
-  let cleaned = '', quoted = false, escaped = false, i = 0, char = '';
-  for (i = 0; i < json.length; i++) {
-    char = json[i];
-    if (!quoted && char === ',' && /^\s*[\]}]/.test(json.slice(i + 1))) continue;
-    cleaned += char;
-    if (escaped) escaped = false;
-    else if (quoted && char === '\\') escaped = true;
-    else if (char === '"') quoted = !quoted;
-  }
-  return cleaned;
-}
+/**
+ * Remove trailing object and array commas outside quoted JSON strings.
+ *
+ * @param {string} json JSON-like source.
+ *
+ * @returns {string} Source without trailing commas.
+ */
+export function removeTrailingCommas(json) {
+  let cleaned = '', quoted = false, escaped = false, i = 0, char = '';
+  for (i = 0; i < json.length; i++) {
+    char = json[i];
+    if (!quoted && char === ',' && /^\s*[\]}]/.test(json.slice(i + 1))) continue;
+    cleaned += char;
+    if (escaped) escaped = false;
+    else if (quoted && char === '\\') escaped = true;
+    else if (char === '"') quoted = !quoted;
+  }
+  return cleaned;
+}

package/src/vector-style/scaleDashArray.js

@@ -1,25 +1,25 @@
-import { evaluateStyle } from './evaluateStyle.js';
-
-/**
- * Evaluate and scale a style dash array by the line width.
- *
- * @param {Array} dash Dash pattern or expression, if present.
- * @param {number} weight Line width.
- * @param {Object} properties Feature properties.
- * @param {number} zoom Current zoom.
- *
- * @returns {string|undefined} Space-separated scaled dashes, or undefined.
- *
- * @throws {TypeError} If the evaluated dash pattern is not an array.
- */
-export function scaleDashArray(dash, weight, properties, zoom) {
-  if (!dash) return undefined;
-  let values = dash, i = 0, result = '';
-  if (typeof dash[0] !== 'number') values = evaluateStyle(dash, properties, zoom);
-  if (!Array.isArray(values)) throw /* alloc */ new TypeError('Style dash array must be an array');
-  for (i = 0; i < values.length; i++) {
-    if (i) result += ' ';
-    result += values[i] * weight;
-  }
-  return result;
-}
+import { evaluateStyle } from './evaluateStyle.js';
+
+/**
+ * Evaluate and scale a style dash array by the line width.
+ *
+ * @param {Array} dash Dash pattern or expression, if present.
+ * @param {number} weight Line width.
+ * @param {Object} properties Feature properties.
+ * @param {number} zoom Current zoom.
+ *
+ * @returns {string|undefined} Space-separated scaled dashes, or undefined.
+ *
+ * @throws {TypeError} If the evaluated dash pattern is not an array.
+ */
+export function scaleDashArray(dash, weight, properties, zoom) {
+  if (!dash) return undefined;
+  let values = dash, i = 0, result = '';
+  if (typeof dash[0] !== 'number') values = evaluateStyle(dash, properties, zoom);
+  if (!Array.isArray(values)) throw /* alloc */ new TypeError('Style dash array must be an array');
+  for (i = 0; i < values.length; i++) {
+    if (i) result += ' ';
+    result += values[i] * weight;
+  }
+  return result;
+}

package/src/vector-style/skipStyleComment.js

@@ -1,20 +1,20 @@
-/**
- * Find the end of a line or block comment in style source text.
- *
- * @param {string} text Style source.
- * @param {number} index Comment start index.
- * @param {string} marker Character after the initial slash.
- *
- * @returns {number} Index at the end of the comment.
- *
- * @throws {Error} If a block comment is unterminated.
- */
-export function skipStyleComment(text, index, marker) {
-  if (marker === '/') {
-    while (index < text.length && text[index] !== '\n') index++;
-    return index;
-  }
-  const end = text.indexOf('*/', index + 2);
-  if (end < 0) throw /* alloc */ new Error('Unterminated style comment');
-  return end + 1;
-}
+/**
+ * Find the end of a line or block comment in style source text.
+ *
+ * @param {string} text Style source.
+ * @param {number} index Comment start index.
+ * @param {string} marker Character after the initial slash.
+ *
+ * @returns {number} Index at the end of the comment.
+ *
+ * @throws {Error} If a block comment is unterminated.
+ */
+export function skipStyleComment(text, index, marker) {
+  if (marker === '/') {
+    while (index < text.length && text[index] !== '\n') index++;
+    return index;
+  }
+  const end = text.indexOf('*/', index + 2);
+  if (end < 0) throw /* alloc */ new Error('Unterminated style comment');
+  return end + 1;
+}

package/src/vector-style/stripStyleComments.js

@@ -1,28 +1,28 @@
-import { appendQuotedStyleCharacter } from './appendQuotedStyleCharacter.js';
-import { skipStyleComment } from './skipStyleComment.js';
-
-/**
- * Strip style comments and normalize quoted strings to JSON form.
- *
- * @param {string} text Style source text.
- *
- * @returns {string} Comment-free JSON-like text.
- */
-export function stripStyleComments(text) {
-  let json = '', i = 0, char = '', next = '', converted = undefined;
-  const state = /* alloc */ { quoted: '', escaped: false };
-  for (i = 0; i < text.length; i++) {
-    char = text[i];
-    next = text[i + 1];
-    converted = appendQuotedStyleCharacter(char, state);
-    if (converted !== undefined) {
-      json += converted;
-      continue;
-    }
-    if (char === '/' && (next === '/' || next === '*')) {
-      i = skipStyleComment(text, i, next);
-      json += next === '/' ? '\n' : ' ';
-    } else json += char;
-  }
-  return json;
-}
+import { appendQuotedStyleCharacter } from './appendQuotedStyleCharacter.js';
+import { skipStyleComment } from './skipStyleComment.js';
+
+/**
+ * Strip style comments and normalize quoted strings to JSON form.
+ *
+ * @param {string} text Style source text.
+ *
+ * @returns {string} Comment-free JSON-like text.
+ */
+export function stripStyleComments(text) {
+  let json = '', i = 0, char = '', next = '', converted = undefined;
+  const state = /* alloc */ { quoted: '', escaped: false };
+  for (i = 0; i < text.length; i++) {
+    char = text[i];
+    next = text[i + 1];
+    converted = appendQuotedStyleCharacter(char, state);
+    if (converted !== undefined) {
+      json += converted;
+      continue;
+    }
+    if (char === '/' && (next === '/' || next === '*')) {
+      i = skipStyleComment(text, i, next);
+      json += next === '/' ? '\n' : ' ';
+    } else json += char;
+  }
+  return json;
+}

package/src/vector-style/styleColor.js

@@ -1,18 +1,18 @@
-import { vectorStyleNamedColors } from '../globals/vectorStyleNamedColors.js';
-import { parseFunctionalColor } from './parseFunctionalColor.js';
-import { parseHexColor } from './parseHexColor.js';
-
-/**
- * Resolve a supported named, hexadecimal or functional style color.
- *
- * @param {string} value Color text.
- *
- * @returns {Array<number>} Red, green, blue and alpha components.
- */
-export function styleColor(value) {
-  if (Object.hasOwn(vectorStyleNamedColors, value)) return vectorStyleNamedColors[value];
-  if (/^#[0-9a-f]{3}$/i.test(value) || /^#[0-9a-f]{6}$/i.test(value)) {
-    return parseHexColor(value);
-  }
-  return parseFunctionalColor(value);
-}
+import { vectorStyleNamedColors } from '../globals/vectorStyleNamedColors.js';
+import { parseFunctionalColor } from './parseFunctionalColor.js';
+import { parseHexColor } from './parseHexColor.js';
+
+/**
+ * Resolve a supported named, hexadecimal or functional style color.
+ *
+ * @param {string} value Color text.
+ *
+ * @returns {Array<number>} Red, green, blue and alpha components.
+ */
+export function styleColor(value) {
+  if (Object.hasOwn(vectorStyleNamedColors, value)) return vectorStyleNamedColors[value];
+  if (/^#[0-9a-f]{3}$/i.test(value) || /^#[0-9a-f]{6}$/i.test(value)) {
+    return parseHexColor(value);
+  }
+  return parseFunctionalColor(value);
+}

package/src/vector-style/validateVectorLayers.js

@@ -1,18 +1,18 @@
-/**
- * Validate that a vector style contains layers with string IDs and types.
- *
- * @param {*} layers Parsed style layers.
- *
- * @throws {Error} If layers is not an array.
- * @throws {Error} If a layer lacks a string ID or type.
- */
-export function validateVectorLayers(layers) {
-  let i = 0, layer = null;
-  if (!Array.isArray(layers)) throw /* alloc */ new Error('Invalid vector style layers');
-  for (i = 0; i < layers.length; i++) {
-    layer = layers[i];
-    if (!layer || typeof layer.id !== 'string' || typeof layer.type !== 'string') {
-      throw /* alloc */ new Error('Invalid vector style layers');
-    }
-  }
-}
+/**
+ * Validate that a vector style contains layers with string IDs and types.
+ *
+ * @param {*} layers Parsed style layers.
+ *
+ * @throws {Error} If layers is not an array.
+ * @throws {Error} If a layer lacks a string ID or type.
+ */
+export function validateVectorLayers(layers) {
+  let i = 0, layer = null;
+  if (!Array.isArray(layers)) throw /* alloc */ new Error('Invalid vector style layers');
+  for (i = 0; i < layers.length; i++) {
+    layer = layers[i];
+    if (!layer || typeof layer.id !== 'string' || typeof layer.type !== 'string') {
+      throw /* alloc */ new Error('Invalid vector style layers');
+    }
+  }
+}

package/src/vector-style/vectorPaint.js

@@ -1,17 +1,17 @@
-import { fillVectorPaint } from './fillVectorPaint.js';
-import { lineVectorPaint } from './lineVectorPaint.js';
-
-/**
- * Resolve a vector style layer's fill or line paint for a feature.
- *
- * @param {Object} layer Vector style layer.
- * @param {Object} properties Feature properties.
- * @param {number} zoom Current zoom.
- *
- * @returns {Object} Resolved rendering options.
- */
-export function vectorPaint(layer, properties, zoom) {
-  const paint = layer.paint || /* alloc */ {};
-  if (layer.type === 'fill') return fillVectorPaint(paint, properties, zoom);
-  return lineVectorPaint(layer, paint, properties, zoom);
-}
+import { fillVectorPaint } from './fillVectorPaint.js';
+import { lineVectorPaint } from './lineVectorPaint.js';
+
+/**
+ * Resolve a vector style layer's fill or line paint for a feature.
+ *
+ * @param {Object} layer Vector style layer.
+ * @param {Object} properties Feature properties.
+ * @param {number} zoom Current zoom.
+ *
+ * @returns {Object} Resolved rendering options.
+ */
+export function vectorPaint(layer, properties, zoom) {
+  const paint = layer.paint || /* alloc */ {};
+  if (layer.type === 'fill') return fillVectorPaint(paint, properties, zoom);
+  return lineVectorPaint(layer, paint, properties, zoom);
+}

package/src/vector-style/visibleStyle.js

@@ -1,16 +1,16 @@
-import { evaluateStyle } from './evaluateStyle.js';
-
-/**
- * Check a style layer's zoom range, visibility and feature filter.
- *
- * @param {Object} layer Vector style layer.
- * @param {Object} properties Feature properties.
- * @param {number} zoom Current zoom.
- *
- * @returns {boolean} Whether the layer is visible for the feature.
- */
-export function visibleStyle(layer, properties, zoom) {
-  return zoom >= (layer.minzoom ?? 0) && zoom < (layer.maxzoom ?? Infinity) &&
-    layer.layout?.visibility !== 'none' &&
-    (!layer.filter || evaluateStyle(layer.filter, properties, zoom, true));
-}
+import { evaluateStyle } from './evaluateStyle.js';
+
+/**
+ * Check a style layer's zoom range, visibility and feature filter.
+ *
+ * @param {Object} layer Vector style layer.
+ * @param {Object} properties Feature properties.
+ * @param {number} zoom Current zoom.
+ *
+ * @returns {boolean} Whether the layer is visible for the feature.
+ */
+export function visibleStyle(layer, properties, zoom) {
+  return zoom >= (layer.minzoom ?? 0) && zoom < (layer.maxzoom ?? Infinity) &&
+    layer.layout?.visibility !== 'none' &&
+    (!layer.filter || evaluateStyle(layer.filter, properties, zoom, true));
+}

package/src/vector-tiles/appendVectorBatch.js

@@ -1,34 +1,34 @@
-import { vectorFeaturePaths } from './vectorFeaturePaths.js';
-
-/**
- * Group feature paths by paint and style dependencies, splitting large batches.
- *
- * @param {Object} job Vector tile preparation job.
- * @param {Object} layer Decoded source layer.
- * @param {Object} entry Style layer entry.
- * @param {Object} feature Decoded feature.
- * @param {number} order Style layer order.
- * @param {Map} batches Batches indexed by paint and property values.
- * @param {Iterable<string>} dependencies Feature properties used by the style.
- * @param {Object} paint Evaluated paint.
- */
-export function appendVectorBatch(job, layer, entry, feature, order, batches, dependencies, paint) {
-  const values = /* alloc */ [];
-  let key, batch, path, count;
-  for (key of dependencies) values.push(feature.properties[key]);
-  key = JSON.stringify(/* alloc */ [paint, values]);
-  batch = batches.get(key);
-  if (!batch) {
-    batch = /* alloc */ { kind: entry.type, order, paint, properties: feature.properties, entry,
-      paths: /* alloc */ [], coordinates: 0 };
-    batches.set(key, batch);
-  }
-  for (path of vectorFeaturePaths(job, layer, entry, feature)) {
-    count = entry.type === 'fill' ? 3 : path.length;
-    if (batch.coordinates + count > 6000 && batch.paths.length) {
-      job.output.push(/* alloc */ { ...batch, paths: batch.paths });
-      batch.paths = /* alloc */ []; batch.coordinates = 0;
-    }
-    batch.paths.push(path); batch.coordinates += count;
-  }
-}
+import { vectorFeaturePaths } from './vectorFeaturePaths.js';
+
+/**
+ * Group feature paths by paint and style dependencies, splitting large batches.
+ *
+ * @param {Object} job Vector tile preparation job.
+ * @param {Object} layer Decoded source layer.
+ * @param {Object} entry Style layer entry.
+ * @param {Object} feature Decoded feature.
+ * @param {number} order Style layer order.
+ * @param {Map} batches Batches indexed by paint and property values.
+ * @param {Iterable<string>} dependencies Feature properties used by the style.
+ * @param {Object} paint Evaluated paint.
+ */
+export function appendVectorBatch(job, layer, entry, feature, order, batches, dependencies, paint) {
+  const values = /* alloc */ [];
+  let key, batch, path, count;
+  for (key of dependencies) values.push(feature.properties[key]);
+  key = JSON.stringify(/* alloc */ [paint, values]);
+  batch = batches.get(key);
+  if (!batch) {
+    batch = /* alloc */ { kind: entry.type, order, paint, properties: feature.properties, entry,
+      paths: /* alloc */ [], coordinates: 0 };
+    batches.set(key, batch);
+  }
+  for (path of vectorFeaturePaths(job, layer, entry, feature)) {
+    count = entry.type === 'fill' ? 3 : path.length;
+    if (batch.coordinates + count > 6000 && batch.paths.length) {
+      job.output.push(/* alloc */ { ...batch, paths: batch.paths });
+      batch.paths = /* alloc */ []; batch.coordinates = 0;
+    }
+    batch.paths.push(path); batch.coordinates += count;
+  }
+}

package/src/vector-tiles/attachVectorTileBatch.js

@@ -1,25 +1,25 @@
-import { L } from '../globals/L.js';
-import { vectorTileOptionsByLayer } from '../weakmaps/vectorTileOptionsByLayer.js';
-import { vectorStyleZoom } from './vectorStyleZoom.js';
-import { vectorTilePaint } from './vectorTilePaint.js';
-import { forwardVectorTileError } from './forwardVectorTileError.js';
-
-/**
- * Create and attach a rendered Leaflet layer for a prepared vector batch.
- *
- * @param {Object} owner Vector tile layer.
- * @param {Object} tile Tile receiving the rendered batch.
- * @param {Object} group Leaflet group receiving the layer.
- * @param {Object} batch Prepared vector batch.
- */
-export function attachVectorTileBatch(owner, tile, group, batch) {
-  const { pane } = vectorTileOptionsByLayer.get(owner);
-  const paint = vectorTilePaint(batch, vectorStyleZoom(owner));
-  const options = /* alloc */ { ...paint, pane: `${pane}-${batch.order}`, interactive: false, smoothFactor: 0 };
-  const layer = batch.kind === 'fill'
-    ? /* alloc */ new L.Polygon(batch.paths, /* alloc */ { ...options, stroke: false, triangulated: true })
-    : /* alloc */ new L.Polyline(batch.paths, options);
-  layer.on('error', forwardVectorTileError, owner);
-  tile.rendered.push(/* alloc */ { layer, kind: batch.kind, entry: batch.entry, properties: batch.properties });
-  group.addLayer(layer);
-}
+import { L } from '../globals/L.js';
+import { vectorTileOptionsByLayer } from '../weakmaps/vectorTileOptionsByLayer.js';
+import { vectorStyleZoom } from './vectorStyleZoom.js';
+import { vectorTilePaint } from './vectorTilePaint.js';
+import { forwardVectorTileError } from './forwardVectorTileError.js';
+
+/**
+ * Create and attach a rendered Leaflet layer for a prepared vector batch.
+ *
+ * @param {Object} owner Vector tile layer.
+ * @param {Object} tile Tile receiving the rendered batch.
+ * @param {Object} group Leaflet group receiving the layer.
+ * @param {Object} batch Prepared vector batch.
+ */
+export function attachVectorTileBatch(owner, tile, group, batch) {
+  const { pane } = vectorTileOptionsByLayer.get(owner);
+  const paint = vectorTilePaint(batch, vectorStyleZoom(owner));
+  const options = /* alloc */ { ...paint, pane: `${pane}-${batch.order}`, interactive: false, smoothFactor: 0 };
+  const layer = batch.kind === 'fill'
+    ? /* alloc */ new L.Polygon(batch.paths, /* alloc */ { ...options, stroke: false, triangulated: true })
+    : /* alloc */ new L.Polyline(batch.paths, options);
+  layer.on('error', forwardVectorTileError, owner);
+  tile.rendered.push(/* alloc */ { layer, kind: batch.kind, entry: batch.entry, properties: batch.properties });
+  group.addLayer(layer);
+}

package/src/vector-tiles/attachVectorTileBatches.js

@@ -1,26 +1,26 @@
-import { attachVectorTileBatch } from './attachVectorTileBatch.js';
-import { vectorTilesIdle } from './vectorTilesIdle.js';
-import { yieldTask } from '../utils/yieldTask.js';
-
-/**
- * Attach vector batches incrementally while the tile session remains current.
- *
- * @param {Object} owner Vector tile layer.
- * @param {Object} tile Tile receiving the batches.
- * @param {Object} group Leaflet group receiving the layers.
- * @param {Array} batches Prepared vector batches.
- * @param {Object} session Session identity.
- *
- * @returns {Promise<boolean>} Whether every batch was attached.
- */
-export async function attachVectorTileBatches(owner, tile, group, batches, session) {
-  let batch, start = performance.now();
-  for (batch of batches) {
-    while (!vectorTilesIdle(owner, session) && owner.session === session &&
-      !tile.controller.signal.aborted) await yieldTask(50);
-    if (tile.controller.signal.aborted || owner.session !== session) return false;
-    attachVectorTileBatch(owner, tile, group, batch);
-    if (performance.now() - start > 8) { await yieldTask(); start = performance.now(); }
-  }
-  return true;
-}
+import { attachVectorTileBatch } from './attachVectorTileBatch.js';
+import { vectorTilesIdle } from './vectorTilesIdle.js';
+import { yieldTask } from '../utils/yieldTask.js';
+
+/**
+ * Attach vector batches incrementally while the tile session remains current.
+ *
+ * @param {Object} owner Vector tile layer.
+ * @param {Object} tile Tile receiving the batches.
+ * @param {Object} group Leaflet group receiving the layers.
+ * @param {Array} batches Prepared vector batches.
+ * @param {Object} session Session identity.
+ *
+ * @returns {Promise<boolean>} Whether every batch was attached.
+ */
+export async function attachVectorTileBatches(owner, tile, group, batches, session) {
+  let batch, start = performance.now();
+  for (batch of batches) {
+    while (!vectorTilesIdle(owner, session) && owner.session === session &&
+      !tile.controller.signal.aborted) await yieldTask(50);
+    if (tile.controller.signal.aborted || owner.session !== session) return false;
+    attachVectorTileBatch(owner, tile, group, batch);
+    if (performance.now() - start > 8) { await yieldTask(); start = performance.now(); }
+  }
+  return true;
+}

package/src/vector-tiles/compareVectorLabelPriority.js

@@ -1,11 +1,11 @@
-/**
- * Order vector labels by ascending priority value.
- *
- * @param {Object} a First label.
- * @param {Object} b Second label.
- *
- * @returns {number} Relative order of the labels.
- */
-export function compareVectorLabelPriority(a, b) {
-  return a.priority - b.priority;
-}
+/**
+ * Order vector labels by ascending priority value.
+ *
+ * @param {Object} a First label.
+ * @param {Object} b Second label.
+ *
+ * @returns {number} Relative order of the labels.
+ */
+export function compareVectorLabelPriority(a, b) {
+  return a.priority - b.priority;
+}

package/src/vector-tiles/compareVectorTileDistance.js

@@ -1,11 +1,11 @@
-/**
- * Order vector tiles by ascending distance.
- *
- * @param {Object} a First tile.
- * @param {Object} b Second tile.
- *
- * @returns {number} Relative order of the tiles.
- */
-export function compareVectorTileDistance(a, b) {
-  return a.distance - b.distance;
-}
+/**
+ * Order vector tiles by ascending distance.
+ *
+ * @param {Object} a First tile.
+ * @param {Object} b Second tile.
+ *
+ * @returns {number} Relative order of the tiles.
+ */
+export function compareVectorTileDistance(a, b) {
+  return a.distance - b.distance;
+}