From b0410daf89c72dcb94d5acf161b98679b14c8791 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Sun, 1 Mar 2020 21:55:34 +0100 Subject: [PATCH] version 1.6.1 --- brouter-codec/pom.xml | 2 +- brouter-core/pom.xml | 2 +- brouter-core/src/main/java/btools/router/OsmTrack.java | 2 +- brouter-expressions/pom.xml | 2 +- brouter-map-creator/pom.xml | 2 +- brouter-mapaccess/pom.xml | 2 +- brouter-routing-app/AndroidManifest.xml | 4 ++-- brouter-routing-app/pom.xml | 2 +- .../src/main/java/btools/routingapp/BRouterView.java | 4 ++-- brouter-server/pom.xml | 2 +- brouter-server/src/main/java/btools/server/BRouter.java | 2 +- brouter-server/src/main/java/btools/server/RouteServer.java | 2 +- brouter-util/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/brouter-codec/pom.xml b/brouter-codec/pom.xml index ec364b6..13dd8e7 100644 --- a/brouter-codec/pom.xml +++ b/brouter-codec/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-codec diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index 5b93d6a..16fe6ac 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-core diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 5ec3071..9e283b4 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -441,7 +441,7 @@ public final class OsmTrack } else { - sb.append( " creator=\"BRouter-1.6.0\" version=\"1.1\">\n" ); + sb.append( " creator=\"BRouter-1.6.1\" version=\"1.1\">\n" ); } if ( turnInstructionMode == 3) // osmand style diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml index 7be6d58..dfb35d2 100644 --- a/brouter-expressions/pom.xml +++ b/brouter-expressions/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-expressions diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml index efa809d..32a0df5 100644 --- a/brouter-map-creator/pom.xml +++ b/brouter-map-creator/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-map-creator diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml index b816fad..c48fddc 100644 --- a/brouter-mapaccess/pom.xml +++ b/brouter-mapaccess/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-mapaccess diff --git a/brouter-routing-app/AndroidManifest.xml b/brouter-routing-app/AndroidManifest.xml index 604581a..498d175 100644 --- a/brouter-routing-app/AndroidManifest.xml +++ b/brouter-routing-app/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="41" + android:versionName="1.6.1" package="btools.routingapp"> org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-routing-app 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 9b4d5b6..bfb1f98 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -177,7 +177,7 @@ public class BRouterView extends View String basedir = fbd.getAbsolutePath(); AppLogger.log( "using basedir: " + basedir ); - String version = "v1.6.0"; + String version = "v1.6.1"; // create missing directories assertDirectoryExists( "project directory", basedir + "/brouter", null, null ); @@ -827,7 +827,7 @@ public class BRouterView extends View else { String memstat = memoryClass + "mb pathPeak " + ((cr.getPathPeak()+500)/1000) + "k"; - String result = "version = BRouter-1.6.0\n" + "mem = " + memstat + "\ndistance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend() + String result = "version = BRouter-1.6.1\n" + "mem = " + memstat + "\ndistance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend() + " m\n" + "plain ascend = " + cr.getPlainAscend() + " m\n" + "estimated time = " + cr.getTime(); rawTrack = cr.getFoundRawTrack(); diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml index b334cd7..d5f3a06 100644 --- a/brouter-server/pom.xml +++ b/brouter-server/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-server diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index d13641c..c2b544b 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -88,7 +88,7 @@ public class BRouter } System.exit(0); } - System.out.println("BRouter 1.6.0 / 16022020"); + System.out.println("BRouter 1.6.1 / 01032020"); if ( args.length < 6 ) { System.out.println("Find routes in an OSM map"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index b215447..dbb3624 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -285,7 +285,7 @@ public class RouteServer extends Thread implements Comparable public static void main(String[] args) throws Exception { - System.out.println("BRouter 1.6.0 / 16022020"); + System.out.println("BRouter 1.6.1 / 01032020"); if ( args.length != 5 && args.length != 6) { System.out.println("serve BRouter protocol"); diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml index 0760275..23b3925 100644 --- a/brouter-util/pom.xml +++ b/brouter-util/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.6.0 + 1.6.1 ../pom.xml brouter-util diff --git a/pom.xml b/pom.xml index b33c1cc..d805140 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.btools brouter - 1.6.0 + 1.6.1 pom http://brouter.de/brouter/ brouter