From 597b2b48511b68c7a6494386b414da479c436bd7 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 15 Oct 2015 11:38:58 -0700
Subject: [core] Pull annotation typedefs to own header; add AnnotationID

---
 include/mbgl/annotation/annotation.hpp       | 20 ++++++++++++++++++++
 include/mbgl/annotation/shape_annotation.hpp |  8 +++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 include/mbgl/annotation/annotation.hpp

(limited to 'include/mbgl/annotation')

diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp
new file mode 100644
index 0000000000..fd21cd5f6a
--- /dev/null
+++ b/include/mbgl/annotation/annotation.hpp
@@ -0,0 +1,20 @@
+#ifndef MBGL_ANNOTATION
+#define MBGL_ANNOTATION
+
+#include <cstdint>
+#include <vector>
+
+namespace mbgl {
+
+enum class AnnotationType : uint8_t {
+    Any   = 0,
+    Point = 1 << 0,
+    Shape = 1 << 1,
+};
+
+using AnnotationID = uint32_t;
+using AnnotationIDs = std::vector<AnnotationID>;
+
+}
+
+#endif
diff --git a/include/mbgl/annotation/shape_annotation.hpp b/include/mbgl/annotation/shape_annotation.hpp
index a35b867266..dd8bf5e4d5 100644
--- a/include/mbgl/annotation/shape_annotation.hpp
+++ b/include/mbgl/annotation/shape_annotation.hpp
@@ -1,14 +1,16 @@
 #ifndef MBGL_ANNOTATION_SHAPE_ANNOTATION
 #define MBGL_ANNOTATION_SHAPE_ANNOTATION
 
-#include <mbgl/util/geo.hpp>
-#include <mbgl/map/map.hpp>
+#include <mbgl/annotation/annotation.hpp>
 #include <mbgl/style/style_properties.hpp>
 
-#include <string>
+#include <mbgl/util/geo.hpp>
 
 namespace mbgl {
 
+using AnnotationSegment = std::vector<LatLng>;
+using AnnotationSegments = std::vector<AnnotationSegment>;
+
 class ShapeAnnotation {
 public:
     inline ShapeAnnotation(const AnnotationSegments& segments_, const StyleProperties& styleProperties_)
-- 
cgit v1.2.1