show traffic signals quests also if crossing:signals=yes

streetcomplete · Feb 2, 2024 · 7a0568e · 7a0568e
1 parent eeb237b
commit 7a0568e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/Crossing.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/Crossing.kt
@@ -11,8 +11,11 @@ private val isCrossingExpr by lazy { """
 
 private val isCrossingWithTrafficSignalsExpr by lazy { """
     nodes with
-      crossing = traffic_signals
-      and highway ~ crossing|traffic_signals
+      highway ~ crossing|traffic_signals
+      and (
+        crossing = traffic_signals
+        or crossing:signals = yes
+      )
 """.toElementFilterExpression() }
 
 fun Element.isCrossing(): Boolean = isCrossingExpr.matches(this)

diff --git a/...va/de/westnordost/streetcomplete/quests/traffic_signals_button/AddTrafficSignalsButton.kt b/...va/de/westnordost/streetcomplete/quests/traffic_signals_button/AddTrafficSignalsButton.kt
@@ -15,7 +15,7 @@ class AddTrafficSignalsButton : OsmFilterQuestType<Boolean>() {
 
     override val elementFilter = """
         nodes with
-          crossing = traffic_signals
+          (crossing = traffic_signals or crossing:signals = yes)
           and highway ~ crossing|traffic_signals
           and foot != no
           and !button_operated

diff --git a/...java/de/westnordost/streetcomplete/quests/traffic_signals_sound/AddTrafficSignalsSound.kt b/...java/de/westnordost/streetcomplete/quests/traffic_signals_sound/AddTrafficSignalsSound.kt
@@ -15,7 +15,8 @@ import de.westnordost.streetcomplete.util.ktx.toYesNo
 class AddTrafficSignalsSound : OsmElementQuestType<Boolean> {
 
     private val crossingFilter by lazy { """
-        nodes with crossing = traffic_signals
+        nodes with
+         (crossing = traffic_signals or crossing:signals = yes)
          and highway ~ crossing|traffic_signals
          and foot != no
          and (

diff --git a/...e/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibration.kt b/...e/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibration.kt
@@ -17,7 +17,7 @@ class AddTrafficSignalsVibration : OsmElementQuestType<Boolean> {
 
     private val crossingFilter by lazy { """
         nodes with
-         crossing = traffic_signals
+         (crossing = traffic_signals or crossing:signals = yes)
          and highway ~ crossing|traffic_signals
          and foot != no
          and (