Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

1.6.0 preparation

Browse source
This commit is contained in:
Arndt Brenschede 2020-02-15 14:36:27 +01:00
parent a0de736323
commit cf5479a261
14 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brouter-codec/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-codec</artifactId> <artifactId>brouter-codec</artifactId>

2
brouter-core/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-core</artifactId> <artifactId>brouter-core</artifactId>

2
brouter-core/src/main/java/btools/router/OsmTrack.java
View file

@ -441,7 +441,7 @@ public final class OsmTrack
} }
else else
{ {
sb.append( " creator=\"BRouter-1.5.5\" version=\"1.1\">\n" ); sb.append( " creator=\"BRouter-1.6.0\" version=\"1.1\">\n" );
} }
if ( turnInstructionMode == 3) // osmand style if ( turnInstructionMode == 3) // osmand style

2
brouter-expressions/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-expressions</artifactId> <artifactId>brouter-expressions</artifactId>

2
brouter-map-creator/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-map-creator</artifactId> <artifactId>brouter-map-creator</artifactId>

2
brouter-mapaccess/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-mapaccess</artifactId> <artifactId>brouter-mapaccess</artifactId>

4
brouter-routing-app/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="38" android:versionCode="39"
android:versionName="1.5.5" package="btools.routingapp"> android:versionName="1.6.0" package="btools.routingapp">
<application android:icon="@drawable/icon" android:label="@string/app_name"> <application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".BRouterActivity" <activity android:name=".BRouterActivity"
android:label="@string/app_name" android:label="@string/app_name"

2
brouter-routing-app/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-routing-app</artifactId> <artifactId>brouter-routing-app</artifactId>

4
brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
View file

@ -177,7 +177,7 @@ public class BRouterView extends View
String basedir = fbd.getAbsolutePath(); String basedir = fbd.getAbsolutePath();
AppLogger.log( "using basedir: " + basedir ); AppLogger.log( "using basedir: " + basedir );
String version = "v1.5.5"; String version = "v1.6.0";
// create missing directories // create missing directories
assertDirectoryExists( "project directory", basedir + "/brouter", null, null ); assertDirectoryExists( "project directory", basedir + "/brouter", null, null );
@ -825,7 +825,7 @@ public class BRouterView extends View
else else
{ {
String memstat = memoryClass + "mb pathPeak " + ((cr.getPathPeak()+500)/1000) + "k"; String memstat = memoryClass + "mb pathPeak " + ((cr.getPathPeak()+500)/1000) + "k";
String result = "version = BRouter-1.5.5\n" + "mem = " + memstat + "\ndistance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend() String result = "version = BRouter-1.6.0\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(); + " m\n" + "plain ascend = " + cr.getPlainAscend() + " m\n" + "estimated time = " + cr.getTime();
rawTrack = cr.getFoundRawTrack(); rawTrack = cr.getFoundRawTrack();

2
brouter-server/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-server</artifactId> <artifactId>brouter-server</artifactId>

2
brouter-server/src/main/java/btools/server/BRouter.java
View file

@ -88,7 +88,7 @@ public class BRouter
} }
System.exit(0); System.exit(0);
} }
System.out.println("BRouter 1.5.5 / 22072019"); System.out.println("BRouter 1.6.0 / 16022020");
if ( args.length < 6 ) if ( args.length < 6 )
{ {
System.out.println("Find routes in an OSM map"); System.out.println("Find routes in an OSM map");

2
brouter-server/src/main/java/btools/server/RouteServer.java
View file

@ -285,7 +285,7 @@ public class RouteServer extends Thread implements Comparable<RouteServer>
public static void main(String[] args) throws Exception public static void main(String[] args) throws Exception
{ {
System.out.println("BRouter 1.5.5 / 22072019"); System.out.println("BRouter 1.6.0 / 16022020");
if ( args.length != 5 && args.length != 6) if ( args.length != 5 && args.length != 6)
{ {
System.out.println("serve BRouter protocol"); System.out.println("serve BRouter protocol");

2
brouter-util/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-util</artifactId> <artifactId>brouter-util</artifactId>

2
pom.xml
View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.5.5</version> <version>1.6.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<url>http://brouter.de/brouter/</url> <url>http://brouter.de/brouter/</url>
<name>brouter</name> <name>brouter</name>