From 2c1493b639786941772896d00210ac5b38641817 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Mon, 5 Feb 2024 19:37:15 +0100
Subject: [PATCH] Don't prompt user to estimate height, tag maxheight:signed=no
 instead (fixes #5458)

---
 .../streetcomplete/quests/max_height/AddMaxHeight.kt |  2 +-
 .../quests/max_height/AddMaxHeightForm.kt            |  8 ++++----
 .../quests/max_height/MaxHeightAnswer.kt             |  2 +-
 app/src/main/res/values/strings.xml                  |  3 ---
 .../quests/max_height/AddMaxHeightTest.kt            | 12 +++---------
 5 files changed, 9 insertions(+), 18 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
index 71d440839b..c8f0ec9021 100644
--- 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
@@ -159,7 +159,7 @@ class AddMaxHeight : OsmElementQuestType<MaxHeightAnswer> {
                 tags["maxheight"] = answer.value.toOsmValue()
             }
             is NoMaxHeightSign -> {
-                tags["maxheight"] = if (answer.isTallEnough) "default" else "below_default"
+                tags["maxheight:signed"] = "no"
             }
         }
     }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt
index 31b0777555..6757c6a342 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt
@@ -66,10 +66,10 @@ class AddMaxHeightForm : AbstractOsmQuestForm<MaxHeightAnswer>() {
     }
 
     private fun confirmNoSign() {
-        activity?.let { AlertDialog.Builder(it)
-            .setMessage(R.string.quest_maxheight_answer_noSign_question)
-            .setPositiveButton(R.string.quest_maxheight_answer_noSign_question_yes) { _, _ -> applyAnswer(NoMaxHeightSign(true)) }
-            .setNegativeButton(R.string.quest_maxheight_answer_noSign_question_no) { _, _ -> applyAnswer(NoMaxHeightSign(false)) }
+        activity?.let { AlertDialog.Builder(requireContext())
+            .setTitle(R.string.quest_generic_confirmation_title)
+            .setPositiveButton(R.string.quest_generic_confirmation_yes) { _, _ -> applyAnswer(NoMaxHeightSign) }
+            .setNegativeButton(R.string.quest_generic_confirmation_no, null)
             .show()
         }
     }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/MaxHeightAnswer.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/MaxHeightAnswer.kt
index 313f230339..73a3b7261c 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/MaxHeightAnswer.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/MaxHeightAnswer.kt
@@ -5,4 +5,4 @@ import de.westnordost.streetcomplete.osm.Length
 sealed interface MaxHeightAnswer
 
 data class MaxHeight(val value: Length) : MaxHeightAnswer
-data class NoMaxHeightSign(val isTallEnough: Boolean) : MaxHeightAnswer
+data object NoMaxHeightSign : MaxHeightAnswer
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec5751258b..3dc042e90c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1113,9 +1113,6 @@ If any lanes are reserved for buses, please leave a note instead."</string>
     <string name="quest_maxheight_sign_below_bridge_title">What height limit is indicated below the bridge?</string>
     <string name="quest_maxheight_answer_noSign">There is no sign…</string>
     <string name="quest_maxheight_split_way_hint">If it doesn’t apply for the whole way, consider answering “%s”.</string>
-    <string name="quest_maxheight_answer_noSign_question">Is there easily enough space for even the tallest trucks (at least about 4.5 meters / 15 feet) to pass through?</string>
-    <string name="quest_maxheight_answer_noSign_question_yes">Tall trucks can pass through</string>
-    <string name="quest_maxheight_answer_noSign_question_no">"Tall trucks don’t fit"</string>
     <string name="quest_maxheight_unusualInput_confirmation_description">This height looks implausible. Are you sure that it is correct?</string>
 
     <string name="quest_maxspeed_title_short2">"What’s the speed limit for this street?"</string>
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
index 00245f03d6..126c86e3a1 100644
--- 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
@@ -156,17 +156,11 @@ class AddMaxHeightTest {
         )
     }
 
-    @Test fun `apply default height answer`() {
+    @Test fun `apply no height sign answer`() {
         assertEquals(
-            setOf(StringMapEntryAdd("maxheight", "default")),
-            questType.answerApplied(NoMaxHeightSign(true))
+            setOf(StringMapEntryAdd("maxheight:signed", "no")),
+            questType.answerApplied(NoMaxHeightSign)
         )
     }
 
-    @Test fun `apply below default height answer`() {
-        assertEquals(
-            setOf(StringMapEntryAdd("maxheight", "below_default")),
-            questType.answerApplied(NoMaxHeightSign(false))
-        )
-    }
 }