Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change srtm generation

Browse source
This commit is contained in:
Victor Shcherb 2012-11-15 17:48:53 +01:00
parent bc23a825dc
commit cb5602b8dd
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
DataExtractionOSM/src/net/osmand/data/index/IndexUploader.java
View file

@ -296,11 +296,13 @@ public class IndexUploader {
}
log.info("Process file " + f.getName());
File unzipped = unzip(f);
boolean skip = false;
File logFile = new File(f.getParentFile(), unzipped.getName() + IndexBatchCreator.GEN_LOG_EXT);
try {
String description = checkfileAndGetDescription(unzipped);
if(description == null) {
log.info("Skip file " + f.getName());
skip = true;
} else {
List<File> files = new ArrayList<File>();
files.add(unzipped);
@ -312,14 +314,15 @@ public class IndexUploader {
uploadIndex(f, zFile, description, uploadCredentials);
}
} finally {
if (!f.getName().equals(unzipped.getName()) ||
(targetDirectory != null && !targetDirectory.equals(directory))) {
if (!skip) {
if (!f.getName().equals(unzipped.getName()) || (targetDirectory != null && !targetDirectory.equals(directory))) {
unzipped.delete(); // delete the unzipped file
}
if (logFile.exists()) {
logFile.delete();
}
}
}
} catch (OneFileException e) {
log.error(f.getName() + ": " + e.getMessage(), e);
} catch (RuntimeException e) {