@mapwhit/tilerenderer 0.48.0 → 0.49.0

package/src/symbol/symbol_layout.js

@@ -13,6 +13,7 @@ const EXTENT = require('../data/extent');
 const SymbolBucket = require('../data/bucket/symbol_bucket');
 const EvaluationParameters = require('../style/evaluation_parameters');
 const { Formatted } = require('../style-spec/expression/definitions/formatted');
+const murmur3 = require('murmurhash-js');
 
 // The symbol layout process needs `text-size` evaluated at up to five different zoom levels, and
 // `icon-size` at up to three:
@@ -31,7 +32,6 @@ const { Formatted } = require('../style-spec/expression/definitions/formatted');
 
 function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePositions, showCollisionBoxes) {
   bucket.createArrays();
-  bucket.symbolInstances = [];
 
   const tileSize = 512 * bucket.overscaling;
   bucket.tilePixelRatio = EXTENT / tileSize;
@@ -199,30 +199,28 @@ function addFeature(bucket, feature, shapedTextOrientations, shapedIcon, glyphPo
       return;
     }
 
-    bucket.symbolInstances.push(
-      addSymbol(
-        bucket,
-        anchor,
-        line,
-        shapedTextOrientations,
-        shapedIcon,
-        bucket.layers[0],
-        bucket.collisionBoxArray,
-        feature.index,
-        feature.sourceLayerIndex,
-        bucket.index,
-        textBoxScale,
-        textPadding,
-        textAlongLine,
-        textOffset,
-        iconBoxScale,
-        iconPadding,
-        iconAlongLine,
-        iconOffset,
-        feature,
-        glyphPositionMap,
-        sizes
-      )
+    addSymbol(
+      bucket,
+      anchor,
+      line,
+      shapedTextOrientations,
+      shapedIcon,
+      bucket.layers[0],
+      bucket.collisionBoxArray,
+      feature.index,
+      feature.sourceLayerIndex,
+      bucket.index,
+      textBoxScale,
+      textPadding,
+      textAlongLine,
+      textOffset,
+      iconBoxScale,
+      iconPadding,
+      iconAlongLine,
+      iconOffset,
+      feature,
+      glyphPositionMap,
+      sizes
     );
   };
 
@@ -368,7 +366,7 @@ function addSymbol(
   let numIconVertices = 0;
   let numGlyphVertices = 0;
   let numVerticalGlyphVertices = 0;
-  const key = shapedTextOrientations.horizontal ? shapedTextOrientations.horizontal.text : '';
+  const key = murmur3(shapedTextOrientations.horizontal ? shapedTextOrientations.horizontal.text : '');
   const placedTextSymbolIndices = [];
   if (shapedTextOrientations.horizontal) {
     // As a collision approximation, we can use either the vertical or the horizontal version of the feature
@@ -483,20 +481,22 @@ function addSymbol(
   if (bucket.glyphOffsetArray.length >= SymbolBucket.MAX_GLYPHS)
     warn.once('Too many glyphs being rendered in a tile. See https://github.com/mapbox/mapbox-gl-js/issues/2907');
 
-  return {
+  bucket.symbolInstances.emplaceBack(
+    anchor.x,
+    anchor.y,
+    placedTextSymbolIndices.length > 0 ? placedTextSymbolIndices[0] : -1,
+    placedTextSymbolIndices.length > 1 ? placedTextSymbolIndices[1] : -1,
     key,
     textBoxStartIndex,
     textBoxEndIndex,
     iconBoxStartIndex,
     iconBoxEndIndex,
-    anchor,
     featureIndex,
     numGlyphVertices,
     numVerticalGlyphVertices,
     numIconVertices,
-    placedTextSymbolIndices,
-    crossTileID: 0
-  };
+    0
+  );
 }
 
 function anchorIsTooClose(bucket, text, repeatDistance, anchor) {

package/src/style-spec/expression/definitions/array.js

@@ -1,82 +0,0 @@
-const { toString, array, ValueType, StringType, NumberType, BooleanType, checkSubtype } = require('../types');
-
-const { typeOf } = require('../values');
-const RuntimeError = require('../runtime_error');
-
-const types = {
-  string: StringType,
-  number: NumberType,
-  boolean: BooleanType
-};
-
-class ArrayAssertion {
-  constructor(type, input) {
-    this.type = type;
-    this.input = input;
-  }
-
-  static parse(args, context) {
-    if (args.length < 2 || args.length > 4)
-      return context.error(`Expected 1, 2, or 3 arguments, but found ${args.length - 1} instead.`);
-
-    let itemType;
-    let N;
-    if (args.length > 2) {
-      const type = args[1];
-      if (typeof type !== 'string' || !(type in types))
-        return context.error('The item type argument of "array" must be one of string, number, boolean', 1);
-      itemType = types[type];
-    } else {
-      itemType = ValueType;
-    }
-
-    if (args.length > 3) {
-      if (typeof args[2] !== 'number' || args[2] < 0 || args[2] !== Math.floor(args[2])) {
-        return context.error('The length argument to "array" must be a positive integer literal', 2);
-      }
-      N = args[2];
-    }
-
-    const type = array(itemType, N);
-
-    const input = context.parse(args[args.length - 1], args.length - 1, ValueType);
-    if (!input) return null;
-
-    return new ArrayAssertion(type, input);
-  }
-
-  evaluate(ctx) {
-    const value = this.input.evaluate(ctx);
-    const error = checkSubtype(this.type, typeOf(value));
-    if (error) {
-      throw new RuntimeError(
-        `Expected value to be of type ${toString(this.type)}, but found ${toString(typeOf(value))} instead.`
-      );
-    }
-    return value;
-  }
-
-  eachChild(fn) {
-    fn(this.input);
-  }
-
-  possibleOutputs() {
-    return this.input.possibleOutputs();
-  }
-
-  serialize() {
-    const serialized = ['array'];
-    const itemType = this.type.itemType;
-    if (itemType.kind === 'string' || itemType.kind === 'number' || itemType.kind === 'boolean') {
-      serialized.push(itemType.kind);
-      const N = this.type.N;
-      if (typeof N === 'number') {
-        serialized.push(N);
-      }
-    }
-    serialized.push(this.input.serialize());
-    return serialized;
-  }
-}
-
-module.exports = ArrayAssertion;