Correct and improve the rendering of QuickMapItems

Various MapItems were not rendered correctly, especially in corner cases.
This change ensures that MapItems are rendered correctly in the vast
majority of cases.

All MapItems are shown correctly if they wrap around the globe and
appear twice on the map.

Circles that span around the globe or are located near poles are shown
correclty and filled all the way to the border of the map.

Polygons are shown correctly including their holes.

The code was simplified and some artefacts of previous implementations
were removed.

Fixes: QTBUG-110701
Fixes: QTBUG-110511
Pick-to: 6.5
Change-Id: I1110659989436cd5a93f6ec26f75caa06d5f2b71
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/location/quickmapitems/qdeclarativegeomapitembase.cpp b/src/location/quickmapitems/qdeclarativegeomapitembase.cpp
index c5b1cc8c..233ea82d 100644
--- a/src/location/quickmapitems/qdeclarativegeomapitembase.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapitembase.cpp
@@ -77,7 +77,7 @@ void QDeclarativeGeoMapItemBase::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *m
         // For performance reasons we're not connecting map_'s and quickMap_'s signals to this.
         // Rather, the handling of cameraDataChanged, visibleAreaChanged, heightChanged and widthChanged is done explicitly in QDeclarativeGeoMap by directly calling methods on the items.
         // See QTBUG-76950
-        lastSize_ = QSizeF(quickMap_->width(), quickMap_->height());
+        lastMapSize_ = QSizeF(quickMap_->width(), quickMap_->height());
         lastCameraData_ = map_->cameraData();
     }
 }
@@ -91,7 +91,7 @@ void QDeclarativeGeoMapItemBase::baseCameraDataChanged(const QGeoCameraData &cam
     evt.cameraData = cameraData;
     evt.mapSize = QSizeF(quickMap_->width(), quickMap_->height());
 
-    if (evt.mapSize != lastSize_)
+    if (evt.mapSize != lastMapSize_)
         evt.mapSizeChanged = true;
 
     if (cameraData.bearing() != lastCameraData_.bearing())
@@ -105,7 +105,7 @@ void QDeclarativeGeoMapItemBase::baseCameraDataChanged(const QGeoCameraData &cam
     if (cameraData.zoomLevel() != lastCameraData_.zoomLevel())
         evt.zoomLevelChanged = true;
 
-    lastSize_ = evt.mapSize;
+    lastMapSize_ = evt.mapSize;
     lastCameraData_ = cameraData;
 
     afterViewportChanged(evt);
@@ -286,8 +286,6 @@ bool QDeclarativeGeoMapItemBase::isPolishScheduled() const
     return QQuickItemPrivate::get(this)->polishScheduled;
 }
 
-void QDeclarativeGeoMapItemBase::setMaterialDirty() {}
-
 void QDeclarativeGeoMapItemBase::polishAndUpdate()
 {
     polish();