From 3afc8b4a2939da70c76dc5b2eb5d007fc917d348 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 19 Oct 2015 15:24:22 -0700
Subject: [core] Introduce StyleLayer subclasses

---
 include/mbgl/annotation/shape_annotation.hpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include/mbgl/annotation')

diff --git a/include/mbgl/annotation/shape_annotation.hpp b/include/mbgl/annotation/shape_annotation.hpp
index dd8bf5e4d5..5e6a13149a 100644
--- a/include/mbgl/annotation/shape_annotation.hpp
+++ b/include/mbgl/annotation/shape_annotation.hpp
@@ -6,6 +6,8 @@
 
 #include <mbgl/util/geo.hpp>
 
+#include <mapbox/variant.hpp>
+
 namespace mbgl {
 
 using AnnotationSegment = std::vector<LatLng>;
@@ -13,12 +15,14 @@ using AnnotationSegments = std::vector<AnnotationSegment>;
 
 class ShapeAnnotation {
 public:
-    inline ShapeAnnotation(const AnnotationSegments& segments_, const StyleProperties& styleProperties_)
+    using Properties = mapbox::util::variant<FillPaintProperties, LinePaintProperties>;
+
+    inline ShapeAnnotation(const AnnotationSegments& segments_, const Properties& styleProperties_)
         : segments(segments_), styleProperties(styleProperties_) {
     }
 
     const AnnotationSegments segments;
-    const StyleProperties styleProperties;
+    const Properties styleProperties;
 };
 
 }
-- 
cgit v1.2.1