@mapwhit/tilerenderer 0.49.0 → 0.51.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapwhit/tilerenderer",
   "description": "A WebGL interactive maps library",
-  "version": "0.49.0",
+  "version": "0.51.0",
   "main": "src/index.js",
   "license": "BSD-3-Clause",
   "repository": {
@@ -11,23 +11,23 @@
   "dependencies": {
     "@mapbox/gl-matrix": "^0.0.1",
     "@mapbox/point-geometry": "^0.1.0",
-    "@mapbox/tiny-sdf": "^1.1.0",
     "@mapbox/unitbezier": "^0.0.0",
-    "@mapbox/vector-tile": "^1.3.1",
     "@mapbox/whoots-js": "^3.0.0",
     "@mapwhit/geojson-rewind": "^1.0.0",
     "@mapwhit/pbf": "^1.0.0",
+    "@mapwhit/style-expressions": "^0.0.2",
+    "@mapwhit/vector-tile": "^1.0.0",
     "@mapwhit/vt-pbf": "^1.0.0",
     "@pirxpilot/nanoassert": "~1",
     "csscolorparser": "^1.0.3",
-    "earcut": "^2.0.3",
-    "geojson-vt": "^3.1.2",
+    "earcut": "^3.0.1",
+    "geojson-vt": "^4.0.2",
     "grid-index": "^1.1.0",
     "murmurhash-js": "^1.0.0",
     "potpack": "^1.0.1",
-    "quickselect": "^2.0.0",
+    "quickselect": "^3.0.0",
     "supercluster": "^2.0.1",
-    "tinyqueue": "^1.1.0"
+    "tinyqueue": "^3.0.0"
   },
   "browser": {
     "assert": "@pirxpilot/nanoassert",

package/src/data/bucket/fill_bucket.js

@@ -4,7 +4,7 @@ const { members: layoutAttributes } = require('./fill_attributes');
 const SegmentVector = require('../segment');
 const { ProgramConfigurationSet } = require('../program_configuration');
 const { LineIndexArray, TriangleIndexArray } = require('../index_array_type');
-const earcut = require('earcut');
+const { default: earcut } = require('earcut');
 const classifyRings = require('../../util/classify_rings');
 const assert = require('assert');
 const EARCUT_MAX_RINGS = 500;

package/src/data/bucket/fill_extrusion_bucket.js

@@ -5,10 +5,10 @@ const SegmentVector = require('../segment');
 const { ProgramConfigurationSet } = require('../program_configuration');
 const { TriangleIndexArray } = require('../index_array_type');
 const EXTENT = require('../extent');
-const earcut = require('earcut');
+const { default: earcut } = require('earcut');
 const {
   VectorTileFeature: { types: vectorTileFeatureTypes }
-} = require('@mapbox/vector-tile');
+} = require('@mapwhit/vector-tile');
 const classifyRings = require('../../util/classify_rings');
 const assert = require('assert');
 const EARCUT_MAX_RINGS = 500;

package/src/data/bucket/line_bucket.js

@@ -5,7 +5,7 @@ const SegmentVector = require('../segment');
 const { ProgramConfigurationSet } = require('../program_configuration');
 const { TriangleIndexArray } = require('../index_array_type');
 const EXTENT = require('../extent');
-const mvt = require('@mapbox/vector-tile');
+const mvt = require('@mapwhit/vector-tile');
 const vectorTileFeatureTypes = mvt.VectorTileFeature.types;
 const { register } = require('../../util/transfer_registry');
 const { hasPattern, addPatternDependencies } = require('./pattern_bucket_features');

package/src/data/bucket/symbol_bucket.js

@@ -26,13 +26,13 @@ const transformText = require('../../symbol/transform_text');
 const mergeLines = require('../../symbol/mergelines');
 const { allowsVerticalWritingMode } = require('../../util/script_detection');
 const loadGeometry = require('../load_geometry');
-const mvt = require('@mapbox/vector-tile');
+const mvt = require('@mapwhit/vector-tile');
 const vectorTileFeatureTypes = mvt.VectorTileFeature.types;
 const { verticalizedCharacterMap } = require('../../util/verticalize_punctuation');
 const { getSizeData } = require('../../symbol/symbol_size');
 const { register } = require('../../util/transfer_registry');
 const EvaluationParameters = require('../../style/evaluation_parameters');
-const { Formatted } = require('../../style-spec/expression/definitions/formatted');
+const { Formatted } = require('@mapwhit/style-expressions');
 
 // Opacity arrays are frequently updated but don't contain a lot of information, so we pack them
 // tight. Each Uint32 is actually four duplicate Uint8s for the four corners of a glyph
@@ -267,8 +267,15 @@ class SymbolBucket {
 
       let text;
       if (hasText) {
-        text = layer.getValueAndResolveTokens('text-field', feature);
-        text = transformText(text, layer, feature);
+        // Expression evaluation will automatically coerce to Formatted
+        // but plain string token evaluation skips that pathway so do the
+        // conversion here.
+        const resolvedTokens = layer.getValueAndResolveTokens('text-field', feature);
+        text = transformText(
+          resolvedTokens instanceof Formatted ? resolvedTokens : Formatted.fromString(resolvedTokens),
+          layer,
+          feature
+        );
       }
 
       let icon;
@@ -300,19 +307,13 @@ class SymbolBucket {
 
       if (text) {
         const fontStack = textFont.evaluate(feature, {}).join(',');
-        const stack = (stacks[fontStack] = stacks[fontStack] || {});
         const textAlongLine =
           layout.get('text-rotation-alignment') === 'map' && layout.get('symbol-placement') !== 'point';
-        if (text instanceof Formatted) {
-          for (const section of text.sections) {
-            const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text.toString());
-            const sectionFont = section.fontStack || fontStack;
-            const sectionStack = (stacks[sectionFont] = stacks[sectionFont] || {});
-            this.calculateGlyphDependencies(section.text, sectionStack, textAlongLine, doesAllowVerticalWritingMode);
-          }
-        } else {
-          const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text);
-          this.calculateGlyphDependencies(text, stack, textAlongLine, doesAllowVerticalWritingMode);
+        for (const section of text.sections) {
+          const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text.toString());
+          const sectionFont = section.fontStack || fontStack;
+          const sectionStack = (stacks[sectionFont] = stacks[sectionFont] || {});
+          this.calculateGlyphDependencies(section.text, sectionStack, textAlongLine, doesAllowVerticalWritingMode);
         }
       }
     }

package/src/data/feature_index.js

@@ -3,7 +3,7 @@ const EXTENT = require('./extent');
 const featureFilter = require('../style-spec/feature_filter');
 const Grid = require('grid-index');
 const dictionaryCoder = require('../util/dictionary_coder');
-const vt = require('@mapbox/vector-tile');
+const vt = require('@mapwhit/vector-tile');
 const Protobuf = require('@mapwhit/pbf');
 const GeoJSONFeature = require('../util/vectortile_to_geojson');
 const { arraysIntersect } = require('../util/object');

package/src/data/program_configuration.js

@@ -1,5 +1,5 @@
 const { packUint8ToFloat } = require('../shaders/encode_attribute');
-const { supportsPropertyExpression } = require('../style-spec/util/properties');
+const { supportsPropertyExpression } = require('@mapwhit/style-expressions');
 const { register } = require('../util/transfer_registry');
 const { PossiblyEvaluatedPropertyValue } = require('../style/properties');
 const {

package/src/gl/color_mode.js

@@ -1,4 +1,4 @@
-const Color = require('../style-spec/util/color');
+const { Color } = require('@mapwhit/style-expressions');
 
 const ZERO = 0x0000;
 const ONE = 0x0001;

package/src/gl/value.js

@@ -1,4 +1,4 @@
-const Color = require('../style-spec/util/color');
+const { Color } = require('@mapwhit/style-expressions');
 
 class ClearColor {
   constructor(context) {

package/src/render/draw_debug.js

@@ -8,7 +8,7 @@ const DepthMode = require('../gl/depth_mode');
 const StencilMode = require('../gl/stencil_mode');
 const CullFaceMode = require('../gl/cull_face_mode');
 const { debugUniformValues } = require('./program/debug_program');
-const Color = require('../style-spec/util/color');
+const { Color } = require('@mapwhit/style-expressions');
 
 module.exports = drawDebug;
 

package/src/render/draw_fill.js

@@ -1,4 +1,4 @@
-const Color = require('../style-spec/util/color');
+const { Color } = require('@mapwhit/style-expressions');
 const DepthMode = require('../gl/depth_mode');
 const CullFaceMode = require('../gl/cull_face_mode');
 const {

package/src/render/draw_heatmap.js

@@ -1,5 +1,5 @@
 const Texture = require('./texture');
-const Color = require('../style-spec/util/color');
+const { Color } = require('@mapwhit/style-expressions');
 const DepthMode = require('../gl/depth_mode');
 const StencilMode = require('../gl/stencil_mode');
 const ColorMode = require('../gl/color_mode');

package/src/render/glyph_manager.js

@@ -1,140 +1,16 @@
-const loadGlyphRange = require('../style/load_glyph_range');
-
-const TinySDF = require('@mapbox/tiny-sdf');
-const isChar = require('../util/is_char_in_unicode_block');
-const { AlphaImage } = require('../util/image');
-
 class GlyphManager {
-  // exposed as statics to enable stubbing in unit tests
-  static loadGlyphRange = loadGlyphRange;
-  static TinySDF = TinySDF;
-
-  constructor(localIdeographFontFamily) {
-    this.localIdeographFontFamily = localIdeographFontFamily;
-    this.entries = {};
-  }
+  #cache = {};
 
   setGlyphsLoader(loader) {
     this.loader = loader;
   }
 
-  async getGlyphs(glyphs) {
-    const all = [];
-    for (const stack in glyphs) {
-      for (const id of glyphs[stack]) {
-        all.push(retrieveGlyph(this, { stack, id }));
-      }
-    }
-    const fetchedGlyphs = await Promise.all(all);
-    const result = {};
-    for (const { stack, id, glyph } of fetchedGlyphs) {
-      // Clone the glyph so that our own copy of its ArrayBuffer doesn't get transferred.
-      (result[stack] ??= {})[id] = cloneGlyph(glyph);
-    }
-    return result;
-
-    function cloneGlyph(glyph) {
-      if (glyph) {
-        return {
-          id: glyph.id,
-          bitmap: glyph.bitmap.clone(),
-          metrics: glyph.metrics
-        };
-      }
-    }
-
-    async function retrieveGlyph({ entries, loader, localIdeographFontFamily }, { stack, id }) {
-      const entry = (entries[stack] ??= { glyphs: {}, requests: {} });
-
-      let glyph = entry.glyphs[id];
-      if (glyph) {
-        return { stack, id, glyph };
-      }
-
-      glyph = tinySDF(localIdeographFontFamily, entry, stack, id);
-      if (glyph) {
-        return { stack, id, glyph };
-      }
-
-      const range = Math.floor(id / 256);
-      if (range * 256 > 65535) {
-        throw new Error('glyphs > 65535 not supported');
-      }
-
-      const promise = (entry.requests[range] ??= GlyphManager.loadGlyphRange(stack, range, loader));
-      const response = await promise;
-      if (response) {
-        for (const id in response) {
-          entry.glyphs[+id] = response[+id];
-        }
-      }
-      delete entry.requests[range];
-      return { stack, id, glyph: response?.[id] || null };
-    }
+  async loadGlyphRange(stack, range) {
+    this.#cache[stack] ??= {};
+    const promise = (this.#cache[stack][range] ??= this.loader(stack, range));
+    const response = await promise;
+    return response.slice();
   }
 }
 
 module.exports = GlyphManager;
-
-/**
- * Creates a glyph descriptor for a character using TinySDF if the character belongs to
- * the CJK Unified Ideographs or Hangul Syllables ranges.
- *
- * The function checks if the provided font family is valid and whether the Unicode code
- * point (id) falls within the supported character ranges. If so, it creates or reuses a
- * TinySDF instance from the given entry to generate a bitmap for the character.
- *
- * @param {string} family - The font family to be used for rendering the glyph.
- * @param {Object} entry - An object containing glyph-related data. May store a cached TinySDF instance.
- * @param {string} stack - A string representing the font style stack (e.g., "bold", "medium", "light") to determine the font weight.
- * @param {number} id - The Unicode code point of the character to render.
- * @returns {Object|undefined} An object with the glyph descriptor containing:
- *   - id {number}: The Unicode code point.
- *   - bitmap {AlphaImage}: An image instance created from the glyph bitmap.
- *   - metrics {Object}: An object containing rendering metrics:
- *       - width {number}: The width of the glyph.
- *       - height {number}: The height of the glyph.
- *       - left {number}: The left bearing for the glyph.
- *       - top {number}: The top bearing for the glyph (used for vertical offset).
- *       - advance {number}: The advance width for spacing the glyph.
- *
- * Returns undefined if no font family is provided or if the character is not within the supported ranges.
- */
-function tinySDF(family, entry, stack, id) {
-  if (!family) {
-    return;
-  }
-
-  if (!isChar['CJK Unified Ideographs'](id) && !isChar['Hangul Syllables'](id)) {
-    return;
-  }
-
-  const tinySDF = getTinySDF();
-  return {
-    id,
-    bitmap: new AlphaImage({ width: 30, height: 30 }, tinySDF.draw(String.fromCharCode(id))),
-    metrics: {
-      width: 24,
-      height: 24,
-      left: 0,
-      top: -8,
-      advance: 24
-    }
-  };
-
-  function getTinySDF() {
-    const { tinySDF } = entry;
-    if (tinySDF) {
-      return tinySDF;
-    }
-    let fontWeight = '400';
-    if (/bold/i.test(stack)) {
-      fontWeight = '900';
-    } else if (/medium/i.test(stack)) {
-      fontWeight = '500';
-    } else if (/light/i.test(stack)) {
-      fontWeight = '200';
-    }
-    return (entry.tinySDF = new GlyphManager.TinySDF(24, 3, 8, 0.25, family, fontWeight));
-  }
-}

package/src/render/painter.js

@@ -20,7 +20,7 @@ const ColorMode = require('../gl/color_mode');
 const CullFaceMode = require('../gl/cull_face_mode');
 const updateTileMasks = require('./tile_mask');
 const { clippingMaskUniformValues } = require('./program/clipping_mask_program');
-const Color = require('../style-spec/util/color');
+const { Color } = require('@mapwhit/style-expressions');
 const symbol = require('./draw_symbol');
 const circle = require('./draw_circle');
 const heatmap = require('./draw_heatmap');

package/src/render/uniform_binding.js

@@ -1,4 +1,4 @@
-const Color = require('../style-spec/util/color');
+const { Color } = require('@mapwhit/style-expressions');
 
 class Uniform {
   constructor(context, location) {

package/src/shaders/fill_extrusion.fragment.glsl

@@ -1,13 +1,6 @@
 varying vec4 v_color;
-#pragma mapbox: define lowp float base
-#pragma mapbox: define lowp float height
-#pragma mapbox: define highp vec4 color
 
 void main() {
-    #pragma mapbox: initialize lowp float base
-    #pragma mapbox: initialize lowp float height
-    #pragma mapbox: initialize highp vec4 color
-
     gl_FragColor = v_color;
 
 #ifdef OVERDRAW_INSPECTOR

package/src/shaders/fill_extrusion.vertex.glsl

@@ -10,14 +10,14 @@ attribute vec4 a_normal_ed;
 
 varying vec4 v_color;
 
-#pragma mapbox: define lowp float base
-#pragma mapbox: define lowp float height
+#pragma mapbox: define highp float base
+#pragma mapbox: define highp float height
 
 #pragma mapbox: define highp vec4 color
 
 void main() {
-    #pragma mapbox: initialize lowp float base
-    #pragma mapbox: initialize lowp float height
+    #pragma mapbox: initialize highp float base
+    #pragma mapbox: initialize highp float height
     #pragma mapbox: initialize highp vec4 color
 
     vec3 normal = a_normal_ed.xyz;

package/src/shaders/index.js

@@ -1,103 +1,103 @@
 const shaders = {
   prelude: {
-    fragmentSource: require('../../build/min/src/shaders/_prelude.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/_prelude.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/_prelude.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/_prelude.vertex.glsl.js')
   },
   background: {
-    fragmentSource: require('../../build/min/src/shaders/background.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/background.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/background.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/background.vertex.glsl.js')
   },
   backgroundPattern: {
-    fragmentSource: require('../../build/min/src/shaders/background_pattern.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/background_pattern.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/background_pattern.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/background_pattern.vertex.glsl.js')
   },
   circle: {
-    fragmentSource: require('../../build/min/src/shaders/circle.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/circle.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/circle.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/circle.vertex.glsl.js')
   },
   clippingMask: {
-    fragmentSource: require('../../build/min/src/shaders/clipping_mask.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/clipping_mask.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/clipping_mask.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/clipping_mask.vertex.glsl.js')
   },
   heatmap: {
-    fragmentSource: require('../../build/min/src/shaders/heatmap.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/heatmap.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/heatmap.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/heatmap.vertex.glsl.js')
   },
   heatmapTexture: {
-    fragmentSource: require('../../build/min/src/shaders/heatmap_texture.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/heatmap_texture.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/heatmap_texture.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/heatmap_texture.vertex.glsl.js')
   },
   collisionBox: {
-    fragmentSource: require('../../build/min/src/shaders/collision_box.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/collision_box.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/collision_box.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/collision_box.vertex.glsl.js')
   },
   collisionCircle: {
-    fragmentSource: require('../../build/min/src/shaders/collision_circle.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/collision_circle.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/collision_circle.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/collision_circle.vertex.glsl.js')
   },
   debug: {
-    fragmentSource: require('../../build/min/src/shaders/debug.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/debug.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/debug.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/debug.vertex.glsl.js')
   },
   fill: {
-    fragmentSource: require('../../build/min/src/shaders/fill.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/fill.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/fill.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/fill.vertex.glsl.js')
   },
   fillOutline: {
-    fragmentSource: require('../../build/min/src/shaders/fill_outline.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/fill_outline.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/fill_outline.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/fill_outline.vertex.glsl.js')
   },
   fillOutlinePattern: {
-    fragmentSource: require('../../build/min/src/shaders/fill_outline_pattern.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/fill_outline_pattern.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/fill_outline_pattern.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/fill_outline_pattern.vertex.glsl.js')
   },
   fillPattern: {
-    fragmentSource: require('../../build/min/src/shaders/fill_pattern.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/fill_pattern.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/fill_pattern.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/fill_pattern.vertex.glsl.js')
   },
   fillExtrusion: {
-    fragmentSource: require('../../build/min/src/shaders/fill_extrusion.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/fill_extrusion.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/fill_extrusion.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/fill_extrusion.vertex.glsl.js')
   },
   fillExtrusionPattern: {
-    fragmentSource: require('../../build/min/src/shaders/fill_extrusion_pattern.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/fill_extrusion_pattern.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/fill_extrusion_pattern.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/fill_extrusion_pattern.vertex.glsl.js')
   },
   hillshadePrepare: {
-    fragmentSource: require('../../build/min/src/shaders/hillshade_prepare.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/hillshade_prepare.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/hillshade_prepare.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/hillshade_prepare.vertex.glsl.js')
   },
   hillshade: {
-    fragmentSource: require('../../build/min/src/shaders/hillshade.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/hillshade.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/hillshade.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/hillshade.vertex.glsl.js')
   },
   line: {
-    fragmentSource: require('../../build/min/src/shaders/line.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/line.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/line.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/line.vertex.glsl.js')
   },
   lineGradient: {
-    fragmentSource: require('../../build/min/src/shaders/line_gradient.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/line_gradient.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/line_gradient.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/line_gradient.vertex.glsl.js')
   },
   linePattern: {
-    fragmentSource: require('../../build/min/src/shaders/line_pattern.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/line_pattern.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/line_pattern.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/line_pattern.vertex.glsl.js')
   },
   lineSDF: {
-    fragmentSource: require('../../build/min/src/shaders/line_sdf.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/line_sdf.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/line_sdf.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/line_sdf.vertex.glsl.js')
   },
   raster: {
-    fragmentSource: require('../../build/min/src/shaders/raster.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/raster.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/raster.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/raster.vertex.glsl.js')
   },
   symbolIcon: {
-    fragmentSource: require('../../build/min/src/shaders/symbol_icon.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/symbol_icon.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/symbol_icon.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/symbol_icon.vertex.glsl.js')
   },
   symbolSDF: {
-    fragmentSource: require('../../build/min/src/shaders/symbol_sdf.fragment.glsl.txt'),
-    vertexSource: require('../../build/min/src/shaders/symbol_sdf.vertex.glsl.txt')
+    fragmentSource: require('../../build/min/src/shaders/symbol_sdf.fragment.glsl.js'),
+    vertexSource: require('../../build/min/src/shaders/symbol_sdf.vertex.glsl.js')
   }
 };
 

package/src/source/geojson_worker_source.js

@@ -2,7 +2,7 @@ const rewind = require('@mapwhit/geojson-rewind');
 const GeoJSONWrapper = require('./geojson_wrapper');
 const vtpbf = require('@mapwhit/vt-pbf');
 const supercluster = require('supercluster');
-const geojsonvt = require('geojson-vt');
+const { default: geojsonvt } = require('geojson-vt');
 const VectorTileWorkerSource = require('./vector_tile_worker_source');
 
 function loadGeoJSONTile(params) {
@@ -46,7 +46,7 @@ function loadGeoJSONTile(params) {
  * This class is designed to be easily reused to support custom source types
  * for data formats that can be parsed/converted into an in-memory GeoJSON
  * representation.  To do so, create it with
- * `new GeoJSONWorkerSource(actor, layerIndex, customLoadGeoJSONFunction)`.
+ * `new GeoJSONWorkerSource(resources, layerIndex, customLoadGeoJSONFunction)`.
  * For a full example, see [mapbox-gl-topojson](https://github.com/developmentseed/mapbox-gl-topojson).
  *
  */
@@ -56,8 +56,8 @@ class GeoJSONWorkerSource extends VectorTileWorkerSource {
    * GeoJSON based on parameters passed from the main-thread Source.
    * See {@link GeoJSONWorkerSource#loadGeoJSON}.
    */
-  constructor(actor, layerIndex, loadGeoJSON) {
-    super(actor, layerIndex, loadGeoJSONTile);
+  constructor(resources, layerIndex, loadGeoJSON) {
+    super(resources, layerIndex, loadGeoJSONTile);
     if (loadGeoJSON) {
       this.loadGeoJSON = loadGeoJSON;
     }