1 files changed, 63 insertions, 6 deletions

diff --git a/src/mbgl/map/annotation.hpp b/src/mbgl/map/annotation.hpp
index 0c9a078e57..213ff608a0 100644
--- a/src/mbgl/map/annotation.hpp
+++ b/src/mbgl/map/annotation.hpp
@@ -1,8 +1,13 @@
 #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>
 
@@ -18,35 +23,87 @@ namespace mbgl {
 class Annotation;
 class Map;
 class LiveTile;
+class LiveTileFeature;
 class MapData;
 
-using AnnotationIDs = std::vector<uint32_t>;
+using AnnotationsProperties = std::unordered_map<std::string, std::vector<std::string>>;
+
+using GeoJSONVT = mapbox::util::geojsonvt::GeoJSONVT;
+
+class Annotation : private util::noncopyable {
+    friend class AnnotationManager;
+public:
+    Annotation(AnnotationType, const AnnotationSegments&, const StyleProperties&);
+
+public:
+    const StyleProperties styleProperties;
+
+private:
+    LatLng getPoint() const;
+    LatLngBounds getBounds() const { return bounds; }
+
+private:
+    const AnnotationType type = AnnotationType::Point;
+    const AnnotationSegments geometry;
+    std::unordered_map<TileID, std::weak_ptr<const LiveTileFeature>, TileID::Hash> tilePointFeatures;
+    const LatLngBounds bounds;
+};
 
 class AnnotationManager : private util::noncopyable {
 public:
     AnnotationManager();
     ~AnnotationManager();
 
+    void markStaleTiles(std::unordered_set<TileID, TileID::Hash>);
+    std::unordered_set<TileID, TileID::Hash> resetStaleTiles();
+
     void setDefaultPointAnnotationSymbol(const std::string& symbol);
-    std::pair<std::vector<TileID>, AnnotationIDs> addPointAnnotations(
-        const std::vector<LatLng>&, const std::vector<std::string>& symbols, const MapData&);
-    std::vector<TileID> removeAnnotations(const AnnotationIDs&, const MapData&);
-    AnnotationIDs getAnnotationsInBounds(const LatLngBounds&, const MapData&) const;
+    std::pair<std::unordered_set<TileID, TileID::Hash>, AnnotationIDs> addPointAnnotations(
+        const AnnotationSegment&,
+        const AnnotationsProperties&,
+        const MapData&);
+    std::pair<std::unordered_set<TileID, TileID::Hash>, AnnotationIDs> addShapeAnnotations(
+        const std::vector<AnnotationSegments>&,
+        const std::vector<StyleProperties>&,
+        const AnnotationsProperties&,
+        const MapData&);
+    std::unordered_set<TileID, TileID::Hash> removeAnnotations(const AnnotationIDs&, const MapData&);
+    AnnotationIDs getOrderedShapeAnnotations() const { return orderedShapeAnnotations; }
+    const StyleProperties getAnnotationStyleProperties(uint32_t) const;
+    AnnotationIDs getAnnotationsInBounds(const LatLngBounds&, const MapData&, const AnnotationType& = AnnotationType::Any) const;
     LatLngBounds getBoundsForAnnotations(const AnnotationIDs&) const;
 
     const LiveTile* getTile(const TileID& id);
 
-    static const std::string layerID;
+    static const std::string PointLayerID;
+    static const std::string ShapeLayerID;
 
 private:
     inline uint32_t nextID();
     static vec2<double> projectPoint(const LatLng& point);
+    std::pair<std::unordered_set<TileID, TileID::Hash>, AnnotationIDs> addAnnotations(
+        const AnnotationType,
+        const std::vector<AnnotationSegments>&,
+        const std::vector<StyleProperties>&,
+        const AnnotationsProperties&,
+        const MapData&);
+    std::unordered_set<TileID, TileID::Hash> addTileFeature(
+        const uint32_t annotationID,
+        const AnnotationSegments&,
+        const std::vector<std::vector<vec2<double>>>& projectedFeature,
+        const AnnotationType&,
+        const StyleProperties&,
+        const std::unordered_map<std::string, std::string>& featureProperties,
+        const uint8_t maxZoom);
 
 private:
     mutable std::mutex mtx;
     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> staleTiles;
     uint32_t nextID_ = 0;
 };