Merge pull request #1438 from lat-lon/officialJgridshift-8613-1233

Use official jgridshift version with patch
deegree · Aug 9, 2023 · e567b43 · e567b43
2 parents 5748374 + 018ba5d
commit e567b43
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/deegree-core/deegree-core-cs/pom.xml b/deegree-core/deegree-core-cs/pom.xml
@@ -44,8 +44,8 @@
       <artifactId>vecmath</artifactId>
     </dependency>
     <dependency>
-      <groupId>jgridshift</groupId>
-      <artifactId>jgridshift</artifactId>
+      <groupId>it.geosolutions.jgridshift</groupId>
+      <artifactId>jgridshift-core</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/...deegree-core-cs/src/main/java/org/deegree/cs/transformations/ntv2/NTv2Transformation.java b/...deegree-core-cs/src/main/java/org/deegree/cs/transformations/ntv2/NTv2Transformation.java
@@ -148,21 +148,20 @@ public NTv2Transformation(ICRS sourceCRS, ICRS targetCRS, CRSResource id, URL gr
 		IEllipsoid sourceEl = sourceCRS.getGeodeticDatum().getEllipsoid();
 		IEllipsoid targetEl = targetCRS.getGeodeticDatum().getEllipsoid();
 
-		// rb: patched the gridshift file for access to the axis
-		if (Math.abs(sourceEl.getSemiMajorAxis() - gsf.getFromSemiMajor()) > 0.001
-				|| Math.abs(sourceEl.getSemiMinorAxis() - gsf.getFromSemiMinor()) > 0.001) {
+		if (Math.abs(sourceEl.getSemiMajorAxis() - gsf.getFromSemiMajorAxis()) > 0.001
+				|| Math.abs(sourceEl.getSemiMinorAxis() - gsf.getFromSemiMinorAxis()) > 0.001) {
 			LOG.warn("The given source CRS' ellipsoid (" + sourceEl.getCode().getOriginal()
-					+ ") does not match the 'from' ellipsoid (" + fromEllips + ")defined in the gridfile: " + gridURL);
+					+ ") does not match the 'from' ellipsoid (" + fromEllips + ") defined in the gridfile: " + gridURL);
 		}
 
-		if (Math.abs(targetEl.getSemiMajorAxis() - gsf.getToSemiMajor()) > 0.001
-				|| Math.abs(targetEl.getSemiMinorAxis() - gsf.getToSemiMinor()) > 0.001) {
+		if (Math.abs(targetEl.getSemiMajorAxis() - gsf.getToSemiMajorAxis()) > 0.001
+				|| Math.abs(targetEl.getSemiMinorAxis() - gsf.getToSemiMinorAxis()) > 0.001) {
 			LOG.warn("The given target CRS' ellipsoid (" + targetEl.getCode().getOriginal()
 					+ ") does not match the 'to' ellipsoid (" + toEllips + ") defined in the gridfile: " + gridURL);
 		}
 
-		isIdentity = (Math.abs(gsf.getFromSemiMajor() - gsf.getToSemiMajor()) < 0.001)
-				&& (Math.abs(gsf.getFromSemiMinor() - gsf.getToSemiMinor()) < 0.001);
+		isIdentity = (Math.abs(gsf.getFromSemiMajorAxis() - gsf.getToSemiMajorAxis()) < 0.001)
+				&& (Math.abs(gsf.getFromSemiMinorAxis() - gsf.getToSemiMinorAxis()) < 0.001);
 	}
 
 	/**
@@ -180,21 +179,20 @@ public NTv2Transformation(ICRS sourceCRS, ICRS targetCRS, CRSResource id, GridSh
 		IEllipsoid sourceEl = sourceCRS.getGeodeticDatum().getEllipsoid();
 		IEllipsoid targetEl = targetCRS.getGeodeticDatum().getEllipsoid();
 
-		// rb: patched the gridshift file for access to the axis
-		if (Math.abs(sourceEl.getSemiMajorAxis() - gsf.getFromSemiMajor()) > 0.001
-				|| Math.abs(sourceEl.getSemiMinorAxis() - gsf.getFromSemiMinor()) > 0.001) {
+		if (Math.abs(sourceEl.getSemiMajorAxis() - gsf.getFromSemiMajorAxis()) > 0.001
+				|| Math.abs(sourceEl.getSemiMinorAxis() - gsf.getFromSemiMinorAxis()) > 0.001) {
 			LOG.warn("The given source CRS' ellipsoid (" + sourceEl.getCode().getOriginal()
-					+ ") does not match the 'from' ellipsoid (" + fromEllips + ")defined in the gridfile: " + gridURL);
+					+ ") does not match the 'from' ellipsoid (" + fromEllips + ") defined in the gridfile: " + gridURL);
 		}
 
-		if (Math.abs(targetEl.getSemiMajorAxis() - gsf.getToSemiMajor()) > 0.001
-				|| Math.abs(targetEl.getSemiMinorAxis() - gsf.getToSemiMinor()) > 0.001) {
+		if (Math.abs(targetEl.getSemiMajorAxis() - gsf.getToSemiMajorAxis()) > 0.001
+				|| Math.abs(targetEl.getSemiMinorAxis() - gsf.getToSemiMinorAxis()) > 0.001) {
 			LOG.warn("The given target CRS' ellipsoid (" + targetEl.getCode().getOriginal()
 					+ ") does not match the 'to' ellipsoid (" + toEllips + ") defined in the gridfile: " + gridURL);
 		}
 
-		isIdentity = (Math.abs(gsf.getFromSemiMajor() - gsf.getToSemiMajor()) < 0.001)
-				&& (Math.abs(gsf.getFromSemiMinor() - gsf.getToSemiMinor()) < 0.001);
+		isIdentity = (Math.abs(gsf.getFromSemiMajorAxis() - gsf.getToSemiMajorAxis()) < 0.001)
+				&& (Math.abs(gsf.getFromSemiMinorAxis() - gsf.getToSemiMinorAxis()) < 0.001);
 	}
 
 	/**

diff --git a/pom.xml b/pom.xml
@@ -27,6 +27,13 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>geotools-releases</id>
+      <url>https://repo.osgeo.org/repository/geotools-releases/</url>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </repository>
   </repositories>
 
   <distributionManagement>
@@ -1068,9 +1075,9 @@
         <version>1.19.0</version>
       </dependency>
       <dependency>
-        <groupId>jgridshift</groupId>
-        <artifactId>jgridshift</artifactId>
-        <version>1.0-deegreeversion</version>
+        <groupId>it.geosolutions.jgridshift</groupId>
+        <artifactId>jgridshift-core</artifactId>
+        <version>1.3.1</version>
       </dependency>
       <dependency>
         <groupId>org.ehcache</groupId>