diff options
Diffstat (limited to 'src/mbgl/map/source.hpp')
| -rw-r--r-- | src/mbgl/map/source.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/map/source.hpp b/src/mbgl/map/source.hpp index 661aa09e84..5f4bfe0c61 100644 --- a/src/mbgl/map/source.hpp +++ b/src/mbgl/map/source.hpp @@ -62,7 +62,7 @@ public: virtual void onTileLoadingFailed(std::exception_ptr error) = 0; }; - Source(); + Source(MapData&); ~Source(); void load(); @@ -72,8 +72,7 @@ public: // will return true if all the tiles were scheduled for updating of false if // they were not. shouldReparsePartialTiles must be set to "true" if there is // new data available that a tile in the "partial" state might be interested at. - bool update(MapData&, - const TransformState&, + bool update(const TransformState&, Style&, TexturePool&, bool shouldReparsePartialTiles); @@ -95,7 +94,7 @@ public: bool enabled; private: - void tileLoadingCompleteCallback(const TileID& normalized_id, const TransformState& transformState, bool collisionDebug); + void tileLoadingCompleteCallback(const TileID&, const TransformState&); void emitSourceLoaded(); void emitSourceLoadingFailed(const std::string& message); @@ -108,8 +107,7 @@ private: int32_t coveringZoomLevel(const TransformState&) const; std::forward_list<TileID> coveringTiles(const TransformState&) const; - TileData::State addTile(MapData&, - const TransformState&, + TileData::State addTile(const TransformState&, Style&, TexturePool&, const TileID&); @@ -119,6 +117,8 @@ private: double getZoom(const TransformState &state) const; + MapData& data; + bool loaded = false; // Stores the time when this source was most recently updated. @@ -126,7 +126,7 @@ private: std::map<TileID, std::unique_ptr<Tile>> tiles; std::vector<Tile*> tilePtrs; - std::map<TileID, std::weak_ptr<TileData>> tile_data; + std::map<TileID, std::weak_ptr<TileData>> tileDataMap; TileCache cache; std::unique_ptr<FileRequest> req; |