Fabio/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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brouter-codec/pom.xml
View file

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

2
brouter-core/pom.xml
View file

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

2
brouter-core/src/main/java/btools/router/OsmTrack.java
View file

@ -390,7 +390,7 @@ public final class OsmTrack
} }
else else
{ {
sb.append( " creator=\"BRouter-1.4.6\" version=\"1.1\">\n" ); sb.append( " creator=\"BRouter-1.4.7\" version=\"1.1\">\n" );
} }
if ( turnInstructionMode == 3) // osmand style if ( turnInstructionMode == 3) // osmand style

2
brouter-expressions/pom.xml
View file

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

2
brouter-map-creator/pom.xml
View file

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

2
brouter-mapaccess/pom.xml
View file

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

2
brouter-mem-router/pom.xml
View file

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

4
brouter-routing-app/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="17" android:versionCode="18"
android:versionName="1.4.6" package="btools.routingapp"> android:versionName="1.4.7" package="btools.routingapp">
<application android:icon="@drawable/icon" android:label="@string/app_name"> <application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".BRouterActivity" <activity android:name=".BRouterActivity"
android:label="@string/app_name" android:label="@string/app_name"

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

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.4.6</version> <version>1.4.7</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-routing-app</artifactId> <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(); String basedir = fbd.getAbsolutePath();
AppLogger.log( "using basedir: " + basedir ); AppLogger.log( "using basedir: " + basedir );
String version = "v1.4.4"; String version = "v1.4.7";
// create missing directories // create missing directories
assertDirectoryExists( "project directory", basedir + "/brouter", null, null ); assertDirectoryExists( "project directory", basedir + "/brouter", null, null );
@ -767,7 +767,7 @@ public class BRouterView extends View
else else
{ {
String memstat = memoryClass + "mb pathPeak " + ((cr.getPathPeak()+500)/1000) + "k"; 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(); + " m\n" + "plain ascend = " + cr.getPlainAscend();
rawTrack = cr.getFoundRawTrack(); rawTrack = cr.getFoundRawTrack();

2
brouter-server/pom.xml
View file

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

2
brouter-server/src/main/java/btools/server/BRouter.java
View file

@ -88,7 +88,7 @@ public class BRouter
} }
System.exit(0); System.exit(0);
} }
System.out.println("BRouter 1.4.6 / 30092016 / abrensch"); System.out.println("BRouter 1.4.7 / 19102016 / abrensch");
if ( args.length < 6 ) if ( args.length < 6 )
{ {
System.out.println("Find routes in an OSM map"); System.out.println("Find routes in an OSM map");

2
brouter-server/src/main/java/btools/server/RouteServer.java
View file

@ -155,7 +155,7 @@ public class RouteServer extends Thread
public static void main(String[] args) throws Exception public static void main(String[] args) throws Exception
{ {
System.out.println("BRouter 1.4.6 / 30092016"); System.out.println("BRouter 1.4.7 / 19102016");
if ( args.length != 5 ) if ( args.length != 5 )
{ {
System.out.println("serve BRouter protocol"); System.out.println("serve BRouter protocol");

2
brouter-util/pom.xml
View file

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

32
misc/profiles2/fastbike-asia-pacific.brf
View file

@ -94,21 +94,27 @@ assign accesspenalty
# #
# handle one-ways. On primary roads, wrong-oneways should # handle one-ways. On primary roads, wrong-oneways should
# be close to forbidden, while on other ways we just add # be close to forbidden, while on other ways we just add
# 4 to the costfactor (making it at least 5 - you are allowed # 6 to the costfactor (making it at least 7 - you are allowed
# to push your bike) # to push your bike)
# #
assign oneway assign badoneway =
switch oneway= if reversedirection=yes then
junction=roundabout if oneway:bicycle=yes then true
or oneway=yes or oneway=true oneway=1 else if oneway= then junction=roundabout
assign onewaypenalty else oneway=yes|true|1
switch switch reversedirection=yes oneway oneway=-1 else oneway=-1
switch or cycleway=opposite or cycleway=opposite_lane or cycleway=opposite_track oneway:bicycle=no 0
switch or highway=primary highway=primary_link 50 assign onewaypenalty =
switch or highway=secondary highway=secondary_link 30 if ( badoneway ) then
switch or highway=tertiary highway=tertiary_link 20 (
6.0 if ( cycleway=opposite|opposite_lane|opposite_track ) then 0
0.0 else if ( oneway:bicycle=no ) then 0
else if ( highway=primary|primary_link ) then 50
else if ( highway=secondary|secondary_link ) then 30
else if ( highway=tertiary|tertiary_link ) then 20
else 6.0
)
else 0.0
assign costfactor assign costfactor

32
misc/profiles2/fastbike-lowtraffic.brf
View file

@ -84,21 +84,27 @@ assign accesspenalty =
# #
# handle one-ways. On primary roads, wrong-oneways should # handle one-ways. On primary roads, wrong-oneways should
# be close to forbidden, while on other ways we just add # be close to forbidden, while on other ways we just add
# 4 to the costfactor (making it at least 5 - you are allowed # 6 to the costfactor (making it at least 7 - you are allowed
# to push your bike) # to push your bike)
# #
assign oneway assign badoneway =
switch oneway= if reversedirection=yes then
junction=roundabout if oneway:bicycle=yes then true
or oneway=yes or oneway=true oneway=1 else if oneway= then junction=roundabout
assign onewaypenalty else oneway=yes|true|1
switch switch reversedirection=yes oneway oneway=-1 else oneway=-1
switch or cycleway=opposite or cycleway=opposite_lane or cycleway=opposite_track oneway:bicycle=no 0
switch or highway=primary highway=primary_link 50 assign onewaypenalty =
switch or highway=secondary highway=secondary_link 30 if ( badoneway ) then
switch or highway=tertiary highway=tertiary_link 20 (
6.0 if ( cycleway=opposite|opposite_lane|opposite_track ) then 0
0.0 else if ( oneway:bicycle=no ) then 0
else if ( highway=primary|primary_link ) then 50
else if ( highway=secondary|secondary_link ) then 30
else if ( highway=tertiary|tertiary_link ) then 20
else 6.0
)
else 0.0
assign hascycleway = not assign hascycleway = not
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no ) and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no )

32
misc/profiles2/fastbike.brf
View file

@ -89,21 +89,27 @@ assign accesspenalty
# #
# handle one-ways. On primary roads, wrong-oneways should # handle one-ways. On primary roads, wrong-oneways should
# be close to forbidden, while on other ways we just add # be close to forbidden, while on other ways we just add
# 4 to the costfactor (making it at least 5 - you are allowed # 6 to the costfactor (making it at least 7 - you are allowed
# to push your bike) # to push your bike)
# #
assign oneway assign badoneway =
switch oneway= if reversedirection=yes then
junction=roundabout if oneway:bicycle=yes then true
or oneway=yes or oneway=true oneway=1 else if oneway= then junction=roundabout
assign onewaypenalty else oneway=yes|true|1
switch switch reversedirection=yes oneway oneway=-1 else oneway=-1
switch or cycleway=opposite or cycleway=opposite_lane or cycleway=opposite_track oneway:bicycle=no 0
switch or highway=primary highway=primary_link 50 assign onewaypenalty =
switch or highway=secondary highway=secondary_link 30 if ( badoneway ) then
switch or highway=tertiary highway=tertiary_link 20 (
6.0 if ( cycleway=opposite|opposite_lane|opposite_track ) then 0
0.0 else if ( oneway:bicycle=no ) then 0
else if ( highway=primary|primary_link ) then 50
else if ( highway=secondary|secondary_link ) then 30
else if ( highway=tertiary|tertiary_link ) then 20
else 6.0
)
else 0.0
assign costfactor assign costfactor

4
misc/profiles2/trekking.brf
View file

@ -133,7 +133,9 @@ assign accesspenalty =
# #
assign badoneway = assign badoneway =
if reversedirection=yes then if reversedirection=yes then
if oneway= then junction=roundabout else oneway=yes|true|1 if oneway:bicycle=yes then true
else if oneway= then junction=roundabout
else oneway=yes|true|1
else oneway=-1 else oneway=-1
assign onewaypenalty = assign onewaypenalty =

2
pom.xml
View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>1.4.6</version> <version>1.4.7</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<url>http://brouter.de/brouter/</url> <url>http://brouter.de/brouter/</url>
<name>brouter</name> <name>brouter</name>