organicmaps/organicmaps-tmp

Archived

Fork 1

Outdoors map style support #4247

Merged

root merged 7 commits from pastk-outdoors into master

2023-11-02 12:50:46 +00:00

pastk commented

2023-01-09 14:15:04 +00:00

Owner

Adds a compiled outdoors map style (changes and screenshots are same as in #2804) into android apk.
There is no UI switcher yet.
To switch into outdoors use a search command ?olight, issue ?light to switch back to normal style.
The style will be applied full only after maps regeneration (due to features' zoom level visibility changes). Or compile with a patch #2798 to be able to test the full style without maps regen.

Tested on Android and desktop only.
Might break iOS (as new style files should be added to the project files, etc.) - need help here!

TODO (probably best in separate PRs):

add Android UI style switcher - anyone wants to do it? @arnaudvergnet maybe? As you worked with the layers button recently
add iOS UI style switcher
add desktop UI style switcher
regenerate maps and check impact on size
polish the new style to make it release worthy
refactor style files handling in core/scripts to move from hardcoded to more dynamic way based on existing style files/folders - to make it easier to add new core styles, add custom styles, support different style files for different data versions

Needed-for: organicmaps/organicmaps#2356

Adds a compiled outdoors map style (changes and screenshots are same as in #2804) into android apk. There is no UI switcher yet. To switch into outdoors use a search command `?olight`, issue `?light` to switch back to normal style. The style will be applied full only after maps regeneration (due to features' zoom level visibility changes). Or compile with a patch #2798 to be able to test the full style without maps regen. Tested on Android and desktop only. Might break iOS (as new style files should be added to the project files, etc.) - need help here! TODO (probably best in separate PRs): - add Android UI style switcher - anyone wants to do it? @arnaudvergnet maybe? As you worked with the layers button recently - add iOS UI style switcher - add desktop UI style switcher - regenerate maps and check impact on size - polish the new style to make it release worthy - refactor style files handling in core/scripts to move from hardcoded to more dynamic way based on existing style files/folders - to make it easier to add new core styles, add custom styles, support different style files for different data versions Needed-for: https://git.omaps.dev/organicmaps/organicmaps/issues/2356

👍 2 ❤️ 4 🚀 2

rtsisyk reviewed 2023-01-09 14:15:04 +00:00

biodranik (Migrated from github.com) reviewed 2023-01-09 14:15:04 +00:00

biodranik (Migrated from github.com) reviewed 2023-01-09 15:15:24 +00:00

biodranik (Migrated from github.com) left a comment

На сколько увеличился размер данных в этом PR по сравнению с мастером, на примере какой-то отдельной страны/региона, где много хайков?

data/styles/outdoors/include/Basemap_label.mapcss

biodranik (Migrated from github.com) commented

2023-01-09 15:12:07 +00:00

Эти файлы полностью дублируют остальные стили? Хотелось бы иметь максимально общую базу, и в разных стилях хранить только оверрайды базы, иначе замучаемся с поддержкой, добавив ещё 3-4 стиля.

map/framework.cpp

biodranik (Migrated from github.com) commented

2023-01-09 15:13:24 +00:00

olight/odark?

pastk reviewed 2023-01-09 15:19:13 +00:00

data/styles/outdoors/include/Basemap_label.mapcss

pastk commented

2023-01-09 15:19:13 +00:00

Author

Owner

Yeap, its in plans.

pastk commented

2023-01-09 15:21:33 +00:00

Author

Owner

На сколько увеличился размер данных в этом PR по сравнению с мастером, на примере какой-то отдельной страны/региона, где много хайков?

I don't know, as I don't have a map gen pipeline setup.
It would be better (much quicker at least) if someone else could regen maps with a new style and check.

> На сколько увеличился размер данных в этом PR по сравнению с мастером, на примере какой-то отдельной страны/региона, где много хайков? I don't know, as I don't have a map gen pipeline setup. It would be better (much quicker at least) if someone else could regen maps with a new style and check.

biodranik (Migrated from github.com) reviewed 2023-01-09 15:59:52 +00:00

data/styles/outdoors/include/Basemap_label.mapcss

biodranik (Migrated from github.com) commented

2023-01-09 15:59:51 +00:00

Maybe we can start with these plans first, to avoid unnecessary copy-paste?

pastk reviewed 2023-01-09 16:03:50 +00:00

data/styles/outdoors/include/Basemap_label.mapcss

pastk commented

2023-01-09 16:03:50 +00:00

Author

Owner

Yeap I'm going to try it asap.

vng commented

2023-01-09 21:06:25 +00:00

(Migrated from github.com)

Suspicious that first commit organicmaps/organicmaps#4247/commits/bff0ea9004ecd169edf175268566bd06dc1e71dd, adding outdoor style switch into the code, has data/colors.txt modifications like removing a bunch of colors ..

I suspect that this file should be in the regenerated commit, or something goes wrong ..

Suspicious that first commit https://git.omaps.dev/organicmaps/organicmaps/pulls/4247/commits/bff0ea9004ecd169edf175268566bd06dc1e71dd, adding outdoor style switch into the code, has data/colors.txt modifications like removing a bunch of colors .. I suspect that this file should be in the regenerated commit, or something goes wrong ..

👍 1

pastk commented

2023-01-10 21:11:57 +00:00

Author

Owner

Made *.mapcss files of the new style contain only changes to the base style.
I had to copy some "eval" sections still due to #4258.

Also copied some unchanged rules in case they belong to a logical block when the most of it was changed, e.g. isolines (all rules are changed somewhat except [isoline=step_10]).

Made *.mapcss files of the new style contain only changes to the base style. I had to copy some "eval" sections still due to #4258. Also copied some unchanged rules in case they belong to a logical block when the most of it was changed, e.g. isolines (all rules are changed somewhat except `[isoline=step_10]`).

biodranik commented

2023-01-10 21:22:59 +00:00

(Migrated from github.com)

Is there a way to "validate" mapcss and report some issues/fail on errors if necessary?

pastk commented

2023-01-10 22:24:03 +00:00

Author

Owner

Is there a way to "validate" mapcss and report some issues/fail on errors if necessary?

I think we don't have such a tool. @vng ?
TBH our style files are full of duplicate and overriding rules, not working rules etc.

> Is there a way to "validate" mapcss and report some issues/fail on errors if necessary? I think we don't have such a tool. @vng ? TBH our style files are full of duplicate and overriding rules, not working rules etc.

pastk commented

2023-01-11 12:36:47 +00:00

Author

Owner

Tested it on desktop - works well.