Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Avoid SRTM cache for HGT files

Browse source
This commit is contained in:
afischerdev 2023-05-20 18:16:01 +02:00 committed by Manuel Fuhr
parent 781661ea12
commit c2400a96e7
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brouter-map-creator/src/main/java/btools/mapcreator/ConvertLidarTile.java
View file

@ -165,7 +165,7 @@ public class ConvertLidarTile {
String s = "E"; String s = "E";
if (lon < 0) { if (lon < 0) {
lon = -lon; lon = -lon;
s = "E"; s = "W";
} }
String n = "000" + lon; String n = "000" + lon;
return s + n.substring(n.length() - 3); return s + n.substring(n.length() - 3);

19
brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java
View file

@ -214,22 +214,23 @@ public class PosUnifier extends MapCreatorBase {
double lat = (ilat - 90000000) / 1000000.; double lat = (ilat - 90000000) / 1000000.;
String filename = buildHgtFilename(lat, lon); String filename = buildHgtFilename(lat, lon);
lastSrtmRaster = srtmmap.get(filename); // don't block lastSrtmRaster
if (lastSrtmRaster == null) { SrtmRaster srtm = srtmmap.get(filename);
if (srtm == null) {
File f = new File(new File(srtmdir), filename + ".hgt"); File f = new File(new File(srtmdir), filename + ".hgt");
if (f.exists()) { if (f.exists()) {
lastSrtmRaster = new ConvertLidarTile().getRaster(f, lon, lat); srtm = new ConvertLidarTile().getRaster(f, lon, lat);
srtmmap.put(filename, lastSrtmRaster); srtmmap.put(filename, srtm);
return lastSrtmRaster; return srtm;
} }
f = new File(new File(srtmdir), filename + ".zip"); f = new File(new File(srtmdir), filename + ".zip");
if (f.exists()) { if (f.exists()) {
lastSrtmRaster = new ConvertLidarTile().getRaster(f, lon, lat); srtm = new ConvertLidarTile().getRaster(f, lon, lat);
srtmmap.put(filename, lastSrtmRaster); srtmmap.put(filename, srtm);
return lastSrtmRaster; return srtm;
} }
} }
return lastSrtmRaster; return srtm;
} }
private String buildHgtFilename(double llat, double llon) { private String buildHgtFilename(double llat, double llon) {