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

feature() -> getFeature() to clear up ambiguity / Linux compiler error

Browse Source
This commit is contained in:
Justin R. Miller
2015-03-17 19:25:32 -07:00
parent 02cccfe7e8
commit 93abf881fb
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/map/geometry_tile.hpp
View File

@@ -33,7 +33,7 @@ public:
class GeometryTileLayer : private util::noncopyable {
public:
virtual std::size_t featureCount() const = 0;
virtual util::ptr<const GeometryTileFeature> feature(std::size_t) const = 0;
virtual util::ptr<const GeometryTileFeature> getFeature(std::size_t) const = 0;
};
class GeometryTile : private util::noncopyable {

2
src/mbgl/map/live_tile.hpp
View File

@@ -29,7 +29,7 @@ public:
void addFeature(util::ptr<const LiveTileFeature>);
void removeFeature(util::ptr<const LiveTileFeature>);
std::size_t featureCount() const override { return features.size(); }
util::ptr<const GeometryTileFeature> feature(std::size_t i) const override { return features[i]; }
util::ptr<const GeometryTileFeature> getFeature(std::size_t i) const override { return features[i]; }
private:
std::vector<util::ptr<const LiveTileFeature>> features;

2
src/mbgl/map/tile_parser.cpp
View File

@@ -215,7 +215,7 @@ std::unique_ptr<Bucket> TileParser::createBucket(const StyleBucket &bucketDesc)
template <class Bucket>
void TileParser::addBucketGeometries(Bucket& bucket, const GeometryTileLayer& layer, const FilterExpression &filter) {
for (std::size_t i = 0; i < layer.featureCount(); i++) {
auto feature = layer.feature(i);
auto feature = layer.getFeature(i);
if (obsolete())
return;

2
src/mbgl/map/vector_tile.cpp
View File

@@ -159,7 +159,7 @@ VectorTileLayer::VectorTileLayer(pbf layer_pbf) {
}
}
util::ptr<const GeometryTileFeature> VectorTileLayer::feature(std::size_t i) const {
util::ptr<const GeometryTileFeature> VectorTileLayer::getFeature(std::size_t i) const {
return std::make_shared<VectorTileFeature>(features.at(i), *this);
}

2
src/mbgl/map/vector_tile.hpp
View File

@@ -31,7 +31,7 @@ public:
VectorTileLayer(pbf);
std::size_t featureCount() const override { return features.size(); }
util::ptr<const GeometryTileFeature> feature(std::size_t) const override;
util::ptr<const GeometryTileFeature> getFeature(std::size_t) const override;
private:
friend class VectorTile;

2
src/mbgl/renderer/symbol_bucket.cpp
View File

@@ -60,7 +60,7 @@ std::vector<SymbolFeature> SymbolBucket::processFeatures(const GeometryTileLayer
std::set<GlyphRange> ranges;
for (std::size_t i = 0; i < layer.featureCount(); i++) {
auto feature = layer.feature(i);
auto feature = layer.getFeature(i);
GeometryTileFeatureExtractor extractor(*feature);
if (!evaluate(filter, extractor))