[core] Rewrite style parsing logic for reuse in node bindings

12 files changed, 12 insertions, 12 deletions

diff --git a/test/fixtures/style_parser/circle-blur.info.json b/test/fixtures/style_parser/circle-blur.info.json
index 397e4cd4d1..60306e20c8 100644
--- a/test/fixtures/style_parser/circle-blur.info.json
+++ b/test/fixtures/style_parser/circle-blur.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'circle-blur' must be a number, or a number function"]
+            [1, "WARNING", "ParseStyle", "circle-blur: value must be a number"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/circle-color.info.json b/test/fixtures/style_parser/circle-color.info.json
index 70375ce8f5..9d569ad53d 100644
--- a/test/fixtures/style_parser/circle-color.info.json
+++ b/test/fixtures/style_parser/circle-color.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'circle-color' must be a string"]
+            [1, "WARNING", "ParseStyle", "circle-color: value must be a string"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/circle-opacity.info.json b/test/fixtures/style_parser/circle-opacity.info.json
index 3e8662bdbe..bb77cebd1e 100644
--- a/test/fixtures/style_parser/circle-opacity.info.json
+++ b/test/fixtures/style_parser/circle-opacity.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'circle-opacity' must be a number, or a number function"]
+            [1, "WARNING", "ParseStyle", "circle-opacity: value must be a number"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/circle-radius.info.json b/test/fixtures/style_parser/circle-radius.info.json
index 7e87aa4fdb..285e962d74 100644
--- a/test/fixtures/style_parser/circle-radius.info.json
+++ b/test/fixtures/style_parser/circle-radius.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'circle-radius' must be a number, or a number function"]
+            [1, "WARNING", "ParseStyle", "circle-radius: value must be a number"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/function-numeric.info.json b/test/fixtures/style_parser/function-numeric.info.json
index e2170eed4f..906cccf106 100644
--- a/test/fixtures/style_parser/function-numeric.info.json
+++ b/test/fixtures/style_parser/function-numeric.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "function argument must be a numeric value"]
+            [1, "WARNING", "ParseStyle", "line-width: function stop must be an array"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/function-type.info.json b/test/fixtures/style_parser/function-type.info.json
index 1549262bb0..8a844bf7c1 100644
--- a/test/fixtures/style_parser/function-type.info.json
+++ b/test/fixtures/style_parser/function-type.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "function must specify a function type"]
+            [1, "WARNING", "ParseStyle", "line-width: function value must specify stops"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/line-opacity.info.json b/test/fixtures/style_parser/line-opacity.info.json
index 36f02e6e02..63af59e280 100644
--- a/test/fixtures/style_parser/line-opacity.info.json
+++ b/test/fixtures/style_parser/line-opacity.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'line-opacity' must be a number, or a number function"]
+            [1, "WARNING", "ParseStyle", "line-opacity: value must be a number"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/line-translate.info.json b/test/fixtures/style_parser/line-translate.info.json
index ff126bbf22..a23e17012e 100644
--- a/test/fixtures/style_parser/line-translate.info.json
+++ b/test/fixtures/style_parser/line-translate.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'line-translate' must be an array of two numbers"]
+            [1, "WARNING", "ParseStyle", "line-translate: value must be an array of two numbers"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/line-width.info.json b/test/fixtures/style_parser/line-width.info.json
index af2f9b284a..9e549a0228 100644
--- a/test/fixtures/style_parser/line-width.info.json
+++ b/test/fixtures/style_parser/line-width.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'line-width' must be a number, or a number function"]
+            [1, "WARNING", "ParseStyle", "line-width: value must be a number"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/stop-zoom-value.info.json b/test/fixtures/style_parser/stop-zoom-value.info.json
index deaba65e25..3abf1867a4 100644
--- a/test/fixtures/style_parser/stop-zoom-value.info.json
+++ b/test/fixtures/style_parser/stop-zoom-value.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "stop must have zoom level and value specification"]
+            [1, "WARNING", "ParseStyle", "fill-opacity: function stop must have two elements"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/stops-array.info.json b/test/fixtures/style_parser/stops-array.info.json
index 3324958c85..b82f5a97d7 100644
--- a/test/fixtures/style_parser/stops-array.info.json
+++ b/test/fixtures/style_parser/stops-array.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "stops function must specify a stops array"]
+            [1, "WARNING", "ParseStyle", "line-width: function stops must be an array"]
         ]
     }
 }
diff --git a/test/fixtures/style_parser/text-size.info.json b/test/fixtures/style_parser/text-size.info.json
index 871a6ad499..b412c6beed 100644
--- a/test/fixtures/style_parser/text-size.info.json
+++ b/test/fixtures/style_parser/text-size.info.json
@@ -1,7 +1,7 @@
 {
     "default": {
         "log": [
-            [1, "WARNING", "ParseStyle", "value of 'text-size' must be a number, or a number function"]
+            [1, "WARNING", "ParseStyle", "text-size: value must be a number"]
         ]
     }
 }