MapParameters for accessing specific features of custom QGeoMaps

This patch adds a new MapParameter object to give users access to
specific features of a custom QGeoMap otherwise not accessible through
the standard API.

A MapParameter is implemented by a QDeclarativeGeoMapParameter, which,
in turns, inherits from QGeoMapParameter in the location module.

In this way QGeoMap & subclasses won't depend on declarative, from
this side, still allowing a QMapWidget someday.

The implementation is based, on both sides, on the dynamic
properties of QObjects for defining the MapProperty data.
This allows high flexibility in defining various types of
MapParameters (essentially by duck typing them), and therefore
each plugin which makes use of them must document each of them.

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

22 files changed, 732 insertions, 26 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 6405313b..f9b3545f 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -49,6 +49,7 @@
 #include "qdeclarativeroutemapitem_p.h"
 #include "qdeclarativepolylinemapitem_p.h"
 #include "qdeclarativepolygonmapitem_p.h"
+#include "qdeclarativegeomapparameter_p.h"
 
 //Place includes
 #include "qdeclarativecategory_p.h"
@@ -166,6 +167,11 @@ public:
             minor = 7;
             qmlRegisterType<QDeclarativeGeoManeuver>(uri, major, minor, "RouteManeuver");
 
+            // Register the 5.9 types
+            minor = 9;
+            qmlRegisterType<QDeclarativeGeoMapParameter>(uri, major, minor, "MapParameter");
+
+
             //registrations below are version independent
             qRegisterMetaType<QPlaceCategory>();
             qRegisterMetaType<QPlace>();
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro
index 57172ad8..e733a768 100644
--- a/src/imports/location/location.pro
+++ b/src/imports/location/location.pro
@@ -30,7 +30,8 @@ HEADERS += \
            qquickgeomapgesturearea_p.h\
            ../positioning/qquickgeocoordinateanimation_p.h \
            mapitemviewdelegateincubator.h \
-           qdeclarativegeomapitemview_p_p.h
+           qdeclarativegeomapitemview_p_p.h \
+           qdeclarativegeomapparameter_p.h
 
 SOURCES += \
            location.cpp \
@@ -56,7 +57,8 @@ SOURCES += \
            locationvaluetypehelper.cpp \
            qquickgeomapgesturearea.cpp \
            ../positioning/qquickgeocoordinateanimation.cpp \
-           mapitemviewdelegateincubator.cpp
+           mapitemviewdelegateincubator.cpp \
+           qdeclarativegeomapparameter.cpp
 
 include(declarativeplaces/declarativeplaces.pri)
 
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index dcf8b203..49d6ddd1 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -42,6 +42,7 @@
 #include "qgeomappingmanager_p.h"
 #include "qgeocameracapabilities_p.h"
 #include "qgeomap_p.h"
+#include "qdeclarativegeomapparameter_p.h"
 #include <QtPositioning/QGeoCircle>
 #include <QtPositioning/QGeoRectangle>
 #include <QtQuick/QQuickWindow>
@@ -359,6 +360,7 @@ void QDeclarativeGeoMap::pluginReady()
 void QDeclarativeGeoMap::componentComplete()
 {
     m_componentCompleted = true;
+    populateParameters();
     populateMap();
     QQuickItem::componentComplete();
 }
@@ -454,6 +456,19 @@ void QDeclarativeGeoMap::populateMap()
     }
 }
 
+void QDeclarativeGeoMap::populateParameters()
+{
+    QObjectList kids = children();
+    QList<QQuickItem *> quickKids = childItems();
+    for (int i = 0; i < quickKids.count(); ++i)
+        kids.append(quickKids.at(i));
+    for (int i = 0; i < kids.size(); ++i) {
+        QDeclarativeGeoMapParameter *mapParameter = qobject_cast<QDeclarativeGeoMapParameter *>(kids.at(i));
+        if (mapParameter)
+            addMapParameter(mapParameter);
+    }
+}
+
 /*!
     \internal
 */
@@ -589,6 +604,11 @@ void QDeclarativeGeoMap::mappingManagerInitialized()
         if (item)
             item.data()->setMap(this, m_map);
     }
+
+    // All map parameters that were added before the plugin was ready
+    // need to be added to m_map
+    for (QDeclarativeGeoMapParameter *p : m_mapParameters)
+        m_map->addParameter(p);
 }
 
 /*!
@@ -1206,6 +1226,95 @@ void QDeclarativeGeoMap::addMapItem(QDeclarativeGeoMapItemBase *item)
 }
 
 /*!
+    \qmlmethod void QtLocation::Map::addMapParameter(MapParameter parameter)
+
+    Adds a MapParameter object to the map. The effect of this call is dependent
+    on the combination of the content of the MapParameter and the type of
+    underlying QGeoMap. If a MapParameter that is not supported by the underlying
+    QGeoMap gets added, the call has no effect.
+
+    The release of this API with Qt 5.9 is a Technology Preview.
+
+    \sa MapParameter, removeMapParameter, mapParameters, clearMapParameters
+
+    \since 5.9
+*/
+void QDeclarativeGeoMap::addMapParameter(QDeclarativeGeoMapParameter *parameter)
+{
+    if (!parameter->isComponentComplete()) {
+        connect(parameter, &QDeclarativeGeoMapParameter::completed, this, &QDeclarativeGeoMap::addMapParameter);
+        return;
+    }
+
+    disconnect(parameter);
+    if (m_mapParameters.contains(parameter))
+        return;
+    parameter->setParent(this);
+    m_mapParameters.insert(parameter); // parameter now owned by QDeclarativeGeoMap
+    if (m_map)
+        m_map->addParameter(parameter);
+}
+
+/*!
+    \qmlmethod void QtLocation::Map::removeMapParameter(MapParameter parameter)
+
+    Removes the given MapParameter object from the map.
+
+    The release of this API with Qt 5.9 is a Technology Preview.
+
+    \sa MapParameter, addMapParameter, mapParameters, clearMapParameters
+
+    \since 5.9
+*/
+void QDeclarativeGeoMap::removeMapParameter(QDeclarativeGeoMapParameter *parameter)
+{
+    if (!m_mapParameters.contains(parameter))
+        return;
+    if (m_map)
+        m_map->removeParameter(parameter);
+    m_mapParameters.remove(parameter);
+}
+
+/*!
+    \qmlmethod void QtLocation::Map::clearMapParameters()
+
+    Removes all map parameters from the map.
+
+    The release of this API with Qt 5.9 is a Technology Preview.
+
+    \sa MapParameter, mapParameters, addMapParameter, removeMapParameter, clearMapParameters
+
+    \since 5.9
+*/
+void QDeclarativeGeoMap::clearMapParameters()
+{
+    if (m_map)
+        m_map->clearParameters();
+    m_mapParameters.clear();
+}
+
+/*!
+    \qmlproperty list<MapParameters> QtLocation::Map::mapParameters
+
+    Returns the list of all map parameters in no particular order.
+    These items include map parameters that were declared statically as part of
+    the type declaration, as well as dynamical map parameters (\l addMapParameter).
+
+    The release of this API with Qt 5.9 is a Technology Preview.
+
+    \sa MapParameter, addMapParameter, removeMapParameter, clearMapParameters
+
+    \since 5.9
+*/
+QList<QObject *> QDeclarativeGeoMap::mapParameters()
+{
+    QList<QObject *> ret;
+    for (QDeclarativeGeoMapParameter *p : m_mapParameters)
+        ret << p;
+    return ret;
+}
+
+/*!
     \qmlproperty list<MapItem> QtLocation::Map::mapItems
 
     Returns the list of all map items in no particular order.
diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h
index 468046d1..e0940f97 100644
--- a/src/imports/location/qdeclarativegeomap_p.h
+++ b/src/imports/location/qdeclarativegeomap_p.h
@@ -54,6 +54,7 @@
 #include "qgeocameradata_p.h"
 #include <QtQuick/QQuickItem>
 #include <QtCore/QPointer>
+#include <QtCore/QSet>
 #include <QtGui/QColor>
 #include <QtPositioning/qgeoshape.h>
 
@@ -62,6 +63,7 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeGeoServiceProvider;
 class QDeclarativeGeoMapType;
 class QDeclarativeGeoMapCopyrightNotice;
+class QDeclarativeGeoMapParameter;
 
 class QDeclarativeGeoMap : public QQuickItem
 {
@@ -76,6 +78,7 @@ class QDeclarativeGeoMap : public QQuickItem
     Q_PROPERTY(QQmlListProperty<QDeclarativeGeoMapType> supportedMapTypes READ supportedMapTypes NOTIFY supportedMapTypesChanged)
     Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY centerChanged)
     Q_PROPERTY(QList<QObject *> mapItems READ mapItems NOTIFY mapItemsChanged)
+    Q_PROPERTY(QList<QObject *> mapParameters READ mapParameters)
     Q_PROPERTY(QGeoServiceProvider::Error error READ error NOTIFY errorChanged)
     Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
     Q_PROPERTY(QGeoShape visibleRegion READ visibleRegion WRITE setVisibleRegion)
@@ -119,9 +122,15 @@ public:
 
     Q_INVOKABLE void removeMapItem(QDeclarativeGeoMapItemBase *item);
     Q_INVOKABLE void addMapItem(QDeclarativeGeoMapItemBase *item);
+
     Q_INVOKABLE void clearMapItems();
     QList<QObject *> mapItems();
 
+    Q_INVOKABLE void addMapParameter(QDeclarativeGeoMapParameter *parameter);
+    Q_INVOKABLE void removeMapParameter(QDeclarativeGeoMapParameter *parameter);
+    Q_INVOKABLE void clearMapParameters();
+    QList<QObject *> mapParameters();
+
     Q_INVOKABLE QGeoCoordinate toCoordinate(const QPointF &position, bool clipToViewPort = true) const;
     Q_INVOKABLE QPointF fromCoordinate(const QGeoCoordinate &coordinate, bool clipToViewPort = true) const;
 
@@ -177,6 +186,7 @@ private Q_SLOTS:
 private:
     void setupMapView(QDeclarativeGeoMapItemView *view);
     void populateMap();
+    void populateParameters();
     void fitViewportToMapItemsRefine(bool refine);
     void fitViewportToGeoShape();
     bool isInteractive();
@@ -202,6 +212,7 @@ private:
     double m_maximumViewportLatitude;
     bool m_initialized;
     bool m_validRegion;
+    QSet<QDeclarativeGeoMapParameter *> m_mapParameters;
 
     friend class QDeclarativeGeoMapItem;
     friend class QDeclarativeGeoMapItemView;
diff --git a/src/imports/location/qdeclarativegeomapparameter.cpp b/src/imports/location/qdeclarativegeomapparameter.cpp
new file mode 100644
index 00000000..88d609f4
--- /dev/null
+++ b/src/imports/location/qdeclarativegeomapparameter.cpp
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 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 "qdeclarativegeomapparameter_p.h"
+
+#include <QByteArray>
+#include <QMetaObject>
+#include <QMetaProperty>
+#include <QSignalMapper>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmltype MapParameter
+    \instantiates QDeclarativeGeoMapParameter
+    \inqmlmodule QtLocation
+    \ingroup qml-QtLocation5-maps
+    \since Qt Location 5.9
+
+    \brief The MapParameter type represents a parameter for a Map element.
+    This type provides a mean to specify plugin-dependent optional parameters
+    for a map.
+
+    MapParameters by default contain only the \l type property, and
+    are highly plugin-dependent.
+    For this reason, additional properties have to be defined inside a
+    MapParameter at declaration time, using the QML syntax "property var foo".
+
+    What properties have to be put inside a particular MapParameter type for
+    a particular plugin can be found in the documentation of the plugin.
+    Note that MapProperties are \b optional.
+    By not specifying any of them, the Map will have the default behavior.
+
+    The release of this API with Qt 5.9 is a Technology Preview.
+*/
+
+/*!
+    \qmlproperty georectangle QtLocation::MapParameter::type
+
+    Set-once property which holds a string defining the type of the MapParameter
+*/
+
+QDeclarativeGeoMapParameter::QDeclarativeGeoMapParameter(QObject *parent)
+:   QGeoMapParameter(parent), m_initialPropertyCount(metaObject()->propertyCount()), m_complete(false)
+{
+
+}
+
+QDeclarativeGeoMapParameter::~QDeclarativeGeoMapParameter()
+{
+}
+
+bool QDeclarativeGeoMapParameter::isComponentComplete() const
+{
+    return m_complete;
+}
+
+int QDeclarativeGeoMapParameter::initialPropertyCount() const
+{
+    return m_initialPropertyCount;
+}
+
+void QDeclarativeGeoMapParameter::classBegin()
+{
+}
+
+void QDeclarativeGeoMapParameter::componentComplete()
+{
+    for (int i = m_initialPropertyCount; i < metaObject()->propertyCount(); ++i) {
+        QMetaProperty property = metaObject()->property(i);
+
+        if (!property.hasNotifySignal()) {
+            return;
+        }
+
+        QSignalMapper *mapper = new QSignalMapper(this);
+        mapper->setMapping(this, i);
+
+        const QByteArray signalName = '2' + property.notifySignal().methodSignature(); // TODO: explain why '2'
+        QObject::connect(this, signalName, mapper, SLOT(map()));
+        QObject::connect(mapper, SIGNAL(mapped(int)), this, SLOT(onPropertyUpdated(int)));
+    }
+    m_complete = true;
+    emit completed(this);
+}
+
+void QDeclarativeGeoMapParameter::onPropertyUpdated(int index)
+{
+    emit propertyUpdated(this, metaObject()->property(index).name());
+}
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomapparameter_p.h b/src/imports/location/qdeclarativegeomapparameter_p.h
new file mode 100644
index 00000000..31ea5b04
--- /dev/null
+++ b/src/imports/location/qdeclarativegeomapparameter_p.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 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 QDECLARATIVEGEOMAPPARAMETER_P_H
+#define QDECLARATIVEGEOMAPPARAMETER_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 <QtLocation/private/qgeomapparameter_p.h>
+#include <QQmlParserStatus>
+#include <qqml.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeGeoMapParameter : public QGeoMapParameter, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+
+public:
+    explicit QDeclarativeGeoMapParameter(QObject *parent = 0);
+    virtual ~QDeclarativeGeoMapParameter();
+
+    bool isComponentComplete() const;
+
+Q_SIGNALS:
+    void completed(QDeclarativeGeoMapParameter *);
+
+protected:
+    int initialPropertyCount() const;
+    // QQmlParserStatus implementation
+    void classBegin() override;
+    void componentComplete() override;
+
+private slots:
+    void onPropertyUpdated(int index);
+
+private:
+    int m_initialPropertyCount;
+    bool m_complete;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeGeoMapParameter)
+
+#endif // QDECLARATIVEGEOMAPPARAMETER_P_H
diff --git a/src/location/maps/maps.pri b/src/location/maps/maps.pri
index 97b28b69..3f76f737 100644
--- a/src/location/maps/maps.pri
+++ b/src/location/maps/maps.pri
@@ -18,6 +18,7 @@ PUBLIC_HEADERS += \
                     maps/qgeoserviceprovider.h
 
 PRIVATE_HEADERS += \
+                    maps/qgeomapparameter_p.h \
                     maps/qgeocameracapabilities_p.h \
                     maps/qgeocameradata_p.h \
                     maps/qgeocameratiles_p.h \
@@ -91,5 +92,5 @@ SOURCES += \
             maps/qgeotiledmapscene.cpp \
             maps/qgeorouteparser.cpp \
             maps/qgeorouteparserosrmv5.cpp \
-            maps/qgeorouteparserosrmv4.cpp
-
+            maps/qgeorouteparserosrmv4.cpp \
+            maps/qgeomapparameter.cpp
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index c3b01a3e..f8361ee3 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -130,6 +130,32 @@ void QGeoMap::clearData()
 
 }
 
+void QGeoMap::addParameter(QGeoMapParameter *param)
+{
+    Q_D(QGeoMap);
+    if (param && !d->m_mapParameters.contains(param)) {
+        d->m_mapParameters.insert(param);
+        d->addParameter(param);
+    }
+}
+
+void QGeoMap::removeParameter(QGeoMapParameter *param)
+{
+    Q_D(QGeoMap);
+    if (param && d->m_mapParameters.contains(param)) {
+        d->removeParameter(param);
+        d->m_mapParameters.remove(param);
+    }
+}
+
+void QGeoMap::clearParameters()
+{
+    Q_D(QGeoMap);
+    for (QGeoMapParameter *p : d->m_mapParameters)
+        d->removeParameter(p);
+    d->m_mapParameters.clear();
+}
+
 QGeoMapPrivate::QGeoMapPrivate(QGeoMappingManagerEngine *engine)
     : QObjectPrivate(),
       m_engine(engine),
@@ -141,4 +167,14 @@ QGeoMapPrivate::~QGeoMapPrivate()
 {
 }
 
+void QGeoMapPrivate::addParameter(QGeoMapParameter *param)
+{
+    Q_UNUSED(param)
+}
+
+void QGeoMapPrivate::removeParameter(QGeoMapParameter *param)
+{
+    Q_UNUSED(param)
+}
+
 QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index c16d35af..6a482e4f 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -61,6 +61,7 @@ class QGeoCameraCapabilities;
 class QGeoCoordinate;
 class QSGNode;
 class QQuickWindow;
+class QGeoMapParameter;
 
 class Q_LOCATION_EXPORT QGeoMap : public QObject
 {
@@ -93,6 +94,10 @@ public:
     virtual void prefetchData();
     virtual void clearData();
 
+    void addParameter(QGeoMapParameter *param);
+    void removeParameter(QGeoMapParameter *param);
+    void clearParameters();
+
 protected:
     QGeoMap(QGeoMapPrivate &dd, QObject *parent = 0);
     void setCameraData(const QGeoCameraData &cameraData);
diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
index 311a3eb1..6347d0f7 100644
--- a/src/location/maps/qgeomap_p_p.h
+++ b/src/location/maps/qgeomap_p_p.h
@@ -52,6 +52,7 @@
 #include <QtLocation/private/qgeomaptype_p.h>
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/QSize>
+#include <QtCore/QSet>
 
 
 QT_BEGIN_NAMESPACE
@@ -59,6 +60,7 @@ QT_BEGIN_NAMESPACE
 class QGeoMappingManagerEngine;
 class QGeoMap;
 class QGeoMapController;
+class QGeoMapParameter;
 
 class Q_LOCATION_PRIVATE_EXPORT QGeoMapPrivate :  public QObjectPrivate
 {
@@ -72,12 +74,14 @@ protected:
     virtual void changeMapSize(const QSize &size) = 0; // called by QGeoMap::setSize()
     virtual void changeCameraData(const QGeoCameraData &oldCameraData) = 0; // called by QGeoMap::setCameraData()
     virtual void changeActiveMapType(const QGeoMapType mapType) = 0; // called by QGeoMap::setActiveMapType()
+    virtual void addParameter(QGeoMapParameter *param);
+    virtual void removeParameter(QGeoMapParameter *param);
 
-protected:
     QSize m_size;
     QPointer<QGeoMappingManagerEngine> m_engine;
     QGeoCameraData m_cameraData;
     QGeoMapType m_activeMapType;
+    QSet<QGeoMapParameter *> m_mapParameters;
 };
 
 QT_END_NAMESPACE
diff --git a/src/location/maps/qgeomapparameter.cpp b/src/location/maps/qgeomapparameter.cpp
new file mode 100644
index 00000000..b8f9561f
--- /dev/null
+++ b/src/location/maps/qgeomapparameter.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 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 "qgeomapparameter_p.h"
+#include <QtCore/QVariant>
+
+QT_BEGIN_NAMESPACE
+
+QGeoMapParameter::QGeoMapParameter(QObject *parent) : QObject(parent)
+{
+
+}
+
+QGeoMapParameter::~QGeoMapParameter()
+{
+}
+
+QString QGeoMapParameter::type() const
+{
+    return m_type;
+}
+
+void QGeoMapParameter::setType(const QString &type)
+{
+    if (m_type.isEmpty())
+        m_type = type;
+}
+
+// DO NOT USE to set "type"
+void QGeoMapParameter::updateProperty(const char *propertyName, QVariant value)
+{
+    setProperty(propertyName, value);
+    // This should technically be emitted only for dynamically added properties.
+    // Since this object has only type defined as Q_PROPERTY() which is a set-once
+    // no check is really needed here.
+    emit propertyUpdated(this, propertyName);
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/location/maps/qgeomapparameter_p.h b/src/location/maps/qgeomapparameter_p.h
new file mode 100644
index 00000000..c3bef4d8
--- /dev/null
+++ b/src/location/maps/qgeomapparameter_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 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 QGEOMAPPARAMETER_P_H
+#define QGEOMAPPARAMETER_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 <QObject>
+#include <QString>
+#include <QtLocation/qlocationglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_LOCATION_EXPORT QGeoMapParameter : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString type READ type WRITE setType)
+public:
+    explicit QGeoMapParameter(QObject *parent = 0);
+    virtual ~QGeoMapParameter();
+
+    QString type() const;
+    void setType(const QString &type);
+
+    void updateProperty(const char *propertyName, QVariant value);
+
+Q_SIGNALS:
+    void propertyUpdated(QGeoMapParameter *param, const char *propertyName);
+
+protected:
+    QString m_type;
+
+    Q_DISABLE_COPY(QGeoMapParameter)
+    friend class QGeoMap;
+};
+
+QT_END_NAMESPACE
+
+#endif // QGEOMAPPARAMETER_P_H
diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index fedaecbc..2cf815af 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -60,6 +60,17 @@ QGeoTiledMap::QGeoTiledMap(QGeoTiledMappingManagerEngine *engine, QObject *paren
                      this,&QGeoTiledMap::handleTileVersionChanged);
 }
 
+QGeoTiledMap::QGeoTiledMap(QGeoTiledMapPrivate &dd, QGeoTiledMappingManagerEngine *engine, QObject *parent)
+    : QGeoMap(dd, parent)
+{
+    Q_D(QGeoTiledMap);
+
+    d->m_tileRequests = new QGeoTileRequestManager(this, engine);
+
+    QObject::connect(engine,&QGeoTiledMappingManagerEngine::tileVersionChanged,
+                     this,&QGeoTiledMap::handleTileVersionChanged);
+}
+
 QGeoTiledMap::~QGeoTiledMap()
 {
     Q_D(QGeoTiledMap);
diff --git a/src/location/maps/qgeotiledmap_p.h b/src/location/maps/qgeotiledmap_p.h
index 791384c7..ff5f88a6 100644
--- a/src/location/maps/qgeotiledmap_p.h
+++ b/src/location/maps/qgeotiledmap_p.h
@@ -49,10 +49,10 @@
 
 #include <QObject>
 #include <QString>
-
-#include "qgeomap_p.h"
-#include "qgeocameradata_p.h"
-#include "qgeomaptype_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qgeomap_p.h>
+#include <QtLocation/private/qgeocameradata_p.h>
+#include <QtLocation/private/qgeomaptype_p.h>
 
 #include <QtPositioning/private/qdoublevector2d_p.h>
 
@@ -70,7 +70,7 @@ class QSGNode;
 
 class QPointF;
 
-class Q_LOCATION_EXPORT QGeoTiledMap : public QGeoMap
+class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMap : public QGeoMap
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoTiledMap)
@@ -103,6 +103,8 @@ protected:
     QSGNode *updateSceneGraph(QSGNode *, QQuickWindow *window) Q_DECL_OVERRIDE;
     virtual void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles);
 
+    QGeoTiledMap(QGeoTiledMapPrivate &dd, QGeoTiledMappingManagerEngine *engine, QObject *parent);
+
 private Q_SLOTS:
     void handleTileVersionChanged();
 
diff --git a/src/location/maps/qgeotiledmap_p_p.h b/src/location/maps/qgeotiledmap_p_p.h
index f7f9c4d9..f0744df6 100644
--- a/src/location/maps/qgeotiledmap_p_p.h
+++ b/src/location/maps/qgeotiledmap_p_p.h
@@ -47,10 +47,10 @@
 // We mean it.
 //
 
-#include "qlocationglobal_p.h"
-#include "qgeomap_p_p.h"
-#include "qgeocameradata_p.h"
-#include "qgeomaptype_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qgeomap_p_p.h>
+#include <QtLocation/private/qgeocameradata_p.h>
+#include <QtLocation/private/qgeomaptype_p.h>
 #include <QtPositioning/private/qdoublevector3d_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtCore/QPointer>
@@ -90,10 +90,9 @@ protected:
     void changeTileVersion(int version);
     void clearScene();
 
-private:
     void updateScene();
 
-private:
+protected:
     QAbstractGeoTileCache *m_cache;
     QGeoCameraTiles *m_visibleTiles;
     QGeoCameraTiles *m_prefetchTiles;
@@ -102,7 +101,6 @@ private:
     int m_maxZoomLevel;
     int m_minZoomLevel;
     QGeoTiledMap::PrefetchStyle m_prefetchStyle;
-    bool m_geomoteryUpdated;
     Q_DISABLE_COPY(QGeoTiledMapPrivate)
 };
 
diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 5f02962d..a81885fb 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -28,8 +28,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtLocation 5.6
 import QtPositioning 5.5
+import QtLocation 5.9
 
 Item {
     width:100
@@ -82,7 +82,11 @@ Item {
     Map {id: coordinateMap; plugin: herePlugin; center: coordinate3;
         width: 1000; height: 1000; zoomLevel: 15 }
 
-
+    MapParameter {
+        id: testParameter
+        type: "cameraCenter_test"
+        property var center: QtPositioning.coordinate(-33.0, -47.0)
+    }
 
 
     TestCase {
@@ -128,6 +132,51 @@ Item {
             compare(map.center.latitude, 12)
         }
 
+        function test_map_parameters()
+        {
+            // coordinate is set at map element declaration
+            var center = map.toCoordinate(Qt.point((map.width - 1) / 2.0, (map.height - 1) / 2.0))
+            fuzzyCompare(center.latitude, 10, 0.1)
+            fuzzyCompare(center.longitude, 11, 0.1)
+
+            compare(map.mapParameters.length, 0)
+
+            map.addMapParameter(testParameter)
+
+            compare(map.mapParameters.length, 1)
+
+            center = map.toCoordinate(Qt.point((map.width - 1) / 2.0, (map.height - 1) / 2.0))
+            fuzzyCompare(center.latitude, -33, 0.1)
+            fuzzyCompare(center.longitude, -47, 0.1)
+
+            map.addMapParameter(testParameter)
+            compare(map.mapParameters.length, 1)
+
+            map.removeMapParameter(testParameter)
+            compare(map.mapParameters.length, 0)
+
+            center = map.toCoordinate(Qt.point((map.width - 1) / 2.0, (map.height - 1) / 2.0))
+            fuzzyCompare(center.latitude, -33, 0.1)
+            fuzzyCompare(center.longitude, -47, 0.1)
+
+            testParameter.center = map.center
+            map.addMapParameter(testParameter)
+            compare(map.mapParameters.length, 1)
+
+            var center = map.toCoordinate(Qt.point((map.width - 1) / 2.0, (map.height - 1) / 2.0))
+            fuzzyCompare(center.latitude, 10, 0.1)
+            fuzzyCompare(center.longitude, 11, 0.1)
+
+            testParameter.center = QtPositioning.coordinate(-33.0, -47.0)
+
+            center = map.toCoordinate(Qt.point((map.width - 1) / 2.0, (map.height - 1) / 2.0))
+            fuzzyCompare(center.latitude, -33, 0.1)
+            fuzzyCompare(center.longitude, -47, 0.1)
+
+            map.removeMapParameter(testParameter)
+            compare(map.mapParameters.length, 0)
+        }
+
         function test_map_clamp()
         {
             //valid
diff --git a/tests/auto/geotestplugin/geotestplugin.pro b/tests/auto/geotestplugin/geotestplugin.pro
index fb3f1b39..f4fe25b3 100644
--- a/tests/auto/geotestplugin/geotestplugin.pro
+++ b/tests/auto/geotestplugin/geotestplugin.pro
@@ -14,7 +14,8 @@ HEADERS += qgeocodingmanagerengine_test.h \
            qgeotiledmap_test.h \
            qgeotilefetcher_test.h
 
-SOURCES += qgeoserviceproviderplugin_test.cpp
+SOURCES += qgeoserviceproviderplugin_test.cpp \
+           qgeotiledmap_test.cpp
 
 OTHER_FILES += \
     geotestplugin.json \
diff --git a/tests/auto/geotestplugin/qgeotiledmap_test.cpp b/tests/auto/geotestplugin/qgeotiledmap_test.cpp
new file mode 100644
index 00000000..ef2af7db
--- /dev/null
+++ b/tests/auto/geotestplugin/qgeotiledmap_test.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qgeotiledmap_test.h"
+#include <QtLocation/private/qgeotiledmap_p_p.h>
+#include <QtLocation/private/qgeomapparameter_p.h>
+
+QT_USE_NAMESPACE
+
+class QGeoTiledMapTestPrivate: public QGeoTiledMapPrivate
+{
+    Q_DECLARE_PUBLIC(QGeoTiledMapTest)
+public:
+    QGeoTiledMapTestPrivate(QGeoTiledMappingManagerEngine *engine)
+        : QGeoTiledMapPrivate(engine)
+    {
+
+    }
+
+    ~QGeoTiledMapTestPrivate()
+    {
+
+    }
+
+    void addParameter(QGeoMapParameter *param) override
+    {
+        Q_Q(QGeoTiledMapTest);
+        if (param->type() == QStringLiteral("cameraCenter_test")) {
+            // We assume that cameraCenter_test parameters have a QGeoCoordinate property named "center"
+            // Handle the parameter
+            QGeoCameraData cameraData = m_cameraData;
+            QGeoCoordinate newCenter = param->property("center").value<QGeoCoordinate>();
+            cameraData.setCenter(newCenter);
+            q->setCameraData(cameraData);
+            // Connect for further changes handling
+            q->connect(param, SIGNAL(propertyUpdated(QGeoMapParameter *, const char *)),
+                       q, SLOT(onCameraCenter_testChanged(QGeoMapParameter*, const char*)));
+
+        }
+    }
+    void removeParameter(QGeoMapParameter *param) override
+    {
+        Q_Q(QGeoTiledMapTest);
+        param->disconnect(q);
+    }
+};
+
+QGeoTiledMapTest::QGeoTiledMapTest(QGeoTiledMappingManagerEngine *engine, QObject *parent)
+:   QGeoTiledMap(*new QGeoTiledMapTestPrivate(engine), engine, parent), m_engine(engine)
+{
+}
+
+void QGeoTiledMapTest::onCameraCenter_testChanged(QGeoMapParameter *param, const char *propertyName)
+{
+    Q_D(QGeoTiledMapTest);
+    if (strcmp(propertyName, "center") == 0) {
+        QGeoCameraData cameraData = d->m_cameraData;
+        // Not testing for propertyName as this param has only one allowed property
+        QGeoCoordinate newCenter = param->property(propertyName).value<QGeoCoordinate>();
+        cameraData.setCenter(newCenter);
+        setCameraData(cameraData);
+    }
+}
diff --git a/tests/auto/geotestplugin/qgeotiledmap_test.h b/tests/auto/geotestplugin/qgeotiledmap_test.h
index 27ff7164..19c7620e 100644
--- a/tests/auto/geotestplugin/qgeotiledmap_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmap_test.h
@@ -33,17 +33,25 @@
 #include <QtLocation/private/qgeotiledmap_p.h>
 
 QT_USE_NAMESPACE
+
 class QGeoTiledMappingManagerEngineTest;
+class QGeoTiledMapTestPrivate;
+
 class QGeoTiledMapTest: public QGeoTiledMap
 {
     Q_OBJECT
+    Q_DECLARE_PRIVATE(QGeoTiledMapTest)
 public:
-    QGeoTiledMapTest(QGeoTiledMappingManagerEngine *engine, QObject *parent = 0):
-        QGeoTiledMap(engine, parent),
-        m_engine(engine){}
+    QGeoTiledMapTest(QGeoTiledMappingManagerEngine *engine, QObject *parent = 0);
+
+protected slots:
+    void onCameraCenter_testChanged(QGeoMapParameter *param, const char *propertyName);
+
 public:
     using QGeoTiledMap::setCameraData;
     QGeoTiledMappingManagerEngine *m_engine;
 };
 
 #endif
+
+
diff --git a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
index 2765c268..015a203a 100644
--- a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
@@ -57,6 +57,9 @@ public:
         capabilities.setMinimumZoomLevel(0.0);
         capabilities.setMaximumZoomLevel(20.0);
         capabilities.setSupportsBearing(true);
+        capabilities.setSupportsTilting(true);
+        capabilities.setMinimumTilt(0);
+        capabilities.setMaximumTilt(60);
         setTileSize(QSize(256, 256));
 
         QList<QGeoMapType> mapTypes;
diff --git a/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro b/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro
index f629a154..d061f18f 100644
--- a/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro
+++ b/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro
@@ -6,4 +6,4 @@ INCLUDEPATH += ../../../src/location/maps
 
 SOURCES += tst_qgeocameracapabilities.cpp
 
-QT += location positioning-private testlib
+QT += location-private positioning-private testlib
diff --git a/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp b/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp
index 54755421..09d7293b 100644
--- a/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp
+++ b/tests/auto/qgeocameracapabilities/tst_qgeocameracapabilities.cpp
@@ -29,8 +29,8 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
-#include "qgeocameracapabilities_p.h"
-#include "qgeotiledmap_p.h"
+#include <QtLocation/private/qgeocameracapabilities_p.h>
+#include <QtLocation/private/qgeotiledmap_p.h>
 
 QT_USE_NAMESPACE