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

1.0 preparations

Browse source
This commit is contained in:
Arndt 2014-06-19 09:15:51 +02:00
parent 55717c6e71
commit 8fa82633d4
34 changed files with 742 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

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="2"
android:versionName="0.9.9" package="btools.routingapp">
android:versionCode="3"
android:versionName="1.0.1" 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.

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

@ -152,7 +152,7 @@ public class BInstallerView extends View
private void startDownload( int tileIndex, boolean isCd5 )
{
String namebase = baseNameForTile( tileIndex );
String baseurl = "http://h2096617.stratoserver.net/brouter/segments2/";
String baseurl = "http://brouter.de/brouter/segments3/";
currentDownloadFile = namebase + (isCd5 ? ".cd5" : ".rd5" );
String url = baseurl + (isCd5 ? "carsubset/" : "" ) + currentDownloadFile;
isDownloading = true;
@ -584,7 +584,7 @@ float tx, ty;
// download the file
input = connection.getInputStream();
int slidx = surl.lastIndexOf( "segments2/" );
int slidx = surl.lastIndexOf( "segments3/" );
fname = baseDir + "/brouter/segments2/" + surl.substring( slidx+10 );
tmp_file = new File( fname + "_tmp" );
if ( new File( fname ).exists() ) return "internal error: file exists: " + fname;

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

@ -30,6 +30,7 @@ import android.util.DisplayMetrics;
import android.view.View;
import android.widget.Toast;
import btools.expressions.BExpressionContext;
import btools.expressions.BExpressionMetaData;
import btools.mapaccess.OsmNode;
import btools.router.OsmNodeNamed;
import btools.router.OsmTrack;
@ -668,13 +669,14 @@ private long startTime = 0L;
boolean[] modesChecked = new boolean[6];
// parse global section of profile for mode preselection
BExpressionContext expctxGlobal = new BExpressionContext( "global" );
expctxGlobal.readMetaData( new File( profileDir, "lookups.dat" ) );
BExpressionMetaData meta = new BExpressionMetaData();
BExpressionContext expctxGlobal = new BExpressionContext( "global", meta );
meta.readMetaData( new File( profileDir, "lookups.dat" ) );
expctxGlobal.parseFile( new File( profilePath ), null );
expctxGlobal.evaluate( new int[0] );
boolean isFoot = 0.f != expctxGlobal.getVariableValue( "validForFoot" );
boolean isBike = 0.f != expctxGlobal.getVariableValue( "validForBikes" );
boolean isCar = 0.f != expctxGlobal.getVariableValue( "validForCars" );
boolean isFoot = 0.f != expctxGlobal.getVariableValue( "validForFoot", 0.f );
boolean isBike = 0.f != expctxGlobal.getVariableValue( "validForBikes", 0.f );
boolean isCar = 0.f != expctxGlobal.getVariableValue( "validForCars", 0.f );
if ( isFoot || isBike || isCar )
{