From 0fba70d5a8465499b0dce900e5aa74f7189e4594 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 31 May 2016 17:34:11 -0700
Subject: [all] Rationalize annotation API

---
 include/mbgl/map/map.hpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'include/mbgl/map')

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index f074a5ae54..a728e2dd62 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -23,8 +23,6 @@ namespace mbgl {
 class FileSource;
 class View;
 class SpriteImage;
-class PointAnnotation;
-class ShapeAnnotation;
 struct CameraOptions;
 struct AnimationOptions;
 
@@ -142,16 +140,9 @@ public:
     void removeAnnotationIcon(const std::string&);
     double getTopOffsetPixelsForAnnotationIcon(const std::string&);
 
-    AnnotationID addPointAnnotation(const PointAnnotation&);
-    AnnotationIDs addPointAnnotations(const std::vector<PointAnnotation>&);
-
-    AnnotationID addShapeAnnotation(const ShapeAnnotation&);
-    AnnotationIDs addShapeAnnotations(const std::vector<ShapeAnnotation>&);
-
-    void updatePointAnnotation(AnnotationID, const PointAnnotation&);
-
+    AnnotationID addAnnotation(const Annotation&);
+    void updateAnnotation(AnnotationID, const Annotation&);
     void removeAnnotation(AnnotationID);
-    void removeAnnotations(const AnnotationIDs&);
 
     AnnotationIDs getPointAnnotationsInBounds(const LatLngBounds&);
 
-- 
cgit v1.2.1