Changeset 10250 in josm for trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

Timestamp:

2016-05-18T17:44:31+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR

File:

• trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -103 +103 @@
     public void loadGridShiftFile(InputStream in, boolean loadAccuracy) throws IOException {
         byte[] b8 = new byte[8];
-        boolean bigEndian = true;
         fromEllipsoid = "";
         toEllipsoid = "";
@@ -111 +110 @@
         if (!"NUM_OREC".equals(overviewHeaderCountId))
             throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");
+        boolean bigEndian;
         readBytes(in, b8);
         overviewHeaderCount = NTV2Util.getIntBE(b8, 0);
@@ -204 +204 @@
      */
     public boolean gridShiftForward(NTV2GridShift gs) {
-        // Try the last sub grid first, big chance the coord is still within it
-        NTV2SubGrid subGrid = lastSubGrid.getSubGridForCoord(gs.getLonPositiveWestSeconds(), gs.getLatSeconds());
+        NTV2SubGrid subGrid = null;
+        if (lastSubGrid != null) {
+            // Try the last sub grid first, big chance the coord is still within it
+            subGrid = lastSubGrid.getSubGridForCoord(gs.getLonPositiveWestSeconds(), gs.getLatSeconds());
+        }
         if (subGrid == null) {
-            subGrid = getSubGrid(gs.getLonPositiveWestSeconds(), gs.getLatSeconds());
-        }
-        if (subGrid == null)
+            subGrid = getSubGrid(topLevelSubGrid, gs.getLonPositiveWestSeconds(), gs.getLatSeconds());
+        }
+        if (subGrid == null) {
             return false;
-        else {
+        } else {
             subGrid.interpolateGridShift(gs);
             gs.setSubGridName(subGrid.getSubGridName());
@@ -251 +254 @@
 
     /**
-     * Find the finest SubGrid containing the coordinate, specified
-     * in Positive West Seconds
-     *
+     * Find the finest SubGrid containing the coordinate, specified in Positive West Seconds
+     * @param topLevelSubGrid top level subgrid
      * @param lon Longitude in Positive West Seconds
      * @param lat Latitude in Seconds
      * @return The SubGrid found or null
      */
-    private NTV2SubGrid getSubGrid(double lon, double lat) {
+    private static NTV2SubGrid getSubGrid(NTV2SubGrid[] topLevelSubGrid, double lon, double lat) {
         NTV2SubGrid sub = null;
         for (int i = 0; i < topLevelSubGrid.length; i++) {