Fix MapCircle QQuickItem geometry to allow enabling layers

This patch does not include a fix for the degenerated cases:
- circle including one pole
- circle including both poles

Change-Id: I78d9a29bf1071ab3b3405179f34f42a71c0a79a5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 11 insertions, 3 deletions

diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
index a30b7b30..608260cd 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
@@ -513,7 +513,7 @@ void QDeclarativeCircleMapItem::updatePolish()
         invertedCircle = true;
     } else {
         geometry_.updateSourcePoints(*map(), circlePath);
-        geometry_.updateScreenPoints(*map());
+        geometry_.updateScreenPoints(*map(), border_.width());
     }
 
     borderGeometry_.clear();
@@ -552,9 +552,17 @@ void QDeclarativeCircleMapItem::updatePolish()
     }
 
     QRectF combined = QGeoMapItemGeometry::translateToCommonOrigin(geoms);
-    setWidth(combined.width());
-    setHeight(combined.height());
 
+    if (invertedCircle || !preserve) {
+        setWidth(combined.width());
+        setHeight(combined.height());
+        setPositionOnMap(geometry_.origin(), geometry_.firstPointOffset());
+    } else {
+        setWidth(combined.width() + 2 * border_.width());
+        setHeight(combined.height() + 2 * border_.width());
+    }
+
+    // No offsetting here, even in normal case, because first point offset is already translated
     setPositionOnMap(geometry_.origin(), geometry_.firstPointOffset());
 }