From ed884ef8da00b8f78b32d90b5df5c4a561cbc5e2 Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Fri, 20 Dec 2019 08:43:20 -0700 Subject: [PATCH] Documentation and cleanup Signed-off-by: Taylor Smock --- .../data/validation/tests/RoutingIslandsTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTest.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTest.java index 06b5f14..8c7b5b3 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTest.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTest.java @@ -129,7 +129,7 @@ public class RoutingIslandsTest extends Test { .collect(Collectors.toSet())).parallelStream() .map(way -> new Pair<>((incomingWays.containsAll(way) ? "outgoing" : "incoming"), way)) .collect(Collectors.toList()); - createErrors(problematic, currentTransportMode, potentialWays); + createErrors(problematic, currentTransportMode); } /** @@ -200,7 +200,15 @@ public class RoutingIslandsTest extends Test { .collect(Collectors.toSet())); } - private void createErrors(List>> problematic, String mode, Collection potentialWays) { + /** + * Create errors for a problematic way + * + * @param problematic The set of problematic ways (Pairs are + * <incoming/outgoing, Set<Connected ways with same + * issue>>) + * @param mode The transport mode + */ + private void createErrors(List>> problematic, String mode) { for (Pair> ways : problematic) { errors.add( TestError.builder(this, SEVERITY_MAP.getOrDefault(ROUTING_ISLAND, Severity.OTHER), ROUTING_ISLAND) @@ -312,7 +320,7 @@ public class RoutingIslandsTest extends Test { String backward = transportType.concat(":backward"); boolean possibleForward = "yes".equals(way.get(forward)) || (!way.hasKey(forward) && way.isOneway() != -1); boolean possibleBackward = "yes".equals(way.get(backward)) || (!way.hasKey(backward) && way.isOneway() != 1); - if (transportType.equals(Access.AccessTags.FOOT.getKey()) && !"footway".equals(way.get("highway")) + if (transportType.equals(Access.AccessTags.FOOT.getKey()) && !"footway".equals(way.get(HIGHWAY)) && !way.hasTag("foot:forward") && !way.hasTag("foot:backward")) { return 0; // Foot is almost never oneway, especially on generic road types. There are some // cases on mountain paths.