Change QGeoRectangle::translate to not modify the rectangle

QGeoRectangle::translate currently modifies the rectangle if the
latitudinal offset brings the rectangle out of bounds.
This patch changes the behavior of the translation, clamping the
latitudinal offset, and preventing changes to the rectangle geometry.

Change-Id: Iedb8823bbd6e3c04ee499bb9f9945049a9590aae
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 9 insertions, 27 deletions

diff --git a/src/positioning/qgeorectangle.cpp b/src/positioning/qgeorectangle.cpp
index a8d74414..33d740ca 100644
--- a/src/positioning/qgeorectangle.cpp
+++ b/src/positioning/qgeorectangle.cpp
@@ -44,6 +44,7 @@
 #include "qdoublevector2d_p.h"
 #include "qgeocoordinate.h"
 #include "qnumeric.h"
+#include "qlocationutils_p.h"
 #include <QList>
 QT_BEGIN_NAMESPACE
 
@@ -767,37 +768,18 @@ void QGeoRectangle::translate(double degreesLatitude, double degreesLongitude)
     double brLat = d->bottomRight.latitude();
     double brLon = d->bottomRight.longitude();
 
-    if ((tlLat != 90.0) || (brLat != -90.0)) {
-        tlLat += degreesLatitude;
-        brLat += degreesLatitude;
-    }
+    if (degreesLatitude >= 0.0)
+        degreesLatitude = qMin(degreesLatitude, 90.0 - tlLat);
+    else
+        degreesLatitude = qMax(degreesLatitude, -90.0 - brLat);
 
     if ( (tlLon != -180.0) || (brLon != 180.0) ) {
-        tlLon += degreesLongitude;
-        brLon += degreesLongitude;
+        tlLon = QLocationUtils::wrapLong(tlLon + degreesLongitude);
+        brLon = QLocationUtils::wrapLong(brLon + degreesLongitude);
     }
 
-    if (tlLon < -180.0)
-        tlLon += 360.0;
-    if (tlLon > 180.0)
-        tlLon -= 360.0;
-
-    if (brLon < -180.0)
-        brLon += 360.0;
-    if (brLon > 180.0)
-        brLon -= 360.0;
-
-    if (tlLat > 90.0)
-        tlLat = 90.0;
-
-    if (tlLat < -90.0)
-        tlLat = -90.0;
-
-    if (brLat > 90.0)
-        brLat = 90.0;
-
-    if (brLat < -90.0)
-        brLat = -90.0;
+    tlLat += degreesLatitude;
+    brLat += degreesLatitude;
 
     d->topLeft = QGeoCoordinate(tlLat, tlLon);
     d->bottomRight = QGeoCoordinate(brLat, brLon);