From 6024168ef21dd4fe6c5ddd7e837d56076e886e01 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Tue, 28 Feb 2017 18:26:19 -0800
Subject: Mapbox GL native circle support

Circles crossing one pole are drawn inverted.
Circles crossing 2 poles do not even have the correct geometry.
Nevertheless, a first approximation.

Task-number: QTBUG-58869
Change-Id: I5a508f5d6e27c4f08412a7ae327883866068a1e9
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
---
 .../geoservices/mapboxgl/qmapboxglstylechange.cpp  | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp')

diff --git a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp
index f79f0a38..f8bd9b4d 100644
--- a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp
+++ b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp
@@ -86,6 +86,32 @@ QMapbox::Feature featureFromMapRectangle(QDeclarativeRectangleMapItem *mapItem)
     return QMapbox::Feature(QMapbox::Feature::PolygonType, geometry, {}, getId(mapItem));
 }
 
+QMapbox::Feature featureFromMapCircle(QDeclarativeCircleMapItem *mapItem)
+{
+    static const int circleSamples = 128;
+
+    QList<QGeoCoordinate> path;
+    QGeoCoordinate leftBound;
+    QDeclarativeCircleMapItem::calculatePeripheralPoints(path, mapItem->center(), mapItem->radius(), circleSamples, leftBound);
+    QList<QDoubleVector2D> pathProjected;
+    for (const QGeoCoordinate &c : qAsConst(path))
+        pathProjected << mapItem->map()->geoProjection().geoToMapProjection(c);
+    if (QDeclarativeCircleMapItem::crossEarthPole(mapItem->center(), mapItem->radius()))
+        mapItem->preserveCircleGeometry(pathProjected, mapItem->center(), mapItem->radius());
+    path.clear();
+    for (const QDoubleVector2D &c : qAsConst(pathProjected))
+        path << mapItem->map()->geoProjection().mapProjectionToGeo(c);
+
+
+    QMapbox::Coordinates coordinates;
+    for (const QGeoCoordinate &coordinate : path) {
+        coordinates << QMapbox::Coordinate { coordinate.latitude(), coordinate.longitude() };
+    }
+    coordinates.append(coordinates.first());  // closing the path
+    QMapbox::CoordinatesCollections geometry { { coordinates } };
+    return QMapbox::Feature(QMapbox::Feature::PolygonType, geometry, {}, getId(mapItem));
+}
+
 QMapbox::Feature featureFromMapPolygon(QDeclarativePolygonMapItem *mapItem)
 {
     const QGeoPath *path = static_cast<const QGeoPath *>(&mapItem->geoShape());
@@ -126,6 +152,8 @@ QMapbox::Feature featureFromMapItem(QDeclarativeGeoMapItemBase *item)
     switch (item->itemType()) {
     case QGeoMap::MapRectangle:
         return featureFromMapRectangle(static_cast<QDeclarativeRectangleMapItem *>(item));
+    case QGeoMap::MapCircle:
+        return featureFromMapCircle(static_cast<QDeclarativeCircleMapItem *>(item));
     case QGeoMap::MapPolygon:
         return featureFromMapPolygon(static_cast<QDeclarativePolygonMapItem *>(item));
     case QGeoMap::MapPolyline:
@@ -182,6 +210,7 @@ QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleChange::addMapItem(QDe
 
     switch (item->itemType()) {
     case QGeoMap::MapRectangle:
+    case QGeoMap::MapCircle:
     case QGeoMap::MapPolygon:
     case QGeoMap::MapPolyline:
         break;
@@ -325,6 +354,8 @@ QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::from
     switch (item->itemType()) {
     case QGeoMap::MapRectangle:
         return fromMapItem(static_cast<QDeclarativeRectangleMapItem *>(item));
+    case QGeoMap::MapCircle:
+        return fromMapItem(static_cast<QDeclarativeCircleMapItem *>(item));
     case QGeoMap::MapPolygon:
         return fromMapItem(static_cast<QDeclarativePolygonMapItem *>(item));
     case QGeoMap::MapPolyline:
@@ -352,6 +383,23 @@ QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::from
     return changes;
 }
 
+QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::fromMapItem(QDeclarativeCircleMapItem *item)
+{
+    QList<QSharedPointer<QMapboxGLStyleChange>> changes;
+    changes.reserve(3);
+
+    const QString id = getId(item);
+
+    changes << QSharedPointer<QMapboxGLStyleChange>(
+        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-opacity"), item->mapItemOpacity()));
+    changes << QSharedPointer<QMapboxGLStyleChange>(
+        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-color"), item->color()));
+    changes << QSharedPointer<QMapboxGLStyleChange>(
+        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-outline-color"), item->border()->color()));
+
+    return changes;
+}
+
 QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::fromMapItem(QDeclarativePolygonMapItem *item)
 {
     QList<QSharedPointer<QMapboxGLStyleChange>> changes;
-- 
cgit v1.2.1