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

v1.4.4

Browse source
This commit is contained in:
Arndt Brenschede 2016-08-30 19:30:53 +02:00
parent ea572ad47f
commit e217f12e71
19 changed files with 58 additions and 27 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>
<groupId>org.btools</groupId>
<artifactId>brouter</artifactId>
<version>1.4.3</version>
<version>1.4.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>brouter-codec</artifactId>

2
brouter-core/pom.xml
View file

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

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

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

2
brouter-expressions/pom.xml
View file

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

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

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

2
brouter-mapaccess/pom.xml
View file

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

5
brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java
View file

@ -90,11 +90,6 @@ final public class PhysicalFile
throw new IllegalArgumentException( "lookup version mismatch (old rd5?) lookups.dat="
+ lookupVersion + " " + f. getAbsolutePath() + "=" + readVersion );
}
if ( i == 1 && lookupMinorVersion != -1 && readVersion < lookupMinorVersion )
{
throw new IllegalArgumentException( "lookup minor version mismatch (old rd5?) lookups.dat="
+ lookupMinorVersion + " " + f. getAbsolutePath() + "=" + readVersion );
}
fileIndex[i] = lv & 0xffffffffffffL;
}

2
brouter-mem-router/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<groupId>org.btools</groupId>
<artifactId>brouter</artifactId>
<version>1.4.3</version>
<version>1.4.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>brouter-mem-router</artifactId>

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

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

BIN
brouter-routing-app/assets/profiles2.zip
View file

Binary file not shown.

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

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

35
brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
View file

@ -38,6 +38,7 @@ public class BRouterActivity extends Activity implements OnInitListener
private static final int DIALOG_OLDDATAHINT_ID = 13;
private static final int DIALOG_SHOW_WP_HELP_ID = 14;
private static final int DIALOG_SHOW_WP_SCANRESULT_ID = 15;
private static final int DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID = 16;
private BRouterView mBRouterView;
private PowerManager mPowerManager;
@ -145,6 +146,22 @@ public class BRouterActivity extends Activity implements OnInitListener
}
} );
return builder.create();
case DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID:
builder = new AlertDialog.Builder( this );
builder
.setTitle( "Successfully prepared a timeout-free calculation" )
.setMessage(
"You successfully repeated a calculation that previously run into a timeout "
+ "when started from your map-tool. If you repeat the same request from your "
+ "maptool, with the exact same destination point and a close-by starting point, "
+ "this request is guaranteed not to time out." ).setNegativeButton( "Exit", new DialogInterface.OnClickListener()
{
public void onClick( DialogInterface dialog, int id )
{
finish();
}
} );
return builder.create();
case DIALOG_SHOW_WP_SCANRESULT_ID:
builder = new AlertDialog.Builder( this );
builder
@ -304,8 +321,8 @@ public class BRouterActivity extends Activity implements OnInitListener
} );
return builder.create();
case DIALOG_SHOWRESULT_ID:
String leftLabel = wpCount < 0 ? ( wpCount == -1 ? "Exit" : "Help") : ( wpCount == 0 ? "Select from" : "Select to/via" );
String rightLabel = wpCount < 2 ? "Server-Mode" : "Calc Route";
String leftLabel = wpCount < 0 ? ( wpCount != -2 ? "Exit" : "Help") : ( wpCount == 0 ? "Select from" : "Select to/via" );
String rightLabel = wpCount < 2 ? ( wpCount == -3 ? "Help" : "Server-Mode" ) : "Calc Route";
builder = new AlertDialog.Builder( this );
builder.setTitle( title ).setMessage( errorMessage ).setPositiveButton( leftLabel, new DialogInterface.OnClickListener()
{
@ -328,8 +345,14 @@ public class BRouterActivity extends Activity implements OnInitListener
{
public void onClick( DialogInterface dialog, int id )
{
if ( wpCount < 2 )
if ( wpCount == -3 )
{
showRepeatTimeoutHelp();
}
else if ( wpCount < 2 )
{
mBRouterView.startConfigureService();
}
else
{
mBRouterView.finishWaypointSelection();
@ -504,6 +527,12 @@ public class BRouterActivity extends Activity implements OnInitListener
showNewDialog( DIALOG_SHOW_WP_HELP_ID );
}
@SuppressWarnings("deprecation")
public void showRepeatTimeoutHelp()
{
showNewDialog( DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID );
}
@SuppressWarnings("deprecation")
public void showWpDatabaseScanSuccess( String bestGuess )
{

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

@ -168,7 +168,7 @@ public class BRouterView extends View
String basedir = fbd.getAbsolutePath();
AppLogger.log( "using basedir: " + basedir );
String version = "v1.4.3";
String version = "v1.4.4";
// create missing directories
assertDirectoryExists( "project directory", basedir + "/brouter", null, null );
@ -748,7 +748,7 @@ public class BRouterView extends View
}
else
{
String result = "version = BRouter-1.4.3\n" + "distance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend()
String result = "version = BRouter-1.4.4\n" + "distance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend()
+ " m\n" + "plain ascend = " + cr.getPlainAscend();
rawTrack = cr.getFoundRawTrack();
@ -763,7 +763,7 @@ public class BRouterView extends View
if ( cr.getAlternativeIndex() > 0 )
title += " / " + cr.getAlternativeIndex() + ". Alternative";
( (BRouterActivity) getContext() ).showResultMessage( title, result, -1 );
( (BRouterActivity) getContext() ).showResultMessage( title, result, rawTrackPath == null ? -1 : -3 );
cr = null;
waitingForSelection = true;
return;

2
brouter-server/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<groupId>org.btools</groupId>
<artifactId>brouter</artifactId>
<version>1.4.3</version>
<version>1.4.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<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.out.println("BRouter 1.4.3 / 06082016 / abrensch");
System.out.println("BRouter 1.4.4 / 29082016 / abrensch");
if ( args.length < 6 )
{
System.out.println("Find routes in an OSM map");

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

@ -155,7 +155,7 @@ public class RouteServer extends Thread
public static void main(String[] args) throws Exception
{
System.out.println("BRouter 1.4.3 / 06082016");
System.out.println("BRouter 1.4.4 / 29082016");
if ( args.length != 5 )
{
System.out.println("serve BRouter protocol");

2
brouter-util/pom.xml
View file

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

9
misc/profiles2/lookups.dat
View file

@ -1,5 +1,5 @@
---lookupversion:10
---minorversion:5
---minorversion:6
---context:way
@ -505,6 +505,13 @@ estimated_traffic_class;0000000001 5
estimated_traffic_class;0000000001 6
estimated_traffic_class;0000000001 7
mtb:scale:uphill;0000018869 0 0+ 0-
mtb:scale:uphill;0000015578 1 1+ 1-
mtb:scale:uphill;0000012338 2 2+ 2-
mtb:scale:uphill;0000009099 3 3+ 3-
mtb:scale:uphill;0000005825 4 4+ 4-
mtb:scale:uphill;0000004628 5 5+ 5-
---context:node
highway;0001314954 bus_stop

2
pom.xml
View file

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