Improve MGRS coordinate code

Author: kylecorry31

src/main/kotlin/com/kylecorry/sol/science/geography/CoordinateFormatter.kt

@@ -7,7 +7,7 @@ import com.kylecorry.sol.shared.toDoubleCompat
 import com.kylecorry.sol.units.Coordinate
 import gov.nasa.worldwind.avlist.AVKey
 import gov.nasa.worldwind.geom.Angle
-import gov.nasa.worldwind.geom.coords.MGRSCoord
+import gov.nasa.worldwind.geom.coords.MGRSCoordinateFormat
 import gov.nasa.worldwind.geom.coords.UPSCoord
 import gov.nasa.worldwind.geom.coords.UTMCoord
 import uk.gov.dstl.geo.osgb.Constants
@@ -57,11 +57,8 @@ object CoordinateFormatter {
 
     fun Coordinate.toMGRS(precision: Int = 5): String {
         return try {
-            val lat = Angle.fromDegreesLatitude(latitude)
-            val lng = Angle.fromDegreesLongitude(longitude)
-            val mgrs = MGRSCoord.fromLatLon(lat, lng, precision)
-            mgrs.toString().trim()
-        } catch (e: Exception) {
+            MGRSCoordinateFormat.getString(latitude, longitude, precision)
+        } catch (_: Exception) {
             "?"
         }
     }
@@ -188,8 +185,7 @@ object CoordinateFormatter {
 
     private fun fromMGRS(location: String): Coordinate? {
         return try {
-            val mgrs = MGRSCoord.fromString(location)
-            Coordinate(mgrs.latitude.degrees, mgrs.longitude.degrees)
+            return MGRSCoordinateFormat.fromString(location)
         } catch (e: Exception) {
             null
         }

src/main/kotlin/gov/nasa/worldwind/geom/LatLon.kt

@@ -53,22 +53,6 @@ open class LatLon {
         return LatLon(lat, lon)
     }
 
-    open fun add(that: Position): LatLon {
-
-        val lat = Angle.normalizedLatitude(this.latitude.add(that.latitude))
-        val lon = Angle.normalizedLongitude(this.longitude.add(that.longitude))
-
-        return LatLon(lat, lon)
-    }
-
-    open fun subtract(that: Position): LatLon {
-
-        val lat = Angle.normalizedLatitude(this.latitude.subtract(that.latitude))
-        val lon = Angle.normalizedLongitude(this.longitude.subtract(that.longitude))
-
-        return LatLon(lat, lon)
-    }
-
     override fun toString(): String {
         val las = String.format("Lat %7.4f\u00B0", this.latitude.degrees)
         val los = String.format("Lon %7.4f\u00B0", this.longitude.degrees)

src/main/kotlin/gov/nasa/worldwind/geom/Position.kt

@@ -15,7 +15,7 @@ import kotlin.math.pow
  *
  * @author Patrick Murris
  * @version $Id$
- * @see MGRSCoord
+ * @see MGRSCoordinateFormat
  */
 /**
  * Ported to Java from the NGA GeoTrans mgrs.c and mgrs.h code. Contains routines to convert from Geodetic to MGRS and

src/main/kotlin/gov/nasa/worldwind/geom/coords/MGRSCoord.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2011 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ */
+package gov.nasa.worldwind.geom.coords
+
+import com.kylecorry.sol.units.Coordinate
+import gov.nasa.worldwind.geom.Angle
+
+/**
+ * This class holds an immutable MGRS coordinate string along with
+ * the corresponding latitude and longitude.
+ *
+ * @author Patrick Murris
+ * @version $Id$
+ */
+object MGRSCoordinateFormat {
+    fun getString(latitude: Double, longitude: Double, precision: Int): String {
+        val converter = MGRSCoordConverter()
+        val error = converter.convertGeodeticToMGRS(
+            Angle.fromDegreesLatitude(latitude).radians,
+            Angle.fromDegreesLongitude(longitude).radians,
+            precision
+        )
+        require(error == MGRSCoordConverter.MGRS_NO_ERROR.toLong()) { "MGRS Conversion Error" }
+        return converter.mgrsString.trim()
+    }
+
+    fun fromString(str: String): Coordinate {
+        val upperString = str.uppercase().replace(" ", "")
+        val converter = MGRSCoordConverter()
+        val error = converter.convertMGRSToGeodetic(upperString)
+
+        require(error == MGRSCoordConverter.MGRS_NO_ERROR.toLong()) { "MGRS Conversion Error" }
+
+        return Coordinate(
+            Angle.fromRadians(converter.latitude).degrees,
+            Angle.fromRadians(converter.longitude).degrees
+        )
+    }
+}

src/main/kotlin/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.kt

@@ -15,52 +15,13 @@ import gov.nasa.worldwind.geom.Angle
  * @version $Id$
  * @see TMCoordConverter
  */
-class TMCoord
-    (
-    latitude: Angle, longitude: Angle, easting: Double, northing: Double,
-    originLatitude: Angle, centralMeridian: Angle,
-    falseEasting: Double, falseNorthing: Double,
-    scale: Double
-) {
-    val latitude: Angle
-    val longitude: Angle
-    private val originLatitude: Angle
-    private val centralMeridian: Angle
-    private val falseEasting: Double
-    private val falseNorthing: Double
+internal class TMCoord(
+    val latitude: Angle,
+    val longitude: Angle,
+    val easting: Double,
+    val northing: Double,
     val scale: Double
-    val easting: Double
-    val northing: Double
-
-    /**
-     * Create an arbitrary set of Transverse Mercator coordinates with the given values.
-     *
-     * @param latitude the latitude `Angle`.
-     * @param longitude the longitude `Angle`.
-     * @param easting the easting distance value in meters.
-     * @param northing the northing distance value in meters.
-     * @param originLatitude the origin latitude `Angle`.
-     * @param centralMeridian the central meridian longitude `Angle`.
-     * @param falseEasting easting value at the center of the projection in meters.
-     * @param falseNorthing northing value at the center of the projection in meters.
-     * @param scale scaling factor.
-     * @throws IllegalArgumentException if `latitude`, `longitude`, `originLatitude`
-     * or `centralMeridian` is null.
-     */
-    init {
-        require(!(latitude == null || longitude == null)) { "Latitude Or Longitude Is Null" }
-        require(!(originLatitude == null || centralMeridian == null)) { "Angle Is Null" }
-
-        this.latitude = latitude
-        this.longitude = longitude
-        this.easting = easting
-        this.northing = northing
-        this.originLatitude = originLatitude
-        this.centralMeridian = centralMeridian
-        this.falseEasting = falseEasting
-        this.falseNorthing = falseNorthing
-        this.scale = scale
-    }
+) {
 
     companion object {
         /**
@@ -89,8 +50,6 @@ class TMCoord
         ): TMCoord {
             var a = a
             var f = f
-            require(!(latitude == null || longitude == null)) { "Latitude Or Longitude Is Null" }
-            require(!(originLatitude == null || centralMeridian == null)) { "Angle Is Null" }
 
             val converter = TMCoordConverter()
             if (a == null || f == null) {
@@ -108,7 +67,7 @@ class TMCoord
 
             return TMCoord(
                 latitude, longitude, converter.easting, converter.northing,
-                originLatitude, centralMeridian, falseEasting, falseNorthing, scale
+                scale
             )
         }
 
@@ -134,8 +93,6 @@ class TMCoord
             falseEasting: Double, falseNorthing: Double,
             scale: Double
         ): TMCoord {
-            require(!(originLatitude == null || centralMeridian == null)) { "Angle Is Null" }
-
             val converter = TMCoordConverter()
 
             val a = converter.a
@@ -151,7 +108,7 @@ class TMCoord
 
             return TMCoord(
                 Angle.fromRadians(converter.latitude), Angle.fromRadians(converter.longitude),
-                easting, northing, originLatitude, centralMeridian, falseEasting, falseNorthing, scale
+                easting, northing, scale
             )
         }
     }