[styles] attraction=animal as a standalone tag #7716

map-per · 2024-03-28T15:07:31Z

attraction=* (https://wiki.openstreetmap.org/wiki/Key:attraction) is not a sub key of tourism=attraction (https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dattraction) .
Therefore the style was modified to render attraction=animal without tourism=attraction.

before	now

before	now

(also removed the priority values for tourism-attraction-specified, as there is no style specified)

RedAuburn · 2024-03-28T15:19:30Z

Nice 👍️ maybe it would be better if we remove the circle from the icon, and use the brown for the giraffe?

map-per · 2024-03-28T18:39:24Z

Nice 👍️ maybe it would be better if we remove the circle from the icon, and use the brown for the giraffe?

Good idea, did it

biodranik

Thanks! Maybe some day we can make separate icons for each animal )

@pastk PTAL

pastk

Please amend types_strings.txt accordingly and regenerate strings.

Also you may want to add attraction-animal into editor.config :)

data/mapcss-mapping.csv

data/styles/clear/include/Icons.mapcss

map-per · 2024-03-29T20:22:53Z

Thanks for the review! I should have checked the list in STYLES.md to not forget that much.
Fixed all problems.

data/mapcss-mapping.csv

data/strings/types_strings.txt

map-per · 2024-03-30T19:04:39Z

Updated the PR

data/mapcss-mapping.csv

pastk

LGTM
Many thanks!

pastk · 2024-03-31T19:46:38Z

Let's merge after release!

android/app/src/main/res/values-es-rMX/strings.xml

android/app/src/main/res/values-ca/strings.xml

android/app/src/main/res/values-pt-rBR/strings.xml

data/categories.txt

jimcarst

nl OK

NeatNit · 2024-04-01T13:37:38Z

he okay too.

rtsisyk · 2024-04-04T06:13:07Z

@pastk @vng merging?

map-per · 2024-04-04T07:31:12Z

Thanks for the reviews, I updated the strings.

I explicitly defined es-MX and pt-rBR as, for some reason, the ios strings used the tourism.attraction string when I left them out.

From my side this is ready to be merge now.

data/strings/types_strings.txt

iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings

pastk · 2024-04-04T10:14:24Z

I explicitly defined es-MX and pt-rBR as, for some reason, the ios strings used the tourism.attraction string when I left them out.

Its likely an issue with your twine version, please see my comments above.

Signed-off-by: map-per <map-per@gmx.de>

map-per · 2024-04-04T14:59:53Z

Thanks, I followed the steps, but that did not help. I now cleaned up the wrong translation files by hand.

data/categories.txt

matheusgomesms

This r-BR is wrong, and is duplicate of pt, so no need to add it.

map-per · 2024-04-04T15:41:12Z

Thanks, I overlooked the lines in categories.txt

data/strings/types_strings.txt

pastk · 2024-04-04T15:45:01Z

Thanks, I followed the steps, but that did not help. I now cleaned up the wrong translation files by hand.

It has helped actually!
Now there are no unrelated strings changes in iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings

Signed-off-by: map-per <map-per@gmx.de>

map-per · 2024-04-04T16:08:23Z

The unrelated strings changes in iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings are still there, I just removed them by hand.

pastk

LGTM
Thanks for your patience!

pastk · 2024-04-04T16:20:40Z

The unrelated strings changes in iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings are still there, I just removed them by hand.

Its ok for now, but better to solve it properly as those sudden changes amongst many localization files are easy to miss in a review..

@RedAuburn how did you fix it on your system?

map-per · 2024-04-04T16:39:06Z

Thanks for your patience!

Thanks for your help!

RedAuburn · 2024-04-04T16:40:16Z

@RedAuburn how did you fix it on your system?

i... didn't yet 😅 i tried to find a fix but couldn't, so i just manually remove the replaced es-MX strings

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

map-per requested a review from a team as a code owner March 28, 2024 15:07

map-per added Icons Map and app icons Styles Map drawing styles labels Mar 28, 2024

map-per force-pushed the attraction branch from 69df208 to 87b6535 Compare March 28, 2024 18:38

biodranik approved these changes Mar 28, 2024

View reviewed changes

vng approved these changes Mar 29, 2024

View reviewed changes

pastk requested changes Mar 29, 2024

View reviewed changes

data/mapcss-mapping.csv Outdated Show resolved Hide resolved

data/styles/clear/include/Icons.mapcss Outdated Show resolved Hide resolved

map-per force-pushed the attraction branch from 87b6535 to 868663a Compare March 29, 2024 20:18

pastk reviewed Mar 30, 2024

View reviewed changes

data/mapcss-mapping.csv Outdated Show resolved Hide resolved

data/strings/types_strings.txt Outdated Show resolved Hide resolved

map-per force-pushed the attraction branch from 868663a to 303c566 Compare March 30, 2024 19:02

pastk reviewed Mar 30, 2024

View reviewed changes

data/mapcss-mapping.csv Outdated Show resolved Hide resolved

map-per force-pushed the attraction branch 2 times, most recently from acbe8ab to 96d8641 Compare March 31, 2024 19:22

pastk approved these changes Mar 31, 2024

View reviewed changes

fitojb reviewed Mar 31, 2024

View reviewed changes

android/app/src/main/res/values-es-rMX/strings.xml Outdated Show resolved Hide resolved

fitojb reviewed Mar 31, 2024

View reviewed changes

android/app/src/main/res/values-ca/strings.xml Outdated Show resolved Hide resolved

fitojb reviewed Mar 31, 2024

View reviewed changes

android/app/src/main/res/values-pt-rBR/strings.xml Outdated Show resolved Hide resolved

map-per requested a review from a team April 1, 2024 08:45

vgrigoriu reviewed Apr 1, 2024

View reviewed changes

data/categories.txt Outdated Show resolved Hide resolved

jimcarst approved these changes Apr 1, 2024

View reviewed changes

map-per force-pushed the attraction branch from 96d8641 to f35ba88 Compare April 4, 2024 07:27

pastk requested changes Apr 4, 2024

View reviewed changes

data/strings/types_strings.txt Outdated Show resolved Hide resolved

data/strings/types_strings.txt Outdated Show resolved Hide resolved

iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings Outdated Show resolved Hide resolved

map-per added 4 commits April 4, 2024 16:33

[styles] attraction=animal as a standalone tag

95e4aab

Signed-off-by: map-per <map-per@gmx.de>

[tests] Adjusted unit test

f654691

Signed-off-by: map-per <map-per@gmx.de>

[styles] Regenerated

5cb9fe5

Signed-off-by: map-per <map-per@gmx.de>

[strings] Regenerated

f54c065

Signed-off-by: map-per <map-per@gmx.de>

map-per force-pushed the attraction branch from f35ba88 to f54c065 Compare April 4, 2024 14:53

matheusgomesms reviewed Apr 4, 2024

View reviewed changes

data/categories.txt Outdated Show resolved Hide resolved

matheusgomesms reviewed Apr 4, 2024

View reviewed changes

matheusgomesms approved these changes Apr 4, 2024

View reviewed changes

pastk reviewed Apr 4, 2024

View reviewed changes

data/strings/types_strings.txt Outdated Show resolved Hide resolved

Include review suggestions

c87667d

Signed-off-by: map-per <map-per@gmx.de>

map-per force-pushed the attraction branch from d6983c8 to c87667d Compare April 4, 2024 16:06

pastk approved these changes Apr 4, 2024

View reviewed changes

pastk merged commit ad405b6 into organicmaps:master Apr 4, 2024
15 of 16 checks passed

map-per deleted the attraction branch April 4, 2024 18:41

pastk added a commit that referenced this pull request Apr 9, 2024

[generator] Cleanup surrogate attraction=specified following #7716

6db1a48

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

vng pushed a commit that referenced this pull request Apr 10, 2024

[generator] Cleanup surrogate attraction=specified following #7716

4541194

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[styles] attraction=animal as a standalone tag #7716

[styles] attraction=animal as a standalone tag #7716

map-per commented Mar 28, 2024 •

edited

RedAuburn commented Mar 28, 2024

map-per commented Mar 28, 2024

biodranik left a comment

pastk left a comment

map-per commented Mar 29, 2024

map-per commented Mar 30, 2024

pastk left a comment

pastk commented Mar 31, 2024

jimcarst left a comment

NeatNit commented Apr 1, 2024

rtsisyk commented Apr 4, 2024

map-per commented Apr 4, 2024 •

edited

pastk commented Apr 4, 2024

map-per commented Apr 4, 2024

matheusgomesms left a comment

map-per commented Apr 4, 2024

pastk commented Apr 4, 2024

map-per commented Apr 4, 2024

pastk left a comment

pastk commented Apr 4, 2024

map-per commented Apr 4, 2024

RedAuburn commented Apr 4, 2024

[styles] attraction=animal as a standalone tag #7716

[styles] attraction=animal as a standalone tag #7716

Conversation

map-per commented Mar 28, 2024 • edited

RedAuburn commented Mar 28, 2024

map-per commented Mar 28, 2024

biodranik left a comment

Choose a reason for hiding this comment

pastk left a comment

Choose a reason for hiding this comment

map-per commented Mar 29, 2024

map-per commented Mar 30, 2024

pastk left a comment

Choose a reason for hiding this comment

pastk commented Mar 31, 2024

jimcarst left a comment

Choose a reason for hiding this comment

NeatNit commented Apr 1, 2024

rtsisyk commented Apr 4, 2024

map-per commented Apr 4, 2024 • edited

pastk commented Apr 4, 2024

map-per commented Apr 4, 2024

matheusgomesms left a comment

Choose a reason for hiding this comment

map-per commented Apr 4, 2024

pastk commented Apr 4, 2024

map-per commented Apr 4, 2024

pastk left a comment

Choose a reason for hiding this comment

pastk commented Apr 4, 2024

map-per commented Apr 4, 2024

RedAuburn commented Apr 4, 2024

map-per commented Mar 28, 2024 •

edited

map-per commented Apr 4, 2024 •

edited