LCC ProjectInverse readjustment, BasicCoordinateTransform.transform fix

Author: pomadchin

HOWTORELEASE.txt

@@ -67,7 +67,7 @@ General Notes
 
     Cheat sheet:
         - All commands are can be described via the following template:
-            mvn -P{eclipse | central} {-Dmaven.test.skip=true | } {-pl <module> | } {install, deploy, ...}
+            mvn -P{eclipse | central} {-Dmaven.test.skip=true | } {-pl <module> | } {install, deploy, ...} {-Dmaven.install.skip={false|true}}
 
     The description of the Sonatype publish process:
         - Snaphots:

core/src/main/java/org/locationtech/proj4j/BasicCoordinateTransform.java

@@ -156,7 +156,8 @@ public ProjCoordinate transform(ProjCoordinate src, ProjCoordinate tgt)
         srcCRS.getProjection().getPrimeMeridian().toGreenwich(tgt);
 
         // fixes bug where computed Z value sticks around
-        tgt.clearZ();
+        // commented out, see https://github.com/locationtech/proj4j/issues/116
+        // tgt.clearZ();
 
         if (doDatumTransform) {
             datumTransform(tgt);

core/src/main/java/org/locationtech/proj4j/proj/LambertConformalConicProjection.java

@@ -68,19 +68,21 @@ public ProjCoordinate project(double x, double y, ProjCoordinate out) {
 	}
 
 	public ProjCoordinate projectInverse(double x, double y, ProjCoordinate out) {
+		// https://github.com/OSGeo/PROJ/blob/9.6/src/projections/lcc.cpp#L49-L53
 		x /= scaleFactor;
 		y /= scaleFactor;
-		double rho = ProjectionMath.distance(x, y = rho0 - y);
+		y = rho0 - y;
+		double rho = ProjectionMath.distance(x, y);
 		if (rho != 0) {
 			if (n < 0.0) {
 				rho = -rho;
 				x = -x;
 				y = -y;
 			}
 			if (spherical)
-				out.y = 2.0 * Math.atan(Math.pow(c / rho, 1.0/n)) - ProjectionMath.HALFPI;
+				out.y = 2.0 * Math.atan(Math.pow(c / rho, 1.0 / n)) - ProjectionMath.HALFPI;
 			else
-				out.y = ProjectionMath.phi2(Math.pow(rho / c, 1.0/n), e);
+				out.y = ProjectionMath.phi2(Math.pow(rho / c, 1.0 / n), e);
 			out.x = Math.atan2(x, y) / n;
 		} else {
 			out.x = 0.0;

core/src/test/java/org/locationtech/proj4j/CoordinateTransformTest.java

@@ -290,4 +290,14 @@ public void testEPSG_27250() {
                 "+proj=tmerc +lat_0=-36.87986527777778 +lon_0=174.7643393611111 +k=0.9999 +x_0=300000 +y_0=700000 +datum=nzgd49 +units=m +towgs84=59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993 +nadgrids=nzgd2kgrid0005.gsb +no_defs", 301062.2010778899, 210376.65974323952,
                 0.001);
     }
+
+    // https://github.com/locationtech/proj4j/issues/116
+    @Test
+    public void testEPSG_2994() {
+        checkTransform(
+                "EPSG:2994", new ProjCoordinate(635788, 850485, 81),
+                "+proj=geocent +datum=WGS84",
+                new ProjCoordinate(-2505627.3608, -3847384.25836, 4412472.6628),
+                0.001);
+    }
 }