Do not ask for surface of complicated roads (which already have surface:lanes* taged)

app/src/main/java/de/westnordost/streetcomplete/osm/surface/SurfaceUtils.kt

@@ -100,3 +100,6 @@ fun getKeysAssociatedWithSurface(prefix: String = ""): Set<String> =
     ) +
         getLastCheckDateKeys("${prefix}surface") +
         getLastCheckDateKeys("${prefix}smoothness")
+
+fun hasSurfaceLanes(tags: Map<String, String>): Boolean =
+    tags["surface:lanes"] != null || tags["surface:lanes:forward"] != null || tags["surface:lanes:backward"] != null || tags["surface:lanes:both_ways"] != null

app/src/main/java/de/westnordost/streetcomplete/overlays/surface/SurfaceAndNoteViewController.kt

@@ -11,6 +11,7 @@ import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.osm.surface.Surface
 import de.westnordost.streetcomplete.osm.surface.SurfaceAndNote
 import de.westnordost.streetcomplete.osm.surface.asItem
+import de.westnordost.streetcomplete.osm.surface.hasSurfaceLanes
 import de.westnordost.streetcomplete.osm.surface.shouldBeDescribed
 import de.westnordost.streetcomplete.osm.surface.toItems
 import de.westnordost.streetcomplete.quests.surface.DescribeGenericSurfaceDialog
@@ -92,7 +93,7 @@ class SurfaceAndNoteViewController(
     private fun collectSurfaceData(callback: (Surface, String?) -> Unit) {
         ImageListPickerDialog(selectButton.context, items, cellLayoutId, 2) { item ->
             val value = item.value
-            if (value != null && value.shouldBeDescribed) {
+            if (value != null && value.shouldBeDescribed && !hasSurfaceLanes(element.tags)) {
                 DescribeGenericSurfaceDialog(selectButton.context) { description ->
                     callback(item.value!!, description)
                 }.show()

app/src/main/java/de/westnordost/streetcomplete/overlays/surface/SurfaceColorMapping.kt

@@ -5,6 +5,7 @@ import de.westnordost.streetcomplete.osm.isPrivateOnFoot
 import de.westnordost.streetcomplete.osm.surface.Surface
 import de.westnordost.streetcomplete.osm.surface.Surface.*
 import de.westnordost.streetcomplete.osm.surface.SurfaceAndNote
+import de.westnordost.streetcomplete.osm.surface.hasSurfaceLanes
 import de.westnordost.streetcomplete.osm.surface.isComplete
 import de.westnordost.streetcomplete.overlays.Color
 
@@ -66,7 +67,9 @@ val Surface.color get() = when (this) {
 }
 
 fun SurfaceAndNote?.getColor(element: Element): String =
-    if (this?.isComplete != true) {
+    if (hasSurfaceLanes(element.tags)) {
+            Color.BLACK // same as other complex surfaces, e.g. surface=unpaved with surface:note=*
+    } else if (this?.isComplete != true) {
         // not set but indoor, private or just a "virtual" link -> do not highlight as missing
         if (isIndoor(element.tags) || isPrivateOnFoot(element) || isLink(element.tags)) {
             Color.INVISIBLE

app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt

@@ -31,6 +31,10 @@ class AddRoadSurface : OsmFilterQuestType<SurfaceAndNote>() {
             surface ~ paved|unpaved|${INVALID_SURFACES.joinToString("|")}
             and !surface:note
             and !note:surface
+            and !surface:lanes
+            and !surface:lanes:forward
+            and !surface:lanes:backward
+            and !surface:lanes:both_ways
           )
           ${INVALID_SURFACES_FOR_TRACKTYPES.map{tracktypeConflictClause(it)}.joinToString("\n")}
         )

app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurfaceForm.kt

@@ -5,6 +5,7 @@ import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.osm.surface.SELECTABLE_WAY_SURFACES
 import de.westnordost.streetcomplete.osm.surface.Surface
 import de.westnordost.streetcomplete.osm.surface.SurfaceAndNote
+import de.westnordost.streetcomplete.osm.surface.hasSurfaceLanes
 import de.westnordost.streetcomplete.osm.surface.isSurfaceAndTracktypeConflicting
 import de.westnordost.streetcomplete.osm.surface.toItems
 import de.westnordost.streetcomplete.quests.AImageListQuestForm
@@ -17,8 +18,12 @@ class AddRoadSurfaceForm : AImageListQuestForm<Surface, SurfaceAndNote>() {
     override fun onClickOk(selectedItems: List<Surface>) {
         val surface = selectedItems.single()
         confirmPotentialTracktypeMismatch(surface) {
-            collectSurfaceDescriptionIfNecessary(requireContext(), surface) { description ->
-                applyAnswer(SurfaceAndNote(surface, description))
+            if (hasSurfaceLanes(element.tags)) {
+                    applyAnswer(SurfaceAndNote(surface, null))
+            } else {
+                collectSurfaceDescriptionIfNecessary(requireContext(), surface) { description ->
+                    applyAnswer(SurfaceAndNote(surface, description))
+                }
             }
         }
     }

app/src/test/java/de/westnordost/streetcomplete/overlays/surface/SurfaceColorMappingKtTest.kt

@@ -45,6 +45,16 @@ class SurfaceColorMappingKtTest {
         assertEquals(Color.BLACK, parseSurfaceAndNote(road.tags).getColor(road))
     }
 
+    @Test fun `return black for complex forward surface lanes`() {
+        val road = way(tags = mapOf("surface:lanes:forward" to "asphalt"))
+        assertEquals(Color.BLACK, parseSurfaceAndNote(road.tags).getColor(road))
+    }
+
+    @Test fun `return black for complex surface lanes`() {
+        val road = way(tags = mapOf("surface:lanes" to "concrete|asphalt|asphalt"))
+        assertEquals(Color.BLACK, parseSurfaceAndNote(road.tags).getColor(road))
+    }
+
     @Test fun `return invisible for unpaved with restricted access`() {
         val road = way(tags = mapOf(
             "access" to "private",

app/src/test/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurfaceTest.kt

@@ -1,7 +1,14 @@
 package de.westnordost.streetcomplete.quests.surface
 
+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd
+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete
+import de.westnordost.streetcomplete.osm.surface.Surface
+import de.westnordost.streetcomplete.osm.surface.SurfaceAndNote
+import de.westnordost.streetcomplete.quests.TestMapDataWithGeometry
 import de.westnordost.streetcomplete.testutils.way
+import de.westnordost.streetcomplete.util.ktx.nowAsEpochMilliseconds
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -12,6 +19,20 @@ class AddRoadSurfaceTest {
         assertIsNotApplicable("highway" to "residential", "surface" to "asphalt")
     }
 
+    @Test fun `applicable to old enough road with surface, regardless of existing surface lanes or notes`() {
+        val way = way(1L, listOf(1, 2, 3), mapOf(
+            "highway" to "residential",
+            "surface" to "paved",
+            "surface:lanes" to "asphalt|concrete",
+            "surface:note" to "wildly mixed asphalt, concrete, paving stones and sett",
+            "check_date:surface" to "2001-01-01"
+        ), timestamp = nowAsEpochMilliseconds())
+        val mapData = TestMapDataWithGeometry(listOf(way))
+
+        assertEquals(1, questType.getApplicableElements(mapData).toList().size)
+        assertTrue(questType.isApplicableTo(way))
+    }
+
     @Test fun `applicable to untagged surface`() {
         assertIsApplicable("highway" to "residential")
     }
@@ -28,6 +49,20 @@ class AddRoadSurfaceTest {
         assertIsNotApplicable("highway" to "track", "surface" to "asphalt", "tracktype" to "grade1")
     }
 
+    // see https://github.com/streetcomplete/StreetComplete/pull/5453#issuecomment-1911891944
+    @Test fun `not applicable to alternate tag for surface notes`() {
+        assertIsNotApplicable("highway" to "residential", "surface" to "paved", "note:surface" to "alternative note format, varying asphalt and concrete")
+    }
+    @Test fun `not applicable to tagged complex surface lanes with general surface tag`() {
+        assertIsNotApplicable("highway" to "residential", "surface" to "paved", "surface:lanes" to "concrete|asphalt|asphalt")
+        assertIsNotApplicable("highway" to "track", "surface" to "unpaved", "surface:lanes:forward" to "compacted", "surface:lanes:backward" to "gravel" )
+        assertIsNotApplicable("highway" to "residential", "surface" to "paved", "surface:lanes:both_ways" to "asphalt|concrete")
+        assertIsNotApplicable("highway" to "residential", "surface" to "asphalt", "surface:lanes" to "concrete|asphalt|asphalt")
+    }
+    @Test fun `applicable to tagged complex surface lanes without surface tag`() {
+        assertIsApplicable("highway" to "residential", "surface:lanes" to "concrete|asphalt|cobblestone")
+    }
+
     @Test fun `applicable to surface tags not providing proper info`() {
         assertIsApplicable("highway" to "residential", "surface" to "paved")
         assertIsNotApplicable("highway" to "residential", "surface" to "paved", "surface:note" to "wildly mixed asphalt, concrete, paving stones and sett")
@@ -50,4 +85,9 @@ class AddRoadSurfaceTest {
     @Test fun `not applicable where tracktype and very good surface match is suspicious, but not conflicting`() {
         assertIsNotApplicable("highway" to "track", "surface" to "asphalt", "tracktype" to "grade2")
     }
+
+    @Test fun `not applicable to generic unpaved track with a note and nonconflicting tracktype`() {
+        assertIsNotApplicable("highway" to "track", "surface" to "unpaved", "tracktype" to "grade3", "surface:note" to "varying patches with more and less gravel")
+    }
+
 }