Also ask for height limits of crossings with rails electrified with o…

…verhead wires (fixes #5180)
streetcomplete · Aug 17, 2023 · 50d6f7e · 50d6f7e
1 parent c013568
commit 50d6f7e
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 2 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeight.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeight.kt
@@ -34,6 +34,18 @@ class AddMaxHeight : OsmElementQuestType<MaxHeightAnswer> {
         and !maxheight and !maxheight:signed and !maxheight:physical
     """.toElementFilterExpression() }
 
+    private val railwayCrossingsFilter by lazy { """
+        nodes with
+          railway = level_crossing
+          and !maxheight and !maxheight:signed and !maxheight:physical
+    """.toElementFilterExpression() }
+
+    private val electrifiedRailwaysFilter by lazy { """
+        ways with
+          railway
+          and electrified = contact_line
+    """.toElementFilterExpression() }
+
     private val allRoadsFilter by lazy { """
         ways with highway ~ ${ALL_ROADS.joinToString("|")}
     """.toElementFilterExpression() }
@@ -78,12 +90,22 @@ class AddMaxHeight : OsmElementQuestType<MaxHeightAnswer> {
             .flatMapTo(HashSet()) { it.nodeIds }
 
         val nodesWithoutHeight = mapData.nodes
-            .filter { roadsNodeIds.contains(it.id) && nodeFilter.matches(it) }
+            .filter { it.id in roadsNodeIds && nodeFilter.matches(it) }
+
+        // railway crossings with railways that have an electrified contact line
+        val electrifiedRailwayNodeIds = mapData.ways
+            .filter { electrifiedRailwaysFilter.matches(it) }
+            .flatMapTo(HashSet()) { it.nodeIds }
+
+        val railwayCrossingNodesWithoutHeight = mapData.nodes
+            .filter { it.id in electrifiedRailwayNodeIds && railwayCrossingsFilter.matches(it) }
 
+        // tunnels without height
         val roadsWithoutHeight = mapData.ways.filter { roadsWithoutMaxHeightFilter.matches(it) }
 
         val tunnelsWithoutHeight = roadsWithoutHeight.filter { tunnelFilter.matches(it) }
 
+        // ways below bridges without height
         val bridges = mapData.ways.filter { bridgeFilter.matches(it) }
 
         val waysBelowBridgesWithoutHeight = roadsWithoutHeight.filter { way ->
@@ -104,7 +126,10 @@ class AddMaxHeight : OsmElementQuestType<MaxHeightAnswer> {
             }
         }
 
-        return nodesWithoutHeight + tunnelsWithoutHeight + waysBelowBridgesWithoutHeight
+        return nodesWithoutHeight +
+            railwayCrossingNodesWithoutHeight +
+            tunnelsWithoutHeight +
+            waysBelowBridgesWithoutHeight
     }
 
     override fun isApplicableTo(element: Element): Boolean? {
@@ -117,6 +142,8 @@ class AddMaxHeight : OsmElementQuestType<MaxHeightAnswer> {
         // for nodes that may be applicable we cannot finally determine it because that node must be
         // a vertex of a road
         if (nodeFilter.matches(element)) return null
+        // railway crossing
+        if (railwayCrossingsFilter.matches(element)) return null
         return false
     }
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightTest.kt
@@ -47,6 +47,29 @@ class AddMaxHeightTest {
         assertNull(questType.isApplicableTo(parkingEntrance))
     }
 
+    @Test fun `applicable to railway crossing node that is a vertex of an electrified railway`() {
+        val crossing = node(2, tags = mapOf("railway" to "level_crossing"))
+        val railway = way(1, listOf(1, 2), mapOf(
+            "railway" to "rail",
+            "electrified" to "contact_line"
+        ))
+
+        val mapData = TestMapDataWithGeometry(listOf(railway, crossing))
+
+        assertEquals(1, questType.getApplicableElements(mapData).toList().size)
+        assertNull(questType.isApplicableTo(crossing))
+    }
+
+    @Test fun `not applicable to railway crossing node that is a vertex of a normal railway`() {
+        val crossing = node(2, tags = mapOf("railway" to "level_crossing"))
+        val railway = way(1, listOf(1, 2), mapOf("railway" to "rail"))
+
+        val mapData = TestMapDataWithGeometry(listOf(railway, crossing))
+
+        assertEquals(0, questType.getApplicableElements(mapData).toList().size)
+        assertNull(questType.isApplicableTo(crossing))
+    }
+
     @Test fun `applicable to road below bridge`() {
         val mapData = TestMapDataWithGeometry(listOf(
             way(1, listOf(1, 2), mapOf(