Fix activeMapType handling

* fix map type test to use geo test plugin
* add test types to test plugin
* rewrite map type test so it actually tests something
* fix activeMapTypeChanged signal
* create default map type as NoMap type

Change-Id: I9398815fe42cbdeb392bd226de0c8764d3e0bc19
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index b00d46b7..53c40a6e 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -192,6 +192,9 @@ QDeclarativeGeoMap::QDeclarativeGeoMap(QQuickItem *parent)
 
     // Create internal flickable and pinch area.
     m_gestureArea = new QDeclarativeGeoMapGestureArea(this, this);
+    m_activeMapType = new QDeclarativeGeoMapType(QGeoMapType(QGeoMapType::NoMap,
+                                                             tr("No Map"),
+                                                             tr("No Map"), false, false, 0), this);
 }
 
 QDeclarativeGeoMap::~QDeclarativeGeoMap()
@@ -1123,9 +1126,12 @@ void QDeclarativeGeoMap::clearMapItems()
 */
 void QDeclarativeGeoMap::setActiveMapType(QDeclarativeGeoMapType *mapType)
 {
-    m_activeMapType = mapType;
-    m_map->setActiveMapType(mapType->mapType());
-    emit activeMapTypeChanged();
+    if (m_activeMapType->mapType() != mapType->mapType()) {
+        m_activeMapType = mapType;
+        if (m_map)
+            m_map->setActiveMapType(mapType->mapType());
+        emit activeMapTypeChanged();
+    }
 }
 
 QDeclarativeGeoMapType * QDeclarativeGeoMap::activeMapType() const