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

resolved conflict in RouteServer

Browse source
This commit is contained in:
unknown 2014-04-15 10:28:26 +02:00
commit 5e34d0320b
12 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<parent>
<groupId>org.btools</groupId>
<artifactId>brouter</artifactId>
<version>0.98</version>
<version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<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
{
String result = "version = BRouter-0.98\n"
String result = "version = BRouter-0.9.8\n"
+ "distance = " + cr.getDistance()/1000. + " km\n"
+ "filtered ascend = " + cr.getAscend() + " m\n"
+ "plain ascend = " + cr.getPlainAscend();