Merge pull request orbisgis#113 from mukoki/master

Fix ticket orbisgis#112 (add toWGS84 transform TM65 datum)
mukoki · Mar 5, 2019 · 48cba3c · 48cba3c
2 parents 2dcefc1 + 4c8f510
commit 48cba3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/org/cts/datum/GeodeticDatum.java b/src/main/java/org/cts/datum/GeodeticDatum.java
@@ -252,7 +252,7 @@ public class GeodeticDatum extends AbstractDatum {
 
     public final static GeodeticDatum HERMANNSKOGEL = new GeodeticDatum(
             new Identifier("EPSG", "4312", "Militar-Geographische Institut", "MGI"),
-            PrimeMeridian.GREENWICH, Ellipsoid.BESSEL1841,null, 
+            PrimeMeridian.GREENWICH, Ellipsoid.BESSEL1841, null,
             new GeographicExtent("Austria", 46.4, 49.02, 9.53, 17.17), "","" );
 
     public final static GeodeticDatum POSTDAM = new GeodeticDatum(
@@ -281,7 +281,8 @@ public class GeodeticDatum extends AbstractDatum {
 
     public final static GeodeticDatum IRE65 = new GeodeticDatum(
             new Identifier("EPSG", "4299", "TM65", "TM65"),
-            PrimeMeridian.GREENWICH, Ellipsoid.AIRYMOD, null,
+            PrimeMeridian.GREENWICH, Ellipsoid.AIRYMOD,
+            SevenParameterTransformation.createBursaWolfTransformation(482.5, -130.6, 564.6, -1.042, -0.214, -0.631, 8.15, 1),
             new GeographicExtent("Ireland - onshore. United Kingdom (UK) - Northern Ireland (Ulster) - onshore",
                     51.39, 55.43, -10.56, -5.34), "", "");
 

diff --git a/src/test/java/org/cts/op/BatchCoordinateTransformTest.java b/src/test/java/org/cts/op/BatchCoordinateTransformTest.java
@@ -75,8 +75,8 @@ public void testCoordinateTransformFromFile() throws Exception {
             double[] result = transform((GeodeticCRS) inputCRS, (GeodeticCRS) outputCRS, pointSource);
             double[] pointDest = new double[]{csNameDest_X, csNameDest_Y};
             double[] check = transform((GeodeticCRS) outputCRS, (GeodeticCRS) inputCRS, pointDest);
-            assertTrue(checkEquals2D(id + " dir--> " + csNameSrc + " to " + csNameDest, result, pointDest, tolerance));
-            assertTrue(checkEquals2D(id + " inv--> " + csNameDest + " to " + csNameSrc, check, pointSource, 0.01));           
+            assertTrue(checkEquals2D(id + " dir--> " + csNameSrc + " to " + csNameDest, result, pointDest, tolerance), "Error for direct transformation line " + line + "\n");
+            assertTrue(checkEquals2D(id + " inv--> " + csNameDest + " to " + csNameSrc, check, pointSource, 0.01), "Error for inverse transformation line " + line + "\n");
         }
         lineReader.close();
     }