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

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

@ -306,7 +306,7 @@ public class WayLinker extends MapCreatorBase implements Runnable
// read a traffic-file, if any
if ( trafficFile.exists() )
{
trafficMap = new OsmTrafficMap();
trafficMap = new OsmTrafficMap( expctxWay );
trafficMap.load( trafficFile, minLon, minLat, minLon + 5000000, minLat + 5000000, false );
}
return true;
@ -386,7 +386,6 @@ public class WayLinker extends MapCreatorBase implements Runnable
public void nextWay( WayData way ) throws Exception
{
byte[] description = abUnifier.unify( way.description );
int lastTraffic = 0;
// filter according to profile
expctxWay.evaluate( false, description );
@ -417,15 +416,6 @@ public class WayLinker extends MapCreatorBase implements Runnable
OsmLinkP link = n2.createLink( n1 );
int traffic = trafficMap == null ? 0 : trafficMap.getTrafficClass( n1.getIdFromPos(), n2.getIdFromPos() );
if ( traffic != lastTraffic )
{
expctxWay.decode( description );
expctxWay.addLookupValue( "estimated_traffic_class", traffic == 0 ? 0 : traffic + 1 );
description = abUnifier.unify( expctxWay.encode() );
lastTraffic = traffic;
n1.incWayCount(); // force network node due to description change
}
link.descriptionBitmap = description;
if ( n1.ilon / cellsize != n2.ilon / cellsize || n1.ilat / cellsize != n2.ilat / cellsize )
@ -450,7 +440,6 @@ public class WayLinker extends MapCreatorBase implements Runnable
nodesMap = null;
borderSet = null;
trafficMap = null;
byte[] abBuf1 = new byte[10 * 1024 * 1024];
byte[] abBuf2 = new byte[10 * 1024 * 1024];
@ -552,7 +541,7 @@ public class WayLinker extends MapCreatorBase implements Runnable
for ( OsmNodeP n : sortedList.values() )
{
n.writeNodeData( mc );
n.writeNodeData( mc, trafficMap );
}
if ( mc.getSize() > 0 )
{
@ -623,6 +612,11 @@ public class WayLinker extends MapCreatorBase implements Runnable
ra.write( abFileIndex, 0, abFileIndex.length );
ra.close();
}
if ( trafficMap != null )
{
trafficMap.finish();
trafficMap = null;
}
System.out.println( "**** codec stats: *******\n" + StatCoderContext.getBitReport() );
}