@mapwhit/tilerenderer 0.48.0 → 0.49.0

package/src/style-spec/function/convert.js

@@ -3,85 +3,64 @@ const assert = require('assert');
 module.exports = convertFunction;
 
 function convertFunction(parameters, propertySpec) {
-  let expression;
-
-  parameters = { ...parameters };
-  let defaultExpression;
-  if (typeof parameters.default !== 'undefined') {
-    defaultExpression = convertValue(parameters.default, propertySpec);
-  } else {
-    defaultExpression = convertValue(propertySpec.default, propertySpec);
-    if (defaultExpression === null) {
-      defaultExpression = ['error', 'No default property value available.'];
-    }
+  let stops = parameters.stops;
+  if (!stops) {
+    // identity function
+    return convertIdentityFunction(parameters, propertySpec);
   }
 
-  if (parameters.stops) {
-    const zoomAndFeatureDependent = parameters.stops && typeof parameters.stops[0][0] === 'object';
-    const featureDependent = zoomAndFeatureDependent || parameters.property !== undefined;
-    const zoomDependent = zoomAndFeatureDependent || !featureDependent;
-
-    const stops = parameters.stops.map(stop => {
-      if (!featureDependent && propertySpec.tokens && typeof stop[1] === 'string') {
-        return [stop[0], convertTokenString(stop[1])];
-      }
-      return [stop[0], convertValue(stop[1], propertySpec)];
-    });
+  const zoomAndFeatureDependent = stops && typeof stops[0][0] === 'object';
+  const featureDependent = zoomAndFeatureDependent || parameters.property !== undefined;
+  const zoomDependent = zoomAndFeatureDependent || !featureDependent;
 
-    if (parameters.colorSpace && parameters.colorSpace !== 'rgb') {
-      throw new Error('Unimplemented');
+  stops = stops.map(stop => {
+    if (!featureDependent && propertySpec.tokens && typeof stop[1] === 'string') {
+      return [stop[0], convertTokenString(stop[1])];
     }
+    return [stop[0], ['literal', stop[1]]];
+  });
 
-    if (zoomAndFeatureDependent) {
-      expression = convertZoomAndPropertyFunction(parameters, propertySpec, stops, defaultExpression);
-    } else if (zoomDependent) {
-      expression = convertZoomFunction(parameters, propertySpec, stops);
-    } else {
-      expression = convertPropertyFunction(parameters, propertySpec, stops, defaultExpression);
-    }
-  } else {
-    // identity function
-    expression = convertIdentityFunction(parameters, propertySpec, defaultExpression);
+  if (zoomAndFeatureDependent) {
+    return convertZoomAndPropertyFunction(parameters, propertySpec, stops);
   }
-
-  return expression;
+  if (zoomDependent) {
+    return convertZoomFunction(parameters, propertySpec, stops);
+  }
+  return convertPropertyFunction(parameters, propertySpec, stops);
 }
 
-function convertIdentityFunction(parameters, propertySpec, defaultExpression) {
+function convertIdentityFunction(parameters, propertySpec) {
   const get = ['get', parameters.property];
 
-  if (propertySpec.type === 'color') {
-    return parameters.default === undefined ? get : ['to-color', get, parameters.default];
+  if (parameters.default === undefined) {
+    return get;
   }
-  if (propertySpec.type === 'array' && typeof propertySpec.length === 'number') {
-    return ['array', propertySpec.value, propertySpec.length, get];
+  if (propertySpec.type === 'enum') {
+    return ['match', get, Object.keys(propertySpec.values), get, parameters.default];
   }
+  const expression = [
+    propertySpec.type === 'color' ? 'to-color' : propertySpec.type,
+    get,
+    ['literal', parameters.default]
+  ];
   if (propertySpec.type === 'array') {
-    return ['array', propertySpec.value, get];
-  }
-  if (propertySpec.type === 'enum') {
-    return [
-      'let',
-      'property_value',
-      ['string', get],
-      ['match', ['var', 'property_value'], propertySpec.values, ['var', 'property_value'], defaultExpression]
-    ];
+    expression.splice(1, 0, propertySpec.value, propertySpec.length || null);
   }
-  return parameters.default === undefined ? get : [propertySpec.type, get, parameters.default];
+  return expression;
 }
 
-function convertValue(value, spec) {
-  if (typeof value === 'undefined' || value === null) return null;
-  if (spec.type === 'color') {
-    return value;
-  }
-  if (spec.type === 'array') {
-    return ['literal', value];
+function getInterpolateOperator(parameters) {
+  switch (parameters.colorSpace) {
+    case 'hcl':
+      return 'interpolate-hcl';
+    case 'lab':
+      return 'interpolate-lab';
+    default:
+      return 'interpolate';
   }
-  return value;
 }
 
-function convertZoomAndPropertyFunction(parameters, propertySpec, stops, defaultExpression) {
+function convertZoomAndPropertyFunction(parameters, propertySpec, stops) {
   const featureFunctionParameters = {};
   const featureFunctionStops = {};
   const zoomStops = [];
@@ -107,15 +86,10 @@ function convertZoomAndPropertyFunction(parameters, propertySpec, stops, default
   // otherwise.
   const functionType = getFunctionType({}, propertySpec);
   if (functionType === 'exponential') {
-    const expression = ['interpolate', ['linear'], ['zoom']];
+    const expression = [getInterpolateOperator(parameters), ['linear'], ['zoom']];
 
     for (const z of zoomStops) {
-      const output = convertPropertyFunction(
-        featureFunctionParameters[z],
-        propertySpec,
-        featureFunctionStops[z],
-        defaultExpression
-      );
+      const output = convertPropertyFunction(featureFunctionParameters[z], propertySpec, featureFunctionStops[z]);
       appendStopPair(expression, z, output, false);
     }
 
@@ -124,12 +98,7 @@ function convertZoomAndPropertyFunction(parameters, propertySpec, stops, default
   const expression = ['step', ['zoom']];
 
   for (const z of zoomStops) {
-    const output = convertPropertyFunction(
-      featureFunctionParameters[z],
-      propertySpec,
-      featureFunctionStops[z],
-      defaultExpression
-    );
+    const output = convertPropertyFunction(featureFunctionParameters[z], propertySpec, featureFunctionStops[z]);
     appendStopPair(expression, z, output, true);
   }
 
@@ -138,43 +107,52 @@ function convertZoomAndPropertyFunction(parameters, propertySpec, stops, default
   return expression;
 }
 
-function convertPropertyFunction(parameters, propertySpec, stops, defaultExpression) {
-  const type = getFunctionType(parameters, propertySpec);
+function coalesce(a, b) {
+  if (a !== undefined) return a;
+  if (b !== undefined) return b;
+}
 
-  let expression;
-  let isStep = false;
+function convertPropertyFunction(parameters, propertySpec, stops) {
+  const type = getFunctionType(parameters, propertySpec);
+  const get = ['get', parameters.property];
   if (type === 'categorical' && typeof stops[0][0] === 'boolean') {
     assert(parameters.stops.length > 0 && parameters.stops.length <= 2);
-    expression = ['case'];
+    const expression = ['case'];
     for (const stop of stops) {
-      expression.push(['==', ['get', parameters.property], stop[0]], stop[1]);
+      expression.push(['==', get, stop[0]], stop[1]);
     }
-    expression.push(defaultExpression);
+    expression.push(['literal', coalesce(parameters.default, propertySpec.default)]);
     return expression;
   }
   if (type === 'categorical') {
-    expression = ['match', ['get', parameters.property]];
-  } else if (type === 'interval') {
-    expression = ['step', ['number', ['get', parameters.property]]];
-    isStep = true;
-  } else if (type === 'exponential') {
-    const base = parameters.base !== undefined ? parameters.base : 1;
-    expression = ['interpolate', ['exponential', base], ['number', ['get', parameters.property]]];
-  } else {
-    throw new Error(`Unknown property function type ${type}`);
+    const expression = ['match', get];
+    for (const stop of stops) {
+      appendStopPair(expression, stop[0], stop[1], false);
+    }
+    expression.push(['literal', coalesce(parameters.default, propertySpec.default)]);
+    return expression;
   }
-
-  for (const stop of stops) {
-    appendStopPair(expression, stop[0], stop[1], isStep);
+  if (type === 'interval') {
+    const expression = ['step', ['number', get]];
+    for (const stop of stops) {
+      appendStopPair(expression, stop[0], stop[1], true);
+    }
+    fixupDegenerateStepCurve(expression);
+    return parameters.default === undefined
+      ? expression
+      : ['case', ['==', ['typeof', get], 'number'], expression, ['literal', parameters.default]];
   }
-
-  if (expression[0] === 'match') {
-    expression.push(defaultExpression);
+  if (type === 'exponential') {
+    const base = parameters.base !== undefined ? parameters.base : 1;
+    const expression = [getInterpolateOperator(parameters), ['exponential', base], ['number', get]];
+    for (const stop of stops) {
+      appendStopPair(expression, stop[0], stop[1], false);
+    }
+    return parameters.default === undefined
+      ? expression
+      : ['case', ['==', ['typeof', get], 'number'], expression, ['literal', parameters.default]];
   }
-
-  fixupDegenerateStepCurve(expression);
-
-  return expression;
+  throw new Error(`Unknown property function type ${type}`);
 }
 
 function convertZoomFunction(parameters, propertySpec, stops, input = ['zoom']) {
@@ -186,7 +164,7 @@ function convertZoomFunction(parameters, propertySpec, stops, input = ['zoom'])
     isStep = true;
   } else if (type === 'exponential') {
     const base = parameters.base !== undefined ? parameters.base : 1;
-    expression = ['interpolate', ['exponential', base], input];
+    expression = [getInterpolateOperator(parameters), ['exponential', base], input];
   } else {
     throw new Error(`Unknown zoom function type "${type}"`);
   }

package/src/style-spec/reference/v8.json

@@ -70,12 +70,12 @@
     },
     "sprite": {
       "type": "string",
-      "doc": "A base URL for retrieving the sprite image and metadata. The extensions `.png`, `.json` and scale factor `@2x.png` will be automatically appended. This property is required if any layer uses the `background-pattern`, `fill-pattern`, `line-pattern`, `fill-extrusion-pattern`, or `icon-image` properties.",
+      "doc": "A base URL for retrieving the sprite image and metadata. The extensions `.png`, `.json` and scale factor `@2x.png` will be automatically appended. This property is required if any layer uses the `background-pattern`, `fill-pattern`, `line-pattern`, `fill-extrusion-pattern`, or `icon-image` properties. The URL must be absolute, containing the [scheme, authority and path components](https://en.wikipedia.org/wiki/URL#Syntax).",
       "example": "mapbox://sprites/mapbox/bright-v8"
     },
     "glyphs": {
       "type": "string",
-      "doc": "A URL template for loading signed-distance-field glyph sets in PBF format. The URL must include `{fontstack}` and `{range}` tokens. This property is required if any layer uses the `text-field` layout property.",
+      "doc": "A URL template for loading signed-distance-field glyph sets in PBF format. The URL must include `{fontstack}` and `{range}` tokens. This property is required if any layer uses the `text-field` layout property. The URL must be absolute, containing the [scheme, authority and path components](https://en.wikipedia.org/wiki/URL#Syntax).",
       "example": "mapbox://fonts/mapbox/{fontstack}/{range}.pbf"
     },
     "transition": {
@@ -946,6 +946,32 @@
       },
       "property-type": "data-constant"
     },
+    "symbol-z-order": {
+      "type": "enum",
+      "values": {
+        "viewport-y": {
+          "doc": "Symbols will be sorted by their y-position relative to the viewport."
+        },
+        "source": {
+          "doc": "Symbols will be rendered in the same order as the source data with no sorting applied."
+        }
+      },
+      "default": "viewport-y",
+      "doc": "Controls the order in which overlapping symbols in the same layer are rendered",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "0.49.0"
+        },
+        "data-driven styling": {}
+      },
+      "expression": {
+        "interpolated": false,
+        "parameters": [
+          "zoom"
+        ]
+      },
+      "property-type": "data-constant"
+    },
     "icon-allow-overlap": {
       "type": "boolean",
       "default": false,
@@ -3458,7 +3484,10 @@
           "macos": "0.1.0"
         },
         "data-driven styling": {
-          "js": "0.46.0"
+          "js": "0.49.0",
+          "android": "6.5.0",
+          "macos": "0.11.0",
+          "ios": "4.4.0"
         }
       },
       "expression": {
@@ -3600,7 +3629,12 @@
           "ios": "3.6.0",
           "macos": "0.5.0"
         },
-        "data-driven styling": {}
+        "data-driven styling": {
+          "js": "0.49.0",
+          "android": "6.5.0",
+          "macos": "0.11.0",
+          "ios": "4.4.0"
+        }
       },
       "expression": {
         "interpolated": false,
@@ -3980,7 +4014,10 @@
           "macos": "0.1.0"
         },
         "data-driven styling": {
-          "js": "0.46.0"
+          "js": "0.49.0",
+          "android": "6.5.0",
+          "macos": "0.11.0",
+          "ios": "4.4.0"
         }
       },
       "expression": {

package/src/symbol/collision_index.js

@@ -99,7 +99,6 @@ class CollisionIndex {
     allowOverlap,
     scale,
     textPixelRatio,
-    key,
     symbol,
     lineVertexArray,
     glyphOffsetArray,

package/src/symbol/cross_tile_symbol_index.js

@@ -1,5 +1,7 @@
 const EXTENT = require('../data/extent');
 
+const { SymbolInstanceArray } = require('../data/array_types');
+
 /*
     The CrossTileSymbolIndex generally works on the assumption that
     a conceptual "unique symbol" can be identified by the text of
@@ -23,7 +25,8 @@ class TileLayerIndex {
     this.indexedSymbolInstances = {};
     this.bucketInstanceId = bucketInstanceId;
 
-    for (const symbolInstance of symbolInstances) {
+    for (let i = 0; i < symbolInstances.length; i++) {
+      const symbolInstance = symbolInstances.get(i);
       const key = symbolInstance.key;
       if (!this.indexedSymbolInstances[key]) {
         this.indexedSymbolInstances[key] = [];
@@ -46,10 +49,9 @@ class TileLayerIndex {
   getScaledCoordinates(symbolInstance, childTileID) {
     const zDifference = childTileID.canonical.z - this.tileID.canonical.z;
     const scale = roundingFactor / 2 ** zDifference;
-    const anchor = symbolInstance.anchor;
     return {
-      x: Math.floor((childTileID.canonical.x * EXTENT + anchor.x) * scale),
-      y: Math.floor((childTileID.canonical.y * EXTENT + anchor.y) * scale)
+      x: Math.floor((childTileID.canonical.x * EXTENT + symbolInstance.anchorX) * scale),
+      y: Math.floor((childTileID.canonical.y * EXTENT + symbolInstance.anchorY) * scale)
     };
   }
 
@@ -57,7 +59,8 @@ class TileLayerIndex {
     const tolerance =
       this.tileID.canonical.z < newTileID.canonical.z ? 1 : 2 ** (this.tileID.canonical.z - newTileID.canonical.z);
 
-    for (const symbolInstance of symbolInstances) {
+    for (let i = 0; i < symbolInstances.length; i++) {
+      const symbolInstance = symbolInstances.get(i);
       if (symbolInstance.crossTileID) {
         // already has a match, skip
         continue;
@@ -143,7 +146,8 @@ class CrossTileSymbolLayerIndex {
       this.removeBucketCrossTileIDs(tileID.overscaledZ, this.indexes[tileID.overscaledZ][tileID.key]);
     }
 
-    for (const symbolInstance of bucket.symbolInstances) {
+    for (let i = 0; i < bucket.symbolInstances.length; i++) {
+      const symbolInstance = bucket.symbolInstances.get(i);
       symbolInstance.crossTileID = 0;
     }
 
@@ -170,7 +174,8 @@ class CrossTileSymbolLayerIndex {
       }
     }
 
-    for (const symbolInstance of bucket.symbolInstances) {
+    for (let i = 0; i < bucket.symbolInstances.length; i++) {
+      const symbolInstance = bucket.symbolInstances.get(i);
       if (!symbolInstance.crossTileID) {
         // symbol did not match any known symbol, assign a new id
         symbolInstance.crossTileID = crossTileIDs.generate();

package/src/symbol/placement.js

@@ -172,7 +172,12 @@ class Placement {
 
     const collisionGroup = this.collisionGroups.get(bucket.sourceID);
 
-    for (const symbolInstance of bucket.symbolInstances) {
+    if (!bucket.collisionArrays && collisionBoxArray) {
+      bucket.deserializeCollisionBoxes(collisionBoxArray);
+    }
+
+    for (let i = 0; i < bucket.symbolInstances.length; i++) {
+      const symbolInstance = bucket.symbolInstances.get(i);
       if (!seenCrossTileIDs[symbolInstance.crossTileID]) {
         if (holdingForFade) {
           // Mark all symbols from this tile as "not placed", but don't add to seenCrossTileIDs, because we don't
@@ -192,22 +197,14 @@ class Placement {
         let textFeatureIndex = 0;
         let iconFeatureIndex = 0;
 
-        if (!symbolInstance.collisionArrays) {
-          symbolInstance.collisionArrays = bucket.deserializeCollisionBoxes(
-            collisionBoxArray,
-            symbolInstance.textBoxStartIndex,
-            symbolInstance.textBoxEndIndex,
-            symbolInstance.iconBoxStartIndex,
-            symbolInstance.iconBoxEndIndex
-          );
-        }
+        const collisionArrays = bucket.collisionArrays[i];
 
-        if (symbolInstance.collisionArrays.textFeatureIndex) {
-          textFeatureIndex = symbolInstance.collisionArrays.textFeatureIndex;
+        if (collisionArrays.textFeatureIndex) {
+          textFeatureIndex = collisionArrays.textFeatureIndex;
         }
-        if (symbolInstance.collisionArrays.textBox) {
+        if (collisionArrays.textBox) {
           placedGlyphBoxes = this.collisionIndex.placeCollisionBox(
-            symbolInstance.collisionArrays.textBox,
+            collisionArrays.textBox,
             layout.get('text-allow-overlap'),
             textPixelRatio,
             posMatrix,
@@ -216,9 +213,9 @@ class Placement {
           placeText = placedGlyphBoxes.box.length > 0;
           offscreen = offscreen && placedGlyphBoxes.offscreen;
         }
-        const textCircles = symbolInstance.collisionArrays.textCircles;
+        const textCircles = collisionArrays.textCircles;
         if (textCircles) {
-          const placedSymbol = bucket.text.placedSymbolArray.get(symbolInstance.placedTextSymbolIndices[0]);
+          const placedSymbol = bucket.text.placedSymbolArray.get(symbolInstance.horizontalPlacedTextSymbolIndex);
           const fontSize = symbolSize.evaluateSizeForFeature(
             bucket.textSizeData,
             partiallyEvaluatedTextSize,
@@ -229,7 +226,6 @@ class Placement {
             layout.get('text-allow-overlap'),
             scale,
             textPixelRatio,
-            symbolInstance.key,
             placedSymbol,
             bucket.lineVertexArray,
             bucket.glyphOffsetArray,
@@ -248,12 +244,12 @@ class Placement {
           offscreen = offscreen && placedGlyphCircles.offscreen;
         }
 
-        if (symbolInstance.collisionArrays.iconFeatureIndex) {
-          iconFeatureIndex = symbolInstance.collisionArrays.iconFeatureIndex;
+        if (collisionArrays.iconFeatureIndex) {
+          iconFeatureIndex = collisionArrays.iconFeatureIndex;
         }
-        if (symbolInstance.collisionArrays.iconBox) {
+        if (collisionArrays.iconBox) {
           placedIconBoxes = this.collisionIndex.placeCollisionBox(
-            symbolInstance.collisionArrays.iconBox,
+            collisionArrays.iconBox,
             layout.get('icon-allow-overlap'),
             textPixelRatio,
             posMatrix,
@@ -412,8 +408,16 @@ class Placement {
       true
     );
 
+    if (
+      !bucket.collisionArrays &&
+      collisionBoxArray &&
+      (bucket.hasCollisionBoxData() || bucket.hasCollisionCircleData())
+    ) {
+      bucket.deserializeCollisionBoxes(collisionBoxArray);
+    }
+
     for (let s = 0; s < bucket.symbolInstances.length; s++) {
-      const symbolInstance = bucket.symbolInstances[s];
+      const symbolInstance = bucket.symbolInstances.get(s);
       const isDuplicate = seenCrossTileIDs[symbolInstance.crossTileID];
 
       let opacityState = this.opacities[symbolInstance.crossTileID];
@@ -438,11 +442,14 @@ class Placement {
         for (let i = 0; i < opacityEntryCount; i++) {
           bucket.text.opacityVertexArray.emplaceBack(packedOpacity);
         }
-        for (const placedTextSymbolIndex of symbolInstance.placedTextSymbolIndices) {
-          const placedSymbol = bucket.text.placedSymbolArray.get(placedTextSymbolIndex);
-          // If this label is completely faded, mark it so that we don't have to calculate
-          // its position at render time
-          placedSymbol.hidden = opacityState.text.isHidden();
+        // If this label is completely faded, mark it so that we don't have to calculate
+        // its position at render time
+        bucket.text.placedSymbolArray.get(symbolInstance.horizontalPlacedTextSymbolIndex).hidden =
+          opacityState.text.isHidden();
+
+        if (symbolInstance.verticalPlacedTextSymbolIndex >= 0) {
+          bucket.text.placedSymbolArray.get(symbolInstance.verticalPlacedTextSymbolIndex).hidden =
+            opacityState.text.isHidden();
         }
       }
 
@@ -451,35 +458,26 @@ class Placement {
         for (let i = 0; i < symbolInstance.numIconVertices / 4; i++) {
           bucket.icon.opacityVertexArray.emplaceBack(packedOpacity);
         }
-        const placedSymbol = bucket.icon.placedSymbolArray.get(s);
-        placedSymbol.hidden = opacityState.icon.isHidden();
+        bucket.icon.placedSymbolArray.get(s).hidden = opacityState.icon.isHidden();
       }
 
-      if (!symbolInstance.collisionArrays) {
-        symbolInstance.collisionArrays = bucket.deserializeCollisionBoxes(
-          collisionBoxArray,
-          symbolInstance.textBoxStartIndex,
-          symbolInstance.textBoxEndIndex,
-          symbolInstance.iconBoxStartIndex,
-          symbolInstance.iconBoxEndIndex
-        );
-      }
-
-      const collisionArrays = symbolInstance.collisionArrays;
-      if (collisionArrays) {
-        if (collisionArrays.textBox && bucket.hasCollisionBoxData()) {
-          updateCollisionVertices(bucket.collisionBox.collisionVertexArray, opacityState.text.placed, false);
-        }
+      if (bucket.hasCollisionBoxData() || bucket.hasCollisionCircleData()) {
+        const collisionArrays = bucket.collisionArrays[s];
+        if (collisionArrays) {
+          if (collisionArrays.textBox) {
+            updateCollisionVertices(bucket.collisionBox.collisionVertexArray, opacityState.text.placed, false);
+          }
 
-        if (collisionArrays.iconBox && bucket.hasCollisionBoxData()) {
-          updateCollisionVertices(bucket.collisionBox.collisionVertexArray, opacityState.icon.placed, false);
-        }
+          if (collisionArrays.iconBox) {
+            updateCollisionVertices(bucket.collisionBox.collisionVertexArray, opacityState.icon.placed, false);
+          }
 
-        const textCircles = collisionArrays.textCircles;
-        if (textCircles && bucket.hasCollisionCircleData()) {
-          for (let k = 0; k < textCircles.length; k += 5) {
-            const notUsed = isDuplicate || textCircles[k + 4] === 0;
-            updateCollisionVertices(bucket.collisionCircle.collisionVertexArray, opacityState.text.placed, notUsed);
+          const textCircles = collisionArrays.textCircles;
+          if (textCircles && bucket.hasCollisionCircleData()) {
+            for (let k = 0; k < textCircles.length; k += 5) {
+              const notUsed = isDuplicate || textCircles[k + 4] === 0;
+              updateCollisionVertices(bucket.collisionCircle.collisionVertexArray, opacityState.text.placed, notUsed);
+            }
           }
         }
       }