version 1.6.1
This commit is contained in:
parent
da044752b5
commit
b0410daf89
14 changed files with 16 additions and 16 deletions
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-codec</artifactId>
|
<artifactId>brouter-codec</artifactId>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-core</artifactId>
|
<artifactId>brouter-core</artifactId>
|
||||||
|
|
|
@ -441,7 +441,7 @@ public final class OsmTrack
|
||||||
}
|
}
|
||||||
else
|
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
|
if ( turnInstructionMode == 3) // osmand style
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-expressions</artifactId>
|
<artifactId>brouter-expressions</artifactId>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-map-creator</artifactId>
|
<artifactId>brouter-map-creator</artifactId>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-mapaccess</artifactId>
|
<artifactId>brouter-mapaccess</artifactId>
|
||||||
|
|
|
@ -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="39"
|
android:versionCode="41"
|
||||||
android:versionName="1.6.0" package="btools.routingapp">
|
android:versionName="1.6.1" 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"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-routing-app</artifactId>
|
<artifactId>brouter-routing-app</artifactId>
|
||||||
|
|
|
@ -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.6.0";
|
String version = "v1.6.1";
|
||||||
|
|
||||||
// create missing directories
|
// create missing directories
|
||||||
assertDirectoryExists( "project directory", basedir + "/brouter", null, null );
|
assertDirectoryExists( "project directory", basedir + "/brouter", null, null );
|
||||||
|
@ -827,7 +827,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.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();
|
+ " m\n" + "plain ascend = " + cr.getPlainAscend() + " m\n" + "estimated time = " + cr.getTime();
|
||||||
|
|
||||||
rawTrack = cr.getFoundRawTrack();
|
rawTrack = cr.getFoundRawTrack();
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-server</artifactId>
|
<artifactId>brouter-server</artifactId>
|
||||||
|
|
|
@ -88,7 +88,7 @@ public class BRouter
|
||||||
}
|
}
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
}
|
}
|
||||||
System.out.println("BRouter 1.6.0 / 16022020");
|
System.out.println("BRouter 1.6.1 / 01032020");
|
||||||
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");
|
||||||
|
|
|
@ -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.6.0 / 16022020");
|
System.out.println("BRouter 1.6.1 / 01032020");
|
||||||
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");
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.btools</groupId>
|
<groupId>org.btools</groupId>
|
||||||
<artifactId>brouter</artifactId>
|
<artifactId>brouter</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>brouter-util</artifactId>
|
<artifactId>brouter-util</artifactId>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -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.6.0</version>
|
<version>1.6.1</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>
|
||||||
|
|
Loading…
Reference in a new issue