[core] Add Filter accessors

include/mbgl/layer/background_layer.hpp

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
 
 namespace mbgl {

include/mbgl/layer/circle_layer.hpp

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
 
 namespace mbgl {
@@ -18,6 +19,9 @@ public:
     const std::string& getSourceID() const;
     const std::string& getSourceLayer() const;
 
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
     // Paint properties
 
     PropertyValue<float> getCircleRadius() const;

include/mbgl/layer/fill_layer.hpp

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
 
 namespace mbgl {
@@ -18,6 +19,9 @@ public:
     const std::string& getSourceID() const;
     const std::string& getSourceLayer() const;
 
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
     // Paint properties
 
     PropertyValue<bool> getFillAntialias() const;

include/mbgl/layer/line_layer.hpp

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
 
 #include <vector>
@@ -20,6 +21,9 @@ public:
     const std::string& getSourceID() const;
     const std::string& getSourceLayer() const;
 
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
     // Layout properties
 
     PropertyValue<LineCapType> getLineCap() const;

include/mbgl/layer/raster_layer.hpp

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
 
 namespace mbgl {

include/mbgl/layer/symbol_layer.hpp

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
 
 #include <vector>
@@ -20,6 +21,9 @@ public:
     const std::string& getSourceID() const;
     const std::string& getSourceLayer() const;
 
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
     // Layout properties
 
     PropertyValue<SymbolPlacementType> getSymbolPlacement() const;

scripts/generate-style-code.js

@@ -77,6 +77,7 @@ const layerHpp = ejs.compile(`<%
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
 
 <% if (type === 'line' || type === 'symbol') { -%>
@@ -103,6 +104,9 @@ public:
     const std::string& getSourceID() const;
     const std::string& getSourceLayer() const;
 
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
 <% } -%>
 <% if (layoutProperties.length) { -%>
     // Layout properties
@@ -191,6 +195,16 @@ const std::string& <%- camelize(type) %>Layer::getSourceID() const {
 const std::string& <%- camelize(type) %>Layer::getSourceLayer() const {
     return impl->sourceLayer;
 }
+
+// Filter
+
+void <%- camelize(type) %>Layer::setFilter(const Filter& filter) {
+    impl->filter = filter;
+}
+
+const Filter& <%- camelize(type) %>Layer::getFilter() const {
+    return impl->filter;
+}
 <% } -%>
 
 // Layout properties

src/mbgl/layer/circle_layer.cpp

@@ -37,6 +37,16 @@ const std::string& CircleLayer::getSourceLayer() const {
     return impl->sourceLayer;
 }
 
+// Filter
+
+void CircleLayer::setFilter(const Filter& filter) {
+    impl->filter = filter;
+}
+
+const Filter& CircleLayer::getFilter() const {
+    return impl->filter;
+}
+
 // Layout properties
 
 

src/mbgl/layer/fill_layer.cpp

@@ -37,6 +37,16 @@ const std::string& FillLayer::getSourceLayer() const {
     return impl->sourceLayer;
 }
 
+// Filter
+
+void FillLayer::setFilter(const Filter& filter) {
+    impl->filter = filter;
+}
+
+const Filter& FillLayer::getFilter() const {
+    return impl->filter;
+}
+
 // Layout properties
 
 

src/mbgl/layer/line_layer.cpp

@@ -37,6 +37,16 @@ const std::string& LineLayer::getSourceLayer() const {
     return impl->sourceLayer;
 }
 
+// Filter
+
+void LineLayer::setFilter(const Filter& filter) {
+    impl->filter = filter;
+}
+
+const Filter& LineLayer::getFilter() const {
+    return impl->filter;
+}
+
 // Layout properties
 
 PropertyValue<LineCapType> LineLayer::getLineCap() const {

src/mbgl/layer/symbol_layer.cpp

@@ -37,6 +37,16 @@ const std::string& SymbolLayer::getSourceLayer() const {
     return impl->sourceLayer;
 }
 
+// Filter
+
+void SymbolLayer::setFilter(const Filter& filter) {
+    impl->filter = filter;
+}
+
+const Filter& SymbolLayer::getFilter() const {
+    return impl->filter;
+}
+
 // Layout properties
 
 PropertyValue<SymbolPlacementType> SymbolLayer::getSymbolPlacement() const {