From 67ee51360c1bf72d54544cecb8d8fd638ad4df14 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 27 Apr 2016 15:57:48 -0700 Subject: [PATCH] [core] Add Filter accessors --- include/mbgl/layer/background_layer.hpp | 1 + include/mbgl/layer/circle_layer.hpp | 4 ++++ include/mbgl/layer/fill_layer.hpp | 4 ++++ include/mbgl/layer/line_layer.hpp | 4 ++++ include/mbgl/layer/raster_layer.hpp | 1 + include/mbgl/layer/symbol_layer.hpp | 4 ++++ {src => include}/mbgl/style/filter.hpp | 0 {src => include}/mbgl/util/variant.hpp | 0 scripts/generate-style-code.js | 14 ++++++++++++++ src/mbgl/layer/circle_layer.cpp | 10 ++++++++++ src/mbgl/layer/fill_layer.cpp | 10 ++++++++++ src/mbgl/layer/line_layer.cpp | 10 ++++++++++ src/mbgl/layer/symbol_layer.cpp | 10 ++++++++++ 13 files changed, 72 insertions(+) rename {src => include}/mbgl/style/filter.hpp (100%) rename {src => include}/mbgl/util/variant.hpp (100%) diff --git a/include/mbgl/layer/background_layer.hpp b/include/mbgl/layer/background_layer.hpp index 211597f6e..bba16d383 100644 --- a/include/mbgl/layer/background_layer.hpp +++ b/include/mbgl/layer/background_layer.hpp @@ -3,6 +3,7 @@ #pragma once #include +#include #include namespace mbgl { diff --git a/include/mbgl/layer/circle_layer.hpp b/include/mbgl/layer/circle_layer.hpp index 28e5c2fa7..81f84d36a 100644 --- a/include/mbgl/layer/circle_layer.hpp +++ b/include/mbgl/layer/circle_layer.hpp @@ -3,6 +3,7 @@ #pragma once #include +#include #include 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 getCircleRadius() const; diff --git a/include/mbgl/layer/fill_layer.hpp b/include/mbgl/layer/fill_layer.hpp index 76c043957..10cf4f3bb 100644 --- a/include/mbgl/layer/fill_layer.hpp +++ b/include/mbgl/layer/fill_layer.hpp @@ -3,6 +3,7 @@ #pragma once #include +#include #include 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 getFillAntialias() const; diff --git a/include/mbgl/layer/line_layer.hpp b/include/mbgl/layer/line_layer.hpp index b43879911..aeec36328 100644 --- a/include/mbgl/layer/line_layer.hpp +++ b/include/mbgl/layer/line_layer.hpp @@ -3,6 +3,7 @@ #pragma once #include +#include #include #include @@ -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 getLineCap() const; diff --git a/include/mbgl/layer/raster_layer.hpp b/include/mbgl/layer/raster_layer.hpp index 5d747737c..7dc2532a2 100644 --- a/include/mbgl/layer/raster_layer.hpp +++ b/include/mbgl/layer/raster_layer.hpp @@ -3,6 +3,7 @@ #pragma once #include +#include #include namespace mbgl { diff --git a/include/mbgl/layer/symbol_layer.hpp b/include/mbgl/layer/symbol_layer.hpp index 233951520..006506b3d 100644 --- a/include/mbgl/layer/symbol_layer.hpp +++ b/include/mbgl/layer/symbol_layer.hpp @@ -3,6 +3,7 @@ #pragma once #include +#include #include #include @@ -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 getSymbolPlacement() const; diff --git a/src/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp similarity index 100% rename from src/mbgl/style/filter.hpp rename to include/mbgl/style/filter.hpp diff --git a/src/mbgl/util/variant.hpp b/include/mbgl/util/variant.hpp similarity index 100% rename from src/mbgl/util/variant.hpp rename to include/mbgl/util/variant.hpp diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index b26e0520f..02f904983 100644 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -77,6 +77,7 @@ const layerHpp = ejs.compile(`<% #pragma once #include +#include #include <% 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 diff --git a/src/mbgl/layer/circle_layer.cpp b/src/mbgl/layer/circle_layer.cpp index b1ca06dff..efc0e9488 100644 --- a/src/mbgl/layer/circle_layer.cpp +++ b/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 diff --git a/src/mbgl/layer/fill_layer.cpp b/src/mbgl/layer/fill_layer.cpp index f7a9418c0..77efaa61a 100644 --- a/src/mbgl/layer/fill_layer.cpp +++ b/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 diff --git a/src/mbgl/layer/line_layer.cpp b/src/mbgl/layer/line_layer.cpp index c77a5c3e8..e1a7d813a 100644 --- a/src/mbgl/layer/line_layer.cpp +++ b/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 LineLayer::getLineCap() const { diff --git a/src/mbgl/layer/symbol_layer.cpp b/src/mbgl/layer/symbol_layer.cpp index 6152d7104..66d018b58 100644 --- a/src/mbgl/layer/symbol_layer.cpp +++ b/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 SymbolLayer::getSymbolPlacement() const {