fire hydrant type: replace "pond" with "pipe"

"pond" value has been deprecated. See #362
streetcomplete · Dec 26, 2022 · 57028c7 · 57028c7
1 parent fe90608
commit 57028c7
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/FireHydrantType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/FireHydrantType.kt
@@ -4,5 +4,5 @@ enum class FireHydrantType(val osmValue: String) {
     PILLAR("pillar"),
     UNDERGROUND("underground"),
     WALL("wall"),
-    POND("pond"),
+    PIPE("pipe"),
 }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/FireHydrantTypeItem.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/FireHydrantTypeItem.kt
@@ -2,7 +2,7 @@ package de.westnordost.streetcomplete.quests.fire_hydrant
 
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.quests.fire_hydrant.FireHydrantType.PILLAR
-import de.westnordost.streetcomplete.quests.fire_hydrant.FireHydrantType.POND
+import de.westnordost.streetcomplete.quests.fire_hydrant.FireHydrantType.PIPE
 import de.westnordost.streetcomplete.quests.fire_hydrant.FireHydrantType.UNDERGROUND
 import de.westnordost.streetcomplete.quests.fire_hydrant.FireHydrantType.WALL
 import de.westnordost.streetcomplete.view.image_select.Item
@@ -13,12 +13,12 @@ private val FireHydrantType.titleResId: Int get() = when (this) {
     PILLAR ->      R.string.quest_fireHydrant_type_pillar
     UNDERGROUND -> R.string.quest_fireHydrant_type_underground
     WALL ->        R.string.quest_fireHydrant_type_wall
-    POND ->        R.string.quest_fireHydrant_type_pond
+    PIPE ->        R.string.quest_fireHydrant_type_pipe
 }
 
 private val FireHydrantType.iconResId: Int get() = when (this) {
     PILLAR ->      R.drawable.fire_hydrant_pillar
     UNDERGROUND -> R.drawable.fire_hydrant_underground
     WALL ->        R.drawable.fire_hydrant_wall
-    POND ->        R.drawable.fire_hydrant_pond
+    PIPE ->        R.drawable.fire_hydrant_pipe
 }
diff --git a/app/src/main/res/authors.txt b/app/src/main/res/authors.txt
@@ -71,7 +71,7 @@ drinking_water_type_spring.jpg CC-BY-SA 4.0      crop of image by Dampftrain htt
 drinking_water_type_water_wel… CC-BY-SA 3.0      crop of image by Honza Groh (Jagro) https://commons.wikimedia.org/wiki/File:Zmiennica,_studna.jpg
 
 fire_hydrant_pillar.jpg        CC-BY-SA 3.0      Jwh https://commons.wikimedia.org/wiki/File:W%C3%ABntreng,_Hydrant.jpg
-fire_hydrant_pond.jpg          CC-BY-SA 3.0      KeepOnTruckin https://commons.wikimedia.org/wiki/File:Dry_hydrant.jpg
+fire_hydrant_pipe.jpg          CC-BY-SA 3.0      KeepOnTruckin https://commons.wikimedia.org/wiki/File:Dry_hydrant.jpg
 fire_hydrant_underground.jpg   CC-BY 3.0         Panek https://commons.wikimedia.org/wiki/File:Hydrant_MPWiK.jpg
 fire_hydrant_wall.jpg          CC-BY-SA 3.0      Ingo Fick https://commons.wikimedia.org/wiki/File:Guentherscheid_Tunnel_Rescue4.jpg
 

diff --git a/...n/res/drawable-hdpi/fire_hydrant_pond.jpg → ...n/res/drawable-hdpi/fire_hydrant_pipe.jpg b/...n/res/drawable-hdpi/fire_hydrant_pond.jpg → ...n/res/drawable-hdpi/fire_hydrant_pipe.jpg
diff --git a/...n/res/drawable-mdpi/fire_hydrant_pond.jpg → ...n/res/drawable-mdpi/fire_hydrant_pipe.jpg b/...n/res/drawable-mdpi/fire_hydrant_pond.jpg → ...n/res/drawable-mdpi/fire_hydrant_pipe.jpg
diff --git a/.../res/drawable-xhdpi/fire_hydrant_pond.jpg → .../res/drawable-xhdpi/fire_hydrant_pipe.jpg b/.../res/drawable-xhdpi/fire_hydrant_pond.jpg → .../res/drawable-xhdpi/fire_hydrant_pipe.jpg
diff --git a/...res/drawable-xxhdpi/fire_hydrant_pond.jpg → ...res/drawable-xxhdpi/fire_hydrant_pipe.jpg b/...res/drawable-xxhdpi/fire_hydrant_pond.jpg → ...res/drawable-xxhdpi/fire_hydrant_pipe.jpg
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1001,7 +1001,7 @@ Before uploading your changes, the app checks with a &lt;a href=\"https://www.we
     <string name="quest_fireHydrant_type_pillar">Pillar</string>
     <string name="quest_fireHydrant_type_underground">Underground</string>
     <string name="quest_fireHydrant_type_wall">Wall</string>
-    <string name="quest_fireHydrant_type_pond">Pond</string>
+    <string name="quest_fireHydrant_type_pipe">Pipe</string>
 
     <string name="quest_footwayPartSurface_title">What’s the surface of the footpath here?</string>
     <!-- "Self-service" refers to a situation where patrons can pump gas for themselves -->