updateAnnotationTiles is called within invoke*

This commit is contained in:
John Firebaugh
2015-04-20 18:18:44 -07:00
parent 025eb013d7
commit fc9b958bb8
2 changed files with 2 additions and 4 deletions

View File

@@ -298,7 +298,7 @@ void MapContext::updateTiles() {
}
void MapContext::updateAnnotationTiles(const std::vector<TileID>& ids) {
assert(Environment::currentlyOn(ThreadType::Main));
assert(Environment::currentlyOn(ThreadType::Map));
if (!style) return;
for (const auto &source : style->sources) {
if (source->info.type == SourceType::Annotations) {

View File

@@ -57,13 +57,11 @@ public:
return promise.get_future().get();
}
void updateAnnotationTiles(const std::vector<TileID>& ids);
double getTopOffsetPixelsForAnnotationSymbol(const std::string& symbol);
void setSourceTileCacheSize(size_t size);
void onLowMemory();
// TODO: Make this private
public: void updateAnnotationTiles(const std::vector<TileID>& ids);
// These can only be called from the Map thread.
private:
// Checks if render thread needs to pause