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

traffic simulation delta supression

Browse source
This commit is contained in:
Arndt Brenschede 2020-02-01 19:48:53 +01:00
parent e574045548
commit 010383e7e7
3 changed files with 135 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,12 +102,12 @@ public class OsmNodeP extends OsmLinkP
return null;
}
public void writeNodeData( MicroCache mc ) throws IOException
public void writeNodeData( MicroCache mc, OsmTrafficMap trafficMap ) throws IOException
{
boolean valid = true;
if ( mc instanceof MicroCache2 )
{
valid = writeNodeData2( (MicroCache2) mc );
valid = writeNodeData2( (MicroCache2) mc, trafficMap );
}
else
throw new IllegalArgumentException( "unknown cache version: " + mc.getClass() );
@ -167,7 +167,7 @@ public class OsmNodeP extends OsmLinkP
}
}
public boolean writeNodeData2( MicroCache2 mc ) throws IOException
public boolean writeNodeData2( MicroCache2 mc, OsmTrafficMap trafficMap ) throws IOException
{
boolean hasLinks = false;
@ -245,11 +245,18 @@ public class OsmNodeP extends OsmLinkP
}
}
// add traffic simulation, if present
byte[] description = link0.descriptionBitmap;
if ( trafficMap != null )
{
description = trafficMap.addTrafficClass( linkNodes, description );
}
// write link data
int sizeoffset = mc.writeSizePlaceHolder();
mc.writeVarLengthSigned( target.ilon - ilon );
mc.writeVarLengthSigned( target.ilat - ilat );
mc.writeModeAndDesc( isReverse, link0.descriptionBitmap );
mc.writeModeAndDesc( isReverse, description );
if ( !isReverse && linkNodes.size() > 2 ) // write geometry for forward links only
{
DPFilter.doDPFilter( linkNodes );