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

variable length tag descriptions (regtest glitches)

Browse source
This commit is contained in:
Arndt 2014-05-31 09:44:22 +02:00
parent 1633ae78e3
commit 8368df6bcf
8 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,6 @@ final class OsmPath implements OsmLinkHolder
OsmTransferNode transferNode = link.decodeFirsttransfer();
OsmNode targetNode = link.targetNode;
byte[] lastDescription = null;
String lastMessage = null;
for(;;)
{
@ -132,15 +131,17 @@ final class OsmPath implements OsmLinkHolder
if ( description == null ) throw new IllegalArgumentException( "null description for class: " + transferNode.getClass() + "/" + link.getClass() + " counterlinkwritten=" + link.counterLinkWritten );
}
rc.messageHandler.setCurrentPos( lon2, lat2 );
boolean sameData = rc.expctxWay.evaluate( link.counterLinkWritten, description, rc.messageHandler );
// if way description changed, store message
if ( lastMessage != null && description != lastDescription )
if ( lastMessage != null && !sameData )
{
originElement.message = lastMessage;
linkdist = 0;
linkelevationcost = 0;
linkturncost = 0;
}
lastDescription = description;
int dist = rc.calcDistance( lon1, lat1, lon2, lat2 );
int elefactor = 250000;
@ -176,8 +177,6 @@ final class OsmPath implements OsmLinkHolder
linkdist += dist;
linkdisttotal += dist;
rc.messageHandler.setCurrentPos( lon2, lat2 );
rc.expctxWay.evaluate( link instanceof OsmLinkReverse, description, rc.messageHandler );
// *** penalty for way-change
if ( origin.originElement != null )
@ -261,7 +260,7 @@ final class OsmPath implements OsmLinkHolder
+ iCost + "\t"
+ linkelevationcost
+ "\t" + linkturncost
+ rc.expctxWay.getCsvDescription( description );
+ rc.expctxWay.getCsvDescription( link.counterLinkWritten, description );
}
if ( stopAtEndpoint )

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

@ -296,7 +296,7 @@ public class RoutingEngine extends Thread
startLink.addLinkHolder( startPath );
for( OsmLink link = n.firstlink; link != null; link = link.next )
{
if ( link.counterLinkWritten ) continue; // reverse link not found
if ( link.descriptionBitmap == null ) continue; // reverse link not found
OsmNode nextNode = link.targetNode;
if ( nextNode.isHollow() ) continue; // border node?
if ( nextNode.firstlink == null ) continue; // don't care about dead ends
@ -346,7 +346,6 @@ public class RoutingEngine extends Thread
{
link.descriptionBitmap = rlink.descriptionBitmap;
link.firsttransferBytes = rlink.firsttransferBytes;
link.counterLinkWritten = false;
}
}
}