From 97f19e8b849cd0d48ac57e03c3ad49459e7a0d94 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Mon, 9 Feb 2015 11:48:36 -0800 Subject: [PATCH] support constants within dasharrays --- src/mbgl/style/style_parser.cpp | 4 ++-- src/mbgl/style/style_parser.hpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index aedb8255c..251ba8321 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -209,7 +209,7 @@ Color parseColor(JSVal value) { css_color.a}}; } -std::tuple> parseFloatArray(JSVal value) { +std::tuple> StyleParser::parseFloatArray(JSVal value) { if (!value.IsArray()) { Log::Warning(Event::ParseStyle, "dasharray value must be an array of numbers"); return std::tuple> { false, std::vector() }; @@ -217,7 +217,7 @@ std::tuple> parseFloatArray(JSVal value) { std::vector vec; for (rapidjson::SizeType i = 0; i < value.Size(); ++i) { - JSVal part = value[i]; + JSVal part = replaceConstant(value[i]); if (!part.IsNumber()) { Log::Warning(Event::ParseStyle, "dasharray value must be an array of numbers"); return std::tuple> { false, std::vector() }; diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp index 90dd4224e..736cb9e9f 100644 --- a/src/mbgl/style/style_parser.hpp +++ b/src/mbgl/style/style_parser.hpp @@ -87,6 +87,8 @@ private: template std::tuple>> parseStops(JSVal value, const char *property_name); + std::tuple> parseFloatArray(JSVal value); + FilterExpression parseFilter(JSVal); private: