add unit tests

usdot-fhwa-stol · Oct 2, 2024 · 0dd449f · 0dd449f
1 parent a068339
commit 0dd449f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
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
@@ -163,7 +163,7 @@ public MutableGeoPoint utmToGeographic(UtmPoint utmPoint, MutableGeoPoint result
 
         transform.transform(sourceCoord, targetCoord);
         //Transform returned as lon,lat = (targetCoord.x, targetCoord.y)
-        result.set(targetCoord.x, targetCoord.y, 0.0);
+        result.set(targetCoord.y, targetCoord.x, 0.0);
 
         return result;
     }

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
@@ -79,6 +79,18 @@ public void convertGeographictoUTM(){
         assertEquals(actualUtmPoint.getNorthing(), calculatedUtmPoint.getNorthing(), 1d);
         assertEquals(actualUtmPoint.getAltitude(), calculatedUtmPoint.getAltitude(), 1d);
         assertEquals(18, calculatedUtmPoint.getZone().number);
+
+        //Test Special Zone Norway
+        GeoPoint testGeoPoint2 = GeoPoint.latLon(77.8750, 20.9752);
+        UtmPoint calculatedUtmPoint2 = transform.geographicToUtm(testGeoPoint2);
+        assertEquals(33, calculatedUtmPoint2.getZone().number);
+
+        //Test convert back to geographic
+        GeoPoint calculatedGeoPoint = transform.utmToGeographic(calculatedUtmPoint);
+        assertEquals(calculatedGeoPoint.getLatitude(), testGeoPoint.getLatitude(), 0.0001d);
+        assertEquals(calculatedGeoPoint.getLongitude(),testGeoPoint.getLongitude(), 0.0001d);
+
+
     }
 
 }