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

1.3 preparation

Browse source
This commit is contained in:
Arndt Brenschede 2015-10-15 19:12:05 +02:00
parent 20212963ba
commit 112d04979b
21 changed files with 51 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,9 +195,9 @@ public class BInstallerView extends View
{
clearTileSelection( MASK_INSTALLED_RD5 | MASK_CURRENT_RD5 );
scanExistingFiles( new File( baseDir + "/brouter/segments3" ) );
scanExistingFiles( new File( baseDir + "/brouter/segments4" ) );
File secondary = RoutingHelper.getSecondarySegmentDir( baseDir + "/brouter/segments3" );
File secondary = RoutingHelper.getSecondarySegmentDir( baseDir + "/brouter/segments4" );
if ( secondary != null )
{
scanExistingFiles( secondary );
@ -597,7 +597,7 @@ float tx, ty;
input = connection.getInputStream();
int slidx = surl.lastIndexOf( "segments4/" );
fname = baseDir + "/brouter/segments3/" + surl.substring( slidx+10 );
fname = baseDir + "/brouter/segments4/" + surl.substring( slidx+10 );
tmp_file = new File( fname + "_tmp" );
output = new FileOutputStream( tmp_file );

2
brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java
View file

@ -57,7 +57,7 @@ public class BRouterService extends Service
{
String modesFile = baseDir + "/brouter/modes/serviceconfig.dat";
br = new BufferedReader( new FileReader (modesFile ) );
worker.segmentDir = baseDir + "/brouter/segments3";
worker.segmentDir = baseDir + "/brouter/segments4";
for(;;)
{
String line = br.readLine();

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

@ -147,9 +147,8 @@ public class BRouterView extends View
// create missing directories
assertDirectoryExists( "project directory", basedir + "/brouter", null );
segmentDir = basedir + "/brouter/segments3";
assertDirectoryExists( "data directory", segmentDir, "segments3.zip" );
assertDirectoryExists( "carsubset directory", segmentDir + "/carsubset", null );
segmentDir = basedir + "/brouter/segments4";
assertDirectoryExists( "data directory", segmentDir, "segments4.zip" );
profileDir = basedir + "/brouter/profiles2";
assertDirectoryExists( "profile directory", profileDir, "profiles2.zip" );
modesDir = basedir + "/brouter/modes";
@ -501,11 +500,10 @@ private long startTime = 0L;
catch( Throwable t )
{
// on out of mem, try to stop the show
String hint = "";
if ( cr != null ) hint = cr.cleanOnOOM();
if ( cr != null ) cr.cleanOnOOM();
cr = null;
try { Thread.sleep( 2000 ); } catch( InterruptedException ie ) {}
((BRouterActivity)getContext()).showErrorMessage( t.toString() + hint );
((BRouterActivity)getContext()).showErrorMessage( t.toString() );
waitingForSelection = true;
}
}
@ -535,7 +533,7 @@ private long startTime = 0L;
}
else
{
String result = "version = BRouter-1.2\n"
String result = "version = BRouter-1.3\n"
+ "distance = " + cr.getDistance()/1000. + " km\n"
+ "filtered ascend = " + cr.getAscend() + " m\n"
+ "plain ascend = " + cr.getPlainAscend();