From 20d960ed51dcd9267b7ff7a0373c72bf6e287f1f Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Wed, 18 Mar 2020 17:38:56 +0200 Subject: [core] Layer::setProperty() can set min/max zoom and filter --- include/mbgl/style/layer.hpp | 2 ++ src/mbgl/style/layer.cpp | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index 10baf19607..53e0f0f18e 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -148,6 +148,8 @@ protected: private: optional setVisibility(const conversion::Convertible& value); + optional setMinZoom(const conversion::Convertible& value); + optional setMaxZoom(const conversion::Convertible& value); }; } // namespace style diff --git a/src/mbgl/style/layer.cpp b/src/mbgl/style/layer.cpp index efbc91434f..748f52c109 100644 --- a/src/mbgl/style/layer.cpp +++ b/src/mbgl/style/layer.cpp @@ -144,10 +144,27 @@ void Layer::setObserver(LayerObserver* observer_) { } optional Layer::setProperty(const std::string& name, const conversion::Convertible& value) { - optional error = setPropertyInternal(name, value); + using namespace conversion; + optional error = setPropertyInternal(name, value); if (!error) return error; // Successfully set by the derived class implementation. if (name == "visibility") return setVisibility(value); - return error; // Must be Error{"layer doesn't support this property"}. + if (name == "minzoom") { + if (auto zoom = convert(value, *error)) { + setMinZoom(*zoom); + return nullopt; + } + } else if (name == "maxzoom") { + if (auto zoom = convert(value, *error)) { + setMaxZoom(*zoom); + return nullopt; + } + } else if (name == "filter") { + if (auto filter = convert(value, *error)) { + setFilter(*filter); + return nullopt; + } + } + return error; } optional Layer::setVisibility(const conversion::Convertible& value) { -- cgit v1.2.1