Revert "use array of structs rather than parallel arrays for annotations"

This reverts commit 2435c1ad2603432186ee61eb4c423244a088bc51 (#1710), which needs to be revisited in light of #1655, which is a much higher priority at the moment.

2 files changed, 3 insertions, 25 deletions

diff --git a/include/mbgl/annotation/point_annotation.hpp b/include/mbgl/annotation/point_annotation.hpp
deleted file mode 100644
index 17b6fe5369..0000000000
--- a/include/mbgl/annotation/point_annotation.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef MBGL_ANNOTATION_POINT_ANNOTATION
-#define MBGL_ANNOTATION_POINT_ANNOTATION
-
-#include <mbgl/util/geo.hpp>
-
-#include <string>
-
-namespace mbgl {
-
-class PointAnnotation {
-public:
-    inline PointAnnotation(const LatLng& position_, const std::string& icon_ = "")
-        : position(position_), icon(icon_) {
-    }
-
-    const LatLng position;
-    const std::string icon;
-};
-
-}
-
-#endif
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 4418bcaaa4..5535dbcc91 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -21,7 +21,6 @@ class View;
 class MapData;
 class MapContext;
 class StillImage;
-class PointAnnotation;
 
 namespace util {
 template <class T> class Thread;
@@ -112,8 +111,9 @@ public:
     // Annotations
     void setDefaultPointAnnotationSymbol(const std::string&);
     double getTopOffsetPixelsForAnnotationSymbol(const std::string&);
-    uint32_t addPointAnnotation(const PointAnnotation&);
-    std::vector<uint32_t> addPointAnnotations(const std::vector<PointAnnotation>&);
+    uint32_t addPointAnnotation(const LatLng&, const std::string& symbol);
+    std::vector<uint32_t> addPointAnnotations(const std::vector<LatLng>&,
+                                              const std::vector<std::string>& symbols);
     void removeAnnotation(uint32_t);
     void removeAnnotations(const std::vector<uint32_t>&);
     std::vector<uint32_t> getAnnotationsInBounds(const LatLngBounds&);