fix utm conversion and add unit test

usdot-fhwa-stol · Sep 28, 2024 · c608bdd · c608bdd
1 parent f261d31
commit c608bdd
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/...on/lib/mosaic-geomath/src/main/java/org/eclipse/mosaic/lib/transform/Proj4Projection.java b/...on/lib/mosaic-geomath/src/main/java/org/eclipse/mosaic/lib/transform/Proj4Projection.java
@@ -51,7 +51,6 @@ public class Proj4Projection extends GeoProjection {
     private String cartesianReferenceString;
     CoordinateReferenceSystem wgs84CRS;
     CoordinateReferenceSystem cartesianCRS;
-    CoordinateReferenceSystem utmCRS;
 
 
     public Proj4Projection(GeoPoint origin, double x_offset, double y_offset, String georef){
@@ -72,11 +71,6 @@ public Proj4Projection(GeoPoint origin, double x_offset, double y_offset, String
         this.cartesianCRS = crsFactory.createFromParameters("custom_proj", this.cartesianReferenceString);
         this.wgs84CRS = crsFactory.createFromName(wgs84ReferenceString);
 
-        this.zone = getUTMZone(origin);
-        String utm_proj_str = "+proj=utm +zone=" + zone.number;
-
-        this.utmCRS = crsFactory.createFromParameters("custom_proj", utm_proj_str);
-
     }
 
     @Override
@@ -97,7 +91,7 @@ public MutableCartesianPoint geographicToCartesian(GeoPoint geographic, MutableC
         ProjCoordinate sourceCoord = new ProjCoordinate(geographic.getLongitude(),geographic.getLatitude());
         ProjCoordinate targetCoord = new ProjCoordinate();
         CoordinateTransformFactory ctFactory = new CoordinateTransformFactory();
-        CoordinateTransform transform = ctFactory.createTransform(cartesianCRS, wgs84CRS);
+        CoordinateTransform transform = ctFactory.createTransform(wgs84CRS, cartesianCRS);
 
         transform.transform(sourceCoord, targetCoord);
         result.set(targetCoord.x, targetCoord.y, 0.0);
@@ -136,7 +130,14 @@ public MutableUtmPoint geographicToUtm(GeoPoint geoPoint, MutableUtmPoint result
         ProjCoordinate sourceCoord = new ProjCoordinate(geoPoint.getLongitude(),geoPoint.getLatitude());
         ProjCoordinate targetCoord = new ProjCoordinate();
         CoordinateTransformFactory ctFactory = new CoordinateTransformFactory();
-        CoordinateTransform transform = ctFactory.createTransform(cartesianCRS, utmCRS);
+
+        //UTMCRS created dynamically since it depends on the zone
+        zone = getUTMZone(geoPoint);
+        String utm_proj_str = "+proj=utm +zone=" + zone.number;
+        CRSFactory crsFactory = new CRSFactory();
+        CoordinateReferenceSystem utmCRS = crsFactory.createFromParameters("custom_proj", utm_proj_str);
+
+        CoordinateTransform transform = ctFactory.createTransform(wgs84CRS, utmCRS);
 
         transform.transform(sourceCoord, targetCoord);
         result.set(targetCoord.x, targetCoord.y, 0.0, getUTMZone(geoPoint));
@@ -150,6 +151,12 @@ public MutableGeoPoint utmToGeographic(UtmPoint utmPoint, MutableGeoPoint result
         ProjCoordinate sourceCoord = new ProjCoordinate(utmPoint.getEasting(), utmPoint.getNorthing());
         ProjCoordinate targetCoord = new ProjCoordinate();
         CoordinateTransformFactory ctFactory = new CoordinateTransformFactory();
+
+        //UTMCRS created dynamically since it depends on the zone
+        String utm_proj_str = "+proj=utm +zone=" + utmPoint.getZone().number;
+        CRSFactory crsFactory = new CRSFactory();
+        CoordinateReferenceSystem utmCRS = crsFactory.createFromParameters("custom_proj", utm_proj_str);
+
         CoordinateTransform transform = ctFactory.createTransform(utmCRS, wgs84CRS);
 
         transform.transform(sourceCoord, targetCoord);

diff --git a/...ib/mosaic-geomath/src/test/java/org/eclipse/mosaic/lib/transform/Proj4ProjectionTest.java b/...ib/mosaic-geomath/src/test/java/org/eclipse/mosaic/lib/transform/Proj4ProjectionTest.java
@@ -31,7 +31,7 @@
 
 public class Proj4ProjectionTest {
     @Test
-    public void convert_cartesian_to_geographic() {
+    public void convertCartesianToGeographic() {
 
         String georeference = "+proj=tmerc +lat_0=0 +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +geoidgrids=egm96_15.gtx +vunits=m +no_defs";
 
@@ -47,11 +47,12 @@ public void convert_cartesian_to_geographic() {
 
     }
 
-    public void convert_geographic_to_cartesian(){
+    @Test
+    public void convertGeographicToCartesian(){
         String georeference = "+proj=tmerc +lat_0=0 +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +geoidgrids=egm96_15.gtx +vunits=m +no_defs";
         GeoProjection transform = new Proj4Projection(GeoPoint.latLon(0.0, 0.0), 0.0,0.0, georeference);
 
-        GeoPoint testGeoPoint = GeoPoint.latLon(0.0,0.0);
+        GeoPoint testGeoPoint = GeoPoint.latLon(0.000,0.000);
 
         CartesianPoint actualCartesian = transform.geographicToCartesian(testGeoPoint);
         assertEquals(actualCartesian.getX(), 0.0, 1d);
@@ -61,4 +62,22 @@ public void convert_geographic_to_cartesian(){
     }
 
 
+    @Test
+    public void convertGeographictoUTM(){
+        String georeference = "+proj=tmerc +lat_0=42.30059341574939 +lon_0=-83.69928318881136 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +geoidgrids=egm96_15.gtx +vunits=m +no_defs";
+
+        GeoProjection transform = new Proj4Projection(GeoPoint.latLon(42.30059341574939, -83.69928318881136), 0.0, 0.0, georeference);
+
+        GeoPoint testGeoPoint = GeoPoint.latLon(38.9548994, -77.1481211);
+        UtmZone zone = UtmZone.from(18,'n');
+        UtmPoint actualUtmPoint = new MutableUtmPoint(313863.1656767028, 4313966.065972516, 0.0, zone);
+
+
+        UtmPoint calculatedUtmPoint = transform.geographicToUtm(testGeoPoint);
+        assertEquals(actualUtmPoint.getEasting(), calculatedUtmPoint.getEasting(), 1d);
+        assertEquals(actualUtmPoint.getNorthing(), calculatedUtmPoint.getNorthing(), 1d);
+        assertEquals(actualUtmPoint.getAltitude(), calculatedUtmPoint.getAltitude(), 1d);
+        assertEquals(18, calculatedUtmPoint.getZone().number);
+    }
+
 }