Fix QGeoMapObject handling in reference implementation

setVisible was neither changing the visibility nor
triggering repaint.
Pimpls weren't removing themselves in their destructors when
dynamically added/removed via QGeoMapObjectView
add/removeMapObject.
This patch also factors out the duplicated QGeoMapObject support
from QGeoTiledMapLabs and QGeoMapObjectsOverlay and moves it
into an own class, QGeoMapObjectQSGSupport.
To properly flush the scene graph nodes upon object removal,
a pointer to the QSGNode is added to the MapObject struct,
now moved inside QGeoMapObjectQSGSupport.

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

1 files changed, 58 insertions, 11 deletions

diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index dffec4d5..620ed14e 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -1014,29 +1014,76 @@ QGeoMap::ItemType QDeclarativePolylineMapItem::itemType() const
 /*!
     \internal
 */
-MapPolylineNode::MapPolylineNode() :
-    geometry_(QSGGeometry::defaultAttributes_Point2D(),0),
-    blocked_(true)
+VisibleNode::VisibleNode() : m_blocked{true}, m_visible{true}
 {
-    geometry_.setDrawingMode(QSGGeometry::DrawTriangleStrip);
-    QSGGeometryNode::setMaterial(&fill_material_);
-    QSGGeometryNode::setGeometry(&geometry_);
+
 }
 
+VisibleNode::~VisibleNode()
+{
+
+}
 
 /*!
     \internal
 */
-MapPolylineNode::~MapPolylineNode()
+bool VisibleNode::subtreeBlocked() const
+{
+    return m_blocked || !m_visible;
+}
+
+/*!
+    \internal
+*/
+void VisibleNode::setSubtreeBlocked(bool blocked)
+{
+    m_blocked = blocked;
+}
+
+bool VisibleNode::visible() const
+{
+    return m_visible;
+}
+
+/*!
+    \internal
+*/
+void VisibleNode::setVisible(bool visible)
 {
+    m_visible = visible;
 }
 
 /*!
     \internal
 */
-bool MapPolylineNode::isSubtreeBlocked() const
+MapItemGeometryNode::~MapItemGeometryNode()
+{
+
+}
+
+bool MapItemGeometryNode::isSubtreeBlocked() const
+{
+    return subtreeBlocked();
+}
+
+
+/*!
+    \internal
+*/
+MapPolylineNode::MapPolylineNode() :
+    geometry_(QSGGeometry::defaultAttributes_Point2D(),0)
+{
+    geometry_.setDrawingMode(QSGGeometry::DrawTriangleStrip);
+    QSGGeometryNode::setMaterial(&fill_material_);
+    QSGGeometryNode::setGeometry(&geometry_);
+}
+
+
+/*!
+    \internal
+*/
+MapPolylineNode::~MapPolylineNode()
 {
-    return blocked_;
 }
 
 /*!
@@ -1046,10 +1093,10 @@ void MapPolylineNode::update(const QColor &fillColor,
                              const QGeoMapItemGeometry *shape)
 {
     if (shape->size() == 0) {
-        blocked_ = true;
+        setSubtreeBlocked(true);
         return;
     } else {
-        blocked_ = false;
+        setSubtreeBlocked(false);
     }
 
     QSGGeometry *fill = QSGGeometryNode::geometry();