Extend General fee with Sanitary Dump Stations (#5332)

* Add General fee for amenity=sanitary_dump_station * Update app/src/main/java/de/westnordost/streetcomplete/quests/general_fee/AddGeneralFee.kt Co-authored-by: Flo Edelmann <[email protected]> * Update AddGeneralFee with a new title * Update strings.xml with a second title * Update missing brackets Co-authored-by: Tobias Zwick <[email protected]> --------- Co-authored-by: Flo Edelmann <[email protected]> Co-authored-by: Tobias Zwick <[email protected]>
streetcomplete · Nov 26, 2023 · 8b57805 · 8b57805
1 parent 9da0fc7
commit 8b57805
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/general_fee/AddGeneralFee.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/general_fee/AddGeneralFee.kt
@@ -12,7 +12,11 @@ class AddGeneralFee : OsmFilterQuestType<Boolean>() {
 
     override val elementFilter = """
         nodes, ways with
-         (tourism = museum or leisure = beach_resort or tourism = gallery or tourism = caravan_site)
+         (
+           tourism ~ museum|gallery|caravan_site
+           or leisure = beach_resort
+           or amenity = sanitary_dump_station
+         )
          and access !~ private|no
          and !fee
     """
@@ -21,7 +25,11 @@ class AddGeneralFee : OsmFilterQuestType<Boolean>() {
     override val icon = R.drawable.ic_quest_fee
     override val achievements = listOf(CITIZEN)
 
-    override fun getTitle(tags: Map<String, String>) = R.string.quest_generalFee_title2
+    override fun getTitle(tags: Map<String, String>) =
+     if (tags["amenity"] == "sanitary_dump_station")
+         R.string.quest_generalFee_title
+     else
+         R.string.quest_generalFee_title2
 
     override fun createForm() = YesNoQuestForm()
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1038,6 +1038,7 @@ Before uploading your changes, the app checks with a &lt;a href=\"https://www.we
     <!-- "Self-service" refers to a situation where patrons can pump gas for themselves -->
     <string name="quest_fuelSelfService_title">Does this gas station allow self-service?</string>
 
+    <string name="quest_generalFee_title">Do you need to pay to use this?</string>
     <string name="quest_generalFee_title2">Do you need to pay to enter here?</string>
     <string name="quest_genericRef_title">What’s the identification number here?</string>