[core] Layer::setProperty() can set min/max zoom and filter

mapbox · Mar 19, 2020 · 2e03ca1 · 2e03ca1
1 parent 2fa0dbe
commit 2e03ca1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp
@@ -148,6 +148,8 @@ class Layer {
 
 private:
     optional<conversion::Error> setVisibility(const conversion::Convertible& value);
+    optional<conversion::Error> setMinZoom(const conversion::Convertible& value);
+    optional<conversion::Error> setMaxZoom(const conversion::Convertible& value);
 };
 
 } // namespace style

diff --git a/src/mbgl/style/layer.cpp b/src/mbgl/style/layer.cpp
@@ -144,9 +144,17 @@ void Layer::setObserver(LayerObserver* observer_) {
 }
 
 optional<conversion::Error> Layer::setProperty(const std::string& name, const conversion::Convertible& value) {
-    optional<conversion::Error> error = setPropertyInternal(name, value);
+    using namespace conversion;
+    optional<Error> error = setPropertyInternal(name, value);
     if (!error) return error; // Successfully set by the derived class implementation.
     if (name == "visibility") return setVisibility(value);
+    if (name == "min-zoom") {
+        if (auto zoom = convert<float>(value, *error)) setMinZoom(*zoom);
+    } else if (name == "max-zoom") {
+        if (auto zoom = convert<float>(value, *error)) setMaxZoom(*zoom);
+    } else if (name == "filter") {
+        if (auto filter = convert<Filter>(value, *error)) setFilter(*filter);
+    }
     return error; // Must be Error{"layer doesn't support this property"}.
 }