From 922b103b0c899848d6729d2fbccbabbf407dc4a1 Mon Sep 17 00:00:00 2001 From: RolandSzep Date: Sun, 6 Sep 2020 16:11:07 +0200 Subject: [PATCH] Update MGRSCoordConverter.java Fixed conversion error from MGRS to UPS. --- src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java b/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java index 97d577f01b..58441cc939 100644 --- a/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java +++ b/src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java @@ -295,6 +295,7 @@ else if (error_code == MGRS_NOZONE_WARNING) UPSCoord UPS = convertMGRSToUPS(MGRSString); if (UPS != null) { + error_code = MGRS_NO_ERROR; latitude = UPS.getLatitude().radians; longitude = UPS.getLongitude().radians; } @@ -365,6 +366,7 @@ private MGRSComponents breakMGRSString(String MGRSString) num_letters = i - j; if (num_letters == 3) { + error_code = MGRS_NO_ERROR; /* get letters */ letters[0] = alphabet.indexOf(Character.toUpperCase(MGRSString.charAt(j))); if ((letters[0] == LETTER_I) || (letters[0] == LETTER_O)) @@ -1124,7 +1126,7 @@ private UPSCoord convertMGRSToUPS(String MGRS) { hemisphere = AVKey.SOUTH; - ltr2_low_value = upsConstants[mgrs.latitudeBand][12]; //.ltr2_low_value; + ltr2_low_value = upsConstants[mgrs.latitudeBand][1]; //.ltr2_low_value; ltr2_high_value = upsConstants[mgrs.latitudeBand][2]; //.ltr2_high_value; ltr3_high_value = upsConstants[mgrs.latitudeBand][3]; //.ltr3_high_value; false_easting = upsConstants[mgrs.latitudeBand][4]; //.false_easting;