Map item autotests and related fixes.

Change-Id: Ib44f55814baea9e8908a4092102bd42b8b18d5eb
Reviewed-by: David Laing <david.laing@nokia.com>

8 files changed, 10 insertions, 6 deletions

diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h
index 2aa86791..1431dc46 100644
--- a/src/imports/location/qdeclarativecirclemapitem_p.h
+++ b/src/imports/location/qdeclarativecirclemapitem_p.h
@@ -58,7 +58,7 @@ class QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase
     Q_PROPERTY(QDeclarativeCoordinate* center READ center WRITE setCenter NOTIFY centerChanged)
     Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QDeclarativeMapLineProperties *border READ border)
+    Q_PROPERTY(QDeclarativeMapLineProperties *border READ border CONSTANT)
 
 public:
     QDeclarativeCircleMapItem(QQuickItem *parent = 0);
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index e0273fe2..1ea44716 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -714,7 +714,7 @@ QDeclarativeListProperty<QDeclarativeGeoMapType> QDeclarativeGeoMap::supportedMa
 QDeclarativeCoordinate* QDeclarativeGeoMap::toCoordinate(QPointF screenPosition) const
 {
     QGeoCoordinate coordinate;
-    if (mappingManagerInitialized_)
+    if (map_)
         coordinate = map_->screenPositionToCoordinate(screenPosition);
     // by default objects returned from method call get javascript ownership,
     // so we don't need to worry about this as long as we don't set the parent
@@ -734,7 +734,7 @@ QDeclarativeCoordinate* QDeclarativeGeoMap::toCoordinate(QPointF screenPosition)
 QPointF QDeclarativeGeoMap::toScreenPosition(QDeclarativeCoordinate* coordinate) const
 {
     QPointF point(qQNaN(), qQNaN());
-    if (coordinate && mappingManagerInitialized_)
+    if (coordinate && map_)
         point = map_->coordinateToScreenPosition(coordinate->coordinate());
     return point;
 }
diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp
index 6f2bc865..66aa71de 100644
--- a/src/imports/location/qdeclarativegeomapquickitem.cpp
+++ b/src/imports/location/qdeclarativegeomapquickitem.cpp
@@ -110,6 +110,7 @@ void QDeclarativeGeoMapQuickItem::setMap(QDeclarativeGeoMap* quickMap, Map *map)
 
 void QDeclarativeGeoMapQuickItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
+    /*
     if (!dragActive_ && quickMap() && sourceItem() && newGeometry.isValid() && newGeometry != oldGeometry) {
         QPointF point(newGeometry.x(), newGeometry.y());
         // screenPositionToCoordinate seems to return nan values when
@@ -120,6 +121,7 @@ void QDeclarativeGeoMapQuickItem::geometryChanged(const QRectF &newGeometry, con
             setCoordinate(&internalCoordinate_);
         }
     }
+    */
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
 }
 
diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h
index 8b56805b..223fd509 100644
--- a/src/imports/location/qdeclarativepolygonmapitem_p.h
+++ b/src/imports/location/qdeclarativepolygonmapitem_p.h
@@ -57,7 +57,7 @@ class QDeclarativePolygonMapItem : public QDeclarativeGeoMapItemBase
 
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> path READ declarativePath NOTIFY pathChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QDeclarativeMapLineProperties *border READ border)
+    Q_PROPERTY(QDeclarativeMapLineProperties *border READ border CONSTANT)
 
 public:
     QDeclarativePolygonMapItem(QQuickItem *parent = 0);
diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp
index c794abd7..89764b4c 100644
--- a/src/imports/location/qdeclarativepolylinemapitem.cpp
+++ b/src/imports/location/qdeclarativepolylinemapitem.cpp
@@ -148,6 +148,7 @@ void QDeclarativePolylineMapItem::setMap(QDeclarativeGeoMap* quickMap, Map *map)
     QDeclarativeGeoMapItemBase::setMap(quickMap,map);
     if (map){
         QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)), this, SLOT(handleCameraDataChanged(CameraData)));
+        dirtyGeometry_ = true;
         updateMapItem();
     }
 }
diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h
index 6853ad9d..604c485c 100644
--- a/src/imports/location/qdeclarativepolylinemapitem_p.h
+++ b/src/imports/location/qdeclarativepolylinemapitem_p.h
@@ -80,7 +80,7 @@ class QDeclarativePolylineMapItem : public QDeclarativeGeoMapItemBase
     Q_OBJECT
 
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> path READ declarativePath NOTIFY pathChanged)
-    Q_PROPERTY(QDeclarativeMapLineProperties *line READ line)
+    Q_PROPERTY(QDeclarativeMapLineProperties *line READ line CONSTANT)
 
 public:
     QDeclarativePolylineMapItem(QQuickItem *parent = 0);
diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp
index c51b03dc..f2595372 100644
--- a/src/imports/location/qdeclarativerectanglemapitem.cpp
+++ b/src/imports/location/qdeclarativerectanglemapitem.cpp
@@ -74,6 +74,7 @@ void QDeclarativeRectangleMapItem::setMap(QDeclarativeGeoMap* quickMap, Map *map
     QDeclarativeGeoMapItemBase::setMap(quickMap,map);
     if (map) {
         QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)), this, SLOT(handleCameraDataChanged(CameraData)));
+        dirtyGeometry_ = true;
         updateMapItem();
     }
 }
diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/imports/location/qdeclarativeroutemapitem_p.h
index 7dacc6c9..249a7e8c 100644
--- a/src/imports/location/qdeclarativeroutemapitem_p.h
+++ b/src/imports/location/qdeclarativeroutemapitem_p.h
@@ -58,7 +58,7 @@ class QDeclarativeRouteMapItem : public QDeclarativeGeoMapItemBase
     Q_OBJECT
 
     Q_PROPERTY(QDeclarativeGeoRoute* route READ route WRITE setRoute NOTIFY routeChanged)
-    Q_PROPERTY(QDeclarativeMapLineProperties *line READ line)
+    Q_PROPERTY(QDeclarativeMapLineProperties *line READ line CONSTANT)
 
 public:
     QDeclarativeRouteMapItem(QQuickItem *parent = 0);