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

direct weaving option

Browse source
This commit is contained in:
Arndt Brenschede 2019-05-30 15:11:12 +02:00
parent c89058ee63
commit 661a09817a
6 changed files with 295 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java
View file

@ -49,6 +49,8 @@ public final class NodesCache
private long ghostSum = 0;
private long ghostWakeup = 0;
private boolean directWeaving = Boolean.getBoolean( "directWeaving" );
public String formatStatus()
{
return "collecting=" + garbageCollectionEnabled + " noGhosts=" + ghostCleaningDone + " cacheSum=" + cacheSum + " cacheSumClean=" + cacheSumClean + " ghostSum=" + ghostSum + " ghostWakeup=" + ghostWakeup ;
@ -210,7 +212,7 @@ public final class NodesCache
if ( segment == null )
{
checkEnableCacheCleaning();
segment = osmf.createMicroCache( ilon, ilat, dataBuffers, expCtxWay, waypointMatcher );
segment = osmf.createMicroCache( ilon, ilat, dataBuffers, expCtxWay, waypointMatcher, directWeaving ? nodesMap : null );
cacheSum += segment.getDataSize();
}
@ -248,6 +250,10 @@ public final class NodesCache
{
return false;
}
if ( !node.isHollow() )
{
return true; // direct weaving...
}
long id = node.getIdFromPos();
if ( segment.getAndClear( id ) )
@ -292,6 +298,7 @@ public final class NodesCache
// initialize the start-node
OsmNode n = new OsmNode( id );
n.setHollow();
nodesMap.put( n );
if ( !obtainNonHollowNode( n ) )
{
return null;