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

1.3 preparation

Browse source
This commit is contained in:
Arndt Brenschede 2015-10-15 19:12:05 +02:00
parent 20212963ba
commit 112d04979b
21 changed files with 51 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brouter-core/pom.xml
View file

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

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

@ -253,7 +253,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-1.2\" version=\"1.1\">\n" );
sb.append( " creator=\"BRouter-1.3\" version=\"1.1\">\n" );
sb.append( " <trk>\n" );
sb.append(" <name>").append(name).append("</name>\n");
sb.append( " <trkseg>\n" );

12
brouter-core/src/main/java/btools/router/RoutingEngine.java
View file

@ -223,8 +223,8 @@ public class RoutingEngine extends Thread
}
catch( Error e)
{
String hint = cleanOnOOM();
errorMessage = e.toString() + hint;
cleanOnOOM();
errorMessage = e.toString();
logInfo( "Error (linksProcessed=" + linksProcessed + ": " + errorMessage );
logThrowable( e );
}
@ -268,8 +268,8 @@ public class RoutingEngine extends Thread
}
catch( Error e)
{
String hint = cleanOnOOM();
errorMessage = e.toString() + hint;
cleanOnOOM();
errorMessage = e.toString();
logInfo( "Error (linksProcessed=" + linksProcessed + ": " + errorMessage );
logThrowable( e );
}
@ -291,12 +291,10 @@ public class RoutingEngine extends Thread
}
}
public String cleanOnOOM()
public void cleanOnOOM()
{
boolean oom_carsubset_hint = nodesCache == null ? false : nodesCache.oom_carsubset_hint;
nodesMap = null;
terminate();
return oom_carsubset_hint ? "\nPlease use 'carsubset' maps for long-distance car-routing" : "";
}