From 7001c4cbc787cdf26cca9c55e4f7125bc379f226 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Wed, 22 May 2024 17:54:44 +0200 Subject: [PATCH 1/2] check for nogolist --- .../src/main/java/btools/routingapp/BRouterView.java | 4 +++- .../main/java/btools/routingapp/BRouterWorker.java | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java index a14dfcf5c..674eaf94f 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -224,7 +224,9 @@ public void run() { // add a "last timeout" dummy profile File lastTimeoutFile = new File(modesDir + "/timeoutdata.txt"); long lastTimeoutTime = lastTimeoutFile.lastModified(); - if (lastTimeoutTime > 0 && System.currentTimeMillis() - lastTimeoutTime < 1800000) { + if (lastTimeoutTime > 0 && + lastTimeoutFile.length() > 0 && + System.currentTimeMillis() - lastTimeoutTime < 1800000) { BufferedReader br = new BufferedReader(new FileReader(lastTimeoutFile)); String repeatProfile = br.readLine(); br.close(); diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java index f7a74ff65..1c733ba9c 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java @@ -214,10 +214,14 @@ private void writeTimeoutData(RoutingContext rc) throws Exception { } private void writeWPList(BufferedWriter bw, List wps) throws Exception { - bw.write(wps.size() + "\n"); - for (OsmNodeNamed wp : wps) { - bw.write(wp.toString()); - bw.write("\n"); + if (wps == null) { + bw.write("0\n"); + } else { + bw.write(wps.size() + "\n"); + for (OsmNodeNamed wp : wps) { + bw.write(wp.toString()); + bw.write("\n"); + } } } } From cbf172656be825df0c26118aa6f60c7902059f01 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 28 May 2024 10:13:35 +0200 Subject: [PATCH 2/2] updated doc for publishing --- docs/revisions.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/revisions.md b/docs/revisions.md index 97a53c3d5..a520dd0bd 100644 --- a/docs/revisions.md +++ b/docs/revisions.md @@ -2,6 +2,23 @@ (ZIP-Archives including APK, readme + profiles) +### next version + +Android + +- bug fix for repeat last route + +Library + +- ISO8601 compatible timestamps in log +- Update MIME type for GeoJSON responses + +Profiles + +- update gravel profile + +[Solved issues](https://github.com/abrensch/brouter/issues?q=is%3Aissue+milestone%3A%22Version+1.7.5%22+is%3Aclosed) + ### [brouter-1.7.4.zip](../brouter_bin/brouter-1.7.4.zip) (current revision, 09.04.2024)