ensure all possible icons for line-pattern camera funcs are added to …

…the icon atlas
mapbox · Mar 23, 2018 · ca66d46 · ca66d46
1 parent 03828ea
commit ca66d46
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
@@ -142,13 +142,13 @@ class LineBucket implements Bucket {
             if (linePattern.value.kind === "source" || linePattern.value.kind === "composite") {
                 dataDrivenPatternLayers.push(layer);
             } else {
-                // add all icons needed for this tile to the tile's IconAtlas dependencies
+                // add all icons needed for this layer to the tile's IconAtlas dependencies
                 // for non-data-driven line-pattern properties
-                const image = linePattern.constantOr(null);
-                if (image) {
-                    icons[image.min] = true;
-                    icons[image.mid] = true;
-                    icons[image.max] = true;
+                const images = linePattern.property.getPossibleOutputs();
+                for (let i = 0; i < images.length; i++){
+                    // https://github.com/facebook/flow/issues/4310
+                    icons[(images[i]: any)] = true;
+
                 }
             }
         }

diff --git a/src/style-spec/validate/validate_expression.js b/src/style-spec/validate/validate_expression.js
@@ -13,9 +13,9 @@ export default function validateExpression(options: any) {
         });
     }
 
-    if (options.expressionContext === 'property' && options.propertyKey === 'text-font' &&
+    if (options.expressionContext === 'property' && (options.propertyKey === 'text-font' || options.propertyKey === 'line-pattern') &&
         (expression.value: any)._styleExpression.expression.possibleOutputs().indexOf(undefined) !== -1) {
-        return [new ValidationError(options.key, options.value, 'Invalid data expression for "text-font". Output values must be contained as literals within the expression.')];
+        return [new ValidationError(options.key, options.value, `Invalid data expression for ${options.propertyKey}. Output values must be contained as literals within the expression.`)];
     }
 
     return [];

diff --git a/src/style/properties.js b/src/style/properties.js
@@ -574,6 +574,8 @@ export class DataDrivenProperty<T> implements Property<T, PossiblyEvaluatedPrope
             return value.evaluate(globals, feature);
         }
     }
+
+    getPossibleOutputs(){ return []; }
 }
 
 /**
@@ -584,13 +586,18 @@ export class DataDrivenProperty<T> implements Property<T, PossiblyEvaluatedPrope
  */
 
 export class CrossFadedDataDrivenProperty<T> extends DataDrivenProperty<?CrossFaded<T>> {
+    possibleOutputs: Array<T>;
+
     possiblyEvaluate(value: PropertyValue<?CrossFaded<T>, PossiblyEvaluatedPropertyValue<?CrossFaded<T>>>, parameters: EvaluationParameters): PossiblyEvaluatedPropertyValue<?CrossFaded<T>> {
+        this.possibleOutputs = [];
         if (value.value === undefined) {
             return new PossiblyEvaluatedPropertyValue(this, {kind: 'constant', value: undefined}, parameters);
         } else if (value.expression.kind === 'constant') {
             const constant = value.expression.evaluate(parameters);
+            this.possibleOutputs.push(constant);
             return new PossiblyEvaluatedPropertyValue(this, {kind: 'constant', value: this._calculate(constant, constant, constant, parameters)}, parameters);
         } else if (value.expression.kind === 'camera') {
+            this.possibleOutputs = (value.expression: any)._styleExpression.expression.possibleOutputs();
             const cameraVal = this._calculate(
                 value.expression.evaluate({zoom: parameters.zoom - 1.0}),
                 value.expression.evaluate({zoom: parameters.zoom}),
@@ -602,6 +609,9 @@ export class CrossFadedDataDrivenProperty<T> extends DataDrivenProperty<?CrossFa
         }
     }
 
+    getPossibleOutputs() {
+        return this.possibleOutputs;
+    }
 
     evaluate(value: PossiblyEvaluatedValue<?CrossFaded<T>>, globals: EvaluationParameters, feature: Feature): ?CrossFaded<T> {
         if (value.kind === 'source') {