From 659bbe8d82014266273921ae6cfb7ff8ac5e8bd3 Mon Sep 17 00:00:00 2001 From: ntruchsess Date: Sun, 4 Feb 2018 19:24:44 +0100 Subject: [PATCH] fix NogoPolygon radius being modified --- .../src/main/java/btools/router/RoutingContext.java | 10 ++++++---- .../test/java/btools/router/OsmNogoPolygonTest.java | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/RoutingContext.java b/brouter-core/src/main/java/btools/router/RoutingContext.java index 4b0cea4..23661de 100644 --- a/brouter-core/src/main/java/btools/router/RoutingContext.java +++ b/brouter-core/src/main/java/btools/router/RoutingContext.java @@ -296,11 +296,13 @@ public final class RoutingContext radius = Math.sqrt( s1 < s2 ? r12 : r22 ); if ( radius > nogo.radius ) continue; // 20m ^ 2 } - if ( nogo.isNogo - && (!(nogo instanceof OsmNogoPolygon) - || ((OsmNogoPolygon)nogo).intersectsOrIsWithin(lon1, lat1, lon2, lat2))) + if ( nogo.isNogo ) { - nogomatch = true; + if (!(nogo instanceof OsmNogoPolygon) + || ((OsmNogoPolygon)nogo).intersectsOrIsWithin(lon1, lat1, lon2, lat2)) + { + nogomatch = true; + } } else { diff --git a/brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java b/brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java index 7aa95dc..55aa0aa 100644 --- a/brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java +++ b/brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java @@ -61,7 +61,6 @@ public class OsmNogoPolygonTest { @AfterClass public static void tearDown() throws Exception { - polygon.waitForTracker(); } @Test