From 31a216459c564ff7771b0e30837978dbd298de51 Mon Sep 17 00:00:00 2001 From: Asheem Mamoowala Date: Wed, 29 Nov 2017 20:18:40 -0800 Subject: [PATCH] [core] Mark custom geometry tiles stale without clearing data --- src/mbgl/style/custom_tile_loader.cpp | 20 ++++++++++--------- src/mbgl/style/custom_tile_loader.hpp | 10 +++++----- .../style/sources/custom_geometry_source.cpp | 2 +- src/mbgl/tile/custom_geometry_tile.cpp | 15 +++++++++++--- src/mbgl/tile/custom_geometry_tile.hpp | 14 +++++++++++-- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/mbgl/style/custom_tile_loader.cpp b/src/mbgl/style/custom_tile_loader.cpp index d5bebf008..af091be5c 100644 --- a/src/mbgl/style/custom_tile_loader.cpp +++ b/src/mbgl/style/custom_tile_loader.cpp @@ -1,4 +1,5 @@ #include +#include namespace mbgl { namespace style { @@ -8,23 +9,23 @@ CustomTileLoader::CustomTileLoader(const TileFunction& fetchTileFn, const TileFu cancelTileFunction = cancelTileFn; } -void CustomTileLoader::fetchTile(const OverscaledTileID& tileID, ActorRef callbackRef) { +void CustomTileLoader::fetchTile(const OverscaledTileID& tileID, ActorRef tileRef) { auto cachedTileData = dataCache.find(tileID.canonical); if (cachedTileData != dataCache.end()) { - callbackRef.invoke(&SetTileDataFunction::operator(), *(cachedTileData->second)); + tileRef.invoke(&CustomGeometryTile::setTileData, *(cachedTileData->second)); } auto tileCallbacks = tileCallbackMap.find(tileID.canonical); if (tileCallbacks == tileCallbackMap.end()) { - auto tuple = std::make_tuple(tileID.overscaledZ, tileID.wrap, callbackRef); + auto tuple = std::make_tuple(tileID.overscaledZ, tileID.wrap, tileRef); tileCallbackMap.insert({ tileID.canonical, std::vector(1, tuple) }); } else { for (auto iter = tileCallbacks->second.begin(); iter != tileCallbacks->second.end(); iter++) { if (std::get<0>(*iter) == tileID.overscaledZ && std::get<1>(*iter) == tileID.wrap ) { - std::get<2>(*iter) = callbackRef; + std::get<2>(*iter) = tileRef; return; } } - tileCallbacks->second.emplace_back(std::make_tuple(tileID.overscaledZ, tileID.wrap, callbackRef)); + tileCallbacks->second.emplace_back(std::make_tuple(tileID.overscaledZ, tileID.wrap, tileRef)); } if (cachedTileData == dataCache.end()) { invokeTileFetch(tileID.canonical); @@ -57,11 +58,12 @@ void CustomTileLoader::setTileData(const CanonicalTileID& tileID, const GeoJSON& auto iter = tileCallbackMap.find(tileID); if (iter == tileCallbackMap.end()) return; - dataCache[tileID] = std::make_unique(std::move(data));; + auto dataPtr = std::make_unique(std::move(data)); for (auto tuple : iter->second) { auto actor = std::get<2>(tuple); - actor.invoke(&SetTileDataFunction::operator(), data); + actor.invoke(&CustomGeometryTile::setTileData, *dataPtr); } + dataCache[tileID] = std::move(dataPtr); } void CustomTileLoader::invalidateTile(const CanonicalTileID& tileID) { @@ -69,7 +71,7 @@ void CustomTileLoader::invalidateTile(const CanonicalTileID& tileID) { if (tileCallbacks == tileCallbackMap.end()) { return; } for (auto iter = tileCallbacks->second.begin(); iter != tileCallbacks->second.end(); iter++) { auto actor = std::get<2>(*iter); - actor.invoke(&SetTileDataFunction::operator(), mapbox::geojson::feature_collection()); + actor.invoke(&CustomGeometryTile::invalidateTileData); invokeTileCancel(tileID); } tileCallbackMap.erase(tileCallbacks); @@ -82,7 +84,7 @@ void CustomTileLoader::invalidateRegion(const LatLngBounds& bounds, Rangesecond.begin(); iter != idtuple->second.end(); iter++) { auto actor = std::get<2>(*iter); - actor.invoke(&SetTileDataFunction::operator(), mapbox::geojson::feature_collection()); + actor.invoke(&CustomGeometryTile::invalidateTileData); invokeTileCancel(idtuple->first); dataCache.erase(idtuple->first); } diff --git a/src/mbgl/style/custom_tile_loader.hpp b/src/mbgl/style/custom_tile_loader.hpp index 149da69cf..335d8c614 100644 --- a/src/mbgl/style/custom_tile_loader.hpp +++ b/src/mbgl/style/custom_tile_loader.hpp @@ -2,25 +2,25 @@ #include #include -#include #include #include #include namespace mbgl { -namespace style { -using SetTileDataFunction = std::function; +class CustomGeometryTile; + +namespace style { class CustomTileLoader : private util::noncopyable { public: - using OverscaledIDFunctionTuple = std::tuple>; + using OverscaledIDFunctionTuple = std::tuple>; CustomTileLoader(const TileFunction& fetchTileFn, const TileFunction& cancelTileFn); - void fetchTile(const OverscaledTileID& tileID, ActorRef callbackRef); + void fetchTile(const OverscaledTileID& tileID, ActorRef tileRef); void cancelTile(const OverscaledTileID& tileID); void removeTile(const OverscaledTileID& tileID); diff --git a/src/mbgl/style/sources/custom_geometry_source.cpp b/src/mbgl/style/sources/custom_geometry_source.cpp index ab46843d3..b37490a5c 100644 --- a/src/mbgl/style/sources/custom_geometry_source.cpp +++ b/src/mbgl/style/sources/custom_geometry_source.cpp @@ -40,6 +40,6 @@ void CustomGeometrySource::invalidateTile(const CanonicalTileID& tileID) { void CustomGeometrySource::invalidateRegion(const LatLngBounds& bounds) { loader->invoke(&CustomTileLoader::invalidateRegion, bounds, impl().getZoomRange()); } - + } // namespace style } // namespace mbgl diff --git a/src/mbgl/tile/custom_geometry_tile.cpp b/src/mbgl/tile/custom_geometry_tile.cpp index b608d90d8..7c8a85c4a 100644 --- a/src/mbgl/tile/custom_geometry_tile.cpp +++ b/src/mbgl/tile/custom_geometry_tile.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include @@ -19,7 +21,8 @@ CustomGeometryTile::CustomGeometryTile(const OverscaledTileID& overscaledTileID, necessity(TileNecessity::Optional), options(options_), loader(loader_), - actor(*Scheduler::GetCurrent(), std::bind(&CustomGeometryTile::setTileData, this, std::placeholders::_1)) { + mailbox(std::make_shared(*Scheduler::GetCurrent())), + actorRef(*this, mailbox) { } CustomGeometryTile::~CustomGeometryTile() { @@ -43,14 +46,20 @@ void CustomGeometryTile::setTileData(const GeoJSON& geoJSON) { setData(std::make_unique(std::move(featureData))); } +void CustomGeometryTile::invalidateTileData() { + stale = true; + observer->onTileChanged(*this); +} + //Fetching tile data for custom sources is assumed to be an expensive operation. // Only required tiles make fetchTile requests. Attempt to cancel a tile // that is no longer required. void CustomGeometryTile::setNecessity(TileNecessity newNecessity) { - if (newNecessity != necessity) { + if (newNecessity != necessity || stale ) { necessity = newNecessity; if (necessity == TileNecessity::Required) { - loader.invoke(&style::CustomTileLoader::fetchTile, id, actor.self()); + loader.invoke(&style::CustomTileLoader::fetchTile, id, actorRef); + stale = false; } else if (!isRenderable()) { loader.invoke(&style::CustomTileLoader::cancelTile, id); } diff --git a/src/mbgl/tile/custom_geometry_tile.hpp b/src/mbgl/tile/custom_geometry_tile.hpp index 66cc412e8..1df44e6b2 100644 --- a/src/mbgl/tile/custom_geometry_tile.hpp +++ b/src/mbgl/tile/custom_geometry_tile.hpp @@ -1,13 +1,19 @@ #pragma once #include +#include #include -#include +#include +#include namespace mbgl { class TileParameters; +namespace style { +class CustomTileLoader; +} // namespace style + class CustomGeometryTile: public GeometryTile { public: CustomGeometryTile(const OverscaledTileID&, @@ -16,7 +22,9 @@ public: const style::CustomGeometrySource::TileOptions, ActorRef loader); ~CustomGeometryTile() override; + void setTileData(const GeoJSON& data); + void invalidateTileData(); void setNecessity(TileNecessity) final; @@ -25,10 +33,12 @@ public: const SourceQueryOptions&) override; private: + bool stale = true; TileNecessity necessity; const style::CustomGeometrySource::TileOptions options; ActorRef loader; - Actor actor; + std::shared_ptr mailbox; + ActorRef actorRef; }; } // namespace mbgl