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

0.9.9 preparations

Browse source
This commit is contained in:
Arndt 2014-04-18 16:36:04 +02:00
parent a440505f6f
commit c458ec0db9
13 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</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

@ -203,7 +203,7 @@ public final class OsmTrack
sb.append( " xmlns=\"http://www.topografix.com/GPX/1/1\" \n" ); 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( " 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( " 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( " <trk>\n" ); sb.append( " <trk>\n" );
sb.append(" <name>").append(name).append("</name>\n"); sb.append(" <name>").append(name).append("</name>\n");
sb.append( " <trkseg>\n" ); sb.append( " <trkseg>\n" );

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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-map-creator</artifactId> <artifactId>brouter-map-creator</artifactId>

5
brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java
View file

@ -141,6 +141,11 @@ public class OsmCutter extends MapCreatorBase
return; 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 // encode tags
if ( w.getTagsOrNull() != null ) if ( w.getTagsOrNull() != null )

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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-mapaccess</artifactId> <artifactId>brouter-mapaccess</artifactId>

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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-routing-app</artifactId> <artifactId>brouter-routing-app</artifactId>

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

@ -522,7 +522,7 @@ private long startTime = 0L;
} }
else else
{ {
String result = "version = BRouter-0.9.8\n" String result = "version = BRouter-0.9.9\n"
+ "distance = " + cr.getDistance()/1000. + " km\n" + "distance = " + cr.getDistance()/1000. + " km\n"
+ "filtered ascend = " + cr.getAscend() + " m\n" + "filtered ascend = " + cr.getAscend() + " m\n"
+ "plain ascend = " + cr.getPlainAscend(); + "plain ascend = " + cr.getPlainAscend();

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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</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

@ -84,7 +84,7 @@ public class BRouter
} }
System.exit(0); 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 ) 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

@ -114,7 +114,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 0.9.8 / 12012014 / abrensch"); System.out.println("BRouter 0.9.9 / 18042014 / abrensch");
if ( args.length != 4 ) if ( args.length != 4 )
{ {
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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-util</artifactId> <artifactId>brouter-util</artifactId>

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>0.9.8-SNAPSHOT</version> <version>0.9.9-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<url>http://brensche.de/brouter/</url> <url>http://brensche.de/brouter/</url>
<name>brouter</name> <name>brouter</name>