@map-zero/ol 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@map-zero/ol",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "description": "OpenLayers integration helper for map-zero packages.",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "README.md"
   ],
   "dependencies": {
-    "@map-zero/raster": "0.3.1"
+    "@map-zero/raster": "0.3.2"
   },
   "peerDependencies": {
-    "ol": "^10.9.0",
-    "pmtiles": "^4.4.1"
+    "ol": "10.10.0",
+    "pmtiles": "4.4.1"
   }
 }

package/src/index.js

@@ -10,6 +10,7 @@ import { PMTiles } from 'pmtiles';
 import { isAipLayer, layerAlias } from '../../raster/src/shared/layers.js';
 import { pmtilesInfo } from '../../raster/src/shared/manifest.js';
 import { clampInteger, clampNumber } from '../../raster/src/shared/math.js';
+import { maxZoomExpression, minZoomExpression, zoomInterpolateExpression } from './zoom.js';
 
 import {
   activeLabelLayerIdsForZoom,
@@ -57,6 +58,7 @@ const ROAD_HIGHWAY_DRAW_ORDER = [
  *   visibleLayers?: string[] | Set<string>,
  *   source?: 'auto' | 'pmtiles' | 'dynamic',
  *   renderMode?: 'vector' | 'raster-worker',
+ *   hitDetection?: boolean,
  *   workerUrl?: string | URL,
  *   rasterPixelRatio?: number,
  *   overzoomLevels?: number,
@@ -144,6 +146,7 @@ export async function createMapZeroOpenLayersLayers(options) {
     source,
     preload: 0,
     useInterimTilesOnError: false,
+    disableHitDetection: options.hitDetection === false,
     style: createWebGlStyles(context)
   });
   tagOpenLayersLayer(layer, instanceId, orderedLayers.map((item) => item.id), 'geometry');
@@ -1252,7 +1255,7 @@ function onewayFilter(filter) {
  * @returns {unknown[]}
  */
 function minZoomFilter(filter, zoom) {
-  return Number.isFinite(zoom) ? ['all', filter, ['>=', ['zoom'], zoom]] : filter;
+  return Number.isFinite(zoom) ? ['all', filter, minZoomExpression(zoom)] : filter;
 }
 
 /**
@@ -1423,10 +1426,10 @@ function roadOverrideZoomFilter(filter, override) {
   const normalized = normalizeStyleRule(/** @type {Record<string, unknown>} */ (override));
   let next = filter;
   if (Number.isFinite(normalized.minZoom)) {
-    next = ['all', next, ['>=', ['zoom'], Number(normalized.minZoom)]];
+    next = ['all', next, minZoomExpression(Number(normalized.minZoom))];
   }
   if (Number.isFinite(normalized.maxZoom)) {
-    next = ['all', next, ['<=', ['zoom'], Number(normalized.maxZoom)]];
+    next = ['all', next, maxZoomExpression(Number(normalized.maxZoom))];
   }
   return next;
 }
@@ -1647,11 +1650,11 @@ function createLayerFilter(layerId, rule) {
   ];
 
   if (Number.isFinite(rule.minZoom)) {
-    filters.push(['>=', ['zoom'], Number(rule.minZoom)]);
+    filters.push(minZoomExpression(Number(rule.minZoom)));
   }
 
   if (Number.isFinite(rule.maxZoom)) {
-    filters.push(['<=', ['zoom'], Number(rule.maxZoom)]);
+    filters.push(maxZoomExpression(Number(rule.maxZoom)));
   }
 
   if (layerId === 'pois') {
@@ -1836,7 +1839,7 @@ function zoomWidthScale(rule) {
     return null;
   }
 
-  const expression = ['interpolate', ['linear'], ['zoom']];
+  const validStops = [];
   for (const stop of stops) {
     if (!Array.isArray(stop) || stop.length < 2) {
       continue;
@@ -1845,11 +1848,11 @@ function zoomWidthScale(rule) {
     const zoom = Number(stop[0]);
     const scale = Number(stop[1]);
     if (Number.isFinite(zoom) && Number.isFinite(scale) && scale >= 0) {
-      expression.push(zoom, scale);
+      validStops.push([zoom, scale]);
     }
   }
 
-  return expression.length > 4 ? expression : null;
+  return zoomInterpolateExpression(validStops);
 }
 
 /**

package/src/labels.js

@@ -155,7 +155,10 @@ export class LabelAtlas {
  * @returns {{ layer: VectorTileLayer, source: VectorTileSource, attachMap: () => void, detachMap: () => void, refresh: () => void, destroy: () => void }}
  */
 export function createMapZeroLabelLayer(options) {
-  const format = new MVT({ featureClass: Feature });
+  // The geometry layer already decodes every map layer. Labels only need these
+  // source layers, so do not create Canvas features for buildings, water or
+  // other non-label data a second time.
+  const format = new MVT({ featureClass: Feature, layers: LABEL_SOURCE_LAYERS });
   const source = new VectorTileSource({
     format,
     maxZoom: 22,

package/src/zoom.js

@@ -0,0 +1,36 @@
+const WEB_MERCATOR_RESOLUTION_AT_ZOOM_0 = 156543.03392804097;
+
+/**
+ * The WebGL style compiler exposes resolution in all supported render paths.
+ * Convert the standard Web Mercator zoom thresholds used by map-zero styles.
+ *
+ * @param {number} zoom
+ * @returns {number}
+ */
+export function resolutionForZoom(zoom) {
+  return WEB_MERCATOR_RESOLUTION_AT_ZOOM_0 / (2 ** zoom);
+}
+
+/** @param {number} zoom @returns {unknown[]} */
+export function minZoomExpression(zoom) {
+  return ['<=', ['resolution'], resolutionForZoom(zoom)];
+}
+
+/** @param {number} zoom @returns {unknown[]} */
+export function maxZoomExpression(zoom) {
+  return ['>=', ['resolution'], resolutionForZoom(zoom)];
+}
+
+/**
+ * @param {Array<[number, number]>} stops
+ * @returns {unknown[] | null}
+ */
+export function zoomInterpolateExpression(stops) {
+  const entries = stops
+    .filter(([zoom, value]) => Number.isFinite(zoom) && Number.isFinite(value))
+    .map(([zoom, value]) => ({ resolution: resolutionForZoom(zoom), value }))
+    .sort((left, right) => left.resolution - right.resolution);
+
+  if (entries.length < 2) return null;
+  return ['interpolate', ['linear'], ['resolution'], ...entries.flatMap(({ resolution, value }) => [resolution, value])];
+}