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

removed old format support

Browse source
This commit is contained in:
Arndt 2015-08-28 17:49:35 +02:00
parent 87fe904e7b
commit 2cec35f3cc
10 changed files with 35 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

8
brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java
View file

@ -101,7 +101,7 @@ public class OsmNodeP extends OsmLinkP implements Comparable<OsmNodeP>
return null;
}
public void writeNodeData( ByteDataWriter os, boolean writeVarLength, byte[] abBuf ) throws IOException
public void writeNodeData( ByteDataWriter os, byte[] abBuf ) throws IOException
{
int lonIdx = ilon/62500;
int latIdx = ilat/62500;
@ -156,7 +156,7 @@ public class OsmNodeP extends OsmLinkP implements Comparable<OsmNodeP>
int writedescbit = 0;
if ( skipDetailBit == 0 ) // check if description changed
{
int inverseBitByteIndex = writeVarLength ? 0 : 7;
int inverseBitByteIndex = 0;
boolean inverseDirection = link.isReverse( origin );
byte[] ab = link.descriptionBitmap;
int abLen = ab.length;
@ -196,12 +196,12 @@ public class OsmNodeP extends OsmLinkP implements Comparable<OsmNodeP>
if ( writedescbit != 0 )
{
// write the way description, code direction into the first bit
if ( writeVarLength ) os2.writeByte( lastDescription.length );
os2.writeByte( lastDescription.length );
os2.write( lastDescription );
}
if ( nodedescbit != 0 )
{
if ( writeVarLength ) os2.writeByte( nodeDescription.length );
os2.writeByte( nodeDescription.length );
os2.write( nodeDescription );
nodeDescription = null;
}

4
brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java
View file

@ -49,7 +49,6 @@ public class WayLinker extends MapCreatorBase
private CompactLongSet borderSet;
private short lookupVersion;
private short lookupMinorVersion;
private boolean writeVarLength;
private long creationTimeStamp;
@ -97,7 +96,6 @@ public class WayLinker extends MapCreatorBase
lookupVersion = meta.lookupVersion;
lookupMinorVersion = meta.lookupMinorVersion;
writeVarLength = meta.readVarLength;
expctxWay.parseFile( profileFile, "global" );
expctxNode.parseFile( profileFile, "global" );
@ -302,7 +300,7 @@ public class WayLinker extends MapCreatorBase
for( int ni=0; ni<subList.size(); ni++ )
{
OsmNodeP n = subList.get(ni);
n.writeNodeData( dos, writeVarLength, abBuf );
n.writeNodeData( dos, abBuf );
}
byte[] subBytes = dos.toByteArray();
pos += subBytes.length + 4; // reserve 4 bytes for crc