Remove MapObjects from labs

The feature was designed to enable map backends to implement their own
rendering of the map, and map items. It was never really used by any of
the backends we supported, and introduced a lot of complexity to the
code base.

The idea as such has perhaps merit, but for now we focus on the basic
functionality of Qt Location. Support for Qt Location when the Qt
Quick scene graph is not used is not a part of that.

Change-Id: I08e460043a0bd2600bad79b6ce2bb18e40e19eb6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 0 insertions, 247 deletions

diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
deleted file mode 100644
index 906ef2ea..00000000
--- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtLocation module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qgeomapobjectqsgsupport_p.h"
-#include <QtLocation/private/qgeomap_p_p.h>
-
-QT_BEGIN_NAMESPACE
-
-static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list)
-{
-    for (int i = 0; i < list.size(); ++i)
-    {
-        if (list.at(i).object.data() == o)
-            return i;
-    }
-    return -1;
-}
-
-bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d)
-{
-    QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl =
-            QExplicitlySharedDataPointer<QGeoMapObjectPrivate>(d->createMapObjectImplementation(obj));
-    if (pimpl.constData()) {
-        bool res = obj->setImplementation(pimpl);
-        if (res)
-            emit m_map->sgNodeChanged();
-        return res;
-    }
-    return false;
-}
-
-QGeoMapObjectPrivate *QGeoMapObjectQSGSupport::createMapObjectImplementationPrivate(QGeoMapObject *obj)
-{
-    QGeoMapObjectPrivate *res = nullptr;
-
-    {
-        QQSGMapObject *sgo = nullptr;
-        switch (obj->type()) {
-        case QGeoMapObject::PolylineType: {
-            QMapPolylineObjectPrivate &oldImpl = static_cast<QMapPolylineObjectPrivate &>(*obj->implementation());
-            QMapPolylineObjectPrivateQSG *pimpl =
-                    new QMapPolylineObjectPrivateQSG(oldImpl);
-            sgo = pimpl;
-            res = pimpl;
-            break;
-        }
-        case QGeoMapObject::PolygonType: {
-            QMapPolygonObjectPrivate &oldImpl = static_cast<QMapPolygonObjectPrivate &>(*obj->implementation());
-            QMapPolygonObjectPrivateQSG *pimpl =
-                    new QMapPolygonObjectPrivateQSG(oldImpl);
-            sgo = pimpl;
-            res = pimpl;
-            break;
-        }
-        case QGeoMapObject::CircleType: {
-            QMapCircleObjectPrivate &oldImpl = static_cast<QMapCircleObjectPrivate &>(*obj->implementation());
-            QMapCircleObjectPrivateQSG *pimpl =
-                    new QMapCircleObjectPrivateQSG(oldImpl);
-            sgo = pimpl;
-            res = pimpl;
-            break;
-        }
-        case QGeoMapObject::RouteType: {
-            QMapRouteObjectPrivate &oldImpl = static_cast<QMapRouteObjectPrivate &>(*obj->implementation());
-            QMapRouteObjectPrivateQSG *pimpl =
-                    new QMapRouteObjectPrivateQSG(oldImpl);
-            sgo = pimpl;
-            res = pimpl;
-            break;
-        }
-        case QGeoMapObject::IconType: {
-            QMapIconObjectPrivate &oldImpl = static_cast<QMapIconObjectPrivate &>(*obj->implementation());
-            QMapIconObjectPrivateQSG *pimpl =
-                    new QMapIconObjectPrivateQSG(oldImpl);
-            sgo = pimpl;
-            res = pimpl;
-            break;
-        }
-        default:
-            // Use the following warning only for debugging purposes.
-            // qWarning() << "QGeoMapObjectQSGSupport::createMapObjectImplementationPrivate: not instantiating pimpl for unsupported object type " << obj->type();
-            break;
-        }
-
-        if (res) {
-            QPointer<QGeoMapObject> p(obj);
-            MapObject mo(p, sgo);
-            m_pendingMapObjects << mo;
-        }
-    }
-    return res;
-}
-
-QList<QGeoMapObject *> QGeoMapObjectQSGSupport::mapObjects() const
-{
-    QList<QGeoMapObject *> res;
-    for (int i = 0; i < m_mapObjects.size(); ++i) {
-        res.append(m_mapObjects.at(i).object.data());
-    }
-    return res;
-}
-
-void QGeoMapObjectQSGSupport::removeMapObject(QGeoMapObject *obj)
-{
-    int idx = findMapObject(obj, m_mapObjects);
-    if (idx >= 0) {
-        const MapObject &mo = m_mapObjects.takeAt(idx);
-        obj->disconnect(m_map);
-        m_removedMapObjects << mo;
-        emit m_map->sgNodeChanged();
-    } else {
-        idx = findMapObject(obj, m_pendingMapObjects);
-        if (idx >= 0) {
-            m_pendingMapObjects.removeAt(idx);
-            obj->disconnect(m_map);
-        } else {
-            // obj not here.
-        }
-    }
-}
-
-// called in the render thread
-void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *window)
-{
-    if (!root)
-        return;
-
-    if (m_mapObjectsRootNode && !m_mapObjectsRootNode->parent())
-        root->appendChildNode(m_mapObjectsRootNode.get());
-
-    if (!m_mapObjectsRootNode) {
-        m_mapObjectsRootNode = std::make_unique<QDeclarativePolygonMapItemPrivateOpenGL::RootNode>();
-        root->appendChildNode(m_mapObjectsRootNode.get());
-        m_mapObjectsRootNode->setFlag(QSGNode::OwnedByParent, false);
-    }
-
-    m_mapObjectsRootNode->removeAllChildNodes();
-    for (int i = 0; i < m_removedMapObjects.size(); ++i) {
-        MapObject mo = m_removedMapObjects[i];
-        if (mo.qsgNode)  {
-            delete mo.qsgNode;
-            mo.qsgNode = nullptr;
-            // mo.sgObject is now invalid as it is destroyed right after appending
-            // mo to m_removedMapObjects
-        }
-    }
-    m_removedMapObjects.clear();
-
-    for (int i = 0; i < m_mapObjects.size(); ++i) {
-        // already added as node
-        if (Q_UNLIKELY(!m_mapObjects.at(i).object)) {
-            qWarning() << "unexpected NULL pointer in m_mapObjects at "<<i;
-            continue;
-        }
-
-        MapObject &mo = m_mapObjects[i];
-        QQSGMapObject *sgo = mo.sgObject;
-        QSGNode *oldNode = mo.qsgNode;
-        mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window);
-        if (Q_UNLIKELY(!mo.qsgNode)) {
-            qWarning() << "updateMapObjectNode for "<<mo.object->type() << " returned NULL";
-        } else if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) {
-            mo.visibleNode->setVisible(mo.object->visible());
-            mo.qsgNode->markDirty(QSGNode::DirtySubtreeBlocked);
-        }
-    }
-
-    QList<int> toRemove;
-    for (int i = 0; i < m_pendingMapObjects.size(); ++i) {
-        // already added as node
-        MapObject &mo = m_pendingMapObjects[i];
-        QQSGMapObject *sgo = mo.sgObject;
-        QSGNode *oldNode = mo.qsgNode;
-        sgo->updateGeometry(); // or subtree will be blocked
-        mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window);
-        if (mo.qsgNode) {
-            if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) {
-                mo.visibleNode->setVisible(mo.object->visible());
-                mo.qsgNode->markDirty(QSGNode::DirtySubtreeBlocked);
-            }
-            m_mapObjects << mo;
-            toRemove.push_front(i);
-            QObject::connect(mo.object, &QGeoMapObject::visibleChanged,
-                             m_map, &QGeoMap::sgNodeChanged);
-        } else {
-            // leave it to be processed, don't spit warnings
-        }
-    }
-
-    for (int i: qAsConst(toRemove))
-        m_pendingMapObjects.removeAt(i);
-    m_mapObjectsRootNode->setSubtreeBlocked(false);
-}
-
-// called in GUI thread
-void QGeoMapObjectQSGSupport::updateObjectsGeometry()
-{
-    for (int i = 0; i < m_mapObjects.size(); ++i) {
-        // already added as node
-        if (Q_UNLIKELY(!m_mapObjects.at(i).object)) {
-            qWarning() << "unexpected NULL pointer in m_mapObjects at "<<i;
-            continue;
-        }
-
-        QQSGMapObject *sgo = m_mapObjects.at(i).sgObject;
-        sgo->updateGeometry();
-    }
-    emit m_map->sgNodeChanged();
-}
-
-QT_END_NAMESPACE