X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Ftim%2Fprune%2Ffunction%2Fsrtm%2FLookupSrtmFunction.java;h=ceb1b5b6cae570bf4d83843525785ee7ed7cc94f;hb=b5a8f2a4fb5a050fc0e2d2cbe6d07726dec91ac6;hp=c48af016b889f0df84a094de2df84db0db0ef272;hpb=8b20e3e027058cdf6ff52993ee5576193d08667a;p=GpsPrune.git diff --git a/src/tim/prune/function/srtm/LookupSrtmFunction.java b/src/tim/prune/function/srtm/LookupSrtmFunction.java index c48af01..ceb1b5b 100644 --- a/src/tim/prune/function/srtm/LookupSrtmFunction.java +++ b/src/tim/prune/function/srtm/LookupSrtmFunction.java @@ -1,12 +1,6 @@ package tim.prune.function.srtm; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.net.URL; import java.util.ArrayList; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; import javax.swing.JOptionPane; @@ -15,14 +9,12 @@ import tim.prune.DataSubscriber; import tim.prune.GenericFunction; import tim.prune.I18nManager; import tim.prune.UpdateMessageBroker; -import tim.prune.config.Config; import tim.prune.data.Altitude; import tim.prune.data.DataPoint; import tim.prune.data.Field; import tim.prune.data.Track; import tim.prune.data.UnitSetLibrary; import tim.prune.gui.ProgressDialog; -import tim.prune.tips.TipManager; import tim.prune.undo.UndoLookupSrtm; /** @@ -38,13 +30,9 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable private Track _track = null; /** Flag for whether this is a real track or a terrain one */ private boolean _normalTrack = true; - /** Flag set when any tiles had to be downloaded (rather than just loaded locally) */ - private boolean _hadToDownload = false; /** Flag to check whether this function is currently running or not */ private boolean _running = false; - /** Expected size of hgt file in bytes */ - private static final long HGT_SIZE = 2884802L; /** Altitude below which is considered void */ private static final int VOID_VAL = -32768; @@ -84,7 +72,10 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable private void begin(Track inTrack, boolean inNormalTrack) { _running = true; - _hadToDownload = false; + if (! SrtmDiskCache.ensureCacheIsUsable()) + { + _app.showErrorMessage(getNameKey(), "error.cache.notthere"); + } if (_progress == null) { _progress = new ProgressDialog(_parentFrame, getNameKey()); } @@ -102,65 +93,31 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable { // Compile list of tiles to get ArrayList tileList = new ArrayList(); - boolean hasZeroAltitudePoints = false; - boolean hasNonZeroAltitudePoints = false; - // First, loop to see what kind of points we have - for (int i = 0; i < _track.getNumPoints(); i++) - { - if (_track.getPoint(i).hasAltitude()) - { - if (_track.getPoint(i).getAltitude().getValue() == 0) { - hasZeroAltitudePoints = true; - } - else { - hasNonZeroAltitudePoints = true; - } - } - } - // Should we overwrite the zero altitude values? - boolean overwriteZeros = hasZeroAltitudePoints && !hasNonZeroAltitudePoints; - // If non-zero values present as well, ask user whether to overwrite the zeros or not - if (hasNonZeroAltitudePoints && hasZeroAltitudePoints && JOptionPane.showConfirmDialog(_parentFrame, - I18nManager.getText("dialog.lookupsrtm.overwritezeros"), I18nManager.getText(getNameKey()), - JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) - { - overwriteZeros = true; - } // Now loop again to extract the required tiles for (int i = 0; i < _track.getNumPoints(); i++) { - // Consider points which don't have altitudes or have zero values - if (!_track.getPoint(i).hasAltitude() - || (overwriteZeros && _track.getPoint(i).getAltitude().getValue() == 0)) + SrtmTile tile = new SrtmTile(_track.getPoint(i)); + boolean alreadyGot = false; + for (int t = 0; t < tileList.size(); t++) { - SrtmTile tile = new SrtmTile(_track.getPoint(i)); - boolean alreadyGot = false; - for (int t = 0; t < tileList.size(); t++) - { - if (tileList.get(t).equals(tile)) { - alreadyGot = true; - } + if (tileList.get(t).equals(tile)) { + alreadyGot = true; } - if (!alreadyGot) {tileList.add(tile);} } + if (!alreadyGot) {tileList.add(tile);} } - lookupValues(tileList, overwriteZeros); + lookupValues(tileList); // Finished _running = false; - // Show tip if lots of online lookups were necessary - if (_hadToDownload) { - _app.showTip(TipManager.Tip_DownloadSrtm); - } } - /** * Lookup the values from SRTM data * @param inTileList list of tiles to get * @param inOverwriteZeros true to overwrite zero altitude values */ - private void lookupValues(ArrayList inTileList, boolean inOverwriteZeros) + private void lookupValues(ArrayList inTileList) { UndoLookupSrtm undo = new UndoLookupSrtm(_app.getTrackInfo()); int numAltitudesFound = 0; @@ -170,51 +127,44 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable _progress.setMaximum(inTileList.size()); _progress.setValue(0); } - String errorMessage = null; - // Get urls for each tile - URL[] urls = TileFinder.getUrls(inTileList); - for (int t=0; t= 32768) {heights[i] -= 65536;} - } - } - // else { - // System.out.println("length not ok: " + entry.getSize()); - // } - // Close stream from url - inStream.close(); - } + errorMessage += "Tile "+tile.getTileName()+" not in cache!\n"; + continue; + } - if (entryOk) - { - numAltitudesFound += applySrtmTileToWholeTrack(tile, heights, inOverwriteZeros); - } - } - catch (IOException ioe) { - errorMessage = ioe.getClass().getName() + " - " + ioe.getMessage(); - } + // Set progress + _progress.setValue(t); + + int[] heights; + try { + heights = srtmSource.getTileHeights(tile); + } + catch (SrtmSourceException e) + { + errorMessage += e.getMessage(); + e.printStackTrace(); + continue; + } + int rowSize = srtmSource.getRowSize(tile); + if (rowSize <= 0) + { + errorMessage += "Tile "+tile.getTileName()+" is corrupted"; + } + + try { + numAltitudesFound += applySrtmTileToWholeTrack(tile, heights, rowSize); + } + catch (SrtmSourceException e) + { + errorMessage += e.getMessage(); + continue; } } @@ -223,6 +173,10 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable return; } + if (! errorMessage.equals("")) { + _app.showErrorMessageNoLookup(getNameKey(), errorMessage); + return; + } if (numAltitudesFound > 0) { // Inform app including undo information @@ -235,9 +189,6 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable I18nManager.getTextWithNumber("confirm.lookupsrtm", numAltitudesFound)); } } - else if (errorMessage != null) { - _app.showErrorMessageNoLookup(getNameKey(), errorMessage); - } else if (inTileList.size() > 0) { _app.showErrorMessage(getNameKey(), "error.lookupsrtm.nonefound"); } @@ -246,89 +197,55 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable } } - /** - * See whether the SRTM file is already available locally first, then try online - * @param inUrl URL for online resource - * @return ZipInputStream either on the local file or on the downloaded zip file - */ - private ZipInputStream getStreamToHgtFile(URL inUrl) - throws IOException - { - String diskCachePath = Config.getConfigString(Config.KEY_DISK_CACHE); - if (diskCachePath != null) - { - File srtmDir = new File(diskCachePath, "srtm"); - if (srtmDir.exists() && srtmDir.isDirectory() && srtmDir.canRead()) - { - File srtmFile = new File(srtmDir, new File(inUrl.getFile()).getName()); - if (srtmFile.exists() && srtmFile.isFile() && srtmFile.canRead() - && srtmFile.length() > 400) - { - // System.out.println("Lookup: Using file " + srtmFile.getAbsolutePath()); - // File found, use this one - return new ZipInputStream(new FileInputStream(srtmFile)); - } - } - } - // System.out.println("Lookup: Trying online: " + inUrl.toString()); - _hadToDownload = true; - // MAYBE: Only download if we're in online mode? - 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) + private int applySrtmTileToWholeTrack(SrtmTile inTile, int[] inHeights, int inRowSize) + throws SrtmSourceException { 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)) { - if (new SrtmTile(point).equals(inTile)) + double x = (point.getLongitude().getDouble() - inTile.getLongitude()) * (inRowSize - 1); + double y = inRowSize - (point.getLatitude().getDouble() - inTile.getLatitude()) * (inRowSize - 1); + int idx1 = ((int)y)*inRowSize + (int)x; + try { - 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-inRowSize], inHeights[idx1-inRowSize+1]}; + 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) { - 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++; - } + 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; } - catch (ArrayIndexOutOfBoundsException obe) { - // System.err.println("lat=" + point.getLatitude().getDouble() + ", x=" + x + ", y=" + y + ", idx=" + idx1); + // 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("Point not in tile? lat=" + point.getLatitude().getDouble() + ", x=" + x + ", y=" + y + ", idx=" + idx1+"\n"); } } }