Skip to content

Commit bcd5ede

Browse files
GerdPGerdP
authored andcommitted
fix #21541: false positive: crossing railways
- treat railway=halt similar to railway=yard git-svn-id: https://josm.openstreetmap.de/svn/trunk@18323 0c6e7542-c601-0410-84e7-c038aed88b3b
1 parent 5165032 commit bcd5ede

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ && isResidentialArea(w1)))
125125
return true;
126126
if (isWaterArea(w1) && isWaterArea(w2))
127127
return true; // handled by mapcss tests
128-
if (w1.hasKey(RAILWAY) && w2.hasKey(RAILWAY) && w1.hasTag(RAILWAY, "yard") != w2.hasTag(RAILWAY, "yard")) {
129-
return true; // see #20089
130-
}
128+
if (w1.hasKey(RAILWAY) && w2.hasKey(RAILWAY) && (w1.hasTag(RAILWAY, "yard") != w2.hasTag(RAILWAY, "yard")
129+
|| w1.hasTag(RAILWAY, "halt") != w2.hasTag(RAILWAY, "halt")))
130+
return true; // see #20089, #21541
131131
return (w1.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterArea(w2))
132132
|| (w2.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && isWaterArea(w1));
133133
}

0 commit comments

Comments
 (0)