@mapwhit/tilerenderer 0.47.2 → 0.49.0

package/src/symbol/symbol_layout.js

@@ -12,6 +12,8 @@ const classifyRings = require('../util/classify_rings');
 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:
@@ -30,7 +32,6 @@ const EvaluationParameters = require('../style/evaluation_parameters');
 
 function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePositions, showCollisionBoxes) {
   bucket.createArrays();
-  bucket.symbolInstances = [];
 
   const tileSize = 512 * bucket.overscaling;
   bucket.tilePixelRatio = EXTENT / tileSize;
@@ -73,18 +74,18 @@ function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePo
 
   for (const feature of bucket.features) {
     const fontstack = layout.get('text-font').evaluate(feature, {}).join(',');
-    const glyphs = glyphMap[fontstack] || {};
-    const glyphPositionMap = glyphPositions[fontstack] || {};
+    const glyphPositionMap = glyphPositions;
 
     const shapedTextOrientations = {};
     const text = feature.text;
     if (text) {
+      const unformattedText = text instanceof Formatted ? text.toString() : text;
       const textOffset = layout
         .get('text-offset')
         .evaluate(feature, {})
         .map(t => t * oneEm);
       const spacing = layout.get('text-letter-spacing').evaluate(feature, {}) * oneEm;
-      const spacingIfAllowed = allowsLetterSpacing(text) ? spacing : 0;
+      const spacingIfAllowed = allowsLetterSpacing(unformattedText) ? spacing : 0;
       const textAnchor = layout.get('text-anchor').evaluate(feature, {});
       const textJustify = layout.get('text-justify').evaluate(feature, {});
       const maxWidth =
@@ -92,7 +93,8 @@ function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePo
 
       shapedTextOrientations.horizontal = shapeText(
         text,
-        glyphs,
+        glyphMap,
+        fontstack,
         maxWidth,
         lineHeight,
         textAnchor,
@@ -102,10 +104,11 @@ function performSymbolLayout(bucket, glyphMap, glyphPositions, imageMap, imagePo
         oneEm,
         WritingMode.horizontal
       );
-      if (allowsVerticalWritingMode(text) && textAlongLine && keepUpright) {
+      if (allowsVerticalWritingMode(unformattedText) && textAlongLine && keepUpright) {
         shapedTextOrientations.vertical = shapeText(
           text,
-          glyphs,
+          glyphMap,
+          fontstack,
           maxWidth,
           lineHeight,
           textAnchor,
@@ -196,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
     );
   };
 
@@ -365,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
@@ -480,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/symbol/transform_text.js

@@ -1,6 +1,7 @@
 const { plugin: rtlTextPlugin } = require('../source/rtl_text_plugin');
+const { Formatted } = require('../style-spec/expression/definitions/formatted');
 
-module.exports = function (text, layer, feature) {
+function transformText(text, layer, feature) {
   const transform = layer.layout.get('text-transform').evaluate(feature, {});
   if (transform === 'uppercase') {
     text = text.toLocaleUpperCase();
@@ -13,4 +14,14 @@ module.exports = function (text, layer, feature) {
   }
 
   return text;
+}
+
+module.exports = function (text, layer, feature) {
+  if (text instanceof Formatted) {
+    text.sections.forEach(section => {
+      section.text = transformText(section.text, layer, feature);
+    });
+    return text;
+  }
+  return transformText(text, layer, feature);
 };

package/src/ui/map.js

@@ -289,22 +289,17 @@ class Map extends Camera {
   }
 
   /**
-   * Returns the map's geographical bounds.
+   * Returns the map's geographical bounds. When the bearing or pitch is non-zero, the visible region is not
+   * an axis-aligned rectangle, and the result is the smallest bounds that encompasses the visible region.
    *
-   * @returns {LngLatBounds} The map's geographical bounds.
+   * @returns {LngLatBounds}
    */
   getBounds() {
-    const bounds = new LngLatBounds(
-      this.transform.pointLocation(new Point(0, this.transform.height)),
-      this.transform.pointLocation(new Point(this.transform.width, 0))
-    );
-
-    if (this.transform.angle || this.transform.pitch) {
-      bounds.extend(this.transform.pointLocation(new Point(this.transform.size.x, 0)));
-      bounds.extend(this.transform.pointLocation(new Point(0, this.transform.size.y)));
-    }
-
-    return bounds;
+    return new LngLatBounds()
+      .extend(this.transform.pointLocation(new Point(0, 0)))
+      .extend(this.transform.pointLocation(new Point(this.transform.width, 0)))
+      .extend(this.transform.pointLocation(new Point(this.transform.width, this.transform.height)))
+      .extend(this.transform.pointLocation(new Point(0, this.transform.height)));
   }
 
   /**
@@ -772,18 +767,6 @@ class Map extends Camera {
     return true;
   }
 
-  /**
-   * Adds a [custom source type](#Custom Sources), making it available for use with
-   * {@link Map#addSource}.
-   * @private
-   * @param {string} name The name of the source type; source definition objects use this name in the `{type: ...}` field.
-   * @param {Function} SourceType A {@link Source} constructor.
-   * @param {Function} callback Called when the source type is ready or with an error argument if there is an error.
-   */
-  addSourceType(name, SourceType, callback) {
-    return this.style.addSourceType(name, SourceType, callback);
-  }
-
   /**
    * Removes a source from the map's style.
    *

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;

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

@@ -1,93 +0,0 @@
-const { toString, ValueType, BooleanType, CollatorType } = require('../types');
-
-function isComparableType(type) {
-  return type.kind === 'string' || type.kind === 'number' || type.kind === 'boolean' || type.kind === 'null';
-}
-
-/**
- * Special form for ==, !=, implementing the following signatures:
- * - (T1: Comparable, T2: Comparable) => boolean { T1 == T2 }
- * - (Comparable, value) => boolean
- * - (value, Comparable) => boolean
- *
- * Where Comparable = string | number | boolean | null.
- *
- * Evaluation semantics for the value cases are equivalent to Javascript's
- * strict equality (===/!==) -- i.e., when the value argument's type doesn't
- * match that of the Comparable argument, == evaluates to false, != to true.
- *
- * @private
- */
-function makeComparison(op, negate) {
-  return class Comparison {
-    constructor(lhs, rhs, collator) {
-      this.type = BooleanType;
-      this.lhs = lhs;
-      this.rhs = rhs;
-      this.collator = collator;
-    }
-
-    static parse(args, context) {
-      if (args.length !== 3 && args.length !== 4) return context.error('Expected two or three arguments.');
-
-      const lhs = context.parse(args[1], 1, ValueType);
-      if (!lhs) return null;
-      const rhs = context.parse(args[2], 2, ValueType);
-      if (!rhs) return null;
-
-      if (!isComparableType(lhs.type) && !isComparableType(rhs.type)) {
-        return context.error(
-          `Expected at least one argument to be a string, number, boolean, or null, but found (${toString(lhs.type)}, ${toString(rhs.type)}) instead.`
-        );
-      }
-
-      if (lhs.type.kind !== rhs.type.kind && lhs.type.kind !== 'value' && rhs.type.kind !== 'value') {
-        return context.error(`Cannot compare ${toString(lhs.type)} and ${toString(rhs.type)}.`);
-      }
-
-      let collator = null;
-      if (args.length === 4) {
-        if (lhs.type.kind !== 'string' && rhs.type.kind !== 'string') {
-          return context.error('Cannot use collator to compare non-string types.');
-        }
-        collator = context.parse(args[3], 3, CollatorType);
-        if (!collator) return null;
-      }
-
-      return new Comparison(lhs, rhs, collator);
-    }
-
-    evaluate(ctx) {
-      const equal = this.collator
-        ? this.collator.evaluate(ctx).compare(this.lhs.evaluate(ctx), this.rhs.evaluate(ctx)) === 0
-        : this.lhs.evaluate(ctx) === this.rhs.evaluate(ctx);
-
-      return negate ? !equal : equal;
-    }
-
-    eachChild(fn) {
-      fn(this.lhs);
-      fn(this.rhs);
-      if (this.collator) {
-        fn(this.collator);
-      }
-    }
-
-    possibleOutputs() {
-      return [true, false];
-    }
-
-    serialize() {
-      const serialized = [op];
-      this.eachChild(child => {
-        serialized.push(child.serialize());
-      });
-      return serialized;
-    }
-  };
-}
-
-module.exports = {
-  Equals: makeComparison('==', false),
-  NotEquals: makeComparison('!=', true)
-};