@mapwhit/tilerenderer 1.0.0 → 1.1.0

package/src/data/feature_index.js

@@ -1,14 +1,13 @@
-const loadGeometry = require('./load_geometry');
-const EXTENT = require('./extent');
-const featureFilter = require('../style-spec/feature_filter');
-const Grid = require('grid-index');
-const dictionaryCoder = require('../util/dictionary_coder');
-const GeoJSONFeature = require('../util/vectortile_to_geojson');
-const { arraysIntersect } = require('../util/object');
-const EvaluationParameters = require('../style/evaluation_parameters');
-const { polygonIntersectsBox } = require('../util/intersection_tests');
-
-const { FeatureIndexArray } = require('./array_types');
+import Grid from 'grid-index';
+import EvaluationParameters from '../style/evaluation_parameters.js';
+import featureFilter from '../style-spec/feature_filter/index.js';
+import dictionaryCoder from '../util/dictionary_coder.js';
+import { polygonIntersectsBox } from '../util/intersection_tests.js';
+import { arraysIntersect } from '../util/object.js';
+import GeoJSONFeature from '../util/vectortile_to_geojson.js';
+import { FeatureIndexArray } from './array_types.js';
+import EXTENT from './extent.js';
+import loadGeometry from './load_geometry.js';
 
 class FeatureIndex {
   constructor(tileID, grid = new Grid(EXTENT, 16, 0), featureIndexArray = new FeatureIndexArray()) {
@@ -85,7 +84,9 @@ class FeatureIndex {
       const index = matching[k];
 
       // don't check the same feature more than once
-      if (index === previousIndex) continue;
+      if (index === previousIndex) {
+        continue;
+      }
       previousIndex = index;
 
       const match = this.featureIndexArray.get(index);
@@ -136,13 +137,17 @@ class FeatureIndex {
     intersectionTest
   ) {
     const layerIDs = this.bucketLayerIDs[bucketIndex];
-    if (filterLayerIDs && !arraysIntersect(filterLayerIDs, layerIDs)) return;
+    if (filterLayerIDs && !arraysIntersect(filterLayerIDs, layerIDs)) {
+      return;
+    }
 
     const sourceLayerName = this.sourceLayerCoder.decode(sourceLayerIndex);
     const sourceLayer = this.vtLayers[sourceLayerName];
     const feature = sourceLayer.feature(featureIndex);
 
-    if (!filter(new EvaluationParameters(this.tileID.overscaledZ), feature)) return;
+    if (!filter(new EvaluationParameters(this.tileID.overscaledZ), feature)) {
+      return;
+    }
 
     const { x, y, z } = this.tileID.canonical;
     for (const layerID of layerIDs) {
@@ -151,7 +156,9 @@ class FeatureIndex {
       }
 
       const styleLayer = styleLayers.get(layerID);
-      if (!styleLayer) continue;
+      if (!styleLayer) {
+        continue;
+      }
 
       const intersectionZ = !intersectionTest || intersectionTest(feature, styleLayer);
       if (!intersectionZ) {
@@ -189,7 +196,7 @@ class FeatureIndex {
   }
 }
 
-module.exports = FeatureIndex;
+export default FeatureIndex;
 
 function getBounds(geometry) {
   let minX = Number.POSITIVE_INFINITY;
@@ -197,10 +204,18 @@ function getBounds(geometry) {
   let maxX = Number.NEGATIVE_INFINITY;
   let maxY = Number.NEGATIVE_INFINITY;
   for (const { x, y } of geometry) {
-    if (x < minX) minX = x;
-    if (x > maxX) maxX = x;
-    if (y < minY) minY = y;
-    if (y > maxY) maxY = y;
+    if (x < minX) {
+      minX = x;
+    }
+    if (x > maxX) {
+      maxX = x;
+    }
+    if (y < minY) {
+      minY = y;
+    }
+    if (y > maxY) {
+      maxY = y;
+    }
   }
   return { minX, minY, maxX, maxY };
 }

package/src/data/index_array_type.js

@@ -1,4 +1,4 @@
-const { LineIndexArray, TriangleIndexArray, LineStripIndexArray } = require('./array_types');
+export { LineIndexArray, LineStripIndexArray, TriangleIndexArray } from './array_types.js';
 
 /**
  * An index array stores Uint16 indices of vertexes in a corresponding vertex array. We use
@@ -7,8 +7,3 @@ const { LineIndexArray, TriangleIndexArray, LineStripIndexArray } = require('./a
  * forming a line strip.
  * @private
  */
-module.exports = {
-  LineIndexArray,
-  TriangleIndexArray,
-  LineStripIndexArray
-};

package/src/data/load_geometry.js

@@ -1,6 +1,5 @@
-const warn = require('../util/warn');
-
-const EXTENT = require('./extent');
+import warn from '../util/warn.js';
+import EXTENT from './extent.js';
 
 // These bounds define the minimum and maximum supported coordinate values.
 // While visible coordinates are within [0, EXTENT], tiles may theoretically
@@ -21,13 +20,11 @@ const bounds = createBounds(16);
  * @param {VectorTileFeature} feature
  * @private
  */
-module.exports = function loadGeometry(feature) {
+export default function loadGeometry(feature) {
   const scale = EXTENT / feature.extent;
   const geometry = feature.loadGeometry();
-  for (let r = 0; r < geometry.length; r++) {
-    const ring = geometry[r];
-    for (let p = 0; p < ring.length; p++) {
-      const point = ring[p];
+  for (const ring of geometry) {
+    for (const point of ring) {
       // round here because mapbox-gl-native uses integers to represent
       // points and we need to do the same to avoid renering differences.
       point.x = Math.round(point.x * scale);
@@ -39,4 +36,4 @@ module.exports = function loadGeometry(feature) {
     }
   }
   return geometry;
-};
+}

package/src/data/pos_attributes.js

@@ -1,3 +1,2 @@
-const { createLayout } = require('../util/struct_array');
-
-module.exports = createLayout([{ name: 'a_pos', type: 'Int16', components: 2 }]);
+import { createLayout } from '../util/struct_array.js';
+export default createLayout([{ name: 'a_pos', type: 'Int16', components: 2 }]);

package/src/data/program_configuration.js

@@ -1,14 +1,14 @@
-const { packUint8ToFloat } = require('../shaders/encode_attribute');
-const { supportsPropertyExpression } = require('@mapwhit/style-expressions');
-const { PossiblyEvaluatedPropertyValue } = require('../style/properties');
-const {
+import { supportsPropertyExpression } from '@mapwhit/style-expressions';
+import { Uniform1f, Uniform4f, UniformColor } from '../render/uniform_binding.js';
+import { packUint8ToFloat } from '../shaders/encode_attribute.js';
+import EvaluationParameters from '../style/evaluation_parameters.js';
+import { PossiblyEvaluatedPropertyValue } from '../style/properties.js';
+import {
+  PatternLayoutArray,
   StructArrayLayout1f4,
   StructArrayLayout2f8,
-  StructArrayLayout4f16,
-  PatternLayoutArray
-} = require('./array_types');
-const EvaluationParameters = require('../style/evaluation_parameters');
-const { Uniform1f, UniformColor, Uniform4f } = require('../render/uniform_binding');
+  StructArrayLayout4f16
+} from './array_types.js';
 
 function packColor(color) {
   return [packUint8ToFloat(255 * color.r, 255 * color.g), packUint8ToFloat(255 * color.b, 255 * color.a)];
@@ -96,8 +96,12 @@ class CrossFadedConstantBinder {
 
   setUniforms(context, uniform, globals, currentValue, uniformName) {
     const pos = this.patternPositions;
-    if (uniformName === 'u_pattern_to' && pos.patternTo) uniform.set(pos.patternTo);
-    if (uniformName === 'u_pattern_from' && pos.patternFrom) uniform.set(pos.patternFrom);
+    if (uniformName === 'u_pattern_to' && pos.patternTo) {
+      uniform.set(pos.patternTo);
+    }
+    if (uniformName === 'u_pattern_from' && pos.patternFrom) {
+      uniform.set(pos.patternFrom);
+    }
   }
 
   getBinding(context, location) {
@@ -350,7 +354,9 @@ class CrossFadedCompositeBinder {
       const imageMid = imagePositions[mid];
       const imageMax = imagePositions[max];
 
-      if (!imageMin || !imageMid || !imageMax) return;
+      if (!imageMin || !imageMid || !imageMax) {
+        return;
+      }
 
       for (let i = start; i < length; i++) {
         zoomInArray.emplaceBack(
@@ -393,7 +399,9 @@ class CrossFadedCompositeBinder {
       const imageMid = imagePositions[mid];
       const imageMax = imagePositions[max];
 
-      if (!imageMin || !imageMid || !imageMax) return;
+      if (!imageMin || !imageMid || !imageMax) {
+        return;
+      }
       for (let i = start; i < end; i++) {
         zoomInArray.emplace(
           i,
@@ -438,8 +446,12 @@ class CrossFadedCompositeBinder {
   }
 
   destroy() {
-    if (this.zoomOutPaintVertexBuffer) this.zoomOutPaintVertexBuffer.destroy();
-    if (this.zoomInPaintVertexBuffer) this.zoomInPaintVertexBuffer.destroy();
+    if (this.zoomOutPaintVertexBuffer) {
+      this.zoomOutPaintVertexBuffer.destroy();
+    }
+    if (this.zoomInPaintVertexBuffer) {
+      this.zoomInPaintVertexBuffer.destroy();
+    }
   }
 
   setUniforms(context, uniform) {
@@ -471,7 +483,7 @@ class CrossFadedCompositeBinder {
  *
  * @private
  */
-class ProgramConfiguration {
+export default class ProgramConfiguration {
   constructor() {
     this.binders = {};
     this.cacheKey = '';
@@ -486,7 +498,9 @@ class ProgramConfiguration {
     const keys = [];
 
     for (const property in layer._paint._values) {
-      if (!filterProperties(property)) continue;
+      if (!filterProperties(property)) {
+        continue;
+      }
       const value = layer._paint.get(property);
       if (
         !(value instanceof PossiblyEvaluatedPropertyValue) ||
@@ -574,7 +588,9 @@ class ProgramConfiguration {
     let dirty = false;
     for (const id in featureStates) {
       const posArray = this._idMap[id];
-      if (!posArray) continue;
+      if (!posArray) {
+        continue;
+      }
 
       const featureState = featureStates[id];
       for (const pos of posArray) {
@@ -582,7 +598,9 @@ class ProgramConfiguration {
 
         for (const property in this.binders) {
           const binder = this.binders[property];
-          if (binder instanceof ConstantBinder || binder instanceof CrossFadedConstantBinder) continue;
+          if (binder instanceof ConstantBinder || binder instanceof CrossFadedConstantBinder) {
+            continue;
+          }
           if (binder.expression.isStateDependent === true) {
             //AHM: Remove after https://github.com/mapbox/mapbox-gl-js/issues/6255
             const value = layer._paint.get(property);
@@ -639,7 +657,9 @@ class ProgramConfiguration {
       if (binder instanceof CrossFadedCompositeBinder) {
         const patternVertexBuffer =
           crossfade.fromScale === 2 ? binder.zoomInPaintVertexBuffer : binder.zoomOutPaintVertexBuffer;
-        if (patternVertexBuffer) buffers.push(patternVertexBuffer);
+        if (patternVertexBuffer) {
+          buffers.push(patternVertexBuffer);
+        }
       } else if (
         (binder instanceof SourceExpressionBinder || binder instanceof CompositeExpressionBinder) &&
         binder.paintVertexBuffer
@@ -676,7 +696,7 @@ class ProgramConfiguration {
   }
 }
 
-class ProgramConfigurationSet {
+export class ProgramConfigurationSet {
   constructor(layoutAttributes, layers, zoom, filterProperties = () => true) {
     this.programConfigurations = {};
     for (const layer of layers) {
@@ -706,7 +726,9 @@ class ProgramConfigurationSet {
   }
 
   upload(context) {
-    if (!this.needsUpload) return;
+    if (!this.needsUpload) {
+      return;
+    }
     for (const layerId in this.programConfigurations) {
       this.programConfigurations[layerId].upload(context);
     }
@@ -775,7 +797,3 @@ function layoutType(property, type, binderType) {
   const layoutException = getLayoutException(property);
   return layoutException?.[binderType] || defaultLayouts[type][binderType];
 }
-
-ProgramConfiguration.ProgramConfigurationSet = ProgramConfigurationSet;
-
-module.exports = ProgramConfiguration;

package/src/data/raster_bounds_attributes.js

@@ -1,6 +1,6 @@
-const { createLayout } = require('../util/struct_array');
+import { createLayout } from '../util/struct_array.js';
 
-module.exports = createLayout([
+export default createLayout([
   { name: 'a_pos', type: 'Int16', components: 2 },
   { name: 'a_texture_pos', type: 'Int16', components: 2 }
 ]);

package/src/data/segment.js

@@ -1,4 +1,4 @@
-const warn = require('../util/warn');
+import warn from '../util/warn.js';
 
 class SegmentVector {
   constructor(segments = []) {
@@ -6,10 +6,11 @@ class SegmentVector {
   }
 
   prepareSegment(numVertices, layoutVertexArray, indexArray) {
-    if (numVertices > SegmentVector.MAX_VERTEX_ARRAY_LENGTH)
+    if (numVertices > SegmentVector.MAX_VERTEX_ARRAY_LENGTH) {
       warn.once(
         `Max vertices per segment is ${SegmentVector.MAX_VERTEX_ARRAY_LENGTH}: bucket requested ${numVertices}`
       );
+    }
     let segment = this.segments.at(-1);
     if (!segment || segment.vertexLength + numVertices > SegmentVector.MAX_VERTEX_ARRAY_LENGTH) {
       segment = {
@@ -56,4 +57,4 @@ class SegmentVector {
  */
 SegmentVector.MAX_VERTEX_ARRAY_LENGTH = 2 ** 16 - 1;
 
-module.exports = SegmentVector;
+export default SegmentVector;

package/src/geo/coordinate.js

@@ -75,4 +75,4 @@ class Coordinate {
   }
 }
 
-module.exports = Coordinate;
+export default Coordinate;

package/src/geo/lng_lat.js

@@ -1,4 +1,5 @@
-const { wrap } = require('../util/util');
+import { wrap } from '../util/util.js';
+import LngLatBounds from './lng_lat_bounds.js';
 
 /**
  * A `LngLat` object represents a given longitude and latitude coordinate, measured in degrees.
@@ -80,7 +81,6 @@ class LngLat {
     const earthCircumferenceInMetersAtEquator = 40075017;
     const latAccuracy = (360 * radius) / earthCircumferenceInMetersAtEquator;
     const lngAccuracy = latAccuracy / Math.cos((Math.PI / 180) * this.lat);
-    const LngLatBounds = require('./lng_lat_bounds');
 
     return new LngLatBounds(
       new LngLat(this.lng - lngAccuracy, this.lat - latAccuracy),
@@ -126,4 +126,4 @@ class LngLat {
  * var v2 = [-122.420679, 37.772537];
  */
 
-module.exports = LngLat;
+export default LngLat;

package/src/geo/lng_lat_bounds.js

@@ -1,4 +1,4 @@
-const LngLat = require('./lng_lat');
+import LngLat from './lng_lat.js';
 
 /**
  * A `LngLatBounds` object represents a geographical bounding box,
@@ -73,7 +73,9 @@ class LngLatBounds {
       sw2 = obj._sw;
       ne2 = obj._ne;
 
-      if (!sw2 || !ne2) return this;
+      if (!sw2 || !ne2) {
+        return this;
+      }
     } else {
       if (Array.isArray(obj)) {
         if (obj.every(Array.isArray)) {
@@ -231,7 +233,9 @@ class LngLatBounds {
    * llb;   // = LngLatBounds {_sw: LngLat {lng: -73.9876, lat: 40.7661}, _ne: LngLat {lng: -73.9397, lat: 40.8002}}
    */
   static convert(input) {
-    if (!input || input instanceof LngLatBounds) return input;
+    if (!input || input instanceof LngLatBounds) {
+      return input;
+    }
     return new LngLatBounds(input);
   }
 }
@@ -250,4 +254,4 @@ class LngLatBounds {
  * var v3 = [[-73.9876, 40.7661], [-73.9397, 40.8002]];
  */
 
-module.exports = LngLatBounds;
+export default LngLatBounds;

package/src/geo/transform.js

@@ -1,13 +1,14 @@
-const LngLat = require('./lng_lat');
-
-const { default: Point } = require('@mapbox/point-geometry');
-const Coordinate = require('./coordinate');
-const { wrap, clamp } = require('../util/util');
-const interpolate = require('../util/interpolate');
-const tileCover = require('../util/tile_cover');
-const { UnwrappedTileID } = require('../source/tile_id');
-const EXTENT = require('../data/extent');
-const { vec4, mat4, mat2 } = require('@mapbox/gl-matrix');
+import glMatrix from '@mapbox/gl-matrix';
+import Point from '@mapbox/point-geometry';
+import EXTENT from '../data/extent.js';
+import { UnwrappedTileID } from '../source/tile_id.js';
+import interpolate from '../util/interpolate.js';
+import tileCover from '../util/tile_cover.js';
+import { clamp, wrap } from '../util/util.js';
+import Coordinate from './coordinate.js';
+import LngLat from './lng_lat.js';
+
+const { mat2, mat4, vec4 } = glMatrix;
 
 /**
  * A single transform, generally used for a single tile to be
@@ -57,7 +58,9 @@ class Transform {
     return this._minZoom;
   }
   set minZoom(zoom) {
-    if (this._minZoom === zoom) return;
+    if (this._minZoom === zoom) {
+      return;
+    }
     this._minZoom = zoom;
     this.zoom = Math.max(this.zoom, zoom);
   }
@@ -66,7 +69,9 @@ class Transform {
     return this._maxZoom;
   }
   set maxZoom(zoom) {
-    if (this._maxZoom === zoom) return;
+    if (this._maxZoom === zoom) {
+      return;
+    }
     this._maxZoom = zoom;
     this.zoom = Math.min(this.zoom, zoom);
   }
@@ -101,7 +106,9 @@ class Transform {
   }
   set bearing(bearing) {
     const b = (-wrap(bearing, -180, 180) * Math.PI) / 180;
-    if (this.angle === b) return;
+    if (this.angle === b) {
+      return;
+    }
     this._unmodified = false;
     this.angle = b;
     this._calcMatrices();
@@ -116,7 +123,9 @@ class Transform {
   }
   set pitch(pitch) {
     const p = (clamp(pitch, 0, 60) / 180) * Math.PI;
-    if (this._pitch === p) return;
+    if (this._pitch === p) {
+      return;
+    }
     this._unmodified = false;
     this._pitch = p;
     this._calcMatrices();
@@ -127,7 +136,9 @@ class Transform {
   }
   set fov(fov) {
     fov = Math.max(0.01, Math.min(60, fov));
-    if (this._fov === fov) return;
+    if (this._fov === fov) {
+      return;
+    }
     this._unmodified = false;
     this._fov = (fov / 180) * Math.PI;
     this._calcMatrices();
@@ -138,7 +149,9 @@ class Transform {
   }
   set zoom(zoom) {
     const z = Math.min(Math.max(zoom, this.minZoom), this.maxZoom);
-    if (this._zoom === z) return;
+    if (this._zoom === z) {
+      return;
+    }
     this._unmodified = false;
     this._zoom = z;
     this.scale = this.zoomScale(z);
@@ -152,7 +165,9 @@ class Transform {
     return this._center;
   }
   set center(center) {
-    if (center.lat === this._center.lat && center.lng === this._center.lng) return;
+    if (center.lat === this._center.lat && center.lng === this._center.lng) {
+      return;
+    }
     this._unmodified = false;
     this._center = center;
     this._constrain();
@@ -192,7 +207,9 @@ class Transform {
       const extraWorldCopy = 1;
 
       for (let w = w0 - extraWorldCopy; w <= w1 + extraWorldCopy; w++) {
-        if (w === 0) continue;
+        if (w === 0) {
+          continue;
+        }
         result.push(new UnwrappedTileID(w, tileID));
       }
     }
@@ -215,8 +232,12 @@ class Transform {
     let z = this.coveringZoomLevel(options);
     const actualZ = z;
 
-    if (options.minzoom !== undefined && z < options.minzoom) return [];
-    if (options.maxzoom !== undefined && z > options.maxzoom) z = options.maxzoom;
+    if (options.minzoom !== undefined && z < options.minzoom) {
+      return [];
+    }
+    if (options.maxzoom !== undefined && z > options.maxzoom) {
+      z = options.maxzoom;
+    }
 
     const centerCoord = this.pointCoordinate(this.centerPoint, z);
     const centerPoint = new Point(centerCoord.column - 0.5, centerCoord.row - 0.5);
@@ -346,7 +367,9 @@ class Transform {
   }
 
   pointCoordinate(p, zoom) {
-    if (zoom === undefined) zoom = this.tileZoom;
+    if (zoom === undefined) {
+      zoom = this.tileZoom;
+    }
 
     const targetZ = 0;
     // since we don't know the correct projected z value for the point,
@@ -414,7 +437,9 @@ class Transform {
   }
 
   _constrain() {
-    if (!this.center || !this.width || !this.height || this._constraining) return;
+    if (!this.center || !this.width || !this.height || this._constraining) {
+      return;
+    }
 
     this._constraining = true;
 
@@ -458,16 +483,24 @@ class Transform {
       const y = this.y;
       const h2 = size.y / 2;
 
-      if (y - h2 < minY) y2 = minY + h2;
-      if (y + h2 > maxY) y2 = maxY - h2;
+      if (y - h2 < minY) {
+        y2 = minY + h2;
+      }
+      if (y + h2 > maxY) {
+        y2 = maxY - h2;
+      }
     }
 
     if (this.lngRange) {
       const x = this.x;
       const w2 = size.x / 2;
 
-      if (x - w2 < minX) x2 = minX + w2;
-      if (x + w2 > maxX) x2 = maxX - w2;
+      if (x - w2 < minX) {
+        x2 = minX + w2;
+      }
+      if (x + w2 > maxX) {
+        x2 = maxX - w2;
+      }
     }
 
     // pan the map if the screen goes off the range
@@ -480,7 +513,9 @@ class Transform {
   }
 
   _calcMatrices() {
-    if (!this.height) return;
+    if (!this.height) {
+      return;
+    }
 
     this.cameraToCenterDistance = (0.5 / Math.tan(this._fov / 2)) * this.height;
 
@@ -542,7 +577,9 @@ class Transform {
 
     // inverse matrix for conversion from screen coordinaes to location
     m = mat4.invert(new Float64Array(16), this.pixelMatrix);
-    if (!m) throw new Error('failed to invert matrix');
+    if (!m) {
+      throw new Error('failed to invert matrix');
+    }
     this.pixelMatrixInverse = m;
 
     this._posMatrixCache = {};
@@ -551,7 +588,9 @@ class Transform {
 
   maxPitchScaleFactor() {
     // calcMatrices hasn't run yet
-    if (!this.pixelMatrixInverse) return 1;
+    if (!this.pixelMatrixInverse) {
+      return 1;
+    }
 
     const coord = this.pointCoordinate(new Point(0, 0)).zoomTo(this.zoom);
     const p = [coord.column * this.tileSize, coord.row * this.tileSize, 0, 1];
@@ -612,4 +651,4 @@ class Transform {
   }
 }
 
-module.exports = Transform;
+export default Transform;

package/src/gl/color_mode.js

@@ -1,4 +1,4 @@
-const { Color } = require('@mapwhit/style-expressions');
+import { Color } from '@mapwhit/style-expressions';
 
 const ZERO = 0x0000;
 const ONE = 0x0001;
@@ -18,4 +18,4 @@ class ColorMode {
   }
 }
 
-module.exports = ColorMode;
+export default ColorMode;