From c458ec0db9e50146f3997b314e38472434b86ce0 Mon Sep 17 00:00:00 2001 From: Arndt Date: Fri, 18 Apr 2014 16:36:04 +0200 Subject: [PATCH] 0.9.9 preparations --- 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 +- .../src/main/java/btools/mapcreator/OsmCutter.java | 5 +++++ brouter-mapaccess/pom.xml | 2 +- brouter-routing-app/pom.xml | 2 +- .../src/main/java/btools/routingapp/BRouterView.java | 2 +- 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 +- 13 files changed, 17 insertions(+), 12 deletions(-) diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index 7e1e26f..8ed0cd3 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT ../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 82b669c..98ff094 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -203,7 +203,7 @@ public final class OsmTrack sb.append( " xmlns=\"http://www.topografix.com/GPX/1/1\" \n" ); sb.append( " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" ); sb.append( " xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\" \n" ); - sb.append( " creator=\"BRouter-0.9.8\" version=\"1.1\">\n" ); + sb.append( " creator=\"BRouter-0.9.9\" version=\"1.1\">\n" ); sb.append( " \n" ); sb.append(" ").append(name).append("\n"); sb.append( " \n" ); diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml index 1edbb70..6423fe8 100644 --- a/brouter-expressions/pom.xml +++ b/brouter-expressions/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT ../pom.xml brouter-expressions diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml index 13a94bd..e3f77af 100644 --- a/brouter-map-creator/pom.xml +++ b/brouter-map-creator/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT ../pom.xml brouter-map-creator diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java index f0f17fa..b99d6ae 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java @@ -141,6 +141,11 @@ public class OsmCutter extends MapCreatorBase return; } } + + if ( "no".equals( w.getTag( "oneway:bicycle" ) ) && w.getTag( "cycleway" ) == null ) + { + w.putTag( "cycleway", "opposite" ); // fake that (no more bits available for oneway:bicycle.. + } // encode tags if ( w.getTagsOrNull() != null ) diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml index 88c90e7..5ce8a94 100644 --- a/brouter-mapaccess/pom.xml +++ b/brouter-mapaccess/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT ../pom.xml brouter-mapaccess diff --git a/brouter-routing-app/pom.xml b/brouter-routing-app/pom.xml index e653da5..efbfeea 100644 --- a/brouter-routing-app/pom.xml +++ b/brouter-routing-app/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT ../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 419f7fd..ab82c32 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -522,7 +522,7 @@ private long startTime = 0L; } else { - String result = "version = BRouter-0.9.8\n" + String result = "version = BRouter-0.9.9\n" + "distance = " + cr.getDistance()/1000. + " km\n" + "filtered ascend = " + cr.getAscend() + " m\n" + "plain ascend = " + cr.getPlainAscend(); diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml index c54a9c6..de96978 100644 --- a/brouter-server/pom.xml +++ b/brouter-server/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT ../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 7a39e70..a178d10 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -84,7 +84,7 @@ public class BRouter } System.exit(0); } - System.out.println("BRouter 0.9.8 / 12012014 / abrensch"); + System.out.println("BRouter 0.9.9 / 18042014 / 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 c98e64c..9ddcde0 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -114,7 +114,7 @@ public class RouteServer extends Thread public static void main(String[] args) throws Exception { - System.out.println("BRouter 0.9.8 / 12012014 / abrensch"); + System.out.println("BRouter 0.9.9 / 18042014 / abrensch"); if ( args.length != 4 ) { System.out.println("serve BRouter protocol"); diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml index 80c093f..07e81a5 100644 --- a/brouter-util/pom.xml +++ b/brouter-util/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT ../pom.xml brouter-util diff --git a/pom.xml b/pom.xml index 929ee24..a7deb00 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.btools brouter - 0.9.8-SNAPSHOT + 0.9.9-SNAPSHOT pom http://brensche.de/brouter/ brouter