From c2400a96e736f9450d035bcd5accdecced0ea8bd Mon Sep 17 00:00:00 2001 From: afischerdev Date: Sat, 20 May 2023 18:16:01 +0200 Subject: [PATCH 1/4] Avoid SRTM cache for HGT files --- .../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) { From 0831f947505d775b109887169871303dfa7384ee Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Mon, 22 May 2023 13:31:04 +0200 Subject: [PATCH 2/4] Add sparse 90m CGIAR SRTM data for dreieich.pbf --- .../src/test/resources/srtm_38_02.bef | Bin 0 -> 255 bytes .../src/test/resources/srtm_38_03.bef | Bin 0 -> 211 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 brouter-map-creator/src/test/resources/srtm_38_02.bef create mode 100644 brouter-map-creator/src/test/resources/srtm_38_03.bef diff --git a/brouter-map-creator/src/test/resources/srtm_38_02.bef b/brouter-map-creator/src/test/resources/srtm_38_02.bef new file mode 100644 index 0000000000000000000000000000000000000000..b4e287d8474d0ea629a0f4c05cb42f29f138856e GIT binary patch literal 255 zcmZQz5HDZ=VFwWgFmUjM(DvSbjayzw8!#|1F)+;FaASJ#w0^d-<)ot3`){e;-1fG? zm_ehI!7$Ej>69R^Tg$dh^(}IcWSC;rFz2^wsh6gy>DINrItkniUa|-LqoQBy-<}eb zH7R#;9(xRJr`tQ3^GxhGWD<%qHWf$vz{{Fu!chaV_mQNXD83JB0%(|vu zuUo%1`sTKY9(_C(%nd>80$XqVpR|A4r~FfvLMJCO=7W^2)BAes*8k~sOGP?elqTM2 uum-s-GWU8^bk^U~|NS+ed#F5TECi|CbtC&{_R6pKrv&M!v9Dn?um=EBnP_tW literal 0 HcmV?d00001 diff --git a/brouter-map-creator/src/test/resources/srtm_38_03.bef b/brouter-map-creator/src/test/resources/srtm_38_03.bef new file mode 100644 index 0000000000000000000000000000000000000000..14ee74cb35dff458605bf9e3a01236f0757998a4 GIT binary patch literal 211 zcmZQz5HDZ=VFwWgFmP~d0Mqu~evMmRNE$cB{@QzdeP$h0$Rp zv&H4`zu|km-|gS&8*1y$J_jV0@jC49|Jdu*rjwqW@{OO!n9LCHis4$2%D0;--`?b0 zTYqI)X`naLE`|kH7+IEWv71?c{Fnc?Prk2Xw{qQJY6xOCu$*1L*7Rnt>#x24mlmzP zGDSpyjbSNYLZQ{n9n-asZpz;F|GRi7{|k`X58JO@oBPJjU3s19{E%1cu9_(DFfbh0 H<0}LJpbcC6 literal 0 HcmV?d00001 From 1b45d203f043ab15fc0704eb26805b3bc1b402aa Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Mon, 22 May 2023 13:32:48 +0200 Subject: [PATCH 3/4] Use elevation data in mapcreator & route tests --- .../src/test/java/btools/mapcreator/MapcreatorTest.java | 2 +- brouter-server/src/test/java/btools/server/RouteServerTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java index 562d4d2..7567331 100644 --- a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java +++ b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java @@ -42,7 +42,7 @@ public class MapcreatorTest { File unodes55 = new File(tmpdir, "unodes55"); File bordernodes = new File(tmpdir, "bordernodes.dat"); unodes55.mkdir(); - new PosUnifier().process(nodes55, unodes55, borderFile, bordernodes, "/private-backup/srtm"); + new PosUnifier().process(nodes55, unodes55, borderFile, bordernodes, workingDir.getAbsolutePath()); // run WayLinker File segments = new File(tmpdir, "segments"); diff --git a/brouter-server/src/test/java/btools/server/RouteServerTest.java b/brouter-server/src/test/java/btools/server/RouteServerTest.java index dd39216..2bd4609 100644 --- a/brouter-server/src/test/java/btools/server/RouteServerTest.java +++ b/brouter-server/src/test/java/btools/server/RouteServerTest.java @@ -77,6 +77,8 @@ public class RouteServerTest { InputStream inputStream = httpConnection.getInputStream(); JSONObject geoJson = new JSONObject(new String(inputStream.readAllBytes(), StandardCharsets.UTF_8)); Assert.assertEquals("1169", geoJson.query("/features/0/properties/track-length")); + Assert.assertEquals("-15", geoJson.query("/features/0/properties/plain-ascend")); + Assert.assertEquals("4", geoJson.query("/features/0/properties/filtered ascend")); } @Test From d508337d7ea78fa7310966572fd5fa493e6fc0cd Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Mon, 22 May 2023 13:52:25 +0200 Subject: [PATCH 4/4] Fix tests with elevation data --- .../src/test/resources/paramTrack0.gpx | 121 ++++++++---------- .../java/btools/server/RouteServerTest.java | 2 +- 2 files changed, 57 insertions(+), 66 deletions(-) diff --git a/brouter-core/src/test/resources/paramTrack0.gpx b/brouter-core/src/test/resources/paramTrack0.gpx index f3de18c..80d1e3e 100644 --- a/brouter-core/src/test/resources/paramTrack0.gpx +++ b/brouter-core/src/test/resources/paramTrack0.gpx @@ -1,76 +1,67 @@ - + + creator="BRouter-1.7.0" version="1.1"> brouter_trekking_0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 175.25 + 176.75 + 179.25 + 177.5 + 174.5 + 173.25 + 169.5 + 169.5 + 171.0 + 171.25 + 171.25 + 171.0 + 170.25 + 167.75 + 167.5 + 165.25 + 164.75 + 164.5 + 164.25 + 164.25 + 163.75 + 163.75 + 163.25 + 162.25 + 162.0 + 160.0 + 159.25 + 159.0 + 159.0 + 159.0 + 158.0 + 157.5 + 156.25 + 156.0 + 155.25 + 154.25 + 152.5 + 152.5 + 153.0 + 153.25 + 153.75 + 154.0 + 154.25 + 154.5 + 156.25 + 156.5 + 158.5 + 158.5 + 158.5 + 158.5 + 158.5 + 159.5 + 159.75 + 159.5 diff --git a/brouter-server/src/test/java/btools/server/RouteServerTest.java b/brouter-server/src/test/java/btools/server/RouteServerTest.java index 2bd4609..d4c971e 100644 --- a/brouter-server/src/test/java/btools/server/RouteServerTest.java +++ b/brouter-server/src/test/java/btools/server/RouteServerTest.java @@ -91,7 +91,7 @@ public class RouteServerTest { InputStream inputStream = httpConnection.getInputStream(); JSONObject geoJson = new JSONObject(new String(inputStream.readAllBytes(), StandardCharsets.UTF_8)); - Assert.assertEquals("1866", geoJson.query("/features/0/properties/track-length")); + Assert.assertEquals("1570", geoJson.query("/features/0/properties/track-length")); } @Test