Fix re-set map items rendering stale geometry

Geometries are now cleared if data is invalid, before early return.

Task-number: QTBUG-66758
Change-Id: Ie89248f78b5fd817a33ed5d6ff56b3547d64a50b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
index 5eda137c..7493c962 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
@@ -500,9 +500,15 @@ QSGNode *QDeclarativePolygonMapItem::updateMapItemPaintNode(QSGNode *oldNode, Up
 */
 void QDeclarativePolygonMapItem::updatePolish()
 {
-    if (!map() || geopath_.path().length() == 0
-            || map()->geoProjection().projectionType() != QGeoProjection::ProjectionWebMercator)
+    if (!map() || map()->geoProjection().projectionType() != QGeoProjection::ProjectionWebMercator)
+        return;
+    if (geopath_.path().length() == 0) { // Possibly cleared
+        geometry_.clear();
+        borderGeometry_.clear();
+        setWidth(0);
+        setHeight(0);
         return;
+    }
 
     const QGeoProjectionWebMercator &p = static_cast<const QGeoProjectionWebMercator&>(map()->geoProjection());
     QScopedValueRollback<bool> rollback(updatingGeometry_);