044454417b
Layers are added and removed dynamically on the Map thread when we use shape annotations and we are iterating style.layers on the Worker thread without any lock. Now when we create a [Live|Vector]TileData at the Map thread we give it a layers list (instead of the Style) and [Live|Vector]TileData will ultimately make a copy of this list (on the Map thread, so no concurrency with adding shape annotations). The copy should be relatively cheap because we are using a shared pointer for storing the layers on the list.
60 lines
2.1 KiB
C++
60 lines
2.1 KiB
C++
#include <mbgl/map/annotation.hpp>
|
|
#include <mbgl/map/live_tile_data.hpp>
|
|
#include <mbgl/map/live_tile.hpp>
|
|
#include <mbgl/map/tile_parser.hpp>
|
|
#include <mbgl/map/source.hpp>
|
|
#include <mbgl/map/vector_tile.hpp>
|
|
#include <mbgl/platform/log.hpp>
|
|
|
|
using namespace mbgl;
|
|
|
|
LiveTileData::LiveTileData(const TileID& id_,
|
|
AnnotationManager& annotationManager_,
|
|
const std::vector<util::ptr<StyleLayer>>& layers_,
|
|
Worker& workers_,
|
|
GlyphAtlas& glyphAtlas_,
|
|
GlyphStore& glyphStore_,
|
|
SpriteAtlas& spriteAtlas_,
|
|
util::ptr<Sprite> sprite_,
|
|
const SourceInfo& source_,
|
|
float angle_,
|
|
bool collisionDebug_)
|
|
: VectorTileData::VectorTileData(id_, layers_, workers_, glyphAtlas_, glyphStore_,
|
|
spriteAtlas_, sprite_, source_, angle_, collisionDebug_),
|
|
annotationManager(annotationManager_) {
|
|
// live features are always ready
|
|
setState(State::loaded);
|
|
}
|
|
|
|
LiveTileData::~LiveTileData() {
|
|
// Cancel in most derived class destructor so that worker tasks are joined before
|
|
// any member data goes away.
|
|
cancel();
|
|
}
|
|
|
|
void LiveTileData::parse() {
|
|
if (getState() != State::loaded) {
|
|
return;
|
|
}
|
|
|
|
const LiveTile* tile = annotationManager.getTile(id);
|
|
|
|
if (tile) {
|
|
try {
|
|
// Parsing creates state that is encapsulated in TileParser. While parsing,
|
|
// the TileParser object writes results into this objects. All other state
|
|
// is going to be discarded afterwards.
|
|
TileParser parser(*tile, *this, layers, glyphAtlas, glyphStore, spriteAtlas, sprite);
|
|
parser.parse();
|
|
} catch (const std::exception& ex) {
|
|
Log::Error(Event::ParseTile, "Live-parsing [%d/%d/%d] failed: %s", id.z, id.x, id.y, ex.what());
|
|
setState(State::obsolete);
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (getState() != State::obsolete) {
|
|
setState(State::parsed);
|
|
}
|
|
}
|