[core] Add Filter accessors

This commit is contained in:
John Firebaugh
2016-04-27 15:57:48 -07:00
parent cadc617c76
commit 67ee51360c
13 changed files with 72 additions and 0 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -1,103 +0,0 @@
#pragma once
#include <mbgl/util/variant.hpp>
#include <mbgl/util/feature.hpp>
#include <string>
#include <vector>
namespace mbgl {
typedef variant<
class NullFilter,
class EqualsFilter,
class NotEqualsFilter,
class LessThanFilter,
class LessThanEqualsFilter,
class GreaterThanFilter,
class GreaterThanEqualsFilter,
class InFilter,
class NotInFilter,
class AnyFilter,
class AllFilter,
class NoneFilter,
class HasFilter,
class NotHasFilter
> Filter;
class NullFilter {};
class EqualsFilter {
public:
std::string key;
Value value;
};
class NotEqualsFilter {
public:
std::string key;
Value value;
};
class LessThanFilter {
public:
std::string key;
Value value;
};
class LessThanEqualsFilter {
public:
std::string key;
Value value;
};
class GreaterThanFilter {
public:
std::string key;
Value value;
};
class GreaterThanEqualsFilter {
public:
std::string key;
Value value;
};
class InFilter {
public:
std::string key;
std::vector<Value> values;
};
class NotInFilter {
public:
std::string key;
std::vector<Value> values;
};
class AnyFilter {
public:
std::vector<Filter> filters;
};
class AllFilter {
public:
std::vector<Filter> filters;
};
class NoneFilter {
public:
std::vector<Filter> filters;
};
class HasFilter {
public:
std::string key;
};
class NotHasFilter {
public:
std::string key;
};
} // namespace mbgl

View File

@@ -1,10 +0,0 @@
#pragma once
#include <mapbox/variant.hpp>
namespace mbgl {
template <typename... T>
using variant = mapbox::util::variant<T...>;
} // namespace mbgl