Merge pull request #62 from ebocher/fix/gridspath

Fix grid reader This PR solved the grid loading with the IGNF projections
orbisgis · Mar 21, 2014 · f9a7cd0 · f9a7cd0
2 parents 4497807 + 0f998ac
commit f9a7cd0
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 208 deletions.
diff --git a/src/main/java/org/cts/op/transformation/FrenchGeocentricNTF2RGF.java b/src/main/java/org/cts/op/transformation/FrenchGeocentricNTF2RGF.java
@@ -53,7 +53,7 @@
  * compatible RGF93.<p> It is a geocentric translation which parameters are
  * interpolated on a geographic grid.
  *
- * @author Michaël Michaud, Jules Party
+ * @author Michaël Michaud, Jules Party, Erwan Bocher
  */
 public class FrenchGeocentricNTF2RGF extends AbstractCoordinateOperation {
 
@@ -71,10 +71,6 @@ public class FrenchGeocentricNTF2RGF extends AbstractCoordinateOperation {
      * The GeographicGrid that define this transformation.
      */
     private IGNGeographicGrid GRID3D;
-    /**
-     * The grid path to acces the grid used by this transformation.
-     */
-    private String gridPath;
 
     /**
      * Geocentric translation with parameters interpolated in a grid.<p> The
@@ -88,18 +84,14 @@ public FrenchGeocentricNTF2RGF(String gridPath) throws Exception {
         super(opId);
         this.precision = 0.01;
         try {
-            InputStream is;
-
-            is = FrenchGeocentricNTF2RGF.class.getClassLoader().getResourceAsStream("org/cts/op/transformation/grids/gr3df97a.txt");
+            InputStream is = FrenchGeocentricNTF2RGF.class.getResourceAsStream("grids/gr3df97a.txt");
             if (is == null) {
-                this.gridPath = gridPath;
-                GRID3D = new IGNGeographicGrid(new FileInputStream(gridPath + "gr3df97a.txt"), false);
+                GRID3D = new IGNGeographicGrid(new FileInputStream(gridPath + "gr3df97a.txt"));
             } else {
-                this.gridPath = "org/cts/op/transformation/grids/";
-                GRID3D = new IGNGeographicGrid(is, false);
+                GRID3D = new IGNGeographicGrid(is);
             }
         } catch (Exception e) {
-            throw new Exception(e.getMessage() + "\nThis problem occured when trying to load the gr3df97a.txt grid file, using this path : " + gridPath);
+            throw new Exception( "\nThis problem occured when trying to load the gr3df97a.txt grid file", e);
         }
     }
 
@@ -110,15 +102,12 @@ public FrenchGeocentricNTF2RGF(String gridPath) throws Exception {
      */
     public FrenchGeocentricNTF2RGF() throws Exception {
         super(opId);
-        this.gridPath = "org/cts/op/transformation/grids/";
         this.precision = 0.01;
         try {
-            InputStream is;
-
-            is = FrenchGeocentricNTF2RGF.class.getClassLoader().getResourceAsStream("org/cts/op/transformation/grids/gr3df97a.txt");
-            GRID3D = new IGNGeographicGrid(is, false);
+            InputStream is = FrenchGeocentricNTF2RGF.class.getResourceAsStream("grids/gr3df97a.txt");
+            GRID3D = new IGNGeographicGrid(is);
         } catch (Exception e) {
-            throw new Exception(e.getMessage() + "\nThis problem occured when trying to load the gr3df97a.txt grid file, using this path : " + gridPath);
+            throw new Exception("\nThis problem occured when trying to load the gr3df97a.txt grid file", e);
         }
     }
 

diff --git a/src/main/java/org/cts/op/transformation/grids/GeographicGrid.java b/src/main/java/org/cts/op/transformation/grids/GeographicGrid.java
@@ -278,10 +278,6 @@ public double[][][] getValues() {
      * @param longitude the longitude
      * @return the interpolated value as a double
      */
-    // Bug corrigé le 15/11/03 : les indices de grille i+1 ou j+1 provoquent des
-    // IndexOutOfBoundsException --> remplacé par
-    // i\<nbL-1?i+1:i<br>
-    // j\<nbC-1?j+1:j
     public double[] bilinearInterpolation(double latitude, double longitude)
             throws OutOfExtentException {
         if (!extent.isInside(latitude, longitude)) {