Skip to content

Commit

Permalink
Clarify wording of the crossing quest (#5936)
Browse files Browse the repository at this point in the history
* Clarify wording of the crossing quest

I was confused by the wording of the answer "No, but crossing is
possible" to the question "Is there a crossing here?". I needed to check
in the source code of StreetComplete what the answer is saying.

I propose to change the wording. My proposed wording mentions informal
trails and adds a picture of such an informal trail, which would have
helped me.

* scale images correctly

* undo changes in translation strings.xml

* fix images looking weird because of '-colorspace RGB'

* apply suggested wordings

* also bump string name in kotlin code

* revert bumping string
  • Loading branch information
schra authored Oct 3, 2024
1 parent d658eda commit 846070c
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ class AddCrossing : OsmElementQuestType<CrossingAnswer> {
override val icon = R.drawable.ic_quest_pedestrian
override val achievements = listOf(PEDESTRIAN)

override val hint = R.string.quest_crossing_hint
override val hintImages = listOf(
R.drawable.informal_crossing,
)

override fun getTitle(tags: Map<String, String>) = R.string.quest_crossing_title2

override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
Expand Down Expand Up @@ -70,7 +75,7 @@ class AddCrossing : OsmElementQuestType<CrossingAnswer> {
override fun applyAnswerTo(answer: CrossingAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {
when (answer) {
YES -> tags["highway"] = "crossing"
NO -> tags["crossing"] = "informal"
INFORMAL -> tags["crossing"] = "informal"
PROHIBITED -> tags["crossing"] = "no"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ class AddCrossingForm : AListQuestForm<CrossingAnswer>() {

override val items = listOf(
TextItem(YES, R.string.quest_crossing_yes),
TextItem(NO, R.string.quest_crossing_no),
TextItem(INFORMAL, R.string.quest_crossing_no),
TextItem(PROHIBITED, R.string.quest_crossing_prohibited),
)

/*
PROHIBITED is not possible for sidewalks or crossings (=separately mapped sidewalk
infrastructure) because if the crossing does not exist, it would require to also
Expand All @@ -26,8 +25,8 @@ class AddCrossingForm : AListQuestForm<CrossingAnswer>() {
See https://github.com/streetcomplete/StreetComplete/pull/2999#discussion_r681516203
and https://github.com/streetcomplete/StreetComplete/issues/5160
NO on the other hand would be okay because crossing=informal would not require deleting
the crossing ways (I would say... it is in edge case...)
INFORMAL on the other hand would be okay because crossing=informal would not require
deleting the crossing ways (I would say... it is in edge case...)
*/
override fun onClickOk() {
if (checkedItem?.value == PROHIBITED && isOnSidewalkOrCrossing()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ package de.westnordost.streetcomplete.quests.crossing

enum class CrossingAnswer {
YES,
NO,
INFORMAL,
PROHIBITED
}
2 changes: 2 additions & 0 deletions app/src/main/res/authors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -319,3 +319,5 @@ tourism_information_termina... CC-BY 4.0 https://wiki.openstreetmap.org/
vibrating_button_illustrati... CC-BY 4.0 Tobias Zwick
vibrating_button_i... (MCC234) CC0 CJ Malone
vibrating_button_i... (MCC505) CC0 https://commons.wikimedia.org/wiki/File:An_Australian_pedestrian_crossing_button.jpg (James Cridland)

informal_crossing.jpg CC-SA 2.0 https://wiki.openstreetmap.org/wiki/File:West_Highland_Way_crossing_road_-_geograph.org.uk_-_3986498_(cropped).jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -998,9 +998,10 @@ A level counts as a roof level when its windows are in the roof. Subsequently, r
<string name="quest_crossing_kerb_height_title">What’s the height of the curbs at this crossing?</string>

<string name="quest_crossing_title2">Is there a crossing here?</string>
<string name="quest_crossing_yes">Yes (e.g. the curb is lowered here or there are markings)</string>
<string name="quest_crossing_no">No, but crossing is possible</string>
<string name="quest_crossing_yes">Yes, intended as crossing</string>
<string name="quest_crossing_no">Not intended as crossing, still possible to cross (e.g. informal trails)</string>
<string name="quest_crossing_prohibited">No, crossing is prohibited or impossible</string>
<string name="quest_crossing_hint">Informal crossings usually look like this:</string>

<string name="quest_cycleway_title2">"Is there a bicycle lane or path here? What type?"</string>
<string name="quest_cycleway_resurvey_title">"Is this still the cycling situation here?"</string>
Expand Down

0 comments on commit 846070c

Please sign in to comment.