summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauren Budorick <lauren@mapbox.com>2014-10-27 16:41:08 -0400
committerJohn Firebaugh <john.firebaugh@gmail.com>2014-11-04 12:26:14 -0800
commitdc834aec914cc0afaf31dffd0064d54dee05b751 (patch)
tree91bec71fa5e248330ac59af5ef02f309aa82b68f
parent37922605f810b3ce5075b6dd049ddb0cda62f1c3 (diff)
downloadqtlocation-mapboxgl-dc834aec914cc0afaf31dffd0064d54dee05b751.tar.gz
v6: min-zoom -> minzoom, max-zoom -> maxzoom
-rw-r--r--src/style/style_parser.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp
index 5c4ed0cb1a..6dd2e678cc 100644
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -719,21 +719,21 @@ void StyleParser::parseBucket(JSVal value, util::ptr<StyleLayer> &layer) {
parseRender(value_render, layer);
}
- if (value.HasMember("min-zoom")) {
- JSVal min_zoom = value["min-zoom"];
+ if (value.HasMember("minzoom")) {
+ JSVal min_zoom = value["minzoom"];
if (min_zoom.IsNumber()) {
layer->bucket->min_zoom = min_zoom.GetDouble();
} else {
- Log::Warning(Event::ParseStyle, "min-zoom of layer %s must be numeric", layer->id.c_str());
+ Log::Warning(Event::ParseStyle, "minzoom of layer %s must be numeric", layer->id.c_str());
}
}
- if (value.HasMember("max-zoom")) {
- JSVal max_zoom = value["max-zoom"];
+ if (value.HasMember("maxzoom")) {
+ JSVal max_zoom = value["maxzoom"];
if (max_zoom.IsNumber()) {
layer->bucket->min_zoom = max_zoom.GetDouble();
} else {
- Log::Warning(Event::ParseStyle, "max-zoom of layer %s must be numeric", layer->id.c_str());
+ Log::Warning(Event::ParseStyle, "maxzoom of layer %s must be numeric", layer->id.c_str());
}
}
}