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

v1.4.3

Browse source
This commit is contained in:
Arndt 2016-08-06 13:46:30 +02:00
parent 19fd3112bf
commit 42e9ddbdd1
21 changed files with 327 additions and 135 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.4.2</version>
<version>1.4.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>brouter-core</artifactId>

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

@ -18,6 +18,7 @@ import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import btools.mapaccess.OsmPos;
@ -31,6 +32,7 @@ public final class OsmTrack
public MatchedWaypoint endPoint;
public long[] nogoChecksums;
public long profileTimestamp;
public boolean isDirty;
private static class OsmPathElementHolder
@ -160,10 +162,11 @@ public final class OsmTrack
dos.writeLong( nogoChecksums[1] );
dos.writeLong( nogoChecksums[2] );
dos.writeBoolean( isDirty );
dos.writeLong( profileTimestamp );
dos.close();
}
public static OsmTrack readBinary( String filename, OsmNodeNamed newEp, long[] nogoChecksums, StringBuilder debugInfo )
public static OsmTrack readBinary( String filename, OsmNodeNamed newEp, long[] nogoChecksums, long profileChecksum, StringBuilder debugInfo )
{
OsmTrack t = null;
if ( filename != null )
@ -177,7 +180,12 @@ public final class OsmTrack
MatchedWaypoint ep = MatchedWaypoint.readFromStream( dis );
int dlon = ep.waypoint.ilon - newEp.ilon;
int dlat = ep.waypoint.ilat - newEp.ilat;
if ( dlon < 20 && dlon > -20 && dlat < 20 && dlat > -20 )
boolean targetMatch = dlon < 20 && dlon > -20 && dlat < 20 && dlat > -20;
if ( debugInfo != null )
{
debugInfo.append( "target-delta = " + dlon + "/" + dlat + " targetMatch=" + targetMatch );
}
if ( targetMatch )
{
t = new OsmTrack();
t.endPoint = ep;
@ -192,31 +200,40 @@ public final class OsmTrack
}
t.cost = last_pe.cost;
t.buildMap();
}
long[] al = new long[3];
try
{
al[0] = dis.readLong();
al[1] = dis.readLong();
al[2] = dis.readLong();
}
catch (EOFException eof) { /* kind of expected */ }
try
{
boolean isDirty = dis.readBoolean();
if ( t != null ) t.isDirty = isDirty;
}
catch (EOFException eof) { /* kind of expected */ }
dis.close();
boolean nogoCheckOk = Math.abs( al[0] - nogoChecksums[0] ) <= 20
&& Math.abs( al[1] - nogoChecksums[1] ) <= 20
&& Math.abs( al[2] - nogoChecksums[2] ) <= 20;
if ( debugInfo != null )
{
debugInfo.append( "target-delta = " + dlon + "/" + dlat + " nogoCheckOk=" + nogoCheckOk );
// check cheecksums, too
long[] al = new long[3];
long pchecksum = 0;
try
{
al[0] = dis.readLong();
al[1] = dis.readLong();
al[2] = dis.readLong();
}
catch (EOFException eof) { /* kind of expected */ }
try
{
t.isDirty = dis.readBoolean();
}
catch (EOFException eof) { /* kind of expected */ }
try
{
pchecksum = dis.readLong();
}
catch (EOFException eof) { /* kind of expected */ }
boolean nogoCheckOk = Math.abs( al[0] - nogoChecksums[0] ) <= 20
&& Math.abs( al[1] - nogoChecksums[1] ) <= 20
&& Math.abs( al[2] - nogoChecksums[2] ) <= 20;
boolean profileCheckOk = pchecksum == profileChecksum;
if ( debugInfo != null )
{
debugInfo.append( " nogoCheckOk=" + nogoCheckOk + " profileCheckOk=" + profileCheckOk );
debugInfo.append( " al=" + formatLongs(al) + " nogoChecksums=" + formatLongs(nogoChecksums) );
}
if ( !(nogoCheckOk && profileCheckOk) ) return null;
}
if ( !nogoCheckOk ) return null;
dis.close();
}
catch (Exception e)
{
@ -227,6 +244,20 @@ public final class OsmTrack
return t;
}
private static String formatLongs( long[] al )
{
StringBuilder sb = new StringBuilder();
sb.append( '{' );
for( long l : al )
{
sb.append( l );
sb.append( ' ' );
}
sb.append( '}' );
return sb.toString();
}
public void addNodes( OsmTrack t )
{
for ( OsmPathElement n : t.nodes )
@ -343,7 +374,7 @@ public final class OsmTrack
}
else
{
sb.append( " creator=\"BRouter-1.4.2\" version=\"1.1\">\n" );
sb.append( " creator=\"BRouter-1.4.3\" version=\"1.1\">\n" );
}
if ( turnInstructionMode == 3) // osmand style

3
brouter-core/src/main/java/btools/router/ProfileCache.java
View file

@ -40,6 +40,7 @@ public final class ProfileCache
profileDir = new File( profileBaseDir );
profileFile = new File( profileDir, rc.localFunction + ".brf" ) ;
}
rc.profileTimestamp = profileFile.lastModified();
File lookupFile = new File( profileDir, "lookups.dat" );
// check for re-use
@ -47,7 +48,7 @@ public final class ProfileCache
{
if ( profileFile.equals( lastProfileFile ) && lookupFile.equals( lastLookupFile ) )
{
if ( profileFile.lastModified() == lastProfileTimestamp
if ( rc.profileTimestamp == lastProfileTimestamp
&& lookupFile.lastModified() == lastLookupTimestamp )
{
rc.expctxWay = expctxWay;

1
brouter-core/src/main/java/btools/router/RoutingContext.java
View file

@ -27,6 +27,7 @@ public final class RoutingContext implements DistanceChecker
}
public int alternativeIdx = 0;
public String localFunction;
public long profileTimestamp;
public String rawTrackPath;

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

@ -305,10 +305,10 @@ public class RoutingEngine extends Thread
// check for a track for that target
OsmTrack nearbyTrack = null;
if ( refTracks[waypoints.size()-2] == null )
if ( lastTracks[waypoints.size()-2] == null )
{
StringBuilder debugInfo = hasInfo() ? new StringBuilder() : null;
nearbyTrack = OsmTrack.readBinary( routingContext.rawTrackPath, waypoints.get( waypoints.size()-1), routingContext.getNogoChecksums(), debugInfo );
nearbyTrack = OsmTrack.readBinary( routingContext.rawTrackPath, waypoints.get( waypoints.size()-1), routingContext.getNogoChecksums(), routingContext.profileTimestamp, debugInfo );
if ( nearbyTrack != null )
{
nUnmatched--;
@ -532,7 +532,10 @@ public class RoutingEngine extends Thread
dirtyMessage = iae;
logInfo( "using fast partial recalc" );
}
maxRunningTime += System.currentTimeMillis() - startTime; // reset timeout...
if ( maxRunningTime > 0 )
{
maxRunningTime += System.currentTimeMillis() - startTime; // reset timeout...
}
}
}
@ -560,6 +563,7 @@ public class RoutingEngine extends Thread
foundRawTrack = mergeTrack( matchPath, track );
foundRawTrack.endPoint = endWp;
foundRawTrack.nogoChecksums = routingContext.getNogoChecksums();
foundRawTrack.profileTimestamp = routingContext.profileTimestamp;
foundRawTrack.isDirty = true;
}
throw iae;
@ -589,6 +593,7 @@ public class RoutingEngine extends Thread
logInfo( "supplying new reference track, dirty=" + isDirty );
track.endPoint = endWp;
track.nogoChecksums = routingContext.getNogoChecksums();
track.profileTimestamp = routingContext.profileTimestamp;
track.isDirty = isDirty;
foundRawTrack = track;
}