diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-30 13:58:59 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-05 19:38:08 -0700 |
commit | 74af076d405a089fac70a47e41fe92d04d97fc50 (patch) | |
tree | 29e4a76538da9a9455f711a25e7d5ddc1dece625 /src/mbgl/tile | |
parent | 1cf46d93b944095726396acf84649519e2fd96ad (diff) | |
download | qtlocation-mapboxgl-74af076d405a089fac70a47e41fe92d04d97fc50.tar.gz |
[core] Split RenderStyle from Style
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/tile/tile.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/tile.hpp | 7 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 1a60549eb0..32fb6148c2 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -176,7 +176,7 @@ void GeometryTile::queryRenderedFeatures( std::unordered_map<std::string, std::vector<Feature>>& result, const GeometryCoordinates& queryGeometry, const TransformState& transformState, - const style::Style& style, + const RenderStyle& style, const RenderedQueryOptions& options) { if (!featureIndex || !data) return; diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 7fd8d8bc77..c6d0bb35ec 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -19,6 +19,7 @@ namespace mbgl { class GeometryTileData; class FeatureIndex; class CollisionTile; +class RenderStyle; class RenderLayer; class SourceQueryOptions; class TileParameters; @@ -49,7 +50,7 @@ public: std::unordered_map<std::string, std::vector<Feature>>& result, const GeometryCoordinates& queryGeometry, const TransformState&, - const style::Style&, + const RenderStyle&, const RenderedQueryOptions& options) override; void querySourceFeatures( diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp index ec8fe66eec..5080d42933 100644 --- a/src/mbgl/tile/tile.cpp +++ b/src/mbgl/tile/tile.cpp @@ -33,7 +33,7 @@ void Tile::queryRenderedFeatures( std::unordered_map<std::string, std::vector<Feature>>&, const GeometryCoordinates&, const TransformState&, - const style::Style&, + const RenderStyle&, const RenderedQueryOptions&) {} void Tile::querySourceFeatures( diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index 91ed4aadaa..bddae5138b 100644 --- a/src/mbgl/tile/tile.hpp +++ b/src/mbgl/tile/tile.hpp @@ -22,13 +22,10 @@ class DebugBucket; class TransformState; class TileObserver; class PlacementConfig; +class RenderStyle; class RenderedQueryOptions; class SourceQueryOptions; -namespace style { -class Style; -} // namespace style - class Tile : private util::noncopyable { public: Tile(OverscaledTileID); @@ -57,7 +54,7 @@ public: std::unordered_map<std::string, std::vector<Feature>>& result, const GeometryCoordinates& queryGeometry, const TransformState&, - const style::Style&, + const RenderStyle&, const RenderedQueryOptions& options); virtual void querySourceFeatures( |