fìx don't ask for footway/cycleway segregation and its properties on …

…cycleways with any sidewalk-tag (streetcomplete#2644, streetcomplete#5877) Previously, only the check was made for sidewalk, not for sidewalk:<side>
kmpoppe · Sep 8, 2024 · 8ff976f · 8ff976f
1 parent 962c7b2
commit 8ff976f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt
@@ -27,7 +27,7 @@ class AddCyclewaySegregation : OsmFilterQuestType<CyclewaySegregation>() {
         )
         and surface ~ ${PAVED_SURFACES.joinToString("|")}
         and area != yes
-        and !sidewalk
+        and !(sidewalk or sidewalk:left or sidewalk:right or sidewalk:both)
         and !segregated
         and ~path|footway|cycleway !~ link
     """

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt
@@ -19,7 +19,7 @@ class AddCyclewayPartSurface : OsmFilterQuestType<SurfaceAndNote>() {
           or (highway = bridleway and bicycle ~ designated|yes)
         )
         and segregated = yes
-        and !sidewalk
+        and !(sidewalk or sidewalk:left or sidewalk:right or sidewalk:both)
         and (
           !cycleway:surface
           or cycleway:surface older today -8 years

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt
@@ -20,7 +20,7 @@ class AddFootwayPartSurface : OsmFilterQuestType<SurfaceAndNote>() {
           or (highway ~ cycleway|bridleway and foot and foot != no)
         )
         and segregated = yes
-        and !sidewalk
+        and !(sidewalk or sidewalk:left or sidewalk:right or sidewalk:both)
         and (
           !footway:surface
           or footway:surface older today -8 years