@mapwhit/tilerenderer 0.52.1 → 1.1.0

package/src/data/bucket/fill_bucket.js

@@ -1,17 +1,17 @@
-const { FillLayoutArray } = require('../array_types');
-
-const { members: layoutAttributes } = require('./fill_attributes');
-const SegmentVector = require('../segment');
-const { ProgramConfigurationSet } = require('../program_configuration');
-const { LineIndexArray, TriangleIndexArray } = require('../index_array_type');
-const { default: earcut } = require('earcut');
-const classifyRings = require('../../util/classify_rings');
-const assert = require('assert');
+import assert from 'assert';
+import earcut from 'earcut';
+import EvaluationParameters from '../../style/evaluation_parameters.js';
+import classifyRings from '../../util/classify_rings.js';
+import { FillLayoutArray } from '../array_types.js';
+import { LineIndexArray, TriangleIndexArray } from '../index_array_type.js';
+import loadGeometry from '../load_geometry.js';
+import { ProgramConfigurationSet } from '../program_configuration.js';
+import SegmentVector from '../segment.js';
+import layout from './fill_attributes.js';
+import { addPatternDependencies, hasPattern } from './pattern_bucket_features.js';
+
 const EARCUT_MAX_RINGS = 500;
-const { register } = require('../../util/transfer_registry');
-const { hasPattern, addPatternDependencies } = require('./pattern_bucket_features');
-const loadGeometry = require('../load_geometry');
-const EvaluationParameters = require('../../style/evaluation_parameters');
+const layoutAttributes = layout.members;
 
 class FillBucket {
   constructor(options) {
@@ -19,7 +19,6 @@ class FillBucket {
     this.globalState = options.globalState;
     this.overscaling = options.overscaling;
     this.layers = options.layers;
-    this.layerIds = this.layers.map(layer => layer.id);
     this.index = options.index;
     this.hasPattern = false;
 
@@ -38,8 +37,9 @@ class FillBucket {
     for (const { feature, index, sourceLayerIndex } of features) {
       if (
         !this.layers[0]._featureFilter(new EvaluationParameters(this.zoom, { globalState: this.globalState }), feature)
-      )
+      ) {
         continue;
+      }
 
       const geometry = loadGeometry(feature);
 
@@ -57,7 +57,15 @@ class FillBucket {
       }
 
       if (this.hasPattern) {
-        this.features.push(addPatternDependencies('fill', this.layers, patternFeature, this.zoom, options));
+        this.features.push(
+          addPatternDependencies(
+            'fill',
+            this.layers,
+            patternFeature,
+            { zoom: this.zoom, globalState: this.globalState },
+            options
+          )
+        );
       } else {
         this.addFeature(patternFeature, geometry, index, {});
       }
@@ -67,7 +75,9 @@ class FillBucket {
   }
 
   update(states, vtLayer, imagePositions) {
-    if (!this.stateDependentLayers.length) return;
+    if (!this.stateDependentLayers.length) {
+      return;
+    }
     this.programConfigurations.updatePaintArrays(states, vtLayer, this.stateDependentLayers, {
       imagePositions,
       globalState: this.globalState
@@ -88,6 +98,7 @@ class FillBucket {
   uploadPending() {
     return !this.uploaded || this.programConfigurations.needsUpload;
   }
+
   upload(context) {
     if (!this.uploaded) {
       this.layoutVertexBuffer = context.createVertexBuffer(this.layoutVertexArray, layoutAttributes);
@@ -99,7 +110,9 @@ class FillBucket {
   }
 
   destroy() {
-    if (!this.layoutVertexBuffer) return;
+    if (!this.layoutVertexBuffer) {
+      return;
+    }
     this.layoutVertexBuffer.destroy();
     this.indexBuffer.destroy();
     this.indexBuffer2.destroy();
@@ -133,16 +146,16 @@ class FillBucket {
         const lineSegment = this.segments2.prepareSegment(ring.length, this.layoutVertexArray, this.indexArray2);
         const lineIndex = lineSegment.vertexLength;
 
-        this.layoutVertexArray.emplaceBack(ring[0].x, ring[0].y);
+        const { x, y } = ring[0];
+        this.layoutVertexArray.emplaceBack(x, y);
         this.indexArray2.emplaceBack(lineIndex + ring.length - 1, lineIndex);
-        flattened.push(ring[0].x);
-        flattened.push(ring[0].y);
+        flattened.push(x, y);
 
         for (let i = 1; i < ring.length; i++) {
-          this.layoutVertexArray.emplaceBack(ring[i].x, ring[i].y);
+          const { x, y } = ring[i];
+          this.layoutVertexArray.emplaceBack(x, y);
           this.indexArray2.emplaceBack(lineIndex + i - 1, lineIndex + i);
-          flattened.push(ring[i].x);
-          flattened.push(ring[i].y);
+          flattened.push(x, y);
         }
 
         lineSegment.vertexLength += ring.length;
@@ -171,6 +184,4 @@ class FillBucket {
   }
 }
 
-register('FillBucket', FillBucket, { omit: ['layers', 'features'] });
-
-module.exports = FillBucket;
+export default FillBucket;

package/src/data/bucket/fill_extrusion_attributes.js

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

package/src/data/bucket/fill_extrusion_bucket.js

@@ -1,21 +1,22 @@
-const { FillExtrusionLayoutArray } = require('../array_types');
-
-const { members: layoutAttributes } = require('./fill_extrusion_attributes');
-const SegmentVector = require('../segment');
-const { ProgramConfigurationSet } = require('../program_configuration');
-const { TriangleIndexArray } = require('../index_array_type');
-const EXTENT = require('../extent');
-const { default: earcut } = require('earcut');
-const {
-  VectorTileFeature: { types: vectorTileFeatureTypes }
-} = require('@mapwhit/vector-tile');
-const classifyRings = require('../../util/classify_rings');
-const assert = require('assert');
+import { VectorTileFeature } from '@mapwhit/vector-tile';
+import assert from 'assert';
+import earcut from 'earcut';
+import classifyRings from '../../util/classify_rings.js';
+import { FillExtrusionLayoutArray } from '../array_types.js';
+import EXTENT from '../extent.js';
+import { TriangleIndexArray } from '../index_array_type.js';
+import { ProgramConfigurationSet } from '../program_configuration.js';
+import SegmentVector from '../segment.js';
+import layout from './fill_extrusion_attributes.js';
+
 const EARCUT_MAX_RINGS = 500;
-const { register } = require('../../util/transfer_registry');
-const { hasPattern, addPatternDependencies } = require('./pattern_bucket_features');
-const loadGeometry = require('../load_geometry');
-const EvaluationParameters = require('../../style/evaluation_parameters');
+
+import EvaluationParameters from '../../style/evaluation_parameters.js';
+import loadGeometry from '../load_geometry.js';
+import { addPatternDependencies, hasPattern } from './pattern_bucket_features.js';
+
+const { types: vectorTileFeatureTypes } = VectorTileFeature;
+const layoutAttributes = layout.members;
 
 const FACTOR = 2 ** 13;
 
@@ -39,7 +40,6 @@ class FillExtrusionBucket {
     this.globalState = options.globalState;
     this.overscaling = options.overscaling;
     this.layers = options.layers;
-    this.layerIds = this.layers.map(layer => layer.id);
     this.index = options.index;
     this.hasPattern = false;
 
@@ -56,8 +56,9 @@ class FillExtrusionBucket {
     for (const { feature, index, sourceLayerIndex } of features) {
       if (
         !this.layers[0]._featureFilter(new EvaluationParameters(this.zoom, { globalState: this.globalState }), feature)
-      )
+      ) {
         continue;
+      }
 
       const geometry = loadGeometry(feature);
 
@@ -75,7 +76,15 @@ class FillExtrusionBucket {
       }
 
       if (this.hasPattern) {
-        this.features.push(addPatternDependencies('fill-extrusion', this.layers, patternFeature, this.zoom, options));
+        this.features.push(
+          addPatternDependencies(
+            'fill-extrusion',
+            this.layers,
+            patternFeature,
+            { zoom: this.zoom, globalState: this.globalState },
+            options
+          )
+        );
       } else {
         this.addFeature(patternFeature, geometry, index, {});
       }
@@ -92,7 +101,9 @@ class FillExtrusionBucket {
   }
 
   update(states, vtLayer, imagePositions) {
-    if (!this.stateDependentLayers.length) return;
+    if (!this.stateDependentLayers.length) {
+      return;
+    }
     this.programConfigurations.updatePaintArrays(states, vtLayer, this.stateDependentLayers, {
       imagePositions,
       globalState: this.globalState
@@ -117,7 +128,9 @@ class FillExtrusionBucket {
   }
 
   destroy() {
-    if (!this.layoutVertexBuffer) return;
+    if (!this.layoutVertexBuffer) {
+      return;
+    }
     this.layoutVertexBuffer.destroy();
     this.indexBuffer.destroy();
     this.programConfigurations.destroy();
@@ -156,7 +169,9 @@ class FillExtrusionBucket {
 
               const perp = p1.sub(p2)._perp()._unit();
               const dist = p2.dist(p1);
-              if (edgeDistance + dist > 32768) edgeDistance = 0;
+              if (edgeDistance + dist > 32768) {
+                edgeDistance = 0;
+              }
 
               addVertex(this.layoutVertexArray, p1.x, p1.y, perp.x, perp.y, 0, 0, edgeDistance);
               addVertex(this.layoutVertexArray, p1.x, p1.y, perp.x, perp.y, 0, 1, edgeDistance);
@@ -207,12 +222,10 @@ class FillExtrusionBucket {
         }
 
         for (let i = 0; i < ring.length; i++) {
-          const p = ring[i];
-
-          addVertex(this.layoutVertexArray, p.x, p.y, 0, 0, 1, 1, 0);
+          const { x, y } = ring[i];
 
-          flattened.push(p.x);
-          flattened.push(p.y);
+          addVertex(this.layoutVertexArray, x, y, 0, 0, 1, 1, 0);
+          flattened.push(x, y);
         }
       }
 
@@ -239,19 +252,25 @@ class FillExtrusionBucket {
   }
 }
 
-register('FillExtrusionBucket', FillExtrusionBucket, { omit: ['layers', 'features'] });
-
-module.exports = FillExtrusionBucket;
+export default FillExtrusionBucket;
 
 function isBoundaryEdge(p1, p2) {
   return (p1.x === p2.x && (p1.x < 0 || p1.x > EXTENT)) || (p1.y === p2.y && (p1.y < 0 || p1.y > EXTENT));
 }
 
 function isEntirelyOutside(ring) {
-  return (
-    ring.every(p => p.x < 0) ||
-    ring.every(p => p.x > EXTENT) ||
-    ring.every(p => p.y < 0) ||
-    ring.every(p => p.y > EXTENT)
-  );
+  let left = true;
+  let right = true;
+  let top = true;
+  let bottom = true;
+  for (const { x, y } of ring) {
+    left &&= x < 0;
+    right &&= x > EXTENT;
+    top &&= y < 0;
+    bottom &&= y > EXTENT;
+    if (!(left || right || top || bottom)) {
+      return false;
+    }
+  }
+  return true;
 }

package/src/data/bucket/heatmap_bucket.js

@@ -1,12 +1,3 @@
-const CircleBucket = require('./circle_bucket');
+import CircleBucket from './circle_bucket.js';
 
-const { register } = require('../../util/transfer_registry');
-
-class HeatmapBucket extends CircleBucket {
-  // Needed for flow to accept omit: ['layers'] below, due to
-  // https://github.com/facebook/flow/issues/4262
-}
-
-register('HeatmapBucket', HeatmapBucket, { omit: ['layers'] });
-
-module.exports = HeatmapBucket;
+export default class HeatmapBucket extends CircleBucket {}

package/src/data/bucket/line_attributes.js

@@ -1,11 +1,9 @@
-const { createLayout } = require('../../util/struct_array');
+import { createLayout } from '../../util/struct_array.js';
 
-const layout = createLayout(
+export default createLayout(
   [
     { name: 'a_pos_normal', components: 4, type: 'Int16' },
     { name: 'a_data', components: 4, type: 'Uint8' }
   ],
   4
 );
-
-module.exports = layout;