From 6d95bc46e7e6da12a20f40b98be9d304ba4d29b3 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Wed, 19 Oct 2016 18:39:49 +0200 Subject: [PATCH 1/2] github issue 51 --- misc/profiles2/fastbike-asia-pacific.brf | 32 ++++++++++++++---------- misc/profiles2/fastbike-lowtraffic.brf | 32 ++++++++++++++---------- misc/profiles2/fastbike.brf | 32 ++++++++++++++---------- misc/profiles2/trekking.brf | 4 ++- 4 files changed, 60 insertions(+), 40 deletions(-) diff --git a/misc/profiles2/fastbike-asia-pacific.brf b/misc/profiles2/fastbike-asia-pacific.brf index f9b1d20..51f0758 100644 --- a/misc/profiles2/fastbike-asia-pacific.brf +++ b/misc/profiles2/fastbike-asia-pacific.brf @@ -94,21 +94,27 @@ assign accesspenalty # # handle one-ways. On primary roads, wrong-oneways should # 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) # -assign oneway - switch oneway= - junction=roundabout - or oneway=yes or oneway=true oneway=1 -assign onewaypenalty - switch switch reversedirection=yes oneway 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 - switch or highway=secondary highway=secondary_link 30 - switch or highway=tertiary highway=tertiary_link 20 - 6.0 - 0.0 +assign badoneway = + if reversedirection=yes then + if oneway:bicycle=yes then true + else if oneway= then junction=roundabout + else oneway=yes|true|1 + else oneway=-1 + +assign onewaypenalty = + if ( badoneway ) then + ( + if ( cycleway=opposite|opposite_lane|opposite_track ) then 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 diff --git a/misc/profiles2/fastbike-lowtraffic.brf b/misc/profiles2/fastbike-lowtraffic.brf index 4ea8511..6605c0d 100644 --- a/misc/profiles2/fastbike-lowtraffic.brf +++ b/misc/profiles2/fastbike-lowtraffic.brf @@ -84,21 +84,27 @@ assign accesspenalty = # # handle one-ways. On primary roads, wrong-oneways should # 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) # -assign oneway - switch oneway= - junction=roundabout - or oneway=yes or oneway=true oneway=1 -assign onewaypenalty - switch switch reversedirection=yes oneway 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 - switch or highway=secondary highway=secondary_link 30 - switch or highway=tertiary highway=tertiary_link 20 - 6.0 - 0.0 +assign badoneway = + if reversedirection=yes then + if oneway:bicycle=yes then true + else if oneway= then junction=roundabout + else oneway=yes|true|1 + else oneway=-1 + +assign onewaypenalty = + if ( badoneway ) then + ( + if ( cycleway=opposite|opposite_lane|opposite_track ) then 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 and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no ) diff --git a/misc/profiles2/fastbike.brf b/misc/profiles2/fastbike.brf index efa8043..8355b85 100644 --- a/misc/profiles2/fastbike.brf +++ b/misc/profiles2/fastbike.brf @@ -89,21 +89,27 @@ assign accesspenalty # # handle one-ways. On primary roads, wrong-oneways should # 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) # -assign oneway - switch oneway= - junction=roundabout - or oneway=yes or oneway=true oneway=1 -assign onewaypenalty - switch switch reversedirection=yes oneway 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 - switch or highway=secondary highway=secondary_link 30 - switch or highway=tertiary highway=tertiary_link 20 - 6.0 - 0.0 +assign badoneway = + if reversedirection=yes then + if oneway:bicycle=yes then true + else if oneway= then junction=roundabout + else oneway=yes|true|1 + else oneway=-1 + +assign onewaypenalty = + if ( badoneway ) then + ( + if ( cycleway=opposite|opposite_lane|opposite_track ) then 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 diff --git a/misc/profiles2/trekking.brf b/misc/profiles2/trekking.brf index 064e011..8def1e0 100644 --- a/misc/profiles2/trekking.brf +++ b/misc/profiles2/trekking.brf @@ -133,7 +133,9 @@ assign accesspenalty = # assign badoneway = 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 assign onewaypenalty = From d42895880d82373c5f98086c9ae2f9b5c4c77ae4 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Wed, 19 Oct 2016 18:44:28 +0200 Subject: [PATCH 2/2] version 1.4.7 --- brouter-codec/pom.xml | 2 +- brouter-core/pom.xml | 2 +- brouter-core/src/main/java/btools/router/OsmTrack.java | 2 +- brouter-expressions/pom.xml | 2 +- brouter-map-creator/pom.xml | 2 +- brouter-mapaccess/pom.xml | 2 +- brouter-mem-router/pom.xml | 2 +- brouter-routing-app/AndroidManifest.xml | 4 ++-- brouter-routing-app/pom.xml | 2 +- .../src/main/java/btools/routingapp/BRouterView.java | 4 ++-- brouter-server/pom.xml | 2 +- brouter-server/src/main/java/btools/server/BRouter.java | 2 +- brouter-server/src/main/java/btools/server/RouteServer.java | 2 +- brouter-util/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/brouter-codec/pom.xml b/brouter-codec/pom.xml index daf0ce4..2bff461 100644 --- a/brouter-codec/pom.xml +++ b/brouter-codec/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-codec diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index 2d87404..4f65cfe 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-core diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 2678a1d..70e8c00 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -390,7 +390,7 @@ public final class OsmTrack } 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 diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml index a05a873..aa797d4 100644 --- a/brouter-expressions/pom.xml +++ b/brouter-expressions/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-expressions diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml index 6b7e10f..0257a62 100644 --- a/brouter-map-creator/pom.xml +++ b/brouter-map-creator/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-map-creator diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml index 8ee4a4f..3a8d85b 100644 --- a/brouter-mapaccess/pom.xml +++ b/brouter-mapaccess/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-mapaccess diff --git a/brouter-mem-router/pom.xml b/brouter-mem-router/pom.xml index 11810b2..d3bb2e1 100644 --- a/brouter-mem-router/pom.xml +++ b/brouter-mem-router/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-mem-router diff --git a/brouter-routing-app/AndroidManifest.xml b/brouter-routing-app/AndroidManifest.xml index c8ead41..882cc60 100644 --- a/brouter-routing-app/AndroidManifest.xml +++ b/brouter-routing-app/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="18" + android:versionName="1.4.7" package="btools.routingapp"> org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-routing-app diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java index d041fc4..8a68ce9 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -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(); diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml index 096c06c..ff4b0bb 100644 --- a/brouter-server/pom.xml +++ b/brouter-server/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-server diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index e4aece6..761768f 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -88,7 +88,7 @@ public class BRouter } 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 ) { System.out.println("Find routes in an OSM map"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index 772c929..8f5c710 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -155,7 +155,7 @@ public class RouteServer extends Thread 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 ) { System.out.println("serve BRouter protocol"); diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml index 8f6ce81..f3e1fa8 100644 --- a/brouter-util/pom.xml +++ b/brouter-util/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.6 + 1.4.7 ../pom.xml brouter-util diff --git a/pom.xml b/pom.xml index 7a0cd96..3dfaf58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.btools brouter - 1.4.6 + 1.4.7 pom http://brouter.de/brouter/ brouter