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-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) { 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-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 0000000..b4e287d Binary files /dev/null and b/brouter-map-creator/src/test/resources/srtm_38_02.bef differ 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 0000000..14ee74c Binary files /dev/null and b/brouter-map-creator/src/test/resources/srtm_38_03.bef differ diff --git a/brouter-server/src/test/java/btools/server/RouteServerTest.java b/brouter-server/src/test/java/btools/server/RouteServerTest.java index dd39216..d4c971e 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 @@ -89,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