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.

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

merged 6 commits into from
Feb 1, 2022

Conversation

FloEdelmann
Copy link
Member

Fixes #3686.

Screenshot

app/src/main/res/authors.txt Outdated Show resolved Hide resolved
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.

Copy link
Member

@matkoniecz matkoniecz Feb 1, 2022

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

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...

@FloEdelmann FloEdelmann merged commit ed77714 into streetcomplete:master Feb 1, 2022
@FloEdelmann FloEdelmann deleted the hydrant-pillar-position branch February 1, 2022 19:29
@westnordost
Copy link
Member

westnordost commented Feb 1, 2022

Resize existing images to standard size

This commit was wrong. The size as it was was the correct one for being displayed in two columns.

Surfaces are displayed in 3 columns. Those pictures are 128*128. 128*3 = 384.
Hydrants are displayed in 2 columns. 384/2 = 192

@westnordost
Copy link
Member

This is how the quest should look

image

@westnordost
Copy link
Member

It's about the width, not the theight though. So it would be possible to have them at 192*128 for example

@FloEdelmann
Copy link
Member Author

Ahh, I'm sorry. I'll open another PR to fix that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show pillar hydrant images in hydrant position quest
4 participants