Merge pull request #703 from afischerdev/new-apk

Add a check for the nogo list
abrensch · May 29, 2024 · be0aa77 · be0aa77
2 parents 73e7873 + cbf1726
commit be0aa77
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 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
@@ -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
@@ -214,10 +214,14 @@ private void writeTimeoutData(RoutingContext rc) throws Exception {
   }
 
   private void writeWPList(BufferedWriter bw, List<OsmNodeNamed> 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");
+      }
     }
   }
 }

diff --git 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 <repeat:...>
+
+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)