Parsing NTv2 Improvement (#99)

* assign grids value to Datum for parsing nadgrid files * wrap resource stream for nadgrid file in BufferedInput to fix mark/reset not supported exception Signed-off-by: Elio Alvarado <[email protected]>
locationtech · May 25, 2023 · 3680d16 · 3680d16 · lemontmoon · May 26, 2023
1 parent 32ceb7b
commit 3680d16
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/core/src/main/java/org/locationtech/proj4j/datum/Datum.java b/core/src/main/java/org/locationtech/proj4j/datum/Datum.java
@@ -265,4 +265,8 @@ public void shift(ProjCoordinate xy) {
     public void inverseShift(ProjCoordinate xy) {
         Grid.shift(grids, true, xy);
     }
+
+    public void setGrids(List<Grid> grids) {
+        this.grids = grids;
+    }
 }
diff --git a/core/src/main/java/org/locationtech/proj4j/datum/Grid.java b/core/src/main/java/org/locationtech/proj4j/datum/Grid.java
@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.Serializable;
+import java.io.BufferedInputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -377,7 +378,7 @@ private static DataInputStream resolveGridDefinition(String gridName) throws IOE
         File file = new File(gridName);
         if (file.exists()) return new DataInputStream(new FileInputStream(file));
         InputStream resource = Grid.class.getResourceAsStream("/proj4/nad/" + gridName);
-        if (resource != null) return new DataInputStream(resource);
+        if (resource != null) return new DataInputStream(new BufferedInputStream(resource));
 
         return null;
     }

diff --git a/core/src/main/java/org/locationtech/proj4j/parser/DatumParameters.java b/core/src/main/java/org/locationtech/proj4j/parser/DatumParameters.java
@@ -139,4 +139,8 @@ public double getA() {
     public double getES() {
         return es;
     }
+
+    public List<Grid> getGrids() {
+        return grids;
+    }
 }
diff --git a/core/src/main/java/org/locationtech/proj4j/parser/Proj4Parser.java b/core/src/main/java/org/locationtech/proj4j/parser/Proj4Parser.java
@@ -50,6 +50,7 @@ public CoordinateReferenceSystem parse(String name, String[] args) {
         parseDatum(params, datumParam);
         parseEllipsoid(params, datumParam);
         Datum datum = datumParam.getDatum();
+        datum.setGrids(datumParam.getGrids());
         Ellipsoid ellipsoid = datum.getEllipsoid();
         // TODO: this makes a difference - why?
         // which is better?

diff --git a/core/src/test/java/org/locationtech/proj4j/CoordinateTransformTest.java b/core/src/test/java/org/locationtech/proj4j/CoordinateTransformTest.java
@@ -282,4 +282,12 @@ public void testEPSG_5514() {
                 "EPSG:5514", -743093.7321490766, -1044381.7725184687,
                 0.001, 0.4 * APPROX_METRE_IN_DEGREES);
     }
+
+    @Test
+    public void testEPSG_27250() {
+        checkTransform(
+                "+proj=latlong +datum=WGS84", 174.7772114, -41.2887953,
+                "+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);
+    }
 }
diff --git a/core/src/test/resources/proj4/nad/nzgd2kgrid0005.gsb b/core/src/test/resources/proj4/nad/nzgd2kgrid0005.gsb