parse min-zoom/max-zoom values

refs mapbox/mapbox-gl-style-spec#65
mapbox · Jul 17, 2014 · c01143a · c01143a
1 parent afe069d
commit c01143a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/include/mbgl/style/style_bucket.hpp b/include/mbgl/style/style_bucket.hpp
@@ -79,6 +79,8 @@ class StyleBucket {
     std::string source_layer;
     FilterExpression filter;
     StyleBucketRender render = std::false_type();
+    float min_zoom = -std::numeric_limits<float>::infinity();
+    float max_zoom = std::numeric_limits<float>::infinity();
 };
 
 

diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp
@@ -2,6 +2,7 @@
 #include <mbgl/style/style_layer_group.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/std.hpp>
+#include <mbgl/platform/log.hpp>
 #include <csscolorparser/csscolorparser.hpp>
 
 namespace mbgl {
@@ -714,6 +715,24 @@ void StyleParser::parseBucket(JSVal value, std::shared_ptr<StyleLayer> &layer) {
         JSVal value_render = replaceConstant(value["render"]);
         parseRender(value_render, layer);
     }
+
+    if (value.HasMember("min-zoom")) {
+        JSVal min_zoom = value["min-zoom"];
+        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());
+        }
+    }
+
+    if (value.HasMember("max-zoom")) {
+        JSVal max_zoom = value["max-zoom"];
+        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());
+        }
+    }
 }
 
 FilterExpression StyleParser::parseFilter(JSVal value) {