Introduce MapIconObject

Change-Id: I3ce8956ed77d4307521cb6b5e9b53fb4cc5fed7c
Reviewed-by: Michael Brasser <michael.brasser@live.com>

4 files changed, 401 insertions, 3 deletions

diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index 4b77a2ae..3f6991dd 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-//#include <QtLocationLabs/private/qmapiconobject_p.h>
+#include <QtLocationLabs/private/qmapiconobject_p.h>
 #include <QtLocationLabs/private/qmapobjectview_p.h>
 #include <QtLocationLabs/private/qmaprouteobject_p.h>
 //#include <QtLocationLabs/private/qdeclarativenavigator_p.h>
@@ -71,8 +71,8 @@ public:
             int minor = 11;
 
             // Register the 5.11 types
-//            qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
-//            qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject");
+            //qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
+            qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject");
             qmlRegisterType<QMapObjectView>(uri, major, minor, "MapObjectView");
             qmlRegisterType<QMapRouteObject>(uri, major, minor, "MapRouteObject");
 
diff --git a/src/locationlabs/qmapiconobject.cpp b/src/locationlabs/qmapiconobject.cpp
new file mode 100644
index 00000000..7a3a1a75
--- /dev/null
+++ b/src/locationlabs/qmapiconobject.cpp
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmapiconobject_p.h"
+#include "qmapiconobject_p_p.h"
+#include <QExplicitlySharedDataPointer>
+
+QT_BEGIN_NAMESPACE
+
+QMapIconObjectPrivate::~QMapIconObjectPrivate()
+{
+
+}
+
+QMapIconObjectPrivate::QMapIconObjectPrivate(QGeoMapObject *q) : QGeoMapObjectPrivate(q)
+{
+
+}
+
+QGeoMapObject::Type QMapIconObjectPrivate::type() const
+{
+    return QGeoMapObject::IconType;
+}
+
+bool QMapIconObjectPrivate::equals(const QGeoMapObjectPrivate &other) const
+{
+    if (other.type() != type()) // This check might be unnecessary, depending on how equals gets used
+        return false;
+
+    const QMapIconObjectPrivate &o = static_cast<const QMapIconObjectPrivate &>(other);
+    return (QGeoMapObjectPrivate::equals(o)
+            && content() == o.content()
+            && coordinate() == o.coordinate());
+}
+
+//
+// QGeoMapIconPrivate default implementation
+//
+
+QMapIconObjectPrivateDefault::QMapIconObjectPrivateDefault(QGeoMapObject *q) : QMapIconObjectPrivate(q)
+{
+
+}
+QMapIconObjectPrivateDefault::QMapIconObjectPrivateDefault(const QMapIconObjectPrivate &other) : QMapIconObjectPrivate(other.q)
+{
+    m_coordinate = other.coordinate();
+    m_content = other.content();
+    m_size = other.size();
+}
+
+QMapIconObjectPrivateDefault::~QMapIconObjectPrivateDefault()
+{
+
+}
+
+QGeoCoordinate QMapIconObjectPrivateDefault::coordinate() const
+{
+    return m_coordinate;
+}
+
+void QMapIconObjectPrivateDefault::setCoordinate(const QGeoCoordinate &center)
+{
+    m_coordinate = center;
+}
+
+QVariant QMapIconObjectPrivateDefault::content() const
+{
+    return m_content;
+}
+
+void QMapIconObjectPrivateDefault::setContent(const QVariant &content)
+{
+    m_content = content;
+}
+
+QSizeF QMapIconObjectPrivateDefault::size() const
+{
+    return m_size;
+}
+
+void QMapIconObjectPrivateDefault::setSize(const QSizeF &size)
+{
+    m_size = size;
+}
+
+QGeoMapObjectPrivate *QMapIconObjectPrivateDefault::clone()
+{
+    return new QMapIconObjectPrivateDefault(static_cast<QMapIconObjectPrivate &>(*this));
+}
+
+
+/*
+
+    QGeoMapIconPrivate default implementation
+
+*/
+
+
+QMapIconObject::QMapIconObject(QObject *parent)
+    : QGeoMapObject(QExplicitlySharedDataPointer<QGeoMapObjectPrivate>(new QMapIconObjectPrivateDefault(this)), parent)
+{}
+
+QMapIconObject::~QMapIconObject()
+{
+
+}
+
+QVariant QMapIconObject::content() const
+{
+    const QMapIconObjectPrivate *d = static_cast<const QMapIconObjectPrivate *>(d_ptr.data());
+    return d->content();
+}
+
+QGeoCoordinate QMapIconObject::coordinate() const
+{
+    const QMapIconObjectPrivate *d = static_cast<const QMapIconObjectPrivate *>(d_ptr.data());
+    return d->coordinate();
+}
+
+void QMapIconObject::setContent(QVariant content)
+{
+    QMapIconObjectPrivate *d = static_cast<QMapIconObjectPrivate *>(d_ptr.data());
+    if (d->content() == content)
+        return;
+
+    d->setContent(content);
+    emit contentChanged(content);
+}
+
+void QMapIconObject::setCoordinate(const QGeoCoordinate &center)
+{
+    QMapIconObjectPrivate *d = static_cast<QMapIconObjectPrivate*>(d_ptr.data());
+    if (d->coordinate() == center)
+        return;
+
+    d->setCoordinate(center);
+    emit coordinateChanged(center);
+}
+
+QSizeF QMapIconObject::size() const
+{
+    const QMapIconObjectPrivate *d = static_cast<const QMapIconObjectPrivate *>(d_ptr.data());
+    return d->size();
+}
+
+
+void QMapIconObject::setSize(const QSizeF &size)
+{
+    QMapIconObjectPrivate *d = static_cast<QMapIconObjectPrivate*>(d_ptr.data());
+    if (d->size() == size)
+        return;
+
+    d->setSize(size);
+    emit sizeChanged();
+}
+
+void QMapIconObject::setMap(QGeoMap *map)
+{
+    QMapIconObjectPrivate *d = static_cast<QMapIconObjectPrivate *>(d_ptr.data());
+    if (d->m_map == map)
+        return;
+
+    QGeoMapObject::setMap(map); // This is where the specialized pimpl gets created and injected
+
+    if (!map) {
+        // Map was set, now it has ben re-set to NULL
+        d_ptr = new QMapIconObjectPrivateDefault(*d);
+        // Old pimpl deleted implicitly by QExplicitlySharedDataPointer
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/locationlabs/qmapiconobject_p.h b/src/locationlabs/qmapiconobject_p.h
new file mode 100644
index 00000000..4fcef648
--- /dev/null
+++ b/src/locationlabs/qmapiconobject_p.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGEOMAPICON_P_H
+#define QGEOMAPICON_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qgeomapobject_p.h>
+#include <QtCore/QUrl>
+#include <QGeoCoordinate>
+#include <QtCore/qsize.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapIconObject : public QGeoMapObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QGeoCoordinate coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged)
+    Q_PROPERTY(QVariant content READ content WRITE setContent NOTIFY contentChanged)
+    Q_PROPERTY(QSizeF size READ size WRITE setSize NOTIFY sizeChanged)
+
+public:
+    QMapIconObject(QObject *parent = nullptr);
+    ~QMapIconObject() override;
+
+    QVariant content() const;
+    QGeoCoordinate coordinate() const;
+    QSizeF size() const;
+
+    void setContent(QVariant content);
+    void setCoordinate(const QGeoCoordinate &coordinate);
+    void setSize(const QSizeF &size);
+
+    void setMap(QGeoMap *map) override;
+
+signals:
+    void contentChanged(QVariant content);
+    void coordinateChanged(QGeoCoordinate coordinate);
+    void sizeChanged();
+};
+
+QT_END_NAMESPACE
+
+#endif // QGEOMAPICON_P_H
diff --git a/src/locationlabs/qmapiconobject_p_p.h b/src/locationlabs/qmapiconobject_p_p.h
new file mode 100644
index 00000000..7eec58a1
--- /dev/null
+++ b/src/locationlabs/qmapiconobject_p_p.h
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGEOMAPICON_P_P_H
+#define QGEOMAPICON_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtLocationLabs/private/qlocationlabsglobal_p.h>
+#include <QtLocation/private/qgeomapobject_p_p.h>
+#include <QGeoCoordinate>
+
+QT_BEGIN_NAMESPACE
+
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapIconObjectPrivate : public QGeoMapObjectPrivate
+{
+public:
+    QMapIconObjectPrivate(QGeoMapObject *q);
+    ~QMapIconObjectPrivate() override;
+
+    virtual QGeoMapObject::Type type() const override final;
+
+    virtual QGeoCoordinate coordinate() const = 0;
+    virtual void setCoordinate(const QGeoCoordinate &coordinate) = 0;
+    virtual QVariant content() const = 0;
+    virtual void setContent(const QVariant &content) = 0;
+    virtual QSizeF size() const = 0;
+    virtual void setSize(const QSizeF &size) = 0;
+
+    // QGeoMapObjectPrivate interface
+    bool equals(const QGeoMapObjectPrivate &other) const override;
+};
+
+class Q_LOCATIONLABS_PRIVATE_EXPORT QMapIconObjectPrivateDefault : public QMapIconObjectPrivate
+{
+public:
+    QMapIconObjectPrivateDefault(QGeoMapObject *q);
+    QMapIconObjectPrivateDefault(const QMapIconObjectPrivate &other);
+    ~QMapIconObjectPrivateDefault() override;
+
+    // QGeoMapIconPrivate interface
+    QGeoCoordinate coordinate() const override;
+    void setCoordinate(const QGeoCoordinate &coordinate) override;
+    QVariant content() const override;
+    void setContent(const QVariant &content) override;
+    virtual QSizeF size() const override;
+    virtual void setSize(const QSizeF &size) override;
+
+    // QMapIconObjectPrivate interface
+    QGeoMapObjectPrivate *clone() override;
+
+public:
+    QVariant m_content;
+    QGeoCoordinate m_coordinate;
+    QSizeF m_size;
+
+private:
+    QMapIconObjectPrivateDefault(const QMapIconObjectPrivateDefault &other) = delete;
+};
+
+QT_END_NAMESPACE
+
+#endif // QGEOMAPICON_P_P_H