diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:28 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:28 +0300 |
commit | 261b146c5c9dd51c2a88837342b2fe605b3a3c78 (patch) | |
tree | 88fea542f06983eff3052138a91e0ad0cda1de4e | |
parent | ddf3f88156369671576a9bcc703feb22e7b7ff0d (diff) | |
parent | ade8147da038ebaae230a38a6e0f16364fc0edbe (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl
Change-Id: I7592fcec7b13c5bbe021716a424dd03004b101c6
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/positioning/qgeocoordinate.cpp | 47 | ||||
-rw-r--r-- | tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp | 20 |
3 files changed, 42 insertions, 27 deletions
diff --git a/.qmake.conf b/.qmake.conf index 062d6124..0932d882 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,7 +3,7 @@ CONFIG += warning_clean DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.5 +MODULE_VERSION = 5.15.6 # Adds a way to debug location. The define is needed for multiple subprojects as they # include the essential headers. diff --git a/src/positioning/qgeocoordinate.cpp b/src/positioning/qgeocoordinate.cpp index 5ff1299d..dddb61b3 100644 --- a/src/positioning/qgeocoordinate.cpp +++ b/src/positioning/qgeocoordinate.cpp @@ -594,19 +594,18 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const double latMin = (absLat - int(absLat)) * 60; double lngMin = (absLng - int(absLng)) * 60; - if (qRound(latMin) >= 60) { + // We use QString::number(val, 'f', 3) to represent minutes. + // It rounds up to the next integer in case the fraction > 0.9995. + // Such behavior should be handled specifically when the rounded + // value is 60, so that we overflow to degrees correctly. + // If we overflow, the minutes should unconditionally be 0.0. + if (latMin > 59.9995) { absLat++; - latMin = qAbs(latMin - 60.0f); - //avoid invalid latitude due to latMin rounding below - if (qRound(absLat) >= 90) - latMin = 0.0f; + latMin = 0.0f; } - if (qRound(lngMin) >= 60) { + if (lngMin > 59.9995) { absLng++; - lngMin = qAbs(lngMin - 60.0f); - // avoid invalid longitude due to lngMin rounding below - if (qRound(absLng) >= 180) - lngMin = 0.0f; + lngMin = 0.0f; } latStr = QString::fromLatin1("%1%2 %3'") @@ -626,28 +625,28 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const double latSec = (latMin - int(latMin)) * 60; double lngSec = (lngMin - int(lngMin)) * 60; - // overflow to full minutes - if (qRound(latSec) >= 60) { + // We use QString::number(val, 'f', 1) to represent seconds. + // It rounds up to the next integer in case the fraction >= 0.95. + // Such behavior should be handled specifically when the rounded + // value is 60, so that we overflow to minutes correctly. + // If we overflow, the seconds should unconditionally be 0.0. + if (latSec >= 59.95) { latMin++; - latSec = qAbs(latSec - 60.0f); - // overflow to full degrees + latSec = 0.0f; + // We cast to int to represent minutes, so we can use qRound() + // to determine if we need to overflow to full degrees. + // If we overflow, the minutes will unconditionally be 0.0. if (qRound(latMin) >= 60) { absLat++; - latMin = qAbs(latMin - 60.0f); - // avoid invalid latitude due to latSec rounding below - if (qRound(absLat) >= 90) - latSec = 0.0f; + latMin = 0.0f; } } - if (qRound(lngSec) >= 60) { + if (lngSec >= 59.95) { lngMin++; - lngSec = qAbs(lngSec - 60.0f); + lngSec = 0.0f; if (qRound(lngMin) >= 60) { absLng++; - lngMin = qAbs(lngMin - 60.0f); - // avoid invalid longitude due to lngSec rounding below - if (qRound(absLng) >= 180) - lngSec = 0.0f; + lngMin = 0.0f; } } diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp index 1b30f647..28f10aca 100644 --- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp +++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp @@ -843,13 +843,29 @@ private slots: << QString( "2%1 0.000', 2%1 0.000'").arg(DEGREES_SYMB); QTest::newRow("Wrap seconds to minutes to Degrees DM -> above valid long/lat values") - << QGeoCoordinate(89.9999, 179.9999) << QGeoCoordinate::DegreesMinutesSeconds + << QGeoCoordinate(89.999999, 179.999999) << QGeoCoordinate::DegreesMinutesSeconds << QString( "90%1 0' 0.0\", 180%1 0' 0.0\"").arg(DEGREES_SYMB); + QTest::newRow("Seconds and minutes near valid long/lat values border") + << QGeoCoordinate(89.9999, 179.9999) << QGeoCoordinate::DegreesMinutesSeconds + << QString("89%1 59' 59.6\", 179%1 59' 59.6\"").arg(DEGREES_SYMB); + QTest::newRow("Wrap minutes to Degrees DM ->above valid long/lat values") - << QGeoCoordinate(89.9999, 179.9999) << QGeoCoordinate::DegreesMinutes + << QGeoCoordinate(89.999999, 179.999999) << QGeoCoordinate::DegreesMinutes << QString( "90%1 0.000', 180%1 0.000'").arg(DEGREES_SYMB); + QTest::newRow("Minutes near valid long/lat values border") + << QGeoCoordinate(89.9999, 179.9999) << QGeoCoordinate::DegreesMinutes + << QString("89%1 59.994', 179%1 59.994'").arg(DEGREES_SYMB); + + QTest::newRow("Fix incorrect wrap minutes to degrees") + << QGeoCoordinate(0.995833, 0.995833) << QGeoCoordinate::DegreesMinutes + << QString("0%1 59.750', 0%1 59.750'").arg(DEGREES_SYMB); + + QTest::newRow("Fix incorrect wrap seconds to minutes") + << QGeoCoordinate(0.9832222, 0.9832222) << QGeoCoordinate::DegreesMinutesSeconds + << QString("0%1 58' 59.6\", 0%1 58' 59.6\"").arg(DEGREES_SYMB); + } void datastream() |