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

Merge pull request #361 from afischerdev/test-and11

Browse source 
Smaller changes for #312
This commit is contained in:
afischerdev 2021-11-07 15:22:45 +01:00 committed by GitHub
commit 31594880ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
brouter-routing-app/src/main/assets/segments4.zip
View file

Binary file not shown.

2
brouter-routing-app/src/main/assets/serverconfig.txt
View file

@ -13,4 +13,4 @@ profiles_url=https://brouter.de/brouter/profiles2/
# these are comma separated arrays # these are comma separated arrays
check_lookup=lookups.dat check_lookup=lookups.dat
check_profiles=car-eco.brf,car-eco-de.brf,car-eco-suspect_scan.brf,car-fast.brf,car-traffic_analysis.brf,fastbike.brf,fastbike-asia-pacific.brf,fastbike-lowtraffic.brf,fastbike-verylowtraffic.brf,hiking-beta.brf,moped.brf,rail.brf,river.brf,shortest.brf,trekking.brf,vm-forum-liegerad-schnell.brf,vm-forum-velomobil-schnell.brf check_profiles=car-eco.brf,car-eco-de.brf,car-eco-suspect_scan.brf,car-fast.brf,fastbike.brf,fastbike-asia-pacific.brf,fastbike-lowtraffic.brf,fastbike-verylowtraffic.brf,hiking-beta.brf,moped.brf,rail.brf,river.brf,safety.brf,shortest.brf,trekking.brf,trekking-ignore-cr.brf,trekking-noferries.brf,trekking-nosteps.brf,trekking-steep.brf,vm-forum-liegerad-schnell.brf,vm-forum-velomobil-schnell.brf

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

@ -64,6 +64,7 @@ public class BInstallerView extends View
private long availableSize; private long availableSize;
private File baseDir; private File baseDir;
private File segmentDir;
private boolean isDownloading = false; private boolean isDownloading = false;
public static boolean downloadCanceled = false; public static boolean downloadCanceled = false;
@ -301,7 +302,7 @@ public class BInstallerView extends View
public void startInstaller() { public void startInstaller() {
baseDir = ConfigHelper.getBaseDir( getContext() ); baseDir = ConfigHelper.getBaseDir( getContext() );
segmentDir = new File( baseDir, "brouter/segments4");
try try
{ {
AssetManager assetManager = getContext().getAssets(); AssetManager assetManager = getContext().getAssets();
@ -448,7 +449,9 @@ public class BInstallerView extends View
if ( isDownloading ) btnText = "Cancel Download"; if ( isDownloading ) btnText = "Cancel Download";
else if ( delTiles > 0 ) btnText = "Delete " + delTiles + " tiles"; else if ( delTiles > 0 ) btnText = "Delete " + delTiles + " tiles";
else if ( rd5Tiles > 0 ) btnText = "Start Download"; else if ( rd5Tiles > 0 ) btnText = "Start Download";
else if ( tilesVisible && rd5Tiles == 0) btnText = "Update all"; else if ( tilesVisible &&
rd5Tiles == 0 &&
RoutingHelper.hasDirectoryAnyDatafiles( segmentDir )) btnText = "Update all";
if ( btnText != null ) if ( btnText != null )
{ {

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

@ -128,7 +128,8 @@ public class BRouterView extends View
File brd = new File( baseDir, "brouter" ); File brd = new File( baseDir, "brouter" );
if ( brd.isDirectory() ) if ( brd.isDirectory() )
{ {
if (brd.getAbsolutePath().contains("/Android/data/")) { if ( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q &&
!brd.getAbsolutePath().contains("/Android/media/btools.routingapp")) {
String message = "(previous basedir " + baseDir + " has to migrate )" ; String message = "(previous basedir " + baseDir + " has to migrate )" ;
( (BRouterActivity) getContext() ).selectBasedir( ( (BRouterActivity) getContext() ).getStorageDirectories(), guessBaseDir(), message ); ( (BRouterActivity) getContext() ).selectBasedir( ( (BRouterActivity) getContext() ).getStorageDirectories(), guessBaseDir(), message );

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

@ -41,9 +41,9 @@ public class CoordinateReaderInternal extends CoordinateReader
} }
else else
{ {
internalDir = basedir + "/import"; internalDir = basedir + "/brouter/import";
tracksdir = "/import/tracks"; tracksdir = "/brouter/import/tracks";
rootdir = "/import"; rootdir = "/brouter/import";
} }
} }

4
misc/profiles2/readme.txt Normal file
View file

@ -0,0 +1,4 @@
NOTE:
Please copy a profile before you edit it.
The delivered profiles will be overwritten when the lookups.dat changes.