New quest ref for emergency access points

app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt

@@ -7,6 +7,7 @@ import de.westnordost.streetcomplete.data.osmnotes.notequests.OsmNoteQuestType
 import de.westnordost.streetcomplete.data.quest.QuestTypeRegistry
 import de.westnordost.streetcomplete.quests.accepts_cards.AddAcceptsCards
 import de.westnordost.streetcomplete.quests.accepts_cash.AddAcceptsCash
+import de.westnordost.streetcomplete.quests.access_point_ref.AddAccessPointRef
 import de.westnordost.streetcomplete.quests.address.AddAddressStreet
 import de.westnordost.streetcomplete.quests.address.AddHousenumber
 import de.westnordost.streetcomplete.quests.air_conditioning.AddAirConditioning
@@ -363,6 +364,8 @@ fun questTypeRegistry(
     AddPostboxRoyalCypher(), // can be glanced across the road (if postbox facing the right way)
     AddPostboxRef(), // requires text input and to be very close to the collection plate
 
+    AddAccessPointRef(), // requires text input and to be very close to the collection plate
+
     AddWheelchairAccessOutside(),
 
     // road but information is visible usually at the beginning of the marked stretch of way

app/src/main/java/de/westnordost/streetcomplete/quests/access_point_ref/AccessPointRefAnswer.kt

@@ -0,0 +1,7 @@
+package de.westnordost.streetcomplete.quests.access_point_ref
+
+sealed interface AccessPointRefAnswer
+
+object NoAccessPointRef : AccessPointRefAnswer
+object IsAssemblyPointAnswer : AccessPointRefAnswer
+data class AccessPointRef(val ref: String) : AccessPointRefAnswer

app/src/main/java/de/westnordost/streetcomplete/quests/access_point_ref/AddAccessPointRef.kt

@@ -0,0 +1,41 @@
+package de.westnordost.streetcomplete.quests.access_point_ref
+
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType
+import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement
+import de.westnordost.streetcomplete.osm.Tags
+
+class AddAccessPointRef : OsmFilterQuestType<AccessPointRefAnswer>() {
+
+    override val elementFilter = """
+        nodes with
+        (
+          highway = emergency_access_point
+          or emergency = access_point
+        )
+        and !name and !ref and noref != yes and ref:signed != no and !~"ref:.*"
+    """
+
+    override val changesetComment = "Determine emergency access point refs"
+    override val wikiLink = "Key:ref"
+    override val icon = R.drawable.ic_quest_access_point
+    override val achievements = listOf(EditTypeAchievement.LIFESAVER, EditTypeAchievement.RARE)
+    override val isDeleteElementEnabled = true
+
+    override fun getTitle(tags: Map<String, String>) = R.string.quest_accessPointRef_title
+
+    override fun createForm() = AddAccessPointRefForm()
+
+    override fun applyAnswerTo(answer: AccessPointRefAnswer, tags: Tags, timestampEdited: Long) {
+        when (answer) {
+            is NoAccessPointRef -> tags["ref:signed"] = "no"
+            is AccessPointRef ->   tags["ref"] = answer.ref
+            is IsAssemblyPointAnswer -> {
+                tags["emergency"] = "assembly_point"
+                if (tags["highway"] == "emergency_access_point") {
+                    tags.remove("highway")
+                }
+            }
+        }
+    }
+}

app/src/main/java/de/westnordost/streetcomplete/quests/access_point_ref/AddAccessPointRefForm.kt

@@ -0,0 +1,53 @@
+package de.westnordost.streetcomplete.quests.access_point_ref
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.doAfterTextChanged
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.databinding.QuestRefBinding
+import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
+import de.westnordost.streetcomplete.quests.AnswerItem
+import de.westnordost.streetcomplete.util.ktx.nonBlankTextOrNull
+
+class AddAccessPointRefForm : AbstractOsmQuestForm<AccessPointRefAnswer>() {
+
+    override val contentLayoutResId = R.layout.quest_ref
+    private val binding by contentViewBinding(QuestRefBinding::bind)
+
+    override val otherAnswers get() = listOfNotNull(
+        AnswerItem(R.string.quest_ref_answer_noRef) { confirmNoRef() },
+        AnswerItem(R.string.quest_accessPointRef_answer_assembly_point) { AssemblyPointAnswer() }
+    )
+
+    private val ref get() = binding.refInput.nonBlankTextOrNull
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.refInput.doAfterTextChanged { checkIsFormComplete() }
+    }
+
+    override fun onClickOk() {
+        applyAnswer(AccessPointRef(ref!!))
+    }
+
+    private fun confirmNoRef() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.quest_generic_confirmation_title)
+            .setPositiveButton(R.string.quest_generic_confirmation_yes) { _, _ -> applyAnswer(NoAccessPointRef) }
+            .setNegativeButton(R.string.quest_generic_confirmation_no, null)
+            .show()
+    }
+
+    private fun AssemblyPointAnswer() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.quest_generic_confirmation_title)
+            .setView(R.layout.dialog_confirm_assembly_point)
+            .setPositiveButton(R.string.quest_generic_confirmation_yes) { _, _ -> applyAnswer(IsAssemblyPointAnswer) }
+            .setNegativeButton(R.string.quest_generic_confirmation_no, null)
+            .show()
+    }
+
+    override fun isFormComplete() = ref != null
+}

app/src/main/res/drawable/ic_assembly_point.xml

@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="400dp"
+    android:height="400dp"
+    android:viewportWidth="178"
+    android:viewportHeight="178">
+    <path
+        android:pathData="M0,0h178v178h-178z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M5,5h168v168h-168z"
+        android:fillColor="#008855"/>
+    <path
+        android:pathData="M44.9,117.94 L44.9,88.84C44.9,86.32 47.1,84.64 49.4,84.64H76.7C76.6,88.08 79,90.5 80.9,93.04H74C69,93.04 66.5,96.15 66.5,101.74V117.94H56.9V96.04H52.7V117.94zM70.7,127.84 L70.7,101.44C70.7,98.41 72.7,96.94 75.5,96.94H102.5C105.8,96.94 107.3,99.73 107.3,101.14V127.84H101.6V106.54H97.4V127.84H80.9V106.54H76.4V127.84zM133.1,117.94 L133.1,90.04C133.1,86.99 131.5,84.64 128.6,84.64H101.3C101.3,87.95 99,90.54 97.1,93.04H103.7C108.4,93.04 111.5,97.12 111.5,101.74V117.94H121.1V96.04H125.3V117.94z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M97.86,58.49A8.85,8.85 0,0 1,80.15 58.49,8.85 8.85,0 1,1 97.86,58.49z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M122.54,71.07A8.86,8.86 0,0 1,104.83 71.07,8.86 8.86,0 1,1 122.54,71.07z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M72.28,70.69A8.86,8.86 0,0 1,54.57 70.69,8.86 8.86,0 1,1 72.28,70.69z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M97.7,83.41A8.86,8.86 0,0 1,79.99 83.41,8.86 8.86,0 1,1 97.7,83.41z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M14.76,8.9 L8.9,14.5 35.28,41H16.71L24.53,48.95H48.95V25.1L41.14,17.15V35.4L14.76,8.9"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M163.24,8.9 L169.1,14.49 142.72,41H161.28L153.47,48.95H129.05V25.09L136.86,17.14V35.4L163.24,8.9"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M14.76,169.1 L8.9,163.5 35.28,137H16.71L24.53,129.05H48.95V152.9L41.14,160.85V142.59L14.76,169.1"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M163.24,169.1 L169.1,163.51 142.72,137H161.28L153.47,129.05H129.05V152.91L136.86,160.86V142.6L163.24,169.1"
+        android:fillColor="#fff"/>
+</vector>

app/src/main/res/drawable/ic_quest_access_point.xml

@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M119.42,95.99c-17.67,30.6 -56.81,41.09 -87.41,23.42S-9.09,62.61 8.58,32.01 65.39,-9.09 95.99,8.58c30.61,17.67 41.09,56.81 23.42,87.41"
+      android:fillColor="#9bbe55"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M92.3,27.29L35.66,27.29c-4.86,0 -9.42,4.56 -9.42,9.43v56.62c0,4.86 4.57,9.45 9.44,9.45h56.62c4.86,0 9.44,-4.56 9.44,-9.43L101.74,36.72c0,-4.86 -4.58,-9.43 -9.45,-9.43h0ZM94.23,75.11h-20.15v20.13h-20.15v-20.13h-20.16v-20.15h20.16v-20.13h20.15v20.13h20.15v20.15Z"
+      android:strokeAlpha="0.25"
+      android:fillAlpha="0.25"/>
+  <path
+      android:pathData="M92.3,24.21L35.66,24.21c-4.86,0 -9.42,4.56 -9.42,9.43v56.62c0,4.86 4.57,9.45 9.44,9.45h56.62c4.86,0 9.44,-4.56 9.44,-9.43L101.74,33.64c0,-4.86 -4.58,-9.43 -9.45,-9.43h0ZM94.23,72.03h-20.15v20.13h-20.15v-20.13h-20.16v-20.15h20.16L53.93,31.75h20.15v20.13h20.15v20.15Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M119.42,95.99c-17.67,30.6 -56.81,41.09 -87.41,23.42S-9.09,62.61 8.58,32.01 65.39,-9.09 95.99,8.58c30.61,17.67 41.09,56.81 23.42,87.41"
+      android:fillColor="#9bbe55"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M107.84,53.54l-29.23,0l0,-29.2l-29.22,0l0,29.2l-29.24,0l0,29.22l29.24,0l0,29.19l29.22,0l0,-29.19l29.23,0l0,-29.22z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M107.84,46.29l-29.23,0l0,-29.2l-29.22,0l0,29.2l-29.24,0l0,29.22l29.24,0l0,29.19l29.22,0l0,-29.19l29.23,0l0,-29.22z"
+      android:fillColor="#fff"/>
+</vector>

app/src/main/res/layout/dialog_confirm_assembly_point.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:padding="@dimen/dialog_horizontal_margin">
+
+    <TextView
+        android:text="@string/quest_accessPointRef_detailed_answer_impossible_confirmation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@android:style/TextAppearance.Theme.Dialog" />
+
+    <ImageView
+        android:id="@+id/assemblyPointImage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_assembly_point"
+        android:contentDescription="@string/quest_accessPointRef_answer_assembly_point" />
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -1551,4 +1551,8 @@ Partially means that a wheelchair can enter and use the restroom, but no handrai
     <string name="overlay_sidewalk">Sidewalks</string>
 
     <string name="overlay_street_parking">Street parking</string>
+
+    <string name="quest_accessPointRef_title">What’s the identification number here?</string>
+    <string name="quest_accessPointRef_answer_assembly_point">It’s an Assembly Point</string>
+    <string name="quest_accessPointRef_detailed_answer_impossible_confirmation">An Emergency Assembly Point is where people assemble in case of an emergency. It usually looks similar to this:</string>
 </resources>

res/graphics/authors.txt

@@ -71,6 +71,9 @@ app icon/
     ic_launcher.png             https://www.elegantthemes.com/blog/freebie-of-the-week/beautiful-flat-icons-for-free (GPL 2.0) with trivial changes by Mateusz Konieczny (recolour)
     ic_launcher_round.png       https://www.elegantthemes.com/blog/freebie-of-the-week/beautiful-flat-icons-for-free (GPL 2.0) with trivial changes by Mateusz Konieczny (recolour)
 
+assembly_point/
+    assembly_point.svg          Epop, License: Public domain; https://commons.wikimedia.org/wiki/File:E011.svg
+
 bridge structure/
     arch.svg                    Jay Turner, License: CC0 1.0
     beam.svg                    Jay Turner, License: CC0 1.0
@@ -253,6 +256,7 @@ italian police type/
     polizia.svg                     modified from https://commons.wikimedia.org/wiki/File:Italian_traffic_signs_-_icona_polizia.svg, Gigillo83, License: CC-BY-SA 3.0
 
 quest/
+    access_point.svg
     apple.svg
     baby.svg                         modified from Twemoji: U+1F6BC
     barrier.svg                      Tobias Zwick (CC-BY-SA 4.0) (based on road_construction.svg)