Commit graph

794 commits

Author SHA1 Message Date
6e17463575 Fixed regex condition. Fixed unclosed files.
Added TODO comments
2024-12-13 18:21:11 +02:00
70301732f9 Added unit tests and integration tests 2024-12-13 18:21:11 +02:00
2850ec5077 Require protobuf 3.21+
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2024-12-02 01:02:50 +03:00
2796db7ae3 Allow <1 dashdot values
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-11-25 22:17:59 -03:00
b9d308f0cd Generate drules for z20
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-16 12:24:06 -03:00
51864cec29 Validate presence of text-color and text-offset attributes
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-14 17:48:59 -03:00
611abc0d72 Validate pathtexts and shields without lines
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-09-16 19:55:51 -03:00
5b22c7a14c Remove int_name, add a warning for invalid dashdot size
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-09-16 17:27:36 -03:00
d58e496bd4 Make shields prioritizable independently
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-09-07 16:34:11 -03:00
432e0b0d67 Fail on missing priorities errors
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-09-06 13:49:57 -03:00
ff3f8324f8 Fix fill-color: none; handling.
Fixes #19.

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-24 07:13:19 +02:00
feb3b87800 Add a ': none;' syntax for disabling area and icon drules
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-22 23:10:17 -03:00
Andrew Shkrob
ac01664b98 [3party] Update protobuf to v4.23.4
Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
2023-08-21 10:44:37 -03:00
e256a119ab Display drules with automatic priorities
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-18 18:01:11 -03:00
dea0efb9ee Sort drule types in comments in logical order
And some other minor changes.

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-18 18:01:11 -03:00
04f5f44137 Allow setting negative overlays priorities to e.g. put icons below automatic optional captions
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-14 12:49:03 -03:00
24b8586c23 Update comments
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-11 20:16:16 -03:00
024810fb85 Validate visibilities
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
a03d74f588 Load priorities from files without explicit drule types specified
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
0e23a0e798 Remove drule types from prio.txt files
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
fbecca40c3 Make optional captions below other overlays 2023-08-07 11:59:25 -03:00
2d5c553af8 Add comments with visibility range and other drules info
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
b30c3bee84 Load grouped priorities
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
41e9860567 Group types with same priorities
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
98755e5d6a Add auto-fixing of captions/pathtexts priorities being higher than icon/shield
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
8c5e152621 Disable priorities compression by default
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
9c914f097b Compress / re-space priorities evenly
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
58dcaaba51 Load priorities from *.prio.txt files
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
0850cde772 Dump priorities into separate *.prio.txt files
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
b34963026a Calculate minVisibleScale for overlays only
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
492906e130 Prepend minVisibleScale to priority values
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
8e8f17bd29 Remove unused zoom 0 from drules output
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-08-07 11:59:25 -03:00
ebe1ced85c Remove empty casing dashdot definitions
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-07-08 15:20:54 -03:00
2f311e7504 Add a bg-top priorities range
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-06-23 09:21:13 -03:00
dbba1c41e0 Allow comments in mapcss-mapping.csv
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-06-20 21:56:13 +02:00
d580b748f2 Make captions optional by default
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-03-26 12:08:57 -03:00
5b160e185f Remove apply_for_type symbol attribute
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-02-15 11:33:00 -03:00
9b38690e69 Optimize choosers by discarding non-matching rules
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-02-10 12:31:30 -03:00
27b41b5e3f Add zoom into choosers optimization tree
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-02-10 12:31:30 -03:00
70fa78f39b Optimize frequently called functions
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-02-10 12:31:30 -03:00
41498a6ec5 Process unique runtime conditions once only
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-02-10 12:31:30 -03:00
4e29892282 Optimize looking for runtime conditions in selectors
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-02-10 12:31:30 -03:00
a6daa7121b Make per-tag sets of selectors more precise and small
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-01-21 12:57:14 -03:00
471abbd754 Look for missing base_width to use with casing-width
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-01-20 11:29:46 -03:00
32cc5aafb6 Add casing-width-add support
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-01-20 11:29:46 -03:00
Viktor Govako
f9de08f90f
Merge pull request #4 from organicmaps/vng-fix
Don't mix "casing-" for line and area rules.
2023-01-17 17:30:35 -03:00
Viktor Govako
d6a507cfc0 Don't mix "casing-" for line and area rules.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2022-06-07 16:45:54 +03:00
Viktor Govako
01d4e4586c
Merge pull request #3 from organicmaps/vng-python3
Python3 + priorities ascending order.
2022-05-17 11:50:11 +03:00
Viktor Govako
89b59de837 Python3 migration.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2022-05-16 17:06:19 +03:00
Viktor Govako
367da7e676 Added -x-me-min-text-priority hack.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2022-05-16 12:29:40 +03:00