From fab4c2337b73b6de3574491ef6bd2eb10d81b34a Mon Sep 17 00:00:00 2001 From: David Anthony Date: Fri, 29 Sep 2023 16:53:12 -0500 Subject: [PATCH] Adding Adelaide test case for UTM coordinate conversion --- swri_transform_util/test/test_utm_util.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/swri_transform_util/test/test_utm_util.cpp b/swri_transform_util/test/test_utm_util.cpp index b63892791..5907b24c5 100644 --- a/swri_transform_util/test/test_utm_util.cpp +++ b/swri_transform_util/test/test_utm_util.cpp @@ -42,6 +42,7 @@ TEST(UtmUtilTests, GetZone) EXPECT_EQ(37, swri_transform_util::GetZone( 37.414722)); // SVO EXPECT_EQ(54, swri_transform_util::GetZone( 139.781111)); // HND EXPECT_EQ( 4, swri_transform_util::GetZone( -157.9225)); // HNL + EXPECT_EQ(54, swri_transform_util::GetZone( 138.530556)); // ADL } TEST(UtmUtilTests, GetBand) @@ -53,6 +54,7 @@ TEST(UtmUtilTests, GetBand) EXPECT_EQ('S', swri_transform_util::GetBand( 35.553333)); // HND EXPECT_EQ('Q', swri_transform_util::GetBand( 21.318611)); // HNL EXPECT_EQ('F', swri_transform_util::GetBand(-54.843333)); // USH + EXPECT_EQ('H', swri_transform_util::GetBand(-34.945)); // ADL EXPECT_EQ('Z', swri_transform_util::GetBand(84.5)); EXPECT_EQ('Z', swri_transform_util::GetBand(-80.5)); @@ -89,7 +91,7 @@ TEST(UtmUtilTests, ToUtm) EXPECT_FLOAT_EQ(2852989, northing); // USH - utm_util.ToUtm(-54.843333, -68.295556, zone, band,easting, northing); + utm_util.ToUtm(-54.843333, -68.295556, zone, band, easting, northing); EXPECT_EQ(19, zone); EXPECT_EQ('F', band); EXPECT_FLOAT_EQ(545237, easting); @@ -98,6 +100,17 @@ TEST(UtmUtilTests, ToUtm) utm_util.ToUtm(-54.843333, -68.295556, easting, northing); EXPECT_FLOAT_EQ(545237, easting); EXPECT_FLOAT_EQ(3922415, northing); + + // ADL + utm_util.ToUtm(-34.945, 138.530556, zone, band, easting, northing); + EXPECT_EQ(54, zone); + EXPECT_EQ('H', band); + EXPECT_NEAR(274484, easting, 0.5); + EXPECT_FLOAT_EQ(6130272, northing); + + utm_util.ToUtm(-34.945, 138.530556, easting, northing); + EXPECT_NEAR(274484, easting, 0.5); + EXPECT_FLOAT_EQ(6130272, northing); } TEST(UtmUtilTests, ToWgs84) @@ -111,7 +124,7 @@ TEST(UtmUtilTests, ToWgs84) EXPECT_FLOAT_EQ(33.9425, lat); EXPECT_NEAR(-118.408056, lon, .000005); - // LAX + // MIA utm_util.ToLatLon(17, 'R', 571124, 2852989, lat, lon); EXPECT_FLOAT_EQ(25.793333, lat); EXPECT_NEAR(-80.290556, lon, .000005); @@ -120,6 +133,11 @@ TEST(UtmUtilTests, ToWgs84) utm_util.ToLatLon(19, 'F', 545237, 3922415, lat, lon); EXPECT_FLOAT_EQ(-54.843333, lat); EXPECT_FLOAT_EQ(-68.295556, lon); + + // ADL + utm_util.ToLatLon(54, 'H', 274484, 6130272, lat, lon); + EXPECT_FLOAT_EQ(-34.945, lat); + EXPECT_FLOAT_EQ(138.530556, lon); } TEST(UtmUtilTests, Continuity)