diff --git a/brouter-codec/pom.xml b/brouter-codec/pom.xml index c6fc243..6436e1e 100644 --- a/brouter-codec/pom.xml +++ b/brouter-codec/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-codec diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index de5383c..090dae2 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../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 9e8ef2c..01f9aa1 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -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 diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml index 81d1e28..e454161 100644 --- a/brouter-expressions/pom.xml +++ b/brouter-expressions/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-expressions diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml index 033850a..a7499b2 100644 --- a/brouter-map-creator/pom.xml +++ b/brouter-map-creator/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-map-creator diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml index 910c3f7..56ae527 100644 --- a/brouter-mapaccess/pom.xml +++ b/brouter-mapaccess/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-mapaccess diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java index fd73744..6102449 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java @@ -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; } diff --git a/brouter-mem-router/pom.xml b/brouter-mem-router/pom.xml index 14cb12a..d55a5ed 100644 --- a/brouter-mem-router/pom.xml +++ b/brouter-mem-router/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-mem-router diff --git a/brouter-routing-app/AndroidManifest.xml b/brouter-routing-app/AndroidManifest.xml index 20180d1..c8250b3 100644 --- a/brouter-routing-app/AndroidManifest.xml +++ b/brouter-routing-app/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="15" + android:versionName="1.4.4" package="btools.routingapp"> org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-routing-app diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java index cf7d1b7..3c90aca 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java @@ -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 ) { 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 6586d4f..87077f5 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -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; diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml index f6277ed..10aba25 100644 --- a/brouter-server/pom.xml +++ b/brouter-server/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../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 ec361f7..85c9f49 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.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"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index a786e9a..d46dca4 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -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"); diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml index f086584..545a67d 100644 --- a/brouter-util/pom.xml +++ b/brouter-util/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.3 + 1.4.4 ../pom.xml brouter-util diff --git a/misc/profiles2/lookups.dat b/misc/profiles2/lookups.dat index ff5ed3b..a1cc7fe 100644 --- a/misc/profiles2/lookups.dat +++ b/misc/profiles2/lookups.dat @@ -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 diff --git a/pom.xml b/pom.xml index dd352a6..7f7d333 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.btools brouter - 1.4.3 + 1.4.4 pom http://brouter.de/brouter/ brouter