[core] Add support for $id key to filters
https://github.com/mapbox/mapbox-gl-style-spec/issues/391
This commit is contained in:
@@ -107,8 +107,10 @@ class Filter : public FilterBase {
|
||||
public:
|
||||
using FilterBase::FilterBase;
|
||||
|
||||
bool operator()(const Feature&) const;
|
||||
|
||||
template <class PropertyAccessor>
|
||||
bool operator()(FeatureType type, PropertyAccessor accessor) const;
|
||||
bool operator()(FeatureType type, optional<FeatureIdentifier> id, PropertyAccessor accessor) const;
|
||||
};
|
||||
|
||||
} // namespace style
|
||||
|
||||
@@ -26,6 +26,7 @@ template <class PropertyAccessor>
|
||||
class FilterEvaluator {
|
||||
public:
|
||||
const FeatureType featureType;
|
||||
const optional<FeatureIdentifier> featureIdentifier;
|
||||
const PropertyAccessor propertyAccessor;
|
||||
|
||||
bool operator()(const NullFilter&) const {
|
||||
@@ -123,9 +124,19 @@ public:
|
||||
|
||||
private:
|
||||
optional<Value> getValue(const std::string& key_) const {
|
||||
return key_ == "$type"
|
||||
? optional<Value>(uint64_t(featureType))
|
||||
: propertyAccessor(key_);
|
||||
if (key_ == "$type") {
|
||||
return optional<Value>(uint64_t(featureType));
|
||||
} else if (key_ == "$id") {
|
||||
if (featureIdentifier) {
|
||||
return FeatureIdentifier::visit(*featureIdentifier, [] (auto id) {
|
||||
return Value(std::move(id));
|
||||
});
|
||||
} else {
|
||||
return optional<Value>();
|
||||
}
|
||||
} else {
|
||||
return propertyAccessor(key_);
|
||||
}
|
||||
}
|
||||
|
||||
template <class Op>
|
||||
@@ -183,9 +194,18 @@ private:
|
||||
}
|
||||
};
|
||||
|
||||
inline bool Filter::operator()(const Feature& feature) const {
|
||||
return operator()(apply_visitor(ToFeatureType(), feature.geometry), feature.id, [&] (const std::string& key) -> optional<Value> {
|
||||
auto it = feature.properties.find(key);
|
||||
if (it == feature.properties.end())
|
||||
return {};
|
||||
return it->second;
|
||||
});
|
||||
}
|
||||
|
||||
template <class PropertyAccessor>
|
||||
bool Filter::operator()(FeatureType type, PropertyAccessor accessor) const {
|
||||
return FilterBase::visit(*this, FilterEvaluator<PropertyAccessor> { type, accessor });
|
||||
bool Filter::operator()(FeatureType type, optional<FeatureIdentifier> id, PropertyAccessor accessor) const {
|
||||
return FilterBase::visit(*this, FilterEvaluator<PropertyAccessor> { type, id, accessor });
|
||||
}
|
||||
|
||||
} // namespace style
|
||||
|
||||
@@ -10,10 +10,6 @@ using Value = mapbox::geometry::value;
|
||||
using NullValue = mapbox::geometry::null_value_t;
|
||||
using PropertyMap = mapbox::geometry::property_map;
|
||||
using FeatureIdentifier = mapbox::geometry::identifier;
|
||||
class Feature : public mapbox::geometry::feature<double> {
|
||||
public:
|
||||
Feature(geometry_type&& geometry_)
|
||||
: mapbox::geometry::feature<double> { std::move(geometry_) } {}
|
||||
};
|
||||
using Feature = mapbox::geometry::feature<double>;
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
Reference in New Issue
Block a user