[core] Annotations refactor

.gitignore

@@ -25,6 +25,7 @@
 /test/fixtures/api/1.png
 /test/fixtures/api/2.png
 /test/fixtures/database/*.db
+/test/output
 /include/mbgl/shader/shaders.hpp
 /src/shader/shaders_gl.cpp
 /src/shader/shaders_gles2.cpp

include/mbgl/map/update.hpp

@@ -13,6 +13,7 @@ enum class Update : uint32_t {
     Zoom                      = 1 << 4,
     RenderStill               = 1 << 5,
     Repaint                   = 1 << 6,
+    Annotations               = 1 << 7,
 };
 
 inline Update operator| (const Update& lhs, const Update& rhs) {

src/mbgl/annotation/annotation_manager.hpp

@@ -0,0 +1,68 @@
+#ifndef MBGL_MAP_ANNOTATIONS
+#define MBGL_MAP_ANNOTATIONS
+
+#include <mbgl/map/map.hpp>
+#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/map/tile_id.hpp>
+#include <mbgl/style/style_properties.hpp>
+#include <mbgl/style/types.hpp>
+#include <mbgl/util/geo.hpp>
+#include <mbgl/util/geojsonvt/geojsonvt.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/vec.hpp>
+
+#include <string>
+#include <vector>
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace mbgl {
+
+class Annotation;
+class PointAnnotation;
+class ShapeAnnotation;
+class LiveTile;
+class Style;
+
+using GeoJSONVT = mapbox::util::geojsonvt::GeoJSONVT;
+
+class AnnotationManager : private util::noncopyable {
+public:
+    AnnotationManager();
+    ~AnnotationManager();
+
+    void setDefaultPointAnnotationSymbol(const std::string& symbol);
+
+    AnnotationIDs addPointAnnotations(const std::vector<PointAnnotation>&, const uint8_t maxZoom);
+    AnnotationIDs addShapeAnnotations(const std::vector<ShapeAnnotation>&, const uint8_t maxZoom);
+    void removeAnnotations(const AnnotationIDs&, const uint8_t maxZoom);
+
+    AnnotationIDs getAnnotationsInBounds(const LatLngBounds&, const uint8_t maxZoom, const AnnotationType& = AnnotationType::Any) const;
+    LatLngBounds getBoundsForAnnotations(const AnnotationIDs&) const;
+
+    void updateStyle(Style&);
+    const LiveTile* getTile(const TileID& id);
+
+    static const std::string PointSourceID;
+    static const std::string ShapeSourceID;
+
+private:
+    inline uint32_t nextID();
+    static vec2<double> projectPoint(const LatLng& point);
+
+    uint32_t addShapeAnnotation(const ShapeAnnotation&, const uint8_t maxZoom);
+    uint32_t addPointAnnotation(const PointAnnotation&, const uint8_t maxZoom);
+
+    std::string defaultPointAnnotationSymbol;
+    std::unordered_map<uint32_t, std::unique_ptr<Annotation>> annotations;
+    std::vector<uint32_t> orderedShapeAnnotations;
+    std::unordered_map<TileID, std::pair<std::unordered_set<uint32_t>, std::unique_ptr<LiveTile>>, TileID::Hash> tiles;
+    std::unordered_map<uint32_t, std::unique_ptr<GeoJSONVT>> shapeTilers;
+    std::unordered_set<TileID, TileID::Hash> stalePointTileIDs;
+    uint32_t nextID_ = 0;
+};
+
+}
+
+#endif

src/mbgl/map/live_tile_data.cpp

@@ -1,4 +1,3 @@
-#include <mbgl/map/annotation.hpp>
 #include <mbgl/map/live_tile_data.hpp>
 #include <mbgl/map/live_tile.hpp>
 #include <mbgl/style/style_layer.hpp>
@@ -13,7 +12,7 @@
 using namespace mbgl;
 
 LiveTileData::LiveTileData(const TileID& id_,
-                           const LiveTile* tile,
+                           const LiveTile* tile_,
                            Style& style_,
                            const SourceInfo& source_,
                            std::function<void()> callback)
@@ -25,15 +24,28 @@ LiveTileData::LiveTileData(const TileID& id_,
                  style_,
                  style_.layers,
                  state,
-                 std::make_unique<CollisionTile>(0, 0, false)) {
+                 std::make_unique<CollisionTile>(0, 0, false)),
+      tile(tile_) {
     state = State::loaded;
 
     if (!tile) {
         state = State::parsed;
         return;
     }
 
+    reparse(callback);
+}
+
+bool LiveTileData::reparse(std::function<void()> callback) {
+    if (parsing || (state != State::loaded && state != State::partial)) {
+        return false;
+    }
+
+    parsing = true;
+
     workRequest = worker.parseLiveTile(tileWorker, *tile, [this, callback] (TileParseResult result) {
+        parsing = false;
+
         if (result.is<State>()) {
             state = result.get<State>();
         } else {
@@ -43,6 +55,8 @@ LiveTileData::LiveTileData(const TileID& id_,
 
         callback();
     });
+
+    return true;
 }
 
 LiveTileData::~LiveTileData() {

src/mbgl/map/live_tile_data.hpp

@@ -20,13 +20,17 @@ class LiveTileData : public TileData {
                  std::function<void ()> callback);
     ~LiveTileData();
 
+    bool reparse(std::function<void ()> callback) override;
+
     void cancel() override;
     Bucket* getBucket(const StyleLayer&) override;
 
 private:
     Worker& worker;
     TileWorker tileWorker;
     std::unique_ptr<WorkRequest> workRequest;
+    bool parsing = false;
+    const LiveTile* tile;
 };
 
 }

src/mbgl/map/map.cpp

@@ -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,17 +358,17 @@ 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) {
     removeAnnotations({ 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) {