[core] Ability to set generic layer properties using setProperty method

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - [android] Add jni binding for styleable snapshotter ([#16286](https://github.com/mapbox/mapbox-gl-native/pull/16286))
 
+- [core] Ability to set generic layer properties using setProperty method ([#16324](https://github.com/mapbox/mapbox-gl-native/pull/16324))
+  This change enables the following new keys for the `mbgl::Layer::setProperty()` API:
+  - "filter" invokes `setFilter()`
+  - "minzoom" invokes `setMinZoom()`
+  - "maxzoom" invokes `setMaxZoom()`
+  - "source-layer" invokes `setSourceLayer()`
+
+  The newly-added API is used in the style-conversion code, which made this code much simpler.
+
 ### 🐞 Bug fixes
 
 - [core] Use `TileCoordinates` instead of `LngLat` for `within` expression calculation ([#16319](https://github.com/mapbox/mapbox-gl-native/pull/16319))

include/mbgl/gl/custom_layer.hpp

@@ -66,21 +66,17 @@ class CustomLayer : public Layer {
     CustomLayer(const std::string& id,
                 std::unique_ptr<CustomLayerHost> host);
 
+    CustomLayer(const CustomLayer&) = delete;
     ~CustomLayer() final;
-
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-    StyleProperty getProperty(const std::string&) const final;
-    // Private implementation
-
     class Impl;
     const Impl& impl() const;
-
     Mutable<Impl> mutableImpl() const;
-    std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
-
-    CustomLayer(const CustomLayer&) = delete;
 
+private:
+    optional<conversion::Error> setPropertyInternal(const std::string& name,
+                                                    const conversion::Convertible& value) final;
+    StyleProperty getProperty(const std::string&) const final;
+    std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/layermanager/layer_factory.hpp

@@ -37,7 +37,6 @@ class LayerFactory {
 
 protected:
     optional<std::string> getSource(const style::conversion::Convertible& value) const noexcept;
-    bool initSourceLayerAndFilter(style::Layer*, const style::conversion::Convertible& value) const noexcept;
 };
 
 } // namespace mbgl

include/mbgl/style/layer.hpp

@@ -110,8 +110,7 @@ class Layer {
     void setMaxZoom(float);
 
     // Dynamic properties
-    virtual optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) = 0;
-    optional<conversion::Error> setVisibility(const conversion::Convertible& value);
+    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value);
 
     virtual StyleProperty getProperty(const std::string&) const = 0;
     virtual Value serialize() const;
@@ -142,9 +141,15 @@ class Layer {
 protected:
     virtual Mutable<Impl> mutableBaseImpl() const = 0;
     void serializeProperty(Value&, const StyleProperty&, const char* propertyName, bool isPaint) const;
-
+    virtual optional<conversion::Error> setPropertyInternal(const std::string& name,
+                                                            const conversion::Convertible& value) = 0;
     LayerObserver* observer;
     mapbox::base::WeakPtrFactory<Layer> weakFactory {this};
+
+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

include/mbgl/style/layers/background_layer.hpp

@@ -20,12 +20,6 @@ class BackgroundLayer : public Layer {
     BackgroundLayer(const std::string& layerID);
     ~BackgroundLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Paint properties
 
     static PropertyValue<Color> getDefaultBackgroundColor();
@@ -56,6 +50,12 @@ class BackgroundLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/circle_layer.hpp

@@ -20,12 +20,6 @@ class CircleLayer : public Layer {
     CircleLayer(const std::string& layerID, const std::string& sourceID);
     ~CircleLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Paint properties
 
     static PropertyValue<float> getDefaultCircleBlur();
@@ -104,6 +98,12 @@ class CircleLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/fill_extrusion_layer.hpp

@@ -20,12 +20,6 @@ class FillExtrusionLayer : public Layer {
     FillExtrusionLayer(const std::string& layerID, const std::string& sourceID);
     ~FillExtrusionLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Paint properties
 
     static PropertyValue<float> getDefaultFillExtrusionBase();
@@ -86,6 +80,12 @@ class FillExtrusionLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/fill_layer.hpp

@@ -20,12 +20,6 @@ class FillLayer : public Layer {
     FillLayer(const std::string& layerID, const std::string& sourceID);
     ~FillLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Layout properties
 
     static PropertyValue<float> getDefaultFillSortKey();
@@ -86,6 +80,12 @@ class FillLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/heatmap_layer.hpp

@@ -21,12 +21,6 @@ class HeatmapLayer : public Layer {
     HeatmapLayer(const std::string& layerID, const std::string& sourceID);
     ~HeatmapLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Paint properties
 
     static ColorRampPropertyValue getDefaultHeatmapColor();
@@ -69,6 +63,12 @@ class HeatmapLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/hillshade_layer.hpp

@@ -20,12 +20,6 @@ class HillshadeLayer : public Layer {
     HillshadeLayer(const std::string& layerID, const std::string& sourceID);
     ~HillshadeLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Paint properties
 
     static PropertyValue<Color> getDefaultHillshadeAccentColor();
@@ -74,6 +68,12 @@ class HillshadeLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/layer.hpp.ejs

@@ -36,12 +36,6 @@ public:
 <% } -%>
     ~<%- camelize(type) %>Layer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
 <% if (layoutProperties.length) { -%>
     // Layout properties
 
@@ -72,6 +66,12 @@ public:
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/line_layer.hpp

@@ -23,12 +23,6 @@ class LineLayer : public Layer {
     LineLayer(const std::string& layerID, const std::string& sourceID);
     ~LineLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Layout properties
 
     static PropertyValue<LineCapType> getDefaultLineCap();
@@ -129,6 +123,12 @@ class LineLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/raster_layer.hpp

@@ -20,12 +20,6 @@ class RasterLayer : public Layer {
     RasterLayer(const std::string& layerID, const std::string& sourceID);
     ~RasterLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Paint properties
 
     static PropertyValue<float> getDefaultRasterBrightnessMax();
@@ -86,6 +80,12 @@ class RasterLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

include/mbgl/style/layers/symbol_layer.hpp

@@ -22,12 +22,6 @@ class SymbolLayer : public Layer {
     SymbolLayer(const std::string& layerID, const std::string& sourceID);
     ~SymbolLayer() final;
 
-    // Dynamic properties
-    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
-
-    StyleProperty getProperty(const std::string& name) const final;
-    Value serialize() const final;
-
     // Layout properties
 
     static PropertyValue<bool> getDefaultIconAllowOverlap();
@@ -290,6 +284,12 @@ class SymbolLayer : public Layer {
     std::unique_ptr<Layer> cloneRef(const std::string& id) const final;
 
 protected:
+    // Dynamic properties
+    optional<conversion::Error> setPropertyInternal(const std::string& name, const conversion::Convertible& value) final;
+
+    StyleProperty getProperty(const std::string& name) const final;
+    Value serialize() const final;
+
     Mutable<Layer::Impl> mutableBaseImpl() const final;
 };
 

src/mbgl/gl/custom_layer.cpp

@@ -38,7 +38,7 @@ std::unique_ptr<Layer> CustomLayer::cloneRef(const std::string&) const {
 
 using namespace conversion;
 
-optional<Error> CustomLayer::setProperty(const std::string&, const Convertible&) {
+optional<Error> CustomLayer::setPropertyInternal(const std::string&, const Convertible&) {
     return Error { "layer doesn't support this property" };
 }
 

src/mbgl/layermanager/circle_layer_factory.cpp

@@ -17,11 +17,7 @@ std::unique_ptr<style::Layer> CircleLayerFactory::createLayer(const std::string&
         return nullptr;
     }
 
-    std::unique_ptr<style::Layer> layer = std::unique_ptr<style::Layer>(new style::CircleLayer(id, *source));
-    if (!initSourceLayerAndFilter(layer.get(), value)) {
-        return nullptr;
-    }
-    return layer;
+    return std::unique_ptr<style::Layer>(new style::CircleLayer(id, *source));
 }
 
 std::unique_ptr<Bucket> CircleLayerFactory::createBucket(const BucketParameters& parameters, const std::vector<Immutable<style::LayerProperties>>& layers) noexcept {

src/mbgl/layermanager/fill_extrusion_layer_factory.cpp

@@ -17,11 +17,7 @@ std::unique_ptr<style::Layer> FillExtrusionLayerFactory::createLayer(const std::
         return nullptr;
     }
 
-    std::unique_ptr<style::Layer> layer = std::unique_ptr<style::Layer>(new style::FillExtrusionLayer(id, *source));
-    if (!initSourceLayerAndFilter(layer.get(), value)) {
-        return nullptr;
-    }
-    return layer;
+    return std::unique_ptr<style::Layer>(new style::FillExtrusionLayer(id, *source));
 }
 
 std::unique_ptr<Layout> FillExtrusionLayerFactory::createLayout(const LayoutParameters& parameters,

src/mbgl/layermanager/fill_layer_factory.cpp

@@ -17,11 +17,7 @@ std::unique_ptr<style::Layer> FillLayerFactory::createLayer(const std::string& i
         return nullptr;
     }
 
-    std::unique_ptr<style::Layer> layer = std::unique_ptr<style::Layer>(new style::FillLayer(id, *source));
-    if (!initSourceLayerAndFilter(layer.get(), value)) {
-        return nullptr;
-    }
-    return layer;
+    return std::unique_ptr<style::Layer>(new style::FillLayer(id, *source));
 }
 
 std::unique_ptr<Layout>

src/mbgl/layermanager/heatmap_layer_factory.cpp

@@ -17,11 +17,7 @@ std::unique_ptr<style::Layer> HeatmapLayerFactory::createLayer(const std::string
         return nullptr;
     }
 
-    std::unique_ptr<style::Layer> layer = std::unique_ptr<style::Layer>(new style::HeatmapLayer(id, *source));
-    if (!initSourceLayerAndFilter(layer.get(), value)) {
-        return nullptr;
-    }
-    return layer;
+    return std::unique_ptr<style::Layer>(new style::HeatmapLayer(id, *source));
 }
 
 std::unique_ptr<Bucket> HeatmapLayerFactory::createBucket(const BucketParameters& parameters, const std::vector<Immutable<style::LayerProperties>>& layers) noexcept {