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

Merge branch 'master' of https://github.com/abrensch/brouter

Browse source
This commit is contained in:
Arndt 2016-10-19 18:45:27 +02:00
commit 83f439d773
19 changed files with 77 additions and 57 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="17"
android:versionName="1.4.6" package="btools.routingapp">
android:versionCode="18"
android:versionName="1.4.7" package="btools.routingapp">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".BRouterActivity"
android:label="@string/app_name"

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

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

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

@ -171,7 +171,7 @@ public class BRouterView extends View
String basedir = fbd.getAbsolutePath();
AppLogger.log( "using basedir: " + basedir );
String version = "v1.4.4";
String version = "v1.4.7";
// create missing directories
assertDirectoryExists( "project directory", basedir + "/brouter", null, null );
@ -767,7 +767,7 @@ public class BRouterView extends View
else
{
String memstat = memoryClass + "mb pathPeak " + ((cr.getPathPeak()+500)/1000) + "k";
String result = "version = BRouter-1.4.6\n" + "mem = " + memstat + "\ndistance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend()
String result = "version = BRouter-1.4.7\n" + "mem = " + memstat + "\ndistance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend()
+ " m\n" + "plain ascend = " + cr.getPlainAscend();
rawTrack = cr.getFoundRawTrack();