Update layer immediately when changing its max/min zoom level (CP #11399

) (#11687)

* [android][core] update layer immediately when changing it's max/min zoom

* [core] node bindings for layer zoom range

(cherry picked from commit 22b4ef1)

platform/node/src/node_map.cpp

@@ -74,6 +74,7 @@ void NodeMap::Init(v8::Local<v8::Object> target) {
     Nan::SetPrototypeMethod(tpl, "removeLayer", RemoveLayer);
     Nan::SetPrototypeMethod(tpl, "addImage", AddImage);
     Nan::SetPrototypeMethod(tpl, "removeImage", RemoveImage);
+    Nan::SetPrototypeMethod(tpl, "setLayerZoomRange", SetLayerZoomRange);
     Nan::SetPrototypeMethod(tpl, "setLayoutProperty", SetLayoutProperty);
     Nan::SetPrototypeMethod(tpl, "setPaintProperty", SetPaintProperty);
     Nan::SetPrototypeMethod(tpl, "setFilter", SetFilter);
@@ -740,6 +741,33 @@ void NodeMap::RemoveImage(const Nan::FunctionCallbackInfo<v8::Value>& info) {
 
     nodeMap->map->getStyle().removeImage(*Nan::Utf8String(info[0]));
 }
+
+void NodeMap::SetLayerZoomRange(const Nan::FunctionCallbackInfo<v8::Value>& info) {
+    using namespace mbgl::style;
+
+    auto nodeMap = Nan::ObjectWrap::Unwrap<NodeMap>(info.Holder());
+    if (!nodeMap->map) return Nan::ThrowError(releasedMessage());
+
+    if (info.Length() != 3) {
+        return Nan::ThrowTypeError("Three arguments required");
+    }
+
+    if (!info[0]->IsString()) {
+        return Nan::ThrowTypeError("First argument must be a string");
+    }
+
+    if (!info[1]->IsNumber() || !info[2]->IsNumber()) {
+        return Nan::ThrowTypeError("Second and third arguments must be numbers");
+    }
+
+    mbgl::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0]));
+    if (!layer) {
+        return Nan::ThrowTypeError("layer not found");
+    }
+
+    layer->setMinZoom(info[1]->NumberValue());
+    layer->setMaxZoom(info[2]->NumberValue());
+}
 
 void NodeMap::SetLayoutProperty(const Nan::FunctionCallbackInfo<v8::Value>& info) {
     using namespace mbgl::style;

platform/node/src/node_map.hpp

@@ -50,6 +50,7 @@ class NodeMap : public Nan::ObjectWrap,
     static void RemoveLayer(const Nan::FunctionCallbackInfo<v8::Value>&);
     static void AddImage(const Nan::FunctionCallbackInfo<v8::Value>&);
     static void RemoveImage(const Nan::FunctionCallbackInfo<v8::Value>&);
+    static void SetLayerZoomRange(const Nan::FunctionCallbackInfo<v8::Value>&);
     static void SetLayoutProperty(const Nan::FunctionCallbackInfo<v8::Value>&);
     static void SetPaintProperty(const Nan::FunctionCallbackInfo<v8::Value>&);
     static void SetFilter(const Nan::FunctionCallbackInfo<v8::Value>&);

platform/node/test/js/map.test.js

@@ -114,6 +114,7 @@ test('Map', function(t) {
             'removeLayer',
             'addImage',
             'removeImage',
+            'setLayerZoomRange',
             'setLayoutProperty',
             'setPaintProperty',
             'setFilter',

src/mbgl/style/layers/background_layer.cpp

@@ -53,12 +53,14 @@ void BackgroundLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void BackgroundLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/circle_layer.cpp

@@ -81,12 +81,14 @@ void CircleLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void CircleLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/fill_extrusion_layer.cpp

@@ -81,12 +81,14 @@ void FillExtrusionLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void FillExtrusionLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/fill_layer.cpp

@@ -81,12 +81,14 @@ void FillLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void FillLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/heatmap_layer.cpp

@@ -85,12 +85,14 @@ void HeatmapLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void HeatmapLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/hillshade_layer.cpp

@@ -59,12 +59,14 @@ void HillshadeLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void HillshadeLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/layer.cpp.ejs

@@ -108,12 +108,14 @@ void <%- camelize(type) %>Layer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void <%- camelize(type) %>Layer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/line_layer.cpp

@@ -82,12 +82,14 @@ void LineLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void LineLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/raster_layer.cpp

@@ -59,12 +59,14 @@ void RasterLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void RasterLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties

src/mbgl/style/layers/symbol_layer.cpp

@@ -82,12 +82,14 @@ void SymbolLayer::setMinZoom(float minZoom) {
     auto impl_ = mutableImpl();
     impl_->minZoom = minZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 void SymbolLayer::setMaxZoom(float maxZoom) {
     auto impl_ = mutableImpl();
     impl_->maxZoom = maxZoom;
     baseImpl = std::move(impl_);
+    observer->onLayerChanged(*this);
 }
 
 // Layout properties