diff options
Diffstat (limited to 'include/mbgl/style/layers')
-rw-r--r-- | include/mbgl/style/layers/background_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/circle_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/fill_extrusion_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/fill_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/heatmap_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/hillshade_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/layer.hpp.ejs | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/line_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/raster_layer.hpp | 12 | ||||
-rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 12 |
10 files changed, 60 insertions, 60 deletions
diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index 7f48618346..9fdfd3ac92 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -20,12 +20,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index 1ad16cd033..dd5b674002 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -20,12 +20,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index ef692e5708..ca33c6c3f8 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -20,12 +20,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 174758a78e..4a1f09cca0 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -20,12 +20,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp index 0b740c470b..588aaa81df 100644 --- a/include/mbgl/style/layers/heatmap_layer.hpp +++ b/include/mbgl/style/layers/heatmap_layer.hpp @@ -21,12 +21,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp index 184e7c390d..c501e80b8d 100644 --- a/include/mbgl/style/layers/hillshade_layer.hpp +++ b/include/mbgl/style/layers/hillshade_layer.hpp @@ -20,12 +20,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index aecbe25601..9cdd74737a 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/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; }; diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index cef18d9fa8..2186f16669 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -23,12 +23,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index b1aa3a65b9..df82c93660 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -20,12 +20,6 @@ public: 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 @@ 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; }; diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 2cffd2294a..40d16dedf3 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -22,12 +22,6 @@ public: 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 @@ 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; }; |