Add Quest: building:material

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

@@ -53,6 +53,7 @@ import de.westnordost.streetcomplete.quests.building_colour.AddBuildingColour
 import de.westnordost.streetcomplete.quests.building_entrance.AddEntrance
 import de.westnordost.streetcomplete.quests.building_entrance_reference.AddEntranceReference
 import de.westnordost.streetcomplete.quests.building_levels.AddBuildingLevels
+import de.westnordost.streetcomplete.quests.building_material.AddBuildingMaterial
 import de.westnordost.streetcomplete.quests.building_type.AddBuildingType
 import de.westnordost.streetcomplete.quests.building_underground.AddIsBuildingUnderground
 import de.westnordost.streetcomplete.quests.bus_stop_bench.AddBenchStatusOnBusStop
@@ -599,6 +600,7 @@ fun getQuestTypeList(
     // quests added in SCEE
     EE_QUEST_OFFSET + 0 to AddBenchMaterial(),
     EE_QUEST_OFFSET + 27 to AddBuildingColour(),
+    EE_QUEST_OFFSET + 49 to AddBuildingMaterial(),
     EE_QUEST_OFFSET + 24 to AddRoofColour(),
     EE_QUEST_OFFSET + 1 to AddContactPhone(),
     EE_QUEST_OFFSET + 2 to AddContactWebsite(),

app/src/main/java/de/westnordost/streetcomplete/quests/building_material/AddBuildingMaterial.kt

@@ -0,0 +1,39 @@
+package de.westnordost.streetcomplete.quests.building_material
+
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry
+import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType
+import de.westnordost.streetcomplete.osm.Tags
+
+class AddBuildingMaterial : OsmFilterQuestType<BuildingMaterial>() {
+
+    override val elementFilter = """
+        ways, relations with
+          ((building and building !~ no|construction|roof|carport)
+          or (building:part and building:part !~ no|construction|roof|carport))
+          and !building:material
+          and indoor != no
+          and wall != no
+    """
+    override val changesetComment = "Specify building material"
+    override val wikiLink = "Key:building:material"
+    override val icon = R.drawable.ic_quest_building_material
+
+    override val defaultDisabledMessage = R.string.default_disabled_msg_difficult_and_time_consuming
+
+    override fun getTitle(tags: Map<String, String>) = when {
+        tags.containsKey("building:part") -> R.string.quest_buildingPartMaterial_title
+        else -> R.string.quest_buildingMaterial_title
+    }
+
+    override fun createForm() = AddBuildingMaterialForm()
+
+    override fun applyAnswerTo(
+        answer: BuildingMaterial,
+        tags: Tags,
+        geometry: ElementGeometry,
+        timestampEdited: Long,
+    ) {
+        tags["building:material"] = answer.osmValue
+    }
+}

app/src/main/java/de/westnordost/streetcomplete/quests/building_material/AddBuildingMaterialForm.kt

@@ -0,0 +1,21 @@
+package de.westnordost.streetcomplete.quests.building_material
+
+import android.os.Bundle
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.quests.AImageListQuestForm
+
+class AddBuildingMaterialForm : AImageListQuestForm<BuildingMaterial, BuildingMaterial>() {
+
+    override val items = BuildingMaterial.entries.map { it.asItem() }
+
+    override val itemsPerRow = 3
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        imageSelector.cellLayoutId = R.layout.cell_labeled_icon_select
+    }
+
+    override fun onClickOk(selectedItems: List<BuildingMaterial>) {
+        applyAnswer(selectedItems.single())
+    }
+}

app/src/main/java/de/westnordost/streetcomplete/quests/building_material/BuildingMaterial.kt

@@ -0,0 +1,133 @@
+package de.westnordost.streetcomplete.quests.building_material
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.view.image_select.DisplayItem
+import de.westnordost.streetcomplete.view.image_select.Item
+
+enum class BuildingMaterial(
+    val osmValue: String,
+    @DrawableRes val imageResId: Int,
+    @StringRes val titleResId: Int,
+) {
+    CEMENT_BLOCK(
+        osmValue = "cement_block",
+        imageResId = R.drawable.building_material_cement_block,
+        titleResId = R.string.quest_building_material_value_cement_block
+    ),
+    BRICK(
+        osmValue = "brick",
+        imageResId = R.drawable.building_material_brick,
+        titleResId = R.string.quest_building_material_value_brick
+    ),
+    PLASTER(
+        osmValue = "plaster",
+        imageResId = R.drawable.building_material_plaster,
+        titleResId = R.string.quest_building_material_value_plaster
+    ),
+    WOOD(
+        osmValue = "wood",
+        imageResId = R.drawable.building_material_wood,
+        titleResId = R.string.quest_building_material_value_wood
+    ),
+    CONCRETE(
+        osmValue = "concrete",
+        imageResId = R.drawable.building_material_concrete,
+        titleResId = R.string.quest_building_material_value_concrete
+    ),
+    METAL(
+        osmValue = "metal",
+        imageResId = R.drawable.building_material_metal,
+        titleResId = R.string.quest_building_material_value_metal
+    ),
+    STONE(
+        osmValue = "stone",
+        imageResId = R.drawable.building_material_stone,
+        titleResId = R.string.quest_building_material_value_stone
+    ),
+    GLASS(
+        osmValue = "glass",
+        imageResId = R.drawable.building_material_glass,
+        titleResId = R.string.quest_building_material_value_glass
+    ),
+    MIRROR(
+        osmValue = "mirror",
+        imageResId = R.drawable.building_material_mirror,
+        titleResId = R.string.quest_building_material_value_mirror
+    ),
+    MUD(
+        osmValue = "mud",
+        imageResId = R.drawable.building_material_mud,
+        titleResId = R.string.quest_building_material_value_mud
+    ),
+    PLASTIC(
+        osmValue = "plastic",
+        imageResId = R.drawable.building_material_plastic,
+        titleResId = R.string.quest_building_material_value_plastic
+    ),
+    TIMBER_FRAMING(
+        osmValue = "timber_framing",
+        imageResId = R.drawable.building_material_timber_framing,
+        titleResId = R.string.quest_building_material_value_timber_framing
+    ),
+    SANDSTONE(
+        osmValue = "sandstone",
+        imageResId = R.drawable.building_material_sandstone,
+        titleResId = R.string.quest_building_material_value_sandstone
+    ),
+    CLAY(
+        osmValue = "clay",
+        imageResId = R.drawable.building_material_clay,
+        titleResId = R.string.quest_building_material_value_clay
+    ),
+    REED(
+        osmValue = "reed",
+        imageResId = R.drawable.building_material_reed,
+        titleResId = R.string.quest_building_material_value_reed
+    ),
+    LOAM(
+        osmValue = "loam",
+        imageResId = R.drawable.building_material_loam,
+        titleResId = R.string.quest_building_material_value_loam
+    ),
+    MARBLE(
+        osmValue = "marble",
+        imageResId = R.drawable.building_material_marble,
+        titleResId = R.string.quest_building_material_value_marble
+    ),
+    SLATE(
+        osmValue = "slate",
+        imageResId = R.drawable.building_material_slate,
+        titleResId = R.string.quest_building_material_value_slate
+    ),
+    VINYL(
+        osmValue = "vinyl",
+        imageResId = R.drawable.building_material_vinyl,
+        titleResId = R.string.quest_building_material_value_vinyl
+    ),
+    LIMESTONE(
+        osmValue = "limestone",
+        imageResId = R.drawable.building_material_limestone,
+        titleResId = R.string.quest_building_material_value_limestone
+    ),
+    TILES(
+        osmValue = "tiles",
+        imageResId = R.drawable.building_material_tiles,
+        titleResId = R.string.quest_building_material_value_tiles
+    ),
+    BAMBOO(
+        osmValue = "bamboo",
+        imageResId = R.drawable.building_material_bamboo,
+        titleResId = R.string.quest_building_material_value_bamboo
+    ),
+    ADOBE(
+        osmValue = "adobe",
+        imageResId = R.drawable.building_material_adobe,
+        titleResId = R.string.quest_building_material_value_adobe
+    )
+}
+
+fun Collection<BuildingMaterial>.toItems() = map { it.asItem() }
+
+fun BuildingMaterial.asItem(): DisplayItem<BuildingMaterial> = Item(this, imageResId, titleResId)

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

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="34"
+    android:viewportHeight="34">
+    <path
+        android:fillColor="#c8c4b7"
+        android:pathData="M32.64 23.28c-3.51 8.67-13.38 12.85-22.05 9.35-8.67-3.51-12.85-13.38-9.35-22.05C4.75 1.91 14.62-2.27 23.29 1.23c8.67 3.51 12.85 13.38 9.35 22.05" />
+    <path
+        android:pathData="M6.34 16.93L16.92 6.35 27.5 16.93"
+        android:strokeWidth="3"
+        android:strokeAlpha="0.2"
+        android:strokeColor="#000"
+        android:strokeLineCap="square" />
+    <path
+        android:pathData="M6.34 15.94L16.92 5.36 27.5 15.94"
+        android:strokeWidth="3"
+        android:strokeColor="#c84747"
+        android:strokeLineCap="square" />
+    <path
+        android:fillColor="#B6EF28"
+        android:pathData="M16.92 8.46l-8.47 8.47v14.65c0.68 0.39 1.39 0.74 2.14 1.05 2.08 0.84 4.22 1.23 6.33 1.24h0.34c2.87-0.06 5.67-0.85 8.12-2.26V16.94z" />
+</vector>

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

@@ -735,4 +735,31 @@ Out of the box SCEE is configured to behave very similar to StreetComplete.</str
     <string name="outside_downloaded_area_warning">This position is outside the downloaded area. Continue?</string>
     <!-- actually there are still SC translations available, as only the main string has been removed from SC. -->
     <string name="close">Close</string>
+
+    <!-- building material -->
+    <string name="quest_buildingMaterial_title">"What is the overall surface material of building walls here?"</string>
+    <string name="quest_buildingPartMaterial_title">"What overall material is this building part made of?"</string>
+    <string name="quest_building_material_value_cement_block">Cement block</string>
+    <string name="quest_building_material_value_brick">Brick</string>
+    <string name="quest_building_material_value_plaster">Plaster</string>
+    <string name="quest_building_material_value_wood">Wood</string>
+    <string name="quest_building_material_value_concrete">Concrete</string>
+    <string name="quest_building_material_value_metal">Metal</string>
+    <string name="quest_building_material_value_stone">Stone</string>
+    <string name="quest_building_material_value_glass">Glass</string>
+    <string name="quest_building_material_value_mirror">Mirror</string>
+    <string name="quest_building_material_value_mud">Mud</string>
+    <string name="quest_building_material_value_plastic">Plastic</string>
+    <string name="quest_building_material_value_timber_framing">Timber Framing</string>
+    <string name="quest_building_material_value_sandstone">Sandstone</string>
+    <string name="quest_building_material_value_clay">Clay</string>
+    <string name="quest_building_material_value_reed">Reed</string>
+    <string name="quest_building_material_value_loam">Loam</string>
+    <string name="quest_building_material_value_marble">Marble</string>
+    <string name="quest_building_material_value_slate">Slate</string>
+    <string name="quest_building_material_value_vinyl">Vinyl</string>
+    <string name="quest_building_material_value_limestone">Limestone</string>
+    <string name="quest_building_material_value_tiles">Tiles</string>
+    <string name="quest_building_material_value_bamboo">Bamboo</string>
+    <string name="quest_building_material_value_adobe">Adobe</string>
 </resources>