Disallow interpolation for variable-length numeric arrays

mapbox · Oct 25, 2017 · 353c5dd · 353c5dd
1 parent 4c7d0d7
commit 353c5dd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/src/style-spec/expression/definitions/curve.js b/src/style-spec/expression/definitions/curve.js
@@ -140,7 +140,12 @@ class Curve implements Expression {
         if (interpolation.name !== 'step' &&
             outputType.kind !== 'number' &&
             outputType.kind !== 'color' &&
-            !(outputType.kind === 'array' && outputType.itemType.kind === 'number')) {
+            !(
+                outputType.kind === 'array' &&
+                outputType.itemType.kind === 'number' &&
+                typeof outputType.N === 'number'
+            )
+        ) {
             return context.error(`Type ${toString(outputType)} is not interpolatable, and thus cannot be used as a ${interpolation.name} curve's output type.`);
         }
 

diff --git a/...onential-uninterpolatable-array/test.json → .../curve/exponential-string-array/test.json b/...onential-uninterpolatable-array/test.json → .../curve/exponential-string-array/test.json
diff --git a/test/integration/expression-tests/curve/exponential-uninterpolatable-numeric-array/test.json b/test/integration/expression-tests/curve/exponential-uninterpolatable-numeric-array/test.json
@@ -0,0 +1,23 @@
+{
+  "expression": [
+    "curve",
+    ["exponential", 2],
+    ["number", ["get", "x"]],
+    1,
+    ["array", "number", ["get", "array"]],
+    3,
+    ["array", "number", ["get", "array_two"]]
+  ],
+  "inputs": [],
+  "expected": {
+    "compiled": {
+      "result": "error",
+      "errors": [
+        {
+          "key": "",
+          "error": "Type array<number> is not interpolatable, and thus cannot be used as a exponential curve's output type."
+        }
+      ]
+    }
+  }
+}
diff --git a/test/unit/style-spec/fixture/functions.output.json b/test/unit/style-spec/fixture/functions.output.json
@@ -184,7 +184,7 @@
     "line": 934
   },
   {
-    "message": "layers[52].paint.line-dasharray: interpolation type must be \"step\" for this property",
+    "message": "layers[52].paint.line-dasharray: Type array<number> is not interpolatable, and thus cannot be used as a linear curve's output type.",
     "line": 943
   }
 ]