diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-02-09 11:48:36 -0800 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-02-09 11:48:36 -0800 |
| commit | 97f19e8b849cd0d48ac57e03c3ad49459e7a0d94 (patch) | |
| tree | 3170c5cfa215dd585202d168d713c31040952359 /src | |
| parent | 8f4a245c4014b0a2fad754300f3f8372a1b9051e (diff) | |
| download | qtlocation-mapboxgl-97f19e8b849cd0d48ac57e03c3ad49459e7a0d94.tar.gz | |
support constants within dasharrays
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/style/style_parser.cpp | 4 | ||||
| -rw-r--r-- | 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 aedb8255cd..251ba8321e 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<bool,std::vector<float>> parseFloatArray(JSVal value) { +std::tuple<bool,std::vector<float>> StyleParser::parseFloatArray(JSVal value) { if (!value.IsArray()) { Log::Warning(Event::ParseStyle, "dasharray value must be an array of numbers"); return std::tuple<bool, std::vector<float>> { false, std::vector<float>() }; @@ -217,7 +217,7 @@ std::tuple<bool,std::vector<float>> parseFloatArray(JSVal value) { std::vector<float> 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<bool, std::vector<float>> { false, std::vector<float>() }; diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp index 90dd4224e0..736cb9e9fa 100644 --- a/src/mbgl/style/style_parser.hpp +++ b/src/mbgl/style/style_parser.hpp @@ -87,6 +87,8 @@ private: template <typename T> std::tuple<bool, std::vector<std::pair<float, T>>> parseStops(JSVal value, const char *property_name); + std::tuple<bool,std::vector<float>> parseFloatArray(JSVal value); + FilterExpression parseFilter(JSVal); private: |