From 22c89948360049511c46cf1133b310e004828cf7 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sun, 12 Dec 2021 12:10:55 +0300 Subject: [PATCH] [styles] Regenerated styles. Signed-off-by: Viktor Govako --- data/colors.txt | 1 + data/drules_proto.bin | Bin 208369 -> 208557 bytes data/drules_proto.txt | 106 ++++++++++++++++++++++-- data/drules_proto_clear.bin | Bin 209204 -> 209392 bytes data/drules_proto_clear.txt | 106 ++++++++++++++++++++++-- data/drules_proto_dark.bin | Bin 207744 -> 207932 bytes data/drules_proto_dark.txt | 122 +++++++++++++++++++++++++--- data/drules_proto_vehicle_clear.bin | Bin 137610 -> 137744 bytes data/drules_proto_vehicle_clear.txt | 59 ++++++++++++++ data/drules_proto_vehicle_dark.bin | Bin 136976 -> 137110 bytes data/drules_proto_vehicle_dark.txt | 59 ++++++++++++++ data/visibility.txt | 2 +- 12 files changed, 431 insertions(+), 24 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index f961b4e7ee..6ec8888ec1 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -74,6 +74,7 @@ 2828327 2836760 3155515 +3156522 3158064 3183362 3351066 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index c2c52ff08be848438a50b4ad3118f4a69cd76e3d..27cc8843873d401660eda1f124b12f1985d629b0 100644 GIT binary patch delta 417 zcmex(n`iA^o((^O85<}643_5M;bO~8%*@fvmH5#({lQ^I5pE?8Atk8jwvg>@A&kNQnf5YGza7k!=BdQNCndmf>2N>0#F4-M{(}Ld77rIY2baMAe}9=J zW|RskaqtsXGhN_3qlhV3CkK*FK^!`f)lA=bmQh#$UF-A>Axt8CsG{4CgfL|bGOcEu zZji<#!>q(1Fj+8Fd~%;OJKM4{pgRRoxk9L1VHlTbS=si*X-vNaBo;Ap2^0YXr#!Jz Xw;(66BrU%v7ibRo#&T3Jz1#`_-dc~e delta 225 zcmZ2`m*?Yco((^O8M`O{43_5R<6_HA%*@fv6=0k^(Lz*6okK`Tkc+b*zqlkRzXB}m z7$QFX?JFh@E)+4b=IW5`)gg=_|CwGgPQMt;ls5h5ImVXl{Gm))f{ew}tJ9cdm_;}Q zCI_a7G75so=?~MGgvEqJIE1AHIIdmX&Mwi{@*e^ix2vTy{Spw*;u0tVx~4p_Qnw%{ Uu_P_OC>N-nSTl}PFumLg0KYX;EC2ui diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 40e7c0bb25..e42cba3c86 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -7127,7 +7127,6 @@ cont { scale: 17 symbol { name: "mail-m" - apply_for_type: 1 priority: 16632 } caption { @@ -7135,6 +7134,7 @@ cont { height: 10 color: 4473924 offset_y: 1 + is_optional: true } priority: 15632 } @@ -7142,8 +7142,7 @@ cont { element { scale: 18 symbol { - name: "postbox-m" - apply_for_type: 1 + name: "mail-m" priority: 16632 } caption { @@ -7159,8 +7158,7 @@ cont { element { scale: 19 symbol { - name: "postbox-m" - apply_for_type: 1 + name: "mail-m" priority: 16632 } caption { @@ -49463,6 +49461,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 10 + color: 8355711 + } + priority: 15000 + } } element { scale: 15 @@ -49470,6 +49475,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 10 + color: 8355711 + } + priority: 15000 + } } element { scale: 16 @@ -49477,6 +49489,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } element { scale: 17 @@ -49484,6 +49503,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } element { scale: 18 @@ -49491,6 +49517,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } element { scale: 19 @@ -49498,6 +49531,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } } cont { @@ -51185,6 +51225,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 17 @@ -51192,6 +51239,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 18 @@ -51199,6 +51253,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 19 @@ -51206,6 +51267,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } } cont { @@ -52529,6 +52597,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 17 @@ -52536,6 +52611,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 18 @@ -52543,6 +52625,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 19 @@ -52550,6 +52639,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } } cont { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 2475c7f3778c51dbd995c017a4f931a5f0e0246c..0eafa613c37b304fb37cf54929baf71c66ddd7e7 100644 GIT binary patch delta 492 zcmdn;i08v&o(&=H-*{`(IGj9NTg>>OMI|Ns4EmY7irw1=MvH3B%)a3IW?{^1OxNEq03BvB3_ z!a6yG38~rM7sOP?ueh3#OR}IeDJL^IzN9EIuecz;s6@9QC$S_gzbF^z6M@OODdLm+ yq}kb)m4N~fl`DkG6^3z{mX&RfMZ7!il-5d6^}Zx&`^gCGq)bX_?8XLP{KhN_<>wxrv!My14?3 zllv1yh15BOlmxjrLCTWyE5O1BgT1QHhu9K z#+L0jgP2PB8H=X}Br(Z|i*N`?32~{ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index b204f968f8..c1492e6338 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -7061,7 +7061,6 @@ cont { scale: 17 symbol { name: "mail-m" - apply_for_type: 1 priority: 16632 } caption { @@ -7069,6 +7068,7 @@ cont { height: 10 color: 4473924 offset_y: 1 + is_optional: true } priority: 15632 } @@ -7076,8 +7076,7 @@ cont { element { scale: 18 symbol { - name: "postbox-m" - apply_for_type: 1 + name: "mail-m" priority: 16632 } caption { @@ -7093,8 +7092,7 @@ cont { element { scale: 19 symbol { - name: "postbox-m" - apply_for_type: 1 + name: "mail-m" priority: 16632 } caption { @@ -49261,6 +49259,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 10 + color: 8355711 + } + priority: 15000 + } } element { scale: 15 @@ -49268,6 +49273,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 10 + color: 8355711 + } + priority: 15000 + } } element { scale: 16 @@ -49275,6 +49287,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } element { scale: 17 @@ -49282,6 +49301,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } element { scale: 18 @@ -49289,6 +49315,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } element { scale: 19 @@ -49296,6 +49329,13 @@ cont { color: 14934482 priority: -16700 } + caption { + primary { + height: 8 + color: 8355711 + } + priority: 15000 + } } } cont { @@ -50847,6 +50887,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 17 @@ -50854,6 +50901,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 18 @@ -50861,6 +50915,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 19 @@ -50868,6 +50929,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } } cont { @@ -52191,6 +52259,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 17 @@ -52198,6 +52273,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 18 @@ -52205,6 +52287,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } element { scale: 19 @@ -52212,6 +52301,13 @@ cont { color: 15591638 priority: -15858 } + caption { + primary { + height: 9 + color: 6381914 + } + priority: 15142 + } } } cont { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index e4b5d6b520920b4726864a45f8b69a0c6942cf8c..4938b256c3a26800ac6d3d5ccd2f9e0886e37836 100644 GIT binary patch delta 481 zcmZp;&a>wR&jzVr#>UCg!O}cDTx_|CnK`<-5d zq++t7s$}zu;O#4d8TB#^R$V#3DDkZMKLjueiE!{r32>l`s&Vi^MW^fSWmMqcN8+il zfK)@o1!3ZKdl`|%g`wix&+TPQ>SyX^nr`IF6vQbDG?rW9$lrg{H+C=z^UNp}k_8%# z5UB@?2tY)jF4W@TV&~uxxVq{plLS~=5Wln#eraJm(p=kL0bR+@w3>0cZ7h=vvl55E zk delta 331 zcmdmUgQwv-&jzVr#_q||!O}*2Tx_|CnK`<-0*n$r8X2|txHvhu1g@^S%A~<4F`-IG zokK`Tkc+b*zqlkRzXGIe@&|SC>G$?Cv2!B}Iy8wl&kNo@FPKp;)A-Km?d%fIn*T!p zqmT#(uap1>x~LilA3}7x!G1=G>GpdWS-JVKh;p(+bt9=0L|50pml2yfVKjBy@9$-F z?`PW1I90co>&Y<6+_k08cOmWdHyG diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index cd37e9eab9..d4e8594215 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -22839,6 +22839,65 @@ cont { } } } +cont { + name: "natural-bare_rock" + element { + scale: 12 + area { + color: 3156522 + priority: 1001 + } + } + element { + scale: 13 + area { + color: 3156522 + priority: 1001 + } + } + element { + scale: 14 + area { + color: 3156522 + priority: 1001 + } + } + element { + scale: 15 + area { + color: 3156522 + priority: 1001 + } + } + element { + scale: 16 + area { + color: 3156522 + priority: 1001 + } + } + element { + scale: 17 + area { + color: 3156522 + priority: 1001 + } + } + element { + scale: 18 + area { + color: 3156522 + priority: 1001 + } + } + element { + scale: 19 + area { + color: 3156522 + priority: 1001 + } + } +} cont { name: "natural-bay" element { diff --git a/data/visibility.txt b/data/visibility.txt index 39c4d761c1..b34a8de9fa 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -590,7 +590,7 @@ world 00000000000000000000 + {} mountain_pass 00000000000000000000 - natural 00000000000000000000 + - bare_rock 00000000000000000000 - + bare_rock 00000000000011111111 - bay 00000000000000111111 - beach 00000000001111111111 + gravel 00000000001111111111 -