X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=src%2Ftim%2Fprune%2Ffunction%2Fsrtm%2FLookupSrtmFunction.java;h=c48af016b889f0df84a094de2df84db0db0ef272;hp=15997448e038e6f4bb6e9f4b9437c99491b18a6e;hb=8b20e3e027058cdf6ff52993ee5576193d08667a;hpb=2302358503c38817e19f6e529f6c9e530aac0e86

diff --git a/src/tim/prune/function/srtm/LookupSrtmFunction.java b/src/tim/prune/function/srtm/LookupSrtmFunction.java
index 1599744..c48af01 100644
--- a/src/tim/prune/function/srtm/LookupSrtmFunction.java
+++ b/src/tim/prune/function/srtm/LookupSrtmFunction.java
@@ -173,7 +173,7 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 		String errorMessage = null;
 		// Get urls for each tile
 		URL[] urls = TileFinder.getUrls(inTileList);
-		for (int t=0; t<inTileList.size() && !_progress.isCancelled(); t++)
+		for (int t=0; t<inTileList.size() && !_progress.isCancelled() && urls != null; t++)
 		{
 			if (urls[t] != null)
 			{
@@ -209,54 +209,11 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 
 					if (entryOk)
 					{
-						// Loop over all points in track, try to apply altitude from array
-						for (int p = 0; p < _track.getNumPoints(); p++)
-						{
-							DataPoint point = _track.getPoint(p);
-							if (!point.hasAltitude()
-								|| (inOverwriteZeros && point.getAltitude().getValue() == 0))
-							{
-								if (new SrtmTile(point).equals(tile))
-								{
-									double x = (point.getLongitude().getDouble() - tile.getLongitude()) * 1200;
-									double y = 1201 - (point.getLatitude().getDouble() - tile.getLatitude()) * 1200;
-									int idx1 = ((int)y)*1201 + (int)x;
-									try
-									{
-										int[] fouralts = {heights[idx1], heights[idx1+1], heights[idx1-1201], heights[idx1-1200]};
-										int numVoids = (fouralts[0]==VOID_VAL?1:0) + (fouralts[1]==VOID_VAL?1:0)
-											+ (fouralts[2]==VOID_VAL?1:0) + (fouralts[3]==VOID_VAL?1:0);
-										// if (numVoids > 0) System.out.println(numVoids + " voids found");
-										double altitude = 0.0;
-										switch (numVoids)
-										{
-											case 0:	altitude = bilinearInterpolate(fouralts, x, y); break;
-											case 1: altitude = bilinearInterpolate(fixVoid(fouralts), x, y); break;
-											case 2:
-											case 3: altitude = averageNonVoid(fouralts); break;
-											default: altitude = VOID_VAL;
-										}
-										// Special case for terrain tracks, don't interpolate voids yet
-										if (!_normalTrack && numVoids > 0) {
-											altitude = VOID_VAL;
-										}
-										if (altitude != VOID_VAL)
-										{
-											point.setFieldValue(Field.ALTITUDE, ""+altitude, false);
-											// depending on settings, this value may have been added as feet, we need to force metres
-											point.getAltitude().reset(new Altitude((int)altitude, UnitSetLibrary.UNITS_METRES));
-											numAltitudesFound++;
-										}
-									}
-									catch (ArrayIndexOutOfBoundsException obe) {
-										// System.err.println("lat=" + point.getLatitude().getDouble() + ", x=" + x + ", y=" + y + ", idx=" + idx1);
-									}
-								}
-							}
-						}
+						numAltitudesFound += applySrtmTileToWholeTrack(tile, heights, inOverwriteZeros);
 					}
 				}
-				catch (IOException ioe) {errorMessage = ioe.getClass().getName() + " - " + ioe.getMessage();
+				catch (IOException ioe) {
+					errorMessage = ioe.getClass().getName() + " - " + ioe.getMessage();
 				}
 			}
 		}
@@ -319,6 +276,65 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 		return new ZipInputStream(inUrl.openStream());
 	}
 
+	/**
+	 * Given the height data read in from file, apply the given tile to all points
+	 * in the track with missing altitude
+	 * @param inTile tile being applied
+	 * @param inHeights height data read in from file
+	 * @param inOverwriteZeros true to overwrite zero altitude values
+	 * @return number of altitudes found
+	 */
+	private int applySrtmTileToWholeTrack(SrtmTile inTile, int[] inHeights, boolean inOverwriteZeros)
+	{
+		int numAltitudesFound = 0;
+		// Loop over all points in track, try to apply altitude from array
+		for (int p = 0; p < _track.getNumPoints(); p++)
+		{
+			DataPoint point = _track.getPoint(p);
+			if (!point.hasAltitude()
+				|| (inOverwriteZeros && point.getAltitude().getValue() == 0))
+			{
+				if (new SrtmTile(point).equals(inTile))
+				{
+					double x = (point.getLongitude().getDouble() - inTile.getLongitude()) * 1200;
+					double y = 1201 - (point.getLatitude().getDouble() - inTile.getLatitude()) * 1200;
+					int idx1 = ((int)y)*1201 + (int)x;
+					try
+					{
+						int[] fouralts = {inHeights[idx1], inHeights[idx1+1], inHeights[idx1-1201], inHeights[idx1-1200]};
+						int numVoids = (fouralts[0]==VOID_VAL?1:0) + (fouralts[1]==VOID_VAL?1:0)
+							+ (fouralts[2]==VOID_VAL?1:0) + (fouralts[3]==VOID_VAL?1:0);
+						// if (numVoids > 0) System.out.println(numVoids + " voids found");
+						double altitude = 0.0;
+						switch (numVoids)
+						{
+							case 0:	altitude = bilinearInterpolate(fouralts, x, y); break;
+							case 1: altitude = bilinearInterpolate(fixVoid(fouralts), x, y); break;
+							case 2:
+							case 3: altitude = averageNonVoid(fouralts); break;
+							default: altitude = VOID_VAL;
+						}
+						// Special case for terrain tracks, don't interpolate voids yet
+						if (!_normalTrack && numVoids > 0) {
+							altitude = VOID_VAL;
+						}
+						if (altitude != VOID_VAL)
+						{
+							point.setFieldValue(Field.ALTITUDE, ""+altitude, false);
+							// depending on settings, this value may have been added as feet, we need to force metres
+							point.getAltitude().reset(new Altitude((int)altitude, UnitSetLibrary.UNITS_METRES));
+							numAltitudesFound++;
+						}
+					}
+					catch (ArrayIndexOutOfBoundsException obe) {
+						// System.err.println("lat=" + point.getLatitude().getDouble() + ", x=" + x + ", y=" + y + ", idx=" + idx1);
+					}
+				}
+			}
+		}
+		return numAltitudesFound;
+	}
+
 	/**
 	 * Perform a bilinear interpolation on the given altitude array
 	 * @param inAltitudes array of four altitude values on corners of square (bl, br, tl, tr)