From 7d63847beccc5335d7c6eeb4287e6b3a2bba6a83 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 22 Jun 2016 17:44:00 +0300 Subject: [PATCH] [Qt] Use mbgl::LineString instead of mbgl::Polygon as default shape --- platform/qt/include/qmapbox.hpp | 5 ++--- platform/qt/src/qmapboxgl.cpp | 19 ++++++------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp index 1f4f22f5f..60ef0a306 100644 --- a/platform/qt/include/qmapbox.hpp +++ b/platform/qt/include/qmapbox.hpp @@ -11,8 +11,7 @@ namespace QMapbox { typedef QPair Coordinate; -typedef QList Coordinates; -typedef QList CoordinateSegments; +typedef QList LineString; typedef QPair CoordinateZoom; @@ -22,7 +21,7 @@ typedef QList AnnotationIDs; typedef QPair PointAnnotation; // FIXME: We need to add support for custom style properties -typedef QPair ShapeAnnotation; +typedef QPair ShapeAnnotation; enum NetworkMode { Online, // Default diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 76b643f40..efa53a3c6 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -77,24 +77,17 @@ QThreadStorage> 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 polygon; - polygon.reserve(segments.size()); + mbgl::LineString mbglLineString; + mbglLineString.reserve(lineString.size()); - for (const Coordinates &coordinates : segments) { - mbgl::LinearRing linearRing; - linearRing.reserve(coordinates.size()); - - for (const Coordinate &coordinate : coordinates) { - linearRing.emplace_back(mbgl::Point { coordinate.first, coordinate.second }); - } - - polygon.push_back(std::move(linearRing)); + for (const Coordinate &coordinate : lineString) { + mbglLineString.emplace_back(mbgl::Point { 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) {