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

Merge pull request #518 from afischerdev/fix-nogos

Browse source 
Fix wpt and nogo handling
This commit is contained in:
afischerdev 2023-03-28 09:38:18 +02:00 committed by GitHub
commit 88977cca3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brouter-core/src/main/java/btools/router/RoutingContext.java
View file

@ -294,9 +294,10 @@ public final class RoutingContext {
public void checkMatchedWaypointAgainstNogos(List<MatchedWaypoint> matchedWaypoints) { public void checkMatchedWaypointAgainstNogos(List<MatchedWaypoint> matchedWaypoints) {
if (nogopoints == null) return; if (nogopoints == null) return;
List<MatchedWaypoint> newMatchedWaypoints = new ArrayList<>();
int theSize = matchedWaypoints.size(); int theSize = matchedWaypoints.size();
if (theSize<2) return;
int removed = 0; int removed = 0;
List<MatchedWaypoint> newMatchedWaypoints = new ArrayList<>();
MatchedWaypoint prevMwp = null; MatchedWaypoint prevMwp = null;
boolean prevMwpIsInside = false; boolean prevMwpIsInside = false;
for (int i = 0; i < theSize; i++) { for (int i = 0; i < theSize; i++) {
@ -304,7 +305,8 @@ public final class RoutingContext {
boolean isInsideNogo = false; boolean isInsideNogo = false;
OsmNode wp = mwp.crosspoint; OsmNode wp = mwp.crosspoint;
for (OsmNodeNamed nogo : nogopoints) { for (OsmNodeNamed nogo : nogopoints) {
if (wp.calcDistance(nogo) < nogo.radius if (Double.isNaN(nogo.nogoWeight)
&& wp.calcDistance(nogo) < nogo.radius
&& (!(nogo instanceof OsmNogoPolygon) && (!(nogo instanceof OsmNogoPolygon)
|| (((OsmNogoPolygon) nogo).isClosed || (((OsmNogoPolygon) nogo).isClosed
? ((OsmNogoPolygon) nogo).isWithin(wp.ilon, wp.ilat) ? ((OsmNogoPolygon) nogo).isWithin(wp.ilon, wp.ilat)