Rewrite annotation invalidation strategy
First, move style mutation code out of StyleParser and into AnnotationManager, coalescing it with the mutation code for shape layers. Second, allow AnnotationManager to keep track of stale tiles entirely internally. There's no reason to pass sets of TileIDs around. Third, correct the logic for invalidating the shape source. Since AnnotationManager does not track shape invalidations on a tile-by-tile basis, don't try to invalidate the shape source tile-by-tile. Fixes #1675 Fixes #2322 Fixes #2095
This commit is contained in:
@@ -348,8 +348,8 @@ uint32_t Map::addPointAnnotation(const PointAnnotation& annotation) {
|
||||
|
||||
AnnotationIDs Map::addPointAnnotations(const std::vector<PointAnnotation>& annotations) {
|
||||
auto result = data->getAnnotationManager()->addPointAnnotations(annotations, getMaxZoom());
|
||||
context->invoke(&MapContext::updateAnnotationTiles, result.first);
|
||||
return result.second;
|
||||
update(Update::Annotations);
|
||||
return result;
|
||||
}
|
||||
|
||||
uint32_t Map::addShapeAnnotation(const ShapeAnnotation& annotation) {
|
||||
@@ -358,8 +358,8 @@ uint32_t Map::addShapeAnnotation(const ShapeAnnotation& annotation) {
|
||||
|
||||
AnnotationIDs Map::addShapeAnnotations(const std::vector<ShapeAnnotation>& annotations) {
|
||||
auto result = data->getAnnotationManager()->addShapeAnnotations(annotations, getMaxZoom());
|
||||
context->invoke(&MapContext::updateAnnotationTiles, result.first);
|
||||
return result.second;
|
||||
update(Update::Annotations);
|
||||
return result;
|
||||
}
|
||||
|
||||
void Map::removeAnnotation(uint32_t annotation) {
|
||||
@@ -367,8 +367,8 @@ void Map::removeAnnotation(uint32_t annotation) {
|
||||
}
|
||||
|
||||
void Map::removeAnnotations(const std::vector<uint32_t>& annotations) {
|
||||
auto result = data->getAnnotationManager()->removeAnnotations(annotations, getMaxZoom());
|
||||
context->invoke(&MapContext::updateAnnotationTiles, result);
|
||||
data->getAnnotationManager()->removeAnnotations(annotations, getMaxZoom());
|
||||
update(Update::Annotations);
|
||||
}
|
||||
|
||||
std::vector<uint32_t> Map::getAnnotationsInBounds(const LatLngBounds& bounds, const AnnotationType& type) {
|
||||
|
||||
Reference in New Issue
Block a user