3 files changed, 11 insertions, 29 deletions

diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 2b860eb3..bfa1922f 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -494,9 +494,9 @@ void QDeclarativeGeoMap::mappingManagerInitialized()
             this,
             SLOT(update()));
     connect(map_->mapController(),
-            SIGNAL(centerChanged(AnimatableCoordinate)),
+            SIGNAL(centerChanged(QGeoCoordinate)),
             this,
-            SLOT(mapCenterChanged(AnimatableCoordinate)));
+            SIGNAL(centerChanged(QGeoCoordinate)));
     connect(map_->mapController(),
             SIGNAL(bearingChanged(qreal)),
             this,
@@ -510,9 +510,7 @@ void QDeclarativeGeoMap::mappingManagerInitialized()
             this,
             SLOT(mapZoomLevelChanged(qreal)));
 
-    AnimatableCoordinate acenter = map_->mapController()->center();
-    acenter.setCoordinate(center_);
-    map_->mapController()->setCenter(acenter);
+    map_->mapController()->setCenter(center_);
     map_->mapController()->setZoom(zoomLevel_);
     map_->mapController()->setBearing(bearing_);
     map_->mapController()->setTilt(tilt_);
@@ -726,9 +724,7 @@ void QDeclarativeGeoMap::setCenter(const QGeoCoordinate &center)
     center_ = center;
 
     if (center_.isValid() && mappingManagerInitialized_) {
-        AnimatableCoordinate acoord = map_->mapController()->center();
-        acoord.setCoordinate(center_);
-        map_->mapController()->setCenter(acoord);
+        map_->mapController()->setCenter(center_);
         update();
     } else {
         emit centerChanged(center_);
@@ -738,7 +734,7 @@ void QDeclarativeGeoMap::setCenter(const QGeoCoordinate &center)
 QGeoCoordinate QDeclarativeGeoMap::center() const
 {
     if (mappingManagerInitialized_)
-        return map_->mapController()->center().coordinate();
+        return map_->mapController()->center();
     else
         return center_;
 }
@@ -777,14 +773,6 @@ void QDeclarativeGeoMap::mapBearingChanged(qreal bearing)
 }
 
 /*!
-    \internal
-*/
-void QDeclarativeGeoMap::mapCenterChanged(AnimatableCoordinate center)
-{
-    emit centerChanged(center.coordinate());
-}
-
-/*!
     \qmlproperty list<MapType> QtLocation5::Map::supportedMapTypes
 
     This read-only property holds the set of \l{MapType}{map types} supported by this map.
@@ -1140,8 +1128,6 @@ void QDeclarativeGeoMap::fitViewportToMapItemsRefine(bool refine)
     // position camera to the center of bounding box
     QGeoCoordinate coordinate;
     coordinate = map_->screenPositionToCoordinate(QPointF(bboxCenterX, bboxCenterY), false);
-    AnimatableCoordinate acenter = map_->mapController()->center();
-    acenter.setCoordinate(coordinate);
     setCenter(coordinate);
 
     // adjust zoom
diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h
index c69541a7..eee281b7 100644
--- a/src/imports/location/qdeclarativegeomap_p.h
+++ b/src/imports/location/qdeclarativegeomap_p.h
@@ -72,7 +72,6 @@
 #include "qgeocameradata_p.h"
 #include "qgeomap_p.h"
 #include "qdeclarativegeomaptype_p.h"
-#include <QWeakPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -195,7 +194,6 @@ private Q_SLOTS:
     void mapZoomLevelChanged(qreal zoom);
     void mapTiltChanged(qreal tilt);
     void mapBearingChanged(qreal bearing);
-    void mapCenterChanged(AnimatableCoordinate center);
     void pluginReady();
     void onMapChildrenChanged();
 
diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp
index c7f9926d..f9959e19 100644
--- a/src/imports/location/qdeclarativegeomapgesturearea.cpp
+++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp
@@ -1139,8 +1139,7 @@ void QDeclarativeGeoMapGestureArea::updatePan()
     QPointF mapCenterPoint;
     mapCenterPoint.setY(map_->height() / 2.0  - dy);
     mapCenterPoint.setX(map_->width() / 2.0 - dx);
-    AnimatableCoordinate animationStartCoordinate;
-    animationStartCoordinate.setCoordinate(map_->screenPositionToCoordinate(mapCenterPoint, false));
+    QGeoCoordinate animationStartCoordinate = map_->screenPositionToCoordinate(mapCenterPoint, false);
     map_->mapController()->setCenter(animationStartCoordinate);
 
 }
@@ -1196,16 +1195,15 @@ void QDeclarativeGeoMapGestureArea::startFlick(int dx, int dy, int timeMs)
 {
     if (timeMs < 0)
         return;
-    AnimatableCoordinate animationStartCoordinate = map_->mapController()->center();
-    QGeoCoordinate coordinate = animationStartCoordinate.coordinate();
+
+    QGeoCoordinate animationStartCoordinate = map_->mapController()->center();
 
     if (pan_.animation_->state() == QPropertyAnimation::Running)
         pan_.animation_->stop();
-    AnimatableCoordinate animationEndCoordinate = map_->mapController()->center();
+    QGeoCoordinate animationEndCoordinate = map_->mapController()->center();
     pan_.animation_->setDuration(timeMs);
-    coordinate.setLongitude(coordinate.longitude() - (dx / pow(2.0, map_->mapController()->zoom())));
-    coordinate.setLatitude(coordinate.latitude() + (dy / pow(2.0, map_->mapController()->zoom())));
-    animationEndCoordinate.setCoordinate(coordinate);
+    animationEndCoordinate.setLongitude(animationStartCoordinate.longitude() - (dx / pow(2.0, map_->mapController()->zoom())));
+    animationEndCoordinate.setLatitude(animationStartCoordinate.latitude() + (dy / pow(2.0, map_->mapController()->zoom())));
     pan_.animation_->setStartValue(QVariant::fromValue(animationStartCoordinate));
     pan_.animation_->setEndValue(QVariant::fromValue(animationEndCoordinate));
     pan_.animation_->start();