[Qt] Use mbgl::LineString instead of mbgl::Polygon as default shape

2 files changed, 8 insertions, 16 deletions

diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp
index 1f4f22f5f1..60ef0a306f 100644
--- a/platform/qt/include/qmapbox.hpp
+++ b/platform/qt/include/qmapbox.hpp
@@ -11,8 +11,7 @@
 namespace QMapbox {
 
 typedef QPair<double, double> Coordinate;
-typedef QList<Coordinate> Coordinates;
-typedef QList<Coordinates> CoordinateSegments;
+typedef QList<Coordinate> LineString;
 
 typedef QPair<Coordinate, double> CoordinateZoom;
 
@@ -22,7 +21,7 @@ typedef QList<AnnotationID> AnnotationIDs;
 typedef QPair<Coordinate, QString> PointAnnotation;
 
 // FIXME: We need to add support for custom style properties
-typedef QPair<CoordinateSegments, QString> ShapeAnnotation;
+typedef QPair<LineString, QString> ShapeAnnotation;
 
 enum NetworkMode {
     Online, // Default
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 76b643f40a..efa53a3c6b 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -77,24 +77,17 @@ QThreadStorage<std::shared_ptr<mbgl::util::RunLoop>> loop;
 // Convertion helper functions.
 
 auto fromQMapboxGLShapeAnnotation(const ShapeAnnotation &shapeAnnotation) {
-    const CoordinateSegments &segments = shapeAnnotation.first;
+    const LineString &lineString = shapeAnnotation.first;
     const QString &styleLayer = shapeAnnotation.second;
 
-    mbgl::Polygon<double> polygon;
-    polygon.reserve(segments.size());
+    mbgl::LineString<double> mbglLineString;
+    mbglLineString.reserve(lineString.size());
 
-    for (const Coordinates &coordinates : segments) {
-        mbgl::LinearRing<double> linearRing;
-        linearRing.reserve(coordinates.size());
-
-        for (const Coordinate &coordinate : coordinates) {
-            linearRing.emplace_back(mbgl::Point<double> { coordinate.first, coordinate.second });
-        }
-
-        polygon.push_back(std::move(linearRing));
+    for (const Coordinate &coordinate : lineString) {
+        mbglLineString.emplace_back(mbgl::Point<double> { coordinate.first, coordinate.second });
     }
 
-    return mbgl::StyleSourcedAnnotation { std::move(polygon), styleLayer.toStdString() };
+    return mbgl::StyleSourcedAnnotation { std::move(mbglLineString), styleLayer.toStdString() };
 }
 
 auto fromQMapboxTransitionOptions(const QMapbox::TransitionOptions &options) {