tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Qt] Use geometry.hpp internally for shape annotations

Browse Source
This commit is contained in:
Thiago Marcos P. Santos
2016-06-01 11:16:45 +03:00
committed by John Firebaugh
parent 8985b1311b
commit cfd6757ecc
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/qt/src/qmapboxgl.cpp
View File

@@ -413,22 +413,21 @@ mbgl::ShapeAnnotation fromQMapboxGLShapeAnnotation(const ShapeAnnotation &shapeA
const CoordinateSegments &segments = shapeAnnotation.first;
const QString &styleLayer = shapeAnnotation.second;
mbgl::AnnotationSegments mbglAnnotationSegments;
mbglAnnotationSegments.reserve(segments.size());
mbgl::Polygon<double> polygon;
polygon.reserve(segments.size());
for (const Coordinates &coordinates : segments) {
mbgl::AnnotationSegment mbglAnnotationSegment;
mbglAnnotationSegment.reserve(coordinates.size());
mbgl::LinearRing<double> linearRing;
linearRing.reserve(coordinates.size());
for (const Coordinate &coordinate : coordinates) {
mbgl::LatLng mbglCoordinate(coordinate.first, coordinate.second);
mbglAnnotationSegment.emplace_back(mbglCoordinate);
linearRing.emplace_back(mbgl::Point<double>(coordinate.first, coordinate.second));
}
mbglAnnotationSegments.emplace_back(mbglAnnotationSegment);
polygon.emplace_back(linearRing);
}
return { mbglAnnotationSegments, styleLayer.toStdString() };
return { polygon, styleLayer.toStdString() };
}
AnnotationID QMapboxGL::addShapeAnnotation(const ShapeAnnotation &shapeAnnotation)