[core] Use geometry.hpp types for shape annotations

1 files changed, 18 insertions, 13 deletions

diff --git a/platform/darwin/src/MGLPolygon.mm b/platform/darwin/src/MGLPolygon.mm
index 5a24cb0791..47be070246 100644
--- a/platform/darwin/src/MGLPolygon.mm
+++ b/platform/darwin/src/MGLPolygon.mm
@@ -24,26 +24,31 @@
     return self;
 }
 
-- (mbgl::AnnotationSegments)annotationSegments {
-    auto segments = super.annotationSegments;
-    for (MGLPolygon *polygon in self.interiorPolygons) {
-        auto interiorSegments = polygon.annotationSegments;
-        segments.push_back(interiorSegments.front());
+- (mbgl::LinearRing<double>)ring {
+    NSUInteger count = self.pointCount;
+    CLLocationCoordinate2D *coordinates = self.coordinates;
+
+    mbgl::LinearRing<double> result;
+    result.reserve(self.pointCount);
+    for (NSUInteger i = 0; i < count; i++) {
+        result.push_back(mbgl::Point<double>(coordinates[i].longitude, coordinates[i].latitude));
     }
-    return segments;
+    return result;
 }
 
-- (mbgl::ShapeAnnotation::Properties)shapeAnnotationPropertiesObjectWithDelegate:(id <MGLMultiPointDelegate>)delegate {
-    mbgl::ShapeAnnotation::Properties shapeProperties = [super shapeAnnotationPropertiesObjectWithDelegate:delegate];
-    
+- (mbgl::ShapeAnnotation)shapeAnnotationObjectWithDelegate:(id <MGLMultiPointDelegate>)delegate {
     mbgl::FillAnnotationProperties fillProperties;
     fillProperties.opacity = [delegate alphaForShapeAnnotation:self];
     fillProperties.outlineColor = [delegate strokeColorForShapeAnnotation:self];
     fillProperties.color = [delegate fillColorForPolygonAnnotation:self];
-    
-    shapeProperties.set<mbgl::FillAnnotationProperties>(fillProperties);
-    
-    return shapeProperties;
+
+    mbgl::Polygon<double> geometry;
+    geometry.push_back(self.ring);
+    for (MGLPolygon *polygon in self.interiorPolygons) {
+        geometry.push_back(polygon.ring);
+    }
+
+    return mbgl::ShapeAnnotation(geometry, fillProperties);
 }
 
 @end