Add Street cabinet quest

app/src/debug/res/drawable/ic_quest_street_cabinet.xml

@@ -0,0 +1,34 @@
+<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="m128,64c0,35.35 -28.65,64 -64,64s-64,-28.65 -64,-64 28.65,-64 64,-64 64,28.65 64,64"
+      android:strokeWidth=".2"
+      android:fillColor="#fd5"/>
+  <path
+      android:pathData="m25.69,107.25l76.66,0"
+      android:strokeWidth="7.67"
+      android:fillColor="#00000000"
+      android:strokeColor="#c87137"/>
+  <path
+      android:strokeWidth="3"
+      android:pathData="M37.15,20.72l53.67,0l0,84.33l-53.67,0z"
+      android:fillColor="#aaa"
+      android:strokeColor="#333"/>
+  <path
+      android:strokeWidth="3"
+      android:pathData="m25.65,105.06l76.66,0"
+      android:fillColor="#00000000"
+      android:strokeColor="#c87137"/>
+  <path
+      android:pathData="m65.48,31.95 l-5,15 6.25,-1.25 -2.5,13.75 18.75,-20 -12.5,2.5 7.5,-12.5z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.25"
+      android:fillColor="#fac800"
+      android:strokeColor="#fac800"/>
+  <path
+      android:pathData="M48.09,55.73l7.67,0l0,16.75l-7.67,0z"
+      android:fillColor="#ccc"/>
+</vector>

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

@@ -173,6 +173,7 @@ import de.westnordost.streetcomplete.quests.sport.AddSport
 import de.westnordost.streetcomplete.quests.step_count.AddStepCount
 import de.westnordost.streetcomplete.quests.step_count.AddStepCountStile
 import de.westnordost.streetcomplete.quests.steps_ramp.AddStepsRamp
+import de.westnordost.streetcomplete.quests.street_cabinet.AddStreetCabinetType
 import de.westnordost.streetcomplete.quests.summit.AddSummitCross
 import de.westnordost.streetcomplete.quests.summit.AddSummitRegister
 import de.westnordost.streetcomplete.quests.surface.AddCyclewayPartSurface
@@ -582,6 +583,7 @@ fun getQuestTypeList(
     EE_QUEST_OFFSET + 5 to AddHealthcareSpeciality(),
     EE_QUEST_OFFSET + 6 to AddServiceBuildingType(),
     EE_QUEST_OFFSET + 7 to AddServiceBuildingOperator(),
+    EE_QUEST_OFFSET + 29 to AddStreetCabinetType(),
     EE_QUEST_OFFSET + 8 to AddOutdoorSeatingType(),
     EE_QUEST_OFFSET + 25 to AddDestination(),
     EE_QUEST_OFFSET + 22 to AddArtworkType(),

app/src/main/java/de/westnordost/streetcomplete/quests/street_cabinet/AddStreetCabinetType.kt

@@ -0,0 +1,49 @@
+package de.westnordost.streetcomplete.quests.street_cabinet
+
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry
+import de.westnordost.streetcomplete.data.osm.mapdata.Element
+import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry
+import de.westnordost.streetcomplete.data.osm.mapdata.filter
+import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType
+import de.westnordost.streetcomplete.osm.Tags
+
+class AddStreetCabinetType : OsmFilterQuestType<StreetCabinetType>() {
+
+    override val elementFilter = """
+        nodes, ways with
+          man_made = street_cabinet
+          and !street_cabinet
+          and !utility
+    """
+    override val changesetComment = "Add street cabinet type"
+    override val wikiLink = "Tag:man_made=street_cabinet"
+    override val icon = R.drawable.ic_quest_street_cabinet
+    override val defaultDisabledMessage: Int = R.string.default_disabled_msg_ee
+
+    override fun getTitle(tags: Map<String, String>) = R.string.quest_street_cabinet_type_title
+
+    override fun getTitleArgs(tags: Map<String, String>): Array<String> {
+        val operator = tags["operator"]?.let { " ($it)" } ?: ""
+        return arrayOf(operator)
+    }
+
+    override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
+        getMapData().filter("""
+            nodes, ways with
+             (
+                 man_made = street_cabinet
+                 or building = service
+             )
+        """)
+
+    override fun createForm() = AddStreetCabinetTypeForm()
+
+    override fun applyAnswerTo(
+        answer: StreetCabinetType,
+        tags: Tags,
+        geometry: ElementGeometry,
+        timestampEdited: Long
+    ) {
+        tags[answer.osmKey] = answer.osmValue }
+}

app/src/main/java/de/westnordost/streetcomplete/quests/street_cabinet/AddStreetCabinetTypeForm.kt

@@ -0,0 +1,33 @@
+package de.westnordost.streetcomplete.quests.street_cabinet
+
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.quests.AListQuestForm
+import de.westnordost.streetcomplete.quests.TextItem
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.POWER
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.TELECOM
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.POSTAL_SERVICE
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.TRAFFIC_CONTROL
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.TRAFFIC_MONITORING
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.TRANSPORT_MANAGEMENT
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.WASTE
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.TELEVISION
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.GAS
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.STREET_LIGHTING
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.WATER
+import de.westnordost.streetcomplete.quests.street_cabinet.StreetCabinetType.SEWERAGE
+class AddStreetCabinetTypeForm : AListQuestForm<StreetCabinetType>() {
+    override val items = listOf(
+        TextItem(POWER, R.string.quest_street_cabinet_power),
+        TextItem(TELECOM, R.string.quest_street_cabinet_telecom),
+        TextItem(POSTAL_SERVICE, R.string.quest_street_cabinet_postal_service),
+        TextItem(TRAFFIC_CONTROL, R.string.quest_street_cabinet_traffic_control),
+        TextItem(TRAFFIC_MONITORING, R.string.quest_street_cabinet_traffic_monitoring),
+        TextItem(TRANSPORT_MANAGEMENT, R.string.quest_street_cabinet_transport_management),
+        TextItem(WASTE, R.string.quest_street_cabinet_waste),
+        TextItem(TELEVISION, R.string.quest_street_cabinet_television),
+        TextItem(GAS, R.string.quest_street_cabinet_gas),
+        TextItem(STREET_LIGHTING, R.string.quest_street_cabinet_street_lighting),
+        TextItem(WATER, R.string.quest_street_cabinet_water),
+        TextItem(SEWERAGE, R.string.quest_street_cabinet_sewerage),
+    )
+}

app/src/main/java/de/westnordost/streetcomplete/quests/street_cabinet/StreetCabinetType.kt

@@ -0,0 +1,16 @@
+package de.westnordost.streetcomplete.quests.street_cabinet
+
+enum class StreetCabinetType(val osmKey: String, val osmValue: String) {
+    POSTAL_SERVICE("street_cabinet", "postal_service"),
+    TRAFFIC_CONTROL("street_cabinet", "traffic_control"),
+    TRAFFIC_MONITORING("street_cabinet", "traffic_monitoring"),
+    TRANSPORT_MANAGEMENT("street_cabinet", "transport_management"),
+    WASTE("street_cabinet", "waste"),
+    TELEVISION("utility", "television"),
+    GAS("utility", "gas"),
+    POWER("utility", "power"),
+    STREET_LIGHTING("utility", "street_lighting"),
+    TELECOM("utility", "telecom"),
+    WATER("utility", "water"),
+    SEWERAGE("utility", "sewerage");
+}

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

@@ -343,6 +343,24 @@
     <string name="quest_service_building_monitoring_station_description">A station located in a own building that monitors something</string>
     <string name="quest_service_building_other">Other service building</string>
 
+    <!-- street cabinet type -->
+    <string name="quest_street_cabinet_type_title">What kind of street cabinet is this%s?</string>
+    <string name="quest_street_cabinet_traffic">Traffic</string>
+    <string name="quest_street_cabinet_other">Other</string>
+    <string name="quest_street_cabinet_postal_service">Postal Service</string>
+    <string name="quest_street_cabinet_postal_service_description">A street cabinet designed to host pending letters or other postal stuff before they go on local delivery (known as a postal relay box).</string>
+    <string name="quest_street_cabinet_traffic_control">Traffic Control</string>
+    <string name="quest_street_cabinet_traffic_monitoring">Traffic Monitoring</string>
+    <string name="quest_street_cabinet_transport_management">Transport Management</string>
+    <string name="quest_street_cabinet_waste">Waste</string>
+    <string name="quest_street_cabinet_television">Television</string>
+    <string name="quest_street_cabinet_gas">Gas</string>
+    <string name="quest_street_cabinet_power">Power</string>
+    <string name="quest_street_cabinet_street_lighting">Street Lighting</string>
+    <string name="quest_street_cabinet_water">Water</string>
+    <string name="quest_street_cabinet_telecom">Telecom</string>
+    <string name="quest_street_cabinet_sewerage">Sewerage</string>
+
     <!-- outdoor seating type -->
     <string name="quest_seating_parklet">Next to the curb, or where parking used to be</string>
     <string name="quest_seating_pedestrian_zone">In a pedestrian zone</string>

res/graphics/authors.txt

@@ -4,7 +4,7 @@ URLs to other sources used:
  - Twemoji 2 (MIT license)      https://github.com/twitter/twemoji/
  - EmojiOne 2 (CC-BY 4 license) https://github.com/emojione/emojione/tree/2.2.7
  - Google Noto Color Emoji      https://github.com/googlefonts/noto-emoji/tree/main
-   (Apache license, version 2.0) 
+   (Apache license, version 2.0)
 
 File                            Author if not Tobias Zwick / Source
 ===============================================================================
@@ -409,6 +409,7 @@ quest/
     steps_ramp.svg
     steps_handrail.svg
     street.svg
+    street_cabinet.svg               mcliquid (GPL 3) based on https://github.com/JOSM/josm/blob/master/resources/images/presets/misc/street_cabinet.svg)
     street_lanes.svg
     street_name.svg
     street_surface.svg