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

tr bike exceptions

Browse source
This commit is contained in:
Arndt 2016-12-10 19:49:24 +01:00
parent e629a2b2b2
commit f15c5b923e
8 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java
View file

@ -149,7 +149,11 @@ final class OsmFile
int crcData = Crc32.crc( ab, 0, asize - 4 );
int crcFooter = new ByteDataReader( ab, asize - 4 ).readInt();
if ( ( crcData ^ 2 ) == crcFooter )
if ( crcData == crcFooter )
{
throw new IOException( "old, unsupported data-format" );
}
else if ( ( crcData ^ 2 ) == crcFooter )
{
return reallyDecode ? new MicroCache2( dataBuffers, lonIdx, latIdx, divisor, wayValidator, waypointMatcher ) : null;
}

1
brouter-mapaccess/src/main/java/btools/mapaccess/OsmNode.java
View file

@ -136,6 +136,7 @@ public class OsmNode extends OsmLink implements OsmPos
while( mc.readBoolean() )
{
TurnRestriction tr = new TurnRestriction();
tr.exceptions = mc.readShort();
tr.isPositive = mc.readBoolean();
tr.fromLon = mc.readInt();
tr.fromLat = mc.readInt();

6
brouter-mapaccess/src/main/java/btools/mapaccess/TurnRestriction.java
View file

@ -8,6 +8,7 @@ package btools.mapaccess;
public final class TurnRestriction
{
public boolean isPositive;
public short exceptions;
public int fromLon;
public int fromLat;
@ -17,6 +18,11 @@ public final class TurnRestriction
public TurnRestriction next;
public boolean exceptBikes()
{
return ( exceptions & 1 ) != 0;
}
@Override
public String toString()
{