tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Avoid public geometry_tile_data.hpp include

Browse Source
This commit is contained in:
John Firebaugh
2017-02-21 13:42:40 -08:00
committed by Konstantin Käfer
parent a3c8fcda9c
commit 0be8309446
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbgl/style/function/composite_function.hpp
View File

@@ -73,8 +73,9 @@ public:
);
}
template <class Feature>
Range<T> evaluate(Range<InnerStops> coveringStops,
const GeometryTileFeature& feature,
const Feature& feature,
T finalDefaultValue) const {
optional<Value> v = feature.getValue(property);
if (!v) {

4
include/mbgl/style/function/source_function.hpp
View File

@@ -4,7 +4,6 @@
#include <mbgl/style/function/interval_stops.hpp>
#include <mbgl/style/function/categorical_stops.hpp>
#include <mbgl/style/function/identity_stops.hpp>
#include <mbgl/tile/geometry_tile_data.hpp>
#include <mbgl/util/interpolate.hpp>
#include <mbgl/util/variant.hpp>
@@ -34,7 +33,8 @@ public:
defaultValue(std::move(defaultValue_)) {
}
T evaluate(const GeometryTileFeature& feature, T finalDefaultValue) const {
template <class Feature>
T evaluate(const Feature& feature, T finalDefaultValue) const {
optional<Value> v = feature.getValue(property);
if (!v) {
return defaultValue.value_or(finalDefaultValue);