[styles] Add sport beachvolleyball, chess, skateboard, table_tennis, volleyball, 9pin, 10pin, climbing #2960

RedAuburn · 2022-07-13T22:19:01Z

j13m126 commented

2022-07-13 22:19:01 +00:00

(Migrated from github.com)

icon sources:
volleyball&beachvolleyball
chess
skateboarding
table_tennis

![grafik](https://user-images.githubusercontent.com/7961926/178845601-4305e507-5af6-4f2d-a064-ade9072333ab.png) ![grafik](https://user-images.githubusercontent.com/7961926/178845503-c2f88cdc-ebe6-4d2c-8210-06a76ea473d1.png) icon sources: [volleyball&beachvolleyball](https://fonts.google.com/icons?icon.set=Material+Icons&icon.query=volleyball) [chess](https://fontawesome.com/icons/chess?s=solid) [skateboarding](https://fonts.google.com/icons?icon.set=Material+Icons&icon.query=skateboard) [table_tennis](https://fontawesome.com/icons/table-tennis-paddle-ball?s=solid)

❤️ 2

vng (Migrated from github.com) reviewed 2022-07-13 22:19:01 +00:00

biodranik commented

2022-07-14 05:29:05 +00:00

(Migrated from github.com)

Thank you for the pull request!

All icon sources are already listed in our licenses, right?
Icons should be readable on most backgrounds and also look good with the dark style. Current round ones were designed to look good in all cases. But we want to focus on the rule "round background means a business of some sort" and use lighter icons instead. That may require a white-line-with-dark-outline or dark-line-with white-outline style.
It would be better to have the same style for all icons. Can you please try to remove circles for existing sports icons in a separate commit (and maybe edit them a bit for better visibility)?

Thank you for the pull request! 1. All icon sources are already listed in our licenses, right? 2. Icons should be readable on most backgrounds and also look good with the dark style. Current round ones were designed to look good in all cases. But we want to focus on the rule "round background means a business of some sort" and use lighter icons instead. That may require a white-line-with-dark-outline or dark-line-with white-outline style. 3. It would be better to have the same style for all icons. Can you please try to remove circles for existing sports icons in a separate commit (and maybe edit them a bit for better visibility)?

j13m126 commented

2022-07-14 22:15:14 +00:00

(Migrated from github.com)

yes, all sources are already in copyright.html.

Sure, I'll do it.
I noticed that the skiing icon is used for leisure=skiing which is only used 3 times.
This should obviously be replaced with sport=skiing, right? It is used 5800 times

yes, all sources are already in copyright.html. Sure, I'll do it. I noticed that the skiing icon is used for leisure=skiing which is only used [3 times](https://taginfo.openstreetmap.org/search?q=leisure%3Dskiing). This should obviously be replaced with sport=skiing, right? It is used [5800 times](https://taginfo.openstreetmap.org/search?q=sport%3Dskiing)

biodranik commented

2022-07-14 22:24:49 +00:00

(Migrated from github.com)

This should obviously be replaced with sport=skiing, right?

Replaced or both should be supported? Are these tags equivalent? We have a mechanism to replace ("normalize") equivalent tags in data/replaced_tags.txt

Not sure about white icons, please check/compare with other icons.

> This should obviously be replaced with sport=skiing, right? Replaced or both should be supported? Are these tags equivalent? We have a mechanism to replace ("normalize") equivalent tags in data/replaced_tags.txt Not sure about white icons, please check/compare with other icons.

j13m126 commented

2022-07-14 22:30:49 +00:00

(Migrated from github.com)

I don't think it is necessary to add leisure=skiing to replaced_tags.txt. It's not listed in wiki and also not widely used.

I don't think it is necessary to add leisure=skiing to replaced_tags.txt. It's not listed in [wiki](https://wiki.openstreetmap.org/wiki/Key%3Aleisure) and also not widely used.

👍 1

j13m126 commented

2022-07-17 22:16:53 +00:00

(Migrated from github.com)

Todo:

change leisure=skiing to sport=skiing
Rn the icon for bowls is a pin with a bowling ball. bowls is different sport. I'd suggest using pitch-m.svg for bowls, renaming bowls-m.svg to bowling-m.svg and using it for bowling (sport=10pin) and european bowling (sport=9pin), which I can add to om. I couldn't find an icon for bowls.

Todo: - change leisure=skiing to sport=skiing - Rn the icon for bowls is a pin with a bowling ball. bowls is different sport. I'd suggest using pitch-m.svg for bowls, renaming bowls-m.svg to bowling-m.svg and using it for bowling (sport=10pin) and european bowling (sport=9pin), which I can add to om. I couldn't find an icon for bowls.

j13m126 commented

2022-07-17 22:34:55 +00:00

(Migrated from github.com)

Here is a preview of what the existing sport icons look like without the background circle.

pitch, bowls
archery, soccer, pitch
diving
climbing & swimming
curling, tennis
equestrian & golf
american football
australian football & cricket
basketball
baseball

missing sport: skiing (not rendered in all 3 cases of leisure=skiing, need to change to sport=skiing first)

Here is a preview of what the existing sport icons look like without the background circle. - pitch, bowls ![Bildschirmfoto vom 2022-07-17 23-58-40](https://user-images.githubusercontent.com/7961926/179427100-7fa289fc-2274-4932-842d-963db0945f19.png)![Bildschirmfoto vom 2022-07-17 23-58-55](https://user-images.githubusercontent.com/7961926/179427102-363c6914-f646-43a9-a329-51622aa524c6.png) - archery, soccer, pitch ![Bildschirmfoto vom 2022-07-17 23-59-44](https://user-images.githubusercontent.com/7961926/179427103-4b39dfaf-9491-4cc0-bea1-94d30b45a447.png)![Bildschirmfoto vom 2022-07-17 23-59-45](https://user-images.githubusercontent.com/7961926/179427104-aa1eab84-e35f-4d4c-8e83-fef5bdf9e79a.png) - diving ![Bildschirmfoto vom 2022-07-18 00-01-09](https://user-images.githubusercontent.com/7961926/179427105-01d169ce-3f3a-4b40-b064-463d7171e319.png)![Bildschirmfoto vom 2022-07-18 00-01-24](https://user-images.githubusercontent.com/7961926/179427106-fd4fcc36-0a99-4e33-9f5c-098c4a54637b.png) - climbing & swimming ![Bildschirmfoto vom 2022-07-18 00-01-25](https://user-images.githubusercontent.com/7961926/179427107-20807d5c-680b-4e35-8915-59ed17f8ba22.png)![Bildschirmfoto vom 2022-07-18 00-02-00](https://user-images.githubusercontent.com/7961926/179427108-0434456d-6bf4-4379-bcb9-48b732fcb33a.png) - curling, tennis ![Bildschirmfoto vom 2022-07-18 00-03-03](https://user-images.githubusercontent.com/7961926/179427109-953253cd-9288-4655-84dc-b70bdef66cbf.png)![Bildschirmfoto vom 2022-07-18 00-03-17](https://user-images.githubusercontent.com/7961926/179427110-c712028f-f3e4-4f42-b40f-a7070c75e923.png) - equestrian & golf ![Bildschirmfoto vom 2022-07-18 00-03-46](https://user-images.githubusercontent.com/7961926/179427111-4ecf05bc-926d-45af-8054-bee8f4da6f69.png)![Bildschirmfoto vom 2022-07-18 00-03-47](https://user-images.githubusercontent.com/7961926/179427112-3c897dff-0257-4da5-9bed-deb26929fdbf.png) - american football ![Bildschirmfoto vom 2022-07-18 00-05-26](https://user-images.githubusercontent.com/7961926/179427113-2833aabc-adc0-4557-8a8b-e49029a0bbcd.png)![Bildschirmfoto vom 2022-07-18 00-05-42](https://user-images.githubusercontent.com/7961926/179427114-0f19fd86-6caf-4eef-93ce-ad2d76311b28.png) - australian football & cricket ![Bildschirmfoto vom 2022-07-18 00-06-44](https://user-images.githubusercontent.com/7961926/179427115-ab918811-1a14-4841-a99a-91dec7a2ef33.png)![Bildschirmfoto vom 2022-07-18 00-06-45](https://user-images.githubusercontent.com/7961926/179427116-3514fb4c-c80c-41a7-8d7c-324340edddda.png) - basketball ![Bildschirmfoto vom 2022-07-18 00-07-48](https://user-images.githubusercontent.com/7961926/179427117-ae06ef0b-ff91-4c22-b8d8-cfbb3635e18c.png)![Bildschirmfoto vom 2022-07-18 00-08-01](https://user-images.githubusercontent.com/7961926/179427118-7af87c2e-69bf-4c2a-a45c-898a51d2d695.png) - baseball ![Bildschirmfoto vom 2022-07-18 00-08-27](https://user-images.githubusercontent.com/7961926/179427120-6e124aa8-d94c-436e-80b6-f54501ac1cdc.png)![Bildschirmfoto vom 2022-07-18 00-08-28](https://user-images.githubusercontent.com/7961926/179427121-f87f3d98-84d8-46b8-a971-7440d8cd4014.png) missing sport: skiing (not rendered in all 3 cases of leisure=skiing, need to change to sport=skiing first)

vng commented

2022-07-19 10:55:08 +00:00

(Migrated from github.com)

Better to have only two last commits:

[string] Regenerated
[styles] Regenerated
per PR.
And make rebase to avoid conflicts before regenerating.

Better to have only two last commits: - [string] Regenerated - [styles] Regenerated per PR. And make rebase to avoid conflicts before regenerating.

👍 1

biodranik commented

2022-07-19 11:49:16 +00:00

(Migrated from github.com)

The best way to avoid rebase conflicts is to remove regenerated commits and then regenerate them again.

j13m126 commented

2022-07-19 12:02:19 +00:00

(Migrated from github.com)

I marked them with 'drop' in git rebase -i. Don't know why they are still listed.

biodranik (Migrated from github.com) requested changes 2022-07-21 20:33:08 +00:00

biodranik (Migrated from github.com) left a comment

Thanks! Cool icons )

@vng do we need to fix something else?

Thanks! Cool icons ) @vng do we need to fix something else?

data/categories.txt

biodranik (Migrated from github.com) commented

2022-07-21 20:26:02 +00:00

sport-10pin

```suggestion sport-10pin ```

biodranik (Migrated from github.com) commented

2022-07-21 20:26:12 +00:00

sport-9pin

```suggestion sport-9pin ```

biodranik (Migrated from github.com) commented

2022-07-21 20:28:53 +00:00

Does it make sense to differentiate these two types? Let's merge them into one to avoid copy-paste. CC @vng

vng (Migrated from github.com) reviewed 2022-07-22 08:03:56 +00:00

data/categories.txt

vng (Migrated from github.com) commented

2022-07-22 07:58:19 +00:00

sport-10pin

vng (Migrated from github.com) commented

2022-07-22 08:03:18 +00:00

Well, yes, I'd merge them in categories like:
sport-9pin|sport-10pin

And in types_strings like:

[type.sport.9pin]
  ref = type.sport.10pin

Well, yes, I'd merge them in categories like: sport-9pin|sport-10pin And in types_strings like: ``` [type.sport.9pin] ref = type.sport.10pin ```

biodranik (Migrated from github.com) reviewed 2022-07-22 17:55:56 +00:00

data/categories.txt

biodranik (Migrated from github.com) commented

2022-07-22 17:54:58 +00:00

Let's make it simple "Bowling", I doubt that someone will use Nine-pin in the search.

data/visibility.txt

biodranik (Migrated from github.com) commented

2022-07-22 17:51:55 +00:00

@vng do we need this file if it's completely ignored now?

vng (Migrated from github.com) reviewed 2022-07-22 18:47:48 +00:00

data/visibility.txt

vng (Migrated from github.com) commented

2022-07-22 18:47:48 +00:00

No we don't.

j13m126 (Migrated from github.com) reviewed 2022-07-23 08:39:14 +00:00

data/visibility.txt

j13m126 (Migrated from github.com) commented

2022-07-23 08:39:14 +00:00

Sorry, what file? Do you want me to delete it?

vng (Migrated from github.com) reviewed 2022-07-24 08:00:34 +00:00

data/visibility.txt

vng (Migrated from github.com) commented

2022-07-24 08:00:34 +00:00

@j13m126 No need any actions from your side.

vng commented

2022-07-24 08:05:41 +00:00

(Migrated from github.com)

From CI:

Running style_symbols_consistency_test.cpp::Test_SymbolsConsistency
Test with map style MapStyleClear
Symbols mismatch: style MapStyleClear , density mdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleClear , density hdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleClear , density xhdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleClear , density xxhdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleClear , density xxxhdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleClear , density 6plus , missed [1: bowls-m ]
Test with map style MapStyleDark
Symbols mismatch: style MapStyleDark , density mdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleDark , density hdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleDark , density xhdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleDark , density xxhdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleDark , density xxxhdpi , missed [1: bowls-m ]
Symbols mismatch: style MapStyleDark , density 6plus , missed [1: bowls-m ]
Test with map style MapStyleVehicleClear
Test with map style MapStyleVehicleDark
FAILED
style_tests/style_symbols_consistency_test.cpp:97 TEST(res)

bowls-m.svg is deleted, but still present somewhere in mapcss files. Probably in styles-night or vehicle.

From CI: ``` Running style_symbols_consistency_test.cpp::Test_SymbolsConsistency Test with map style MapStyleClear Symbols mismatch: style MapStyleClear , density mdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleClear , density hdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleClear , density xhdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleClear , density xxhdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleClear , density xxxhdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleClear , density 6plus , missed [1: bowls-m ] Test with map style MapStyleDark Symbols mismatch: style MapStyleDark , density mdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleDark , density hdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleDark , density xhdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleDark , density xxhdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleDark , density xxxhdpi , missed [1: bowls-m ] Symbols mismatch: style MapStyleDark , density 6plus , missed [1: bowls-m ] Test with map style MapStyleVehicleClear Test with map style MapStyleVehicleDark FAILED style_tests/style_symbols_consistency_test.cpp:97 TEST(res) ``` bowls-m.svg is deleted, but still present somewhere in mapcss files. Probably in styles-night or vehicle.

vng commented

2022-07-24 12:12:34 +00:00

(Migrated from github.com)

bowls-m.svg still present in Icons.mspcss

vng commented

2022-07-26 17:29:32 +00:00

(Migrated from github.com)

@j13m126 Please, check Icons.mapcss once again. Tests show that deleted bowls-m.svg still present in mapcss styles.

👍 1

RedAuburn commented

2022-07-28 08:17:18 +00:00

Thank you for the PR, sport icons definitely needed work :)

I've found a bug, table tennis tables use the generic sports ground icon when mapped as an area:

on osm: https://www.openstreetmap.org/way/975293363

Thank you for the PR, sport icons definitely needed work :) I've found a bug, table tennis tables use the generic sports ground icon when mapped as an area: ![Screenshot_20220728-091237_Organic Maps](https://user-images.githubusercontent.com/26939824/181456460-aa20b0a3-6fb5-4cfb-b259-3a0d865d10ea.png) on osm: https://www.openstreetmap.org/way/975293363

👍 1

j13m126 commented

2022-07-28 17:40:27 +00:00

(Migrated from github.com)

@endim8 Thank you, I fixed it for table-tennis and other sports as well.

@vng bowls-m.svg is gone now.

I also added sport=climbing, as we already got an icon for that. #2956

@endim8 Thank you, I fixed it for table-tennis and other sports as well. @vng bowls-m.svg is gone now. I also added sport=climbing, as we already got an icon for that. #2956

❤️ 1

vng commented

2022-07-29 04:42:00 +00:00

(Migrated from github.com)

Great!

Should fix existing outdated type like leisure-sports_centre-{climbing,shooting}, I can do it by myself on your branch.
Lets find yoga.svg icon as well, so we can replace all outdated leisure-sports_centre-* with the new approach (sport=*). Because sports exist not only in sports_centre :)

Great! - Should fix existing outdated type like leisure-sports_centre-{climbing,shooting}, I can do it by myself on your branch. - Lets find yoga.svg icon as well, so we can replace all outdated leisure-sports_centre-* with the new approach (sport=*). Because sports exist not only in sports_centre :)

j13m126 commented

2022-07-29 20:23:22 +00:00

(Migrated from github.com)

yoga-m.svg

also: For consistency, I removed the background circle for gym-m.svg (see screenshot above) as well, as fitness_stations are often close to sport pitches.
gym-m.svg is used for leisure=fitness_station and leisure=fitness_centre.

If you are ok, I would push the updated icons.

![Bildschirmfoto vom 2022-07-29 22-08-35](https://user-images.githubusercontent.com/7961926/181836220-1b0d1d6d-7183-4a7c-9c18-aa25990b2fee.png) ![Bildschirmfoto vom 2022-07-29 22-05-02](https://user-images.githubusercontent.com/7961926/181836235-7f467822-9bcc-4e01-ab8a-2733889cfde7.png) [yoga-m.svg](https://fonts.google.com/icons?icon.set=Material+Icons&icon.query=yoga) also: For consistency, I removed the background circle for gym-m.svg (see screenshot above) as well, as fitness_stations are often close to sport pitches. gym-m.svg is used for leisure=fitness_station and leisure=fitness_centre. If you are ok, I would push the updated icons.

vng commented

2022-07-30 00:58:52 +00:00

(Migrated from github.com)

yoga and consistent gym looks good to me

👍 1

biodranik commented

2022-07-30 09:42:56 +00:00

(Migrated from github.com)

For consistency, I removed the background circle for gym-m.svg (see screenshot above) as well, as fitness_stations are often close to sport pitches. gym-m.svg is used for leisure=fitness_station and leisure=fitness_centre.

fitness_centre is a business, and our general pattern is to use a circled icon for all businesses. It is not critical but may bring more consistency to the map. What do you think? Would it be possible to have two variants of the icon for these two different cases?

> For consistency, I removed the background circle for gym-m.svg (see screenshot above) as well, as fitness_stations are often close to sport pitches. gym-m.svg is used for leisure=fitness_station and leisure=fitness_centre. fitness_centre is a business, and our general pattern is to use a circled icon for all businesses. It is not critical but may bring more consistency to the map. What do you think? Would it be possible to have two variants of the icon for these two different cases?

j13m126 commented

2022-07-30 10:18:21 +00:00

(Migrated from github.com)

Sure, I can do that. But that would also mean we would need two variants of all sport icons. Because every sport could be tagged in combination with sports_centre, which is also a business. Right?

Would you prefer any specific naming scheme?

Sure, I can do that. But that would also mean we would need two variants of all sport icons. Because every sport could be tagged in combination with sports_centre, which is also a business. Right? Would you prefer any specific naming scheme?

vng commented

2022-07-30 10:45:40 +00:00

(Migrated from github.com)

I don't think that we need 2 versions of sports icons. drinking_water also may be a business, but we don't use circle there.

vng commented

2022-07-30 10:46:33 +00:00

(Migrated from github.com)

Let's focus here on sport first. And update/merge PR, its a long story already ..

vng commented

2022-07-30 10:48:01 +00:00

(Migrated from github.com)

If we are agree here, I can make final changes to update existing tags and tests.

👍 1

j13m126 commented

2022-07-30 11:20:40 +00:00

(Migrated from github.com)

I am happy with both solutions.

biodranik commented

2022-07-30 12:10:40 +00:00

(Migrated from github.com)

Is there a way to programmatically draw the icon's circle/square, change its color, or do whatever modification we need?

I'm ok to merge all sports first without a circle, but please create a separate issue for it so we can track and improve it later.

Is there a way to programmatically draw the icon's circle/square, change its color, or do whatever modification we need? I'm ok to merge all sports first without a circle, but please create a separate issue for it so we can track and improve it later.

vng commented

2022-07-30 16:54:55 +00:00

(Migrated from github.com)

There is, and we draw some custom user marks like this (speed cams), but for model POIs better to have static icons.

vng commented

2022-07-30 20:55:43 +00:00

(Migrated from github.com)

Final changes. PTAL.

biodranik (Migrated from github.com) reviewed 2022-07-30 22:42:43 +00:00

data/strings/types_strings.txt

biodranik (Migrated from github.com) commented

2022-07-30 22:38:10 +00:00

Should these translations go to type.sport.shooting?

data/strings/types_strings.txt

biodranik (Migrated from github.com) commented

2022-07-30 22:37:59 +00:00

Should these translations go to type.sport.swimming?

map/style_tests/classificator_tests.cpp

					
				@ -256,2 +256,4 @@

				    }, {2, 5}, drule::symbol);

				  }

				  /// @todo Check that all of sport=* icons priority is bigger than all of pitch, sport_center, playground.

biodranik (Migrated from github.com) commented

2022-07-30 22:42:38 +00:00

Classificator::ForEachInSubtree ?

vng (Migrated from github.com) reviewed 2022-07-31 03:27:52 +00:00

data/strings/types_strings.txt

vng (Migrated from github.com) commented

2022-07-31 03:27:52 +00:00

already exists

vng (Migrated from github.com) reviewed 2022-07-31 03:28:16 +00:00

data/strings/types_strings.txt

vng (Migrated from github.com) commented

2022-07-31 03:28:16 +00:00

already exists

vng (Migrated from github.com) reviewed 2022-07-31 03:28:55 +00:00

map/style_tests/classificator_tests.cpp

					
				@ -256,2 +256,4 @@

				    }, {2, 5}, drule::symbol);

				  }

				  /// @todo Check that all of sport=* icons priority is bigger than all of pitch, sport_center, playground.