From 74c85f3f01fdf2b438a17e1785296515c67bac58 Mon Sep 17 00:00:00 2001
From: ryanhamley <ryan.hamley@mapbox.com>
Date: Fri, 9 Aug 2019 13:06:15 -0700
Subject: [PATCH] Avoid Number.isNaN

---
 src/style-spec/util/get_type.js               |  4 +-
 src/style-spec/validate/validate_number.js    |  7 +-
 .../style-spec/fixture/numbers.input.json     | 94 +++++++++++++++++++
 .../style-spec/fixture/numbers.output.json    | 21 +++++
 4 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 test/unit/style-spec/fixture/numbers.input.json
 create mode 100644 test/unit/style-spec/fixture/numbers.output.json

diff --git a/src/style-spec/util/get_type.js b/src/style-spec/util/get_type.js
index 2d1ff998082..c31925f35a3 100644
--- a/src/style-spec/util/get_type.js
+++ b/src/style-spec/util/get_type.js
@@ -1,8 +1,6 @@
 
 export default function getType(val) {
-    if (Number.isNaN(val)) {
-        return 'NaN';
-    } else if (val instanceof Number) {
+    if (val instanceof Number) {
         return 'number';
     } else if (val instanceof String) {
         return 'string';
diff --git a/src/style-spec/validate/validate_number.js b/src/style-spec/validate/validate_number.js
index adf7f3e5ef3..1db12f0364d 100644
--- a/src/style-spec/validate/validate_number.js
+++ b/src/style-spec/validate/validate_number.js
@@ -6,7 +6,12 @@ export default function validateNumber(options) {
     const key = options.key;
     const value = options.value;
     const valueSpec = options.valueSpec;
-    const type = getType(value);
+    let type = getType(value);
+
+    // eslint-disable-next-line no-self-compare
+    if (type === 'number' && value !== value) {
+        type = 'NaN';
+    }
 
     if (type !== 'number') {
         return [new ValidationError(key, value, `number expected, ${type} found`)];
diff --git a/test/unit/style-spec/fixture/numbers.input.json b/test/unit/style-spec/fixture/numbers.input.json
new file mode 100644
index 00000000000..b3146196d77
--- /dev/null
+++ b/test/unit/style-spec/fixture/numbers.input.json
@@ -0,0 +1,94 @@
+{
+  "version": 8,
+  "sources": {
+    "point": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [ 0, 0 ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "valid",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": 5
+      }
+    },
+    {
+      "id": "zero",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": 0
+      }
+    },
+    {
+      "id": "less-than-zero",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": -1
+      }
+    },
+    {
+      "id": "null-not-number",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": null
+      }
+    },
+    {
+      "id": "object-not-number",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": {}
+      }
+    },
+    {
+      "id": "array-not-number",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": []
+      }
+    },
+    {
+      "id": "boolean-not-number",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": true
+      }
+    },
+    {
+      "id": "expression",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": ["sqrt", 16]
+      }
+    },
+    {
+      "id": "expression-invalid",
+      "type": "circle",
+      "source": "point",
+      "paint": {
+        "circle-radius": ["/", 0, 0]
+      }
+    }
+  ]
+}
diff --git a/test/unit/style-spec/fixture/numbers.output.json b/test/unit/style-spec/fixture/numbers.output.json
new file mode 100644
index 00000000000..8fadd34d7ee
--- /dev/null
+++ b/test/unit/style-spec/fixture/numbers.output.json
@@ -0,0 +1,21 @@
+[
+    {
+        "message": "layers[2].paint.circle-radius: -1 is less than the minimum value 0",
+        "line": 42
+    },
+    {
+        "message": "layers[3].paint.circle-radius: number expected, null found"
+    },
+    {
+        "message": "layers[4].paint.circle-radius: missing required property \"stops\"",
+        "line": 58
+    },
+    {
+        "message": "layers[5].paint.circle-radius: number expected, array found",
+        "line": 66
+    },
+    {
+        "message": "layers[6].paint.circle-radius: number expected, boolean found",
+        "line": 74
+    }
+]