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

1.5.0 preparations

Browse source
This commit is contained in:
Arndt Brenschede 2019-06-30 17:34:21 +02:00
parent af6956f4f5
commit f9f08cc0b7
22 changed files with 57 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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="23"
android:versionName="1.4.11" package="btools.routingapp">
android:versionCode="27"
android:versionName="1.5.0" package="btools.routingapp">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".BRouterActivity"
android:label="@string/app_name"
@ -26,7 +26,7 @@
<uses-sdk android:minSdkVersion="10"></uses-sdk>
<uses-sdk android:targetSdkVersion="10"></uses-sdk>
<uses-sdk android:targetSdkVersion="28"></uses-sdk>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
<uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

BIN
brouter-routing-app/assets/profiles2.zip
View file

Binary file not shown.

BIN
brouter-routing-app/assets/readmes.zip
View file

Binary file not shown.

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

@ -5,7 +5,7 @@
<parent>
<groupId>org.btools</groupId>
<artifactId>brouter</artifactId>
<version>1.4.11</version>
<version>1.5.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>brouter-routing-app</artifactId>
@ -60,9 +60,9 @@
<include>${project.build.directory}/${project.artifactId}.apk</include>
</includes>
<keystore>\sign\mystore</keystore>
<alias>abrensch</alias>
<storepass>peru1511</storepass>
<keypass>peru1511</keypass>
<alias>myalias</alias>
<storepass>mypasswd</storepass>
<keypass>mypasswd</keypass>
<verbose>true</verbose>
</configuration>
</execution>

2
brouter-routing-app/project.properties
View file

@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-10
target=android-28

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

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

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

@ -165,6 +165,8 @@ public class BRouterWorker
n.ilon = (int)( ( lons[i] + 180. ) *1000000. + 0.5);
n.ilat = (int)( ( lats[i] + 90. ) *1000000. + 0.5);
n.isNogo = true;
n.nogoWeight = Double.NaN;
AppLogger.log( "added interface provided nogo: " + n );
nogoList.add( n );
}
}

1
brouter-routing-app/src/main/java/btools/routingapp/CoordinateReader.java
View file

@ -140,6 +140,7 @@ public abstract class CoordinateReader
else if ( n.name != null && n.name.startsWith( "nogo" ) )
{
n.isNogo = true;
n.nogoWeight = Double.NaN;
nogopoints.add( n );
}