Commit 1ef4f9ff authored by LEFEBVREJP email's avatar LEFEBVREJP email
Browse files

Merge branch 'coodinateconversion-bug' into 'master'

Fixing typo in radixgeo southern hemisphere bands that caused error in...

See merge request !79
parents 3385ba97 605252b8
Pipeline #62058 passed with stages
in 15 minutes and 40 seconds
......@@ -26,7 +26,7 @@ const std::array<char, 11> UTMZones::pos_letters = {
const std::array<short, 11> UTMZones::pos_degrees = {
{0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 84}};
const std::array<char, 11> UTM2LatLon::southern_hemisphere = {
{'A', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'L', 'L', 'M'}};
{'A', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M'}};
short UTMZones::latZoneDegree(char letter)
{
auto itr = std::find(letters.begin(), letters.end(), letter);
......
......@@ -235,8 +235,8 @@ TEST(Radixgeo, UTM2LatLon)
LatLon2UTM latLonConv;
UTM2LatLon utmConv;
UTMCoordinate utm = latLonConv.toUTM(0.0000, 0.0000);
std::pair<double, double> latLong = utmConv.toLatLon(utm);
UTMCoordinate utm = latLonConv.toUTM(0.0000, 0.0000);
std::pair<double, double> latLong = utmConv.toLatLon(utm);
EXPECT_NEAR(0., latLong.first, fuzzy);
EXPECT_NEAR(0., latLong.second, fuzzy);
......@@ -294,4 +294,9 @@ TEST(Radixgeo, UTM2LatLon)
latLong = utmConv.toLatLon(utm);
EXPECT_NEAR(37.131467, latLong.first, fuzzy);
EXPECT_NEAR(-116.039417, latLong.second, fuzzy);
utm = latLonConv.toUTM(-23.00, -139.00);
latLong = utmConv.toLatLon(utm);
EXPECT_NEAR(-23.00, latLong.first, fuzzy);
EXPECT_NEAR(-139.00, latLong.second, fuzzy);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment