organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Lat,lon to UTM & MGRS error handling. Fix tests

Browse source 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
Sergiy Kozyr 2023-05-26 12:16:22 +03:00
parent 3af0078d77
commit 2632c51605
Signed by: strump
GPG key ID: C622E5563CAC205D
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/platform_tests/utm_mgrs_utils_tests.cpp
View file

@ -38,6 +38,7 @@ UNIT_TEST(FormatMGRS)
TEST_EQUAL(FormatMGRS(84.644103, 3.000009, 5), "Latitude limit exceeded", ()); // Some converters generate string "Z AB 31142 05767"
TEST_EQUAL(FormatMGRS(-81.016469, 8.745519, 5), "Latitude limit exceeded", ()); // Some converters generate string "B BX 51947 87732"
TEST_EQUAL(FormatMGRS(12.016469, 188.0, 2), "Longitude limit exceeded", ());
// Test data from https://s3.amazonaws.com/mgrs.io/mgrsToGeo_WE.txt
TEST_EQUAL(FormatMGRS(0.000005, -0.592324, 5), "30N YF 67993 00000", ());

10
platform/utm_mgrs_utils.cpp
View file

@ -85,6 +85,11 @@ string FormatMGRS(double lat, double lon, int precision)
else if (precision < 1)
precision = 1;
if (lat <= -80 || lat > 84)
return "Latitude limit exceeded";
if (lon <= -180 || lon > 180)
return "Longitude limit exceeded";
UTMPoint mgrsp = latlon_to_utm(lat, lon);
// Need to add this to set the right letter for the latitude.
@ -95,6 +100,11 @@ string FormatMGRS(double lat, double lon, int precision)
// Convert lat,lon for WSG 84 ellipsoid to UTM string.
string FormatUTM(double lat, double lon)
{
if (lat <= -80 || lat > 84)
return "Latitude limit exceeded";
if (lon <= -180 || lon > 180)
return "Longitude limit exceeded";
UTMPoint utm = latlon_to_utm(lat, lon);
return utm_to_str(utm);
}