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

automatically ignore islands

Browse source
This commit is contained in:
Arndt Brenschede 2018-04-02 19:19:52 +02:00
parent f2d04ef70a
commit 599a24f710
8 changed files with 203 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
brouter-codec/src/main/java/btools/codec/MicroCache2.java
View file

@ -170,9 +170,15 @@ public final class MicroCache2 extends MicroCache
if ( !isReverse ) // write geometry for forward links only
{
WaypointMatcher matcher = wayTags == null || wayTags.accessType < 2 ? null : waypointMatcher;
if ( matcher != null ) matcher.startNode( ilon, ilat, wayTags.data );
int ilontarget = ilon + dlon_remaining;
int ilattarget = ilat + dlat_remaining;
if ( matcher != null )
{
if ( !matcher.start( ilon, ilat, ilontarget, ilattarget ) )
{
matcher = null;
}
}
int transcount = bc.decodeVarBits();
if ( debug ) System.out.println( "*** decoding geometry with count=" + transcount );
@ -194,7 +200,7 @@ public final class MicroCache2 extends MicroCache
if ( matcher != null ) matcher.transferNode( ilontarget - dlon_remaining, ilattarget - dlat_remaining );
}
if ( matcher != null ) matcher.endNode( ilontarget, ilattarget );
if ( matcher != null ) matcher.end();
}
if ( wayTags != null )
{

4
brouter-codec/src/main/java/btools/codec/WaypointMatcher.java
View file

@ -7,7 +7,7 @@ package btools.codec;
*/
public interface WaypointMatcher
{
void startNode( int ilon, int ilat, byte[] wayTags );
boolean start( int ilonStart, int ilatStart, int ilonTarget, int ilatTarget );
void transferNode( int ilon, int ilat );
void endNode( int ilon, int ilat );
void end();
}