only show bollard quest for bollards on roads (fixes #3017)

streetcomplete · Jul 5, 2021 · 267ee3b · 267ee3b
1 parent dbfe44e
commit 267ee3b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bollard_type/AddBollardType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bollard_type/AddBollardType.kt
@@ -11,8 +11,14 @@ class AddBollardType : OsmElementQuestType<BollardType> {
 
     private val bollardNodeFilter by lazy { """
         nodes with
-            barrier = bollard
-            and !bollard
+          barrier = bollard
+          and !bollard
+    """.toElementFilterExpression() }
+
+    private val waysFilter by lazy { """
+        ways with
+          highway and highway != construction
+          and area != yes
     """.toElementFilterExpression() }
 
     override val commitMessage = "Add bollard type"
@@ -26,7 +32,7 @@ class AddBollardType : OsmElementQuestType<BollardType> {
     override fun getApplicableElements(mapData: MapDataWithGeometry): Iterable<Element> {
         val wayNodeIds = mutableSetOf<Long>()
         mapData.ways
-            .filter { it.tags["area"] != "yes" }
+            .filter { waysFilter.matches(it) }
             .flatMapTo(wayNodeIds) { it.nodeIds }
 
         return mapData.nodes