Skip to content
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

Show pillar hydrant images in hydrant position quest #3695

Merged
merged 6 commits into from
Feb 1, 2022
Merged

Show pillar hydrant images in hydrant position quest #3695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f40ab55
Fix image attribution
FloEdelmann Jan 30, 2022
6dee9b0
Rename existing images to include "underground"
FloEdelmann Jan 29, 2022
732f1d4
Resize existing images to standard size
FloEdelmann Jan 30, 2022
9a1dc8e
Add fire hydrant position pillar images
FloEdelmann Jan 30, 2022
24ee62d
Show fire hydrant position pillar images where type is known
FloEdelmann Jan 30, 2022
d6af56f
Fix image attribution
FloEdelmann Jan 30, 2022
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
22 changes: 16 additions & 6 deletions .../de/westnordost/streetcomplete/quests/fire_hydrant_position/AddFireHydrantPositionForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,22 @@ import de.westnordost.streetcomplete.view.image_select.Item

class AddFireHydrantPositionForm : AImageListQuestAnswerFragment<FireHydrantPosition, FireHydrantPosition>() {

override val items = listOf(
Item(GREEN, R.drawable.fire_hydrant_position_green, R.string.quest_fireHydrant_position_green),
Item(LANE, R.drawable.fire_hydrant_position_lane, R.string.quest_fireHydrant_position_lane),
Item(SIDEWALK, R.drawable.fire_hydrant_position_sidewalk, R.string.quest_fireHydrant_position_sidewalk),
Item(PARKING_LOT, R.drawable.fire_hydrant_position_parking, R.string.quest_fireHydrant_position_parking_lot)
)
override val items
get() = if (osmElement?.tags?.get("fire_hydrant:type") == "pillar") {
listOf(
Item(GREEN, R.drawable.fire_hydrant_position_pillar_green, R.string.quest_fireHydrant_position_green),
Item(LANE, R.drawable.fire_hydrant_position_pillar_lane, R.string.quest_fireHydrant_position_lane),
Item(SIDEWALK, R.drawable.fire_hydrant_position_pillar_sidewalk, R.string.quest_fireHydrant_position_sidewalk),
Item(PARKING_LOT, R.drawable.fire_hydrant_position_pillar_parking, R.string.quest_fireHydrant_position_parking_lot)
)
} else {
listOf(
Item(GREEN, R.drawable.fire_hydrant_position_underground_green, R.string.quest_fireHydrant_position_green),
Item(LANE, R.drawable.fire_hydrant_position_underground_lane, R.string.quest_fireHydrant_position_lane),
Item(SIDEWALK, R.drawable.fire_hydrant_position_underground_sidewalk, R.string.quest_fireHydrant_position_sidewalk),
Item(PARKING_LOT, R.drawable.fire_hydrant_position_underground_parking, R.string.quest_fireHydrant_position_parking_lot)
)
}

override val itemsPerRow = 2

Expand Down
13 changes: 9 additions & 4 deletions app/src/main/res/authors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,15 @@ fire_hydrant_pond.jpg CC-BY-SA 3.0 KeepOnTruckin https://commons.w
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

fire_hydrant_position_green... CC-BY-SA 4.0 https://upload.wikimedia.org/wikipedia/commons/2/2d/Fire_hydrant_in_grass.jpg
fire_hydrant_position_lane... CC-BY-SA 4.0 https://upload.wikimedia.org/wikipedia/commons/3/32/Fire_hydrant_on_sidewalk.jpg
fire_hydrant_position_sidew... CC-BY-SA 4.0 modified from https://upload.wikimedia.org/wikipedia/commons/d/d0/Fire_hydrant_on_road_side.jpg
fire_hydrant_position_parki... CC-BY 2.0 modified from https://upload.wikimedia.org/wikipedia/commons/3/33/Fire-fighting-facility_node-4279866277.jpg
fire_hydrant_position_undergr… CC-BY-SA 4.0 Thefeiter https://commons.wikimedia.org/wiki/File:Fire_hydrant_in_grass.jpg
fire_hydrant_position_undergr… CC-BY-SA 4.0 modified from Thefeiter https://commons.wikimedia.org/wiki/File:Fire_hydrant_on_road_side.jpg
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modification are limited to cropping, right? Maybe drop "modified from" or modify to "cropped from"/"trivially modified" to avoid another problem of "author of modification is not attributed on file which license requires attribution"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the new pillar hydrant images, I cropped and a tweaked brightness/contrast a bit. That seems to be the case for the underground hydrant images, as well.

In this file and res/graphics/authors.txt, modification is never described more precisely. Do we need this at all? Note that modification inside this repo is retraceable via the git history.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://commons.wikimedia.org/wiki/File:Fire_hydrant_in_grass.jpg#Licensing - human readable summary has

You must give appropriate credit, provide a link to the license, and indicate if changes were made

so just indicating changes is enough

but there is also

share alike – If you remix, transform, or build upon the material, you must distribute your contributions under the same or compatible license as the original.
attribution – You must give appropriate credit

so I think it would be useful to either make clear that changes were trivial, below https://commons.wikimedia.org/wiki/Commons:Threshold_of_originality or mention who did them to satisfy attribution requirement

(warning: I am not a lawyer)

modification is never described more precisely. Do we need this at all?

I may be wrong that it is needed, it may be also true that modifications need to be mentioned also elsewhere

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like kerfuffle over this particular image could be avoided by s/modified/cropped/, which would take less effort than discussing it at all here :P

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#3695 (comment)

Copy link
Member

@matkoniecz matkoniecz Feb 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FloEdelmann If you think that I am panicking and nitpicking and worrying about thing not relevant at all: feel free to merge it and I will do something with it later after merge.

I am considering likely that I am doing exactly that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since all the other ones also lack more precise descriptions, and this PR can be retraced via the git history, I think it's fine to merge now.

Copy link
Member

@matkoniecz matkoniecz Feb 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears to be not needed for CC in version earlier than 4.0.

You must also indicate if you have modified the work—for example, if you have taken an excerpt, or cropped a photo. (For versions prior to 4.0, this is only required if you have created an adaptation by contributing your own creative material, but it is recommended even when not required.)

https://creativecommons.org/faq/#how-do-i-properly-attribute-material-offered-under-a-creative-commons-license

Still, from looking at https://github.com/FloEdelmann/StreetComplete/blob/master/app/src/main/res/authors.txt it seems that some files will be affected even if earlier than 4.0 are excluded...

fire_hydrant_position_undergr… CC-BY 2.0 modified from centauri https://commons.wikimedia.org/wiki/File:Fire-fighting-facility_node-4279866277.jpg
fire_hydrant_position_undergr… CC-BY-SA 4.0 Thefeiter https://commons.wikimedia.org/wiki/File:Fire_hydrant_on_sidewalk.jpg

fire_hydrant_position_pillar_… CC-BY 4.0 modified from FwKfg https://commons.wikimedia.org/wiki/File:Fire-fighting-facility_node-6472528792.jpg
fire_hydrant_position_pillar_… CC-BY 4.0 modified from Corripiano https://commons.wikimedia.org/wiki/File:Fire-fighting-facility_node-6464454770.jpg
fire_hydrant_position_pillar_… CC-BY 4.0 modified from Matija Nalis https://github.com/streetcomplete/StreetComplete/issues/3686#issuecomment-1024936939
fire_hydrant_position_pillar_… CC-BY 4.0 modified from Stefan Patscheider https://commons.wikimedia.org/wiki/File:Fire-fighting-facility_node-7190010477.jpg

ic_link_cyclosm.xml CC-BY-SA Lucas Verney
ic_trophy.xml SIL OFL 1.1 Doug C. Hardester (https://materialdesignicons.com/icon/trophy-variant)
Expand Down
Binary file removed app/src/main/res/drawable-hdpi/fire_hydrant_position_green.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/fire_hydrant_position_lane.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/fire_hydrant_position_parking.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_pillar_green.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_pillar_lane.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_pillar_parking.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_pillar_sidewalk.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-hdpi/fire_hydrant_position_sidewalk.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_underground_green.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_underground_lane.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_underground_parking.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/fire_hydrant_position_underground_sidewalk.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-mdpi/fire_hydrant_position_green.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/fire_hydrant_position_lane.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/fire_hydrant_position_parking.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_pillar_green.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_pillar_lane.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_pillar_parking.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_pillar_sidewalk.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-mdpi/fire_hydrant_position_sidewalk.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_underground_green.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_underground_lane.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_underground_parking.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/fire_hydrant_position_underground_sidewalk.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-xhdpi/fire_hydrant_position_green.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-xhdpi/fire_hydrant_position_lane.jpg
View file
Open in desktop
Diff not rendered.
Binary file removed app/src/main/res/drawable-xhdpi/fire_hydrant_position_parking.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_pillar_green.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_pillar_lane.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_pillar_parking.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_pillar_sidewalk.jpg
View file
Open in desktop
Binary file removed app/src/main/res/drawable-xhdpi/fire_hydrant_position_sidewalk.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_underground_green.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_underground_lane.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_underground_parking.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xhdpi/fire_hydrant_position_underground_sidewalk.jpg
View file
Open in desktop
Binary file removed app/src/main/res/drawable-xxhdpi/fire_hydrant_position_green.jpg
View file
Open in desktop
Diff not rendered.
Binary file removed app/src/main/res/drawable-xxhdpi/fire_hydrant_position_lane.jpg
View file
Open in desktop
Diff not rendered.
Binary file removed app/src/main/res/drawable-xxhdpi/fire_hydrant_position_parking.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_pillar_green.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_pillar_lane.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_pillar_parking.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_pillar_sidewalk.jpg
View file
Open in desktop
Binary file removed app/src/main/res/drawable-xxhdpi/fire_hydrant_position_sidewalk.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_underground_green.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_underground_lane.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_underground_parking.jpg
View file
Open in desktop
Binary file added app/src/main/res/drawable-xxhdpi/fire_hydrant_position_underground_sidewalk.jpg
View file
Open in desktop