From e7416af8e84d450a80310474d14c6e6e243e0b6b Mon Sep 17 00:00:00 2001 From: Vladimir Lemberg <62575608+vladlemberg@users.noreply.github.com> Date: Wed, 8 Dec 2021 11:44:53 -0800 Subject: [PATCH] OverlappingEdgeCheck Pedestrian Area Definition (#638) * bug fix: https://github.com/osmlab/atlas-checks/issues/637 * spotless --- .../validation/linear/edges/OverlappingEdgeCheck.java | 1 + .../linear/edges/OverlappingEdgeCheckTestRule.java | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheck.java index 1ca72eccb..40bd3ea29 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheck.java @@ -128,6 +128,7 @@ protected List getFallbackInstructions() private boolean edgeIsArea(final Edge edge) { return (Validators.isOfType(edge, HighwayTag.class, HighwayTag.PEDESTRIAN) + || Validators.isOfType(edge, HighwayTag.class, HighwayTag.FOOTWAY) || Validators.isOfType(edge, ManMadeTag.class, ManMadeTag.PIER)) && (AREA_YES_TAG.test(edge) || CommonMethods.isClosedWay(edge)) || (Validators.isOfType(edge, HighwayTag.class, HighwayTag.SERVICE) diff --git a/src/test/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheckTestRule.java b/src/test/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheckTestRule.java index c9ec7f065..eafa0a4e7 100644 --- a/src/test/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheckTestRule.java +++ b/src/test/java/org/openstreetmap/atlas/checks/validation/linear/edges/OverlappingEdgeCheckTestRule.java @@ -124,13 +124,15 @@ public class OverlappingEdgeCheckTestRule extends CoreTestRule private Atlas pedestrianAreaOverlapPedestrianAreaClosedWayAtlas; @TestAtlas(nodes = { @Node(coordinates = @Loc(value = ONE)), - @Node(coordinates = @Loc(value = TWO)), - @Node(coordinates = @Loc(value = THREE)) }, edges = { + @Node(coordinates = @Loc(value = TWO)), @Node(coordinates = @Loc(value = THREE)), + @Node(coordinates = @Loc(value = FOUR)), }, edges = { @Edge(id = "521118537000000", coordinates = { @Loc(value = ONE), @Loc(value = TWO), @Loc(value = THREE), @Loc(value = FOUR), - @Loc(value = ONE) }, tags = { "highway=pedestrian" }), + @Loc(value = ONE) }, tags = { "highway=pedestrian", "area=yes" }), @Edge(id = "521118538000000", coordinates = { @Loc(value = TWO), - @Loc(value = THREE) }, tags = { "highway=pedestrian" }) }) + @Loc(value = THREE) }, tags = { "highway=pedestrian" }), + @Edge(id = "521118539000000", coordinates = { @Loc(value = FOUR), + @Loc(value = ONE) }, tags = { "highway=footway" }) }) private Atlas pedestrianAreaOverlapPedestrianEdgeAtlas; @TestAtlas(nodes = { @Node(coordinates = @Loc(value = ONE)),