Skip to content

Add "no toilets" to AddBabyChangingTable Quest #6837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulklie wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −5
Open

Add "no toilets" to AddBabyChangingTable Quest #6837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...n/kotlin/de/westnordost/streetcomplete/quests/baby_changing_table/AddBabyChangingTable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType
import de.westnordost.streetcomplete.data.quest.AndroidQuest
import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN
import de.westnordost.streetcomplete.osm.Tags
import de.westnordost.streetcomplete.quests.YesNoQuestForm
import de.westnordost.streetcomplete.resources.*
import de.westnordost.streetcomplete.util.ktx.toYesNo

class AddBabyChangingTable : OsmFilterQuestType<Boolean>(), AndroidQuest {
class AddBabyChangingTable : OsmFilterQuestType<Boolean?>(), AndroidQuest {

override val elementFilter = """
nodes, ways with
Expand All @@ -33,9 +32,12 @@ class AddBabyChangingTable : OsmFilterQuestType<Boolean>(), AndroidQuest {
override val achievements = listOf(CITIZEN)
override val defaultDisabledMessage = Res.string.default_disabled_msg_go_inside

override fun createForm() = YesNoQuestForm()
override fun createForm() = AddBabyChangingTableForm()

override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {
tags["changing_table"] = answer.toYesNo()
override fun applyAnswerTo(answer: Boolean?, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {
if(answer == null)
tags["toilets"] = "no"
else
tags["changing_table"] = answer.toYesNo()
}
}
17 changes: 17 additions & 0 deletions ...tlin/de/westnordost/streetcomplete/quests/baby_changing_table/AddBabyChangingTableForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package de.westnordost.streetcomplete.quests.baby_changing_table

import de.westnordost.streetcomplete.R
import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
import de.westnordost.streetcomplete.quests.AnswerItem

class AddBabyChangingTableForm : AbstractOsmQuestForm<Boolean?>() {

override val buttonPanelAnswers = listOf(
AnswerItem(R.string.quest_generic_hasFeature_no) { applyAnswer(false) },
AnswerItem(R.string.quest_generic_hasFeature_yes) { applyAnswer(true) }
)

override val otherAnswers get() = listOf(
AnswerItem(R.string.quest_wheelchairAccessPat_noToilet) { applyAnswer(null) }
)
}