From 3ea409078ef08d4f912e761916ef09d891c4ed60 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Sat, 20 May 2023 18:16:01 +0200 Subject: [PATCH] modify hgt call in bef generation --- .../btools/mapcreator/ConvertLidarTile.java | 2 +- .../java/btools/mapcreator/PosUnifier.java | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/ConvertLidarTile.java b/brouter-map-creator/src/main/java/btools/mapcreator/ConvertLidarTile.java index 46f9c57..2a00e96 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/ConvertLidarTile.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/ConvertLidarTile.java @@ -165,7 +165,7 @@ public class ConvertLidarTile { String s = "E"; if (lon < 0) { lon = -lon; - s = "E"; + s = "W"; } String n = "000" + lon; return s + n.substring(n.length() - 3); diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java index 6fade10..3610b54 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java @@ -214,22 +214,23 @@ public class PosUnifier extends MapCreatorBase { double lat = (ilat - 90000000) / 1000000.; String filename = buildHgtFilename(lat, lon); - lastSrtmRaster = srtmmap.get(filename); - if (lastSrtmRaster == null) { + // don't block lastSrtmRaster + SrtmRaster srtm = srtmmap.get(filename); + if (srtm == null) { File f = new File(new File(srtmdir), filename + ".hgt"); if (f.exists()) { - lastSrtmRaster = new ConvertLidarTile().getRaster(f, lon, lat); - srtmmap.put(filename, lastSrtmRaster); - return lastSrtmRaster; + srtm = new ConvertLidarTile().getRaster(f, lon, lat); + srtmmap.put(filename, srtm); + return srtm; } f = new File(new File(srtmdir), filename + ".zip"); if (f.exists()) { - lastSrtmRaster = new ConvertLidarTile().getRaster(f, lon, lat); - srtmmap.put(filename, lastSrtmRaster); - return lastSrtmRaster; + srtm = new ConvertLidarTile().getRaster(f, lon, lat); + srtmmap.put(filename, srtm); + return srtm; } } - return lastSrtmRaster; + return srtm; } private String buildHgtFilename(double llat, double llon) {