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

lifecycle-patch, first shot

Browse source
This commit is contained in:
Arndt 2015-08-28 17:21:34 +02:00
parent 91c809e05c
commit 87fe904e7b
3 changed files with 47 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

62
brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java
View file

@ -20,8 +20,6 @@ public final class OsmNodesMap
return abUnifier;
}
private NodesList completedNodes = null;
/**
* Get a node from the map
* @return the node for the given id if exist, else null
@ -37,25 +35,6 @@ public final class OsmNodesMap
hmap.remove( new Long( id ) );
}
public void removeCompletedNodes()
{
for( NodesList le = completedNodes; le != null; le = le.next )
{
remove( le.node.getIdFromPos() );
}
completedNodes = null;
}
public void registerCompletedNode( OsmNode n )
{
if ( n.completed ) return;
n.completed = true;
NodesList le = new NodesList();
le.node = n;
if ( completedNodes != null ) le.next = completedNodes;
completedNodes = le;
}
/**
* Put a node into the map
* @return the previous node if that id existed, else null
@ -65,15 +44,6 @@ public final class OsmNodesMap
return hmap.put( new Long( id ), node );
}
/**
* Return the internal list.
* A reference is returned, not a copy-
* @return the nodes list
*/
public Collection<OsmNode> nodes()
{
return hmap.values();
}
/**
* @return the number of nodes in that map
@ -83,36 +53,4 @@ public final class OsmNodesMap
return hmap.size();
}
/**
* cleanup the map by removing the nodes
* with no hollow issues
*/
private int dontCareCount = 0;
public void removeCompleteNodes()
{
if ( ++dontCareCount < 5 ) return;
dontCareCount = 0;
ArrayList<OsmNode> delNodes = new ArrayList<OsmNode>();
for( OsmNode n : hmap.values() )
{
if ( n.isHollow() || n.hasHollowLinks() )
{
continue;
}
delNodes.add( n );
}
if ( delNodes.size() > 0 )
{
// System.out.println( "removing " + delNodes.size() + " nodes" );
for( OsmNode n : delNodes )
{
hmap.remove( new Long( n.getIdFromPos() ) );
}
}
}
}