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

update to one routine

Browse source
This commit is contained in:
afischerdev 2023-05-10 12:56:21 +02:00
parent a2c5ed68fc
commit c20b2ba686
2 changed files with 61 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import btools.util.CompactLongSet;
@ -217,13 +218,13 @@ public class PosUnifier extends MapCreatorBase {
if (lastSrtmRaster == null) {
File f = new File(new File(srtmdir), filename + ".hgt");
if (f.exists()) {
lastSrtmRaster = new ConvertLidarTile().getRasterDirect(f, lon, lat);
lastSrtmRaster = new ConvertLidarTile().getRaster(f, lon, lat);
srtmmap.put(filename, lastSrtmRaster);
return lastSrtmRaster;
}
f = new File(new File(srtmdir), filename + ".zip");
if (f.exists()) {
lastSrtmRaster = new ConvertLidarTile().getRasterZip(f, lon, lat);
lastSrtmRaster = new ConvertLidarTile().getRaster(f, lon, lat);
srtmmap.put(filename, lastSrtmRaster);
return lastSrtmRaster;
}
@ -246,11 +247,11 @@ public class PosUnifier extends MapCreatorBase {
lon = -lon + 1;
}
return String.format("%s%02d%s%03d", latPref, lat, lonPref, lon);
return String.format(Locale.US, "%s%02d%s%03d", latPref, lat, lonPref, lon);
}
private void resetSrtm() {
srtmmap = new HashMap<String, SrtmRaster>();
srtmmap = new HashMap<>();
lastSrtmLonIdx = -1;
lastSrtmLatIdx = -1;
lastSrtmRaster = null;