diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt index 5bd338f8e4..9a2d3c8e68 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt @@ -34,6 +34,11 @@ class AddCrossing : OsmElementQuestType { 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) = R.string.quest_crossing_title2 override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) = @@ -70,7 +75,7 @@ class AddCrossing : OsmElementQuestType { 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" } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossingForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossingForm.kt index 764cec6e2b..bd5f50e68a 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossingForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossingForm.kt @@ -13,10 +13,9 @@ class AddCrossingForm : AListQuestForm() { 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 @@ -26,8 +25,8 @@ class AddCrossingForm : AListQuestForm() { 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()) { diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/CrossingAnswer.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/CrossingAnswer.kt index 124ab5b701..68f14baca1 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/CrossingAnswer.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/CrossingAnswer.kt @@ -2,6 +2,6 @@ package de.westnordost.streetcomplete.quests.crossing enum class CrossingAnswer { YES, - NO, + INFORMAL, PROHIBITED } diff --git a/app/src/main/res/authors.txt b/app/src/main/res/authors.txt index fed63426e4..588aad62ee 100644 --- a/app/src/main/res/authors.txt +++ b/app/src/main/res/authors.txt @@ -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 diff --git a/app/src/main/res/drawable-hdpi/informal_crossing.jpg b/app/src/main/res/drawable-hdpi/informal_crossing.jpg new file mode 100644 index 0000000000..962a656f9a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/informal_crossing.jpg differ diff --git a/app/src/main/res/drawable-mdpi/informal_crossing.jpg b/app/src/main/res/drawable-mdpi/informal_crossing.jpg new file mode 100644 index 0000000000..79f0e0aa4f Binary files /dev/null and b/app/src/main/res/drawable-mdpi/informal_crossing.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/informal_crossing.jpg b/app/src/main/res/drawable-xhdpi/informal_crossing.jpg new file mode 100644 index 0000000000..099a90bb7b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/informal_crossing.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/informal_crossing.jpg b/app/src/main/res/drawable-xxhdpi/informal_crossing.jpg new file mode 100644 index 0000000000..97ab465c32 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/informal_crossing.jpg differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4441843bca..24bc697043 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -998,9 +998,10 @@ A level counts as a roof level when its windows are in the roof. Subsequently, r What’s the height of the curbs at this crossing? Is there a crossing here? - Yes (e.g. the curb is lowered here or there are markings) - No, but crossing is possible + Yes, intended as crossing + Not intended as crossing, still possible to cross (e.g. informal trails) No, crossing is prohibited or impossible + Informal crossings usually look like this: "Is there a bicycle lane or path here? What type?" "Is this still the cycling situation here?"