tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse function stops according to spec

Browse Source
This commit is contained in:
Konstantin Käfer
2014-07-02 17:32:29 +02:00
parent 93aad43be9
commit 4856728022
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/style/style_parser.cpp
View File

@@ -285,25 +285,20 @@ std::tuple<bool, Function<T>> StyleParser::parseFunction(JSVal value) {
}
std::vector<std::pair<float, T>> stops;
for (rapidjson::SizeType i = 0; i < value.Size(); ++i) {
JSVal stop = value[i];
if (stop.IsObject()) {
if (!stop.HasMember("z")) {
fprintf(stderr, "[WARNING] stop must have zoom level specification\n");
return false;
}
if (!stop.HasMember("val")) {
fprintf(stderr, "[WARNING] stop must have value specification\n");
return false;
for (rapidjson::SizeType i = 0; i < value_stops.Size(); ++i) {
JSVal stop = value_stops[i];
if (stop.IsArray()) {
if (stop.Size() != 2) {
fprintf(stderr, "[WARNING] stop must have zoom level and value specification\n");
}
JSVal z = stop["z"];
JSVal z = stop[rapidjson::SizeType(0)];
if (!z.IsNumber()) {
fprintf(stderr, "[WARNING] zoom level in stop must be a number\n");
return false;
}
stops.emplace_back(z.GetDouble(), parseFunctionArgument<T>(stop["val"]));
stops.emplace_back(z.GetDouble(), parseFunctionArgument<T>(stop[rapidjson::SizeType(1)]));
} else {
fprintf(stderr, "[WARNING] function argument must be a numeric value\n");
return false;