From 80f89426999111e6a84b9dff61872c364a42d0f9 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 6 Sep 2023 14:09:25 +0300 Subject: [PATCH] [styles] Regenerate for missing priorities Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 355921 -> 356068 bytes data/drules_proto.txt | 39 ++++++++++++++++++++++++++++ data/drules_proto_clear.bin | Bin 356610 -> 356737 bytes data/drules_proto_clear.txt | 29 +++++++++++++++++++++ data/drules_proto_dark.bin | Bin 354912 -> 355039 bytes data/drules_proto_dark.txt | 29 +++++++++++++++++++++ data/drules_proto_vehicle_clear.bin | Bin 261283 -> 261447 bytes data/drules_proto_vehicle_clear.txt | 30 +++++++++++++++++++++ data/drules_proto_vehicle_dark.bin | Bin 260609 -> 260773 bytes data/drules_proto_vehicle_dark.txt | 30 +++++++++++++++++++++ 10 files changed, 157 insertions(+) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 1ff5d3aa2fdf03dcee70e8a407df0d8726865e12..c424685b6f5881eb969dbd1ae7c0be109eb72054 100644 GIT binary patch delta 752 zcmcb3NA$^E(G9)Is;XSXY;GrNH!hDE%Q{s<}9$y*Pt$dvONS*)qmY(;e?K zNw8{h@Cm6+kGs#L#HCPS!6>A~!H>olK;sLd@r9s#HjsX<&(n1tFiBF;SSE#v?II7E z0$D|`GI9wPC1&Q7CsyjFmF8t8m*ylEO~1&G>ii90F3T9M>*xXIJ9q;>gV}%FWN4yfI4&C?SYTLI{_HFs8)8Jf-GK8SR%c z7`I=_U|L!x_kxj2q@cL8C@nELRkt*+Ah9epB|a%JMM#5#Pe^6@!TU@~92Sf~9zP0C z0EH)r!V`k>SS%R1UQW+_z$D2^xnbMmA2J29GVYze@fnk7y%-0NkPv4Y7<{uAXj^@Y z#efm$Oc4%VApuSX2yg(4gGKqUit@unIpAuAI0S_Fpe8^?g@iZ+QN?s_u>b{yPzAwa n!sudLN2Yf^XObCOF3xx{@GjOOK8)L4UortP^LE#lEc06d(!Rxa diff --git a/data/drules_proto.txt b/data/drules_proto.txt index db943c9de2..f0f2956a41 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -2712,6 +2712,7 @@ cont { color: 4473924 offset_y: 1 } + priority: -9960 } } } @@ -7871,6 +7872,7 @@ cont { scale: 16 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7891,6 +7893,7 @@ cont { scale: 17 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7911,6 +7914,7 @@ cont { scale: 18 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7931,6 +7935,7 @@ cont { scale: 19 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -58299,6 +58304,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58311,6 +58317,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58323,6 +58330,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58335,6 +58343,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58347,6 +58356,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58362,6 +58372,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58374,6 +58385,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58386,6 +58398,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58398,6 +58411,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58410,6 +58424,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58789,6 +58804,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58798,6 +58814,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58806,6 +58823,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58814,6 +58832,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58822,6 +58841,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58829,6 +58849,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58836,6 +58857,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58843,6 +58865,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58853,6 +58876,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58862,6 +58886,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58870,6 +58895,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58878,6 +58904,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58886,6 +58913,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58893,6 +58921,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58900,6 +58929,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58907,6 +58937,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58917,6 +58948,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58926,6 +58958,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58934,6 +58967,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58942,6 +58976,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58950,6 +58985,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58957,6 +58993,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58964,6 +59001,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58971,6 +59009,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 81a3bd3066ce4c84479a6b361bae5a3366444722..e67886c7b006df81c9159299800c221f4747e2a0 100644 GIT binary patch delta 636 zcmZpAB-;2`bVIMQswx+IVs2_)W=W-x6o;^u7#Al8m%x#ZiA)-d5;Hdahk(t?mH#=i z^fGg4PTrp&G5KI>!Q=^9Qj^Ql)FObRT)hf9JVF2RAULzF{+TSyRU7Kg+1g|C@J89Amue8VILq#Rx|iSZ!RbKRLf z`yrD|J>8s!NMr8)V0 zw&diqsrg(c90F3T9M>*xXP+FHrUT>(qH={$xxxspcC&qYyL~$2cKdXuOO^F|8My?D z5;Jqk6DxJoO7k+4OLG#7gv2;_goHTLz~Gy`K-=nDEC!4gj6xzDyg~w;3=rS|76*&+ zVHM?vi*mr#3ULSs@j*=hiaLRe782qRL>7dK31JZvMi=8cGX2#!0Kq_z^#A|> diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 8da99845ab..6d50f33e79 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -2712,6 +2712,7 @@ cont { color: 4473924 offset_y: 1 } + priority: -9960 } } } @@ -7745,6 +7746,7 @@ cont { scale: 16 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7765,6 +7767,7 @@ cont { scale: 17 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7785,6 +7788,7 @@ cont { scale: 18 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7805,6 +7809,7 @@ cont { scale: 19 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -58355,6 +58360,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58364,6 +58370,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58372,6 +58379,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58380,6 +58388,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58388,6 +58397,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58395,6 +58405,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58402,6 +58413,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58409,6 +58421,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58419,6 +58432,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58428,6 +58442,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58436,6 +58451,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58444,6 +58460,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58452,6 +58469,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58459,6 +58477,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58466,6 +58485,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58473,6 +58493,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58483,6 +58504,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58492,6 +58514,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58500,6 +58523,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58508,6 +58532,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58516,6 +58541,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58523,6 +58549,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58530,6 +58557,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58537,6 +58565,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index f22064bb637c212b88b15c46a559f041e6d9fee5..f01dd71a97b81a3f9bf54097078dbeb8afd4370d 100644 GIT binary patch delta 628 zcmaEGMfCnv(G9)Is;XSl$f#UKLl)EuDsuo zrI(pYb8HX`^hxM?I+Wi_LbCMW#kep zO3chDPps5UE6vMHF3m|S5|ZTL5fbH01A}k&0;k?hU{W~1WWZ>_C?w9oDIua!mjDj7bbgO?<*6#)DALb!R&NT_(}# wv3Ho*>*?k`Bb3_?e8!h^H@@?9n%X5N1JE=z9@03@ra9RL6T delta 712 zcmcbARrJ9X(G9)IQc_&(iMgqHnI)A%{2ans++3U-Tmn~DU1iePyh(Y#Bg;c3F3rgk zvLz??rRH;*a0p1Tax6MBW3phHE|4dP!V^N_3B!3hP3djvjN8(g_LVU1oxcAzlW4sd z2ak{tXBrrMvllq^ZUU15qXnao2nVl_04DE=pwu_|y0>2e4n1SczKYq5f* zCoAeI@#=C2BgrZ1Dzb9zW8{*X{6SN)*+X-?hbH466|cjLT!MLtC8b4)Il4)SMXB*c z`N`QrA{;zY0vvZvZ)cbI_TfJSFakw+v5NA6MW=5RXB0`t)FXgZk04f2A*`apn4;S^ z_%Z6VGfta+_bQ_Vs}={JklN(fv&x(m7K}n#9Q;6D7nG;LAt0nO-R~Ns5{E*CkOqe! zkT(y`6GGt$19``Qa!LvnT+^AjL<@>bi_#L4Q*}%83KGjwQ{vO}^HYH4Q`a^og^KoX P*BODBY5TY9%xhHu*^#+u delta 498 zcmX^9i+}M?{tbN^jI$>9Yv|Ssa0n>zaB<}37v<*X>Etf;(DJU*2N=r;m)h*2{NGwZDiBC#Q5z^q`6H=Kx;j9ve1tXBd59I8H zaMU;igp{V=yT+)*CZxt82xR-*fUt#-*up?|%ymX31+H!;E>R3C()07FXGi<28;n5A Lw0+hM=CvvS+&+ZN diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 5578921ad6..f5e5e1d83c 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -3017,6 +3017,7 @@ cont { scale: 16 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } } @@ -3024,6 +3025,7 @@ cont { scale: 17 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3031,13 +3033,16 @@ cont { height: 13 color: 4473924 offset_y: 1 + is_optional: true } + priority: -9350 } } element { scale: 18 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3045,13 +3050,16 @@ cont { height: 14 color: 4473924 offset_y: 1 + is_optional: true } + priority: -9350 } } element { scale: 19 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3059,7 +3067,9 @@ cont { height: 14 color: 4473924 offset_y: 1 + is_optional: true } + priority: -9350 } } } @@ -26600,48 +26610,56 @@ cont { scale: 12 area { color: 15590876 + priority: -1930 } } element { scale: 13 area { color: 15590876 + priority: -1930 } } element { scale: 14 area { color: 15590876 + priority: -1930 } } element { scale: 15 area { color: 15590876 + priority: -1930 } } element { scale: 16 area { color: 15590876 + priority: -1930 } } element { scale: 17 area { color: 15590876 + priority: -1930 } } element { scale: 18 area { color: 15590876 + priority: -1930 } } element { scale: 19 area { color: 15590876 + priority: -1930 } } } @@ -36734,6 +36752,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -36746,6 +36765,7 @@ cont { dd: 2.2 dd: 1.26 } + priority: 120 cap: BUTTCAP } } @@ -36758,6 +36778,7 @@ cont { dd: 3.3 dd: 1.8 } + priority: 120 } } element { @@ -36769,6 +36790,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36780,6 +36802,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36791,6 +36814,7 @@ cont { dd: 6.3 dd: 2.7 } + priority: 120 } } } @@ -36805,6 +36829,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -36817,6 +36842,7 @@ cont { dd: 2.2 dd: 1.26 } + priority: 120 cap: BUTTCAP } } @@ -36829,6 +36855,7 @@ cont { dd: 3.3 dd: 1.8 } + priority: 120 } } element { @@ -36840,6 +36867,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36851,6 +36879,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36862,6 +36891,7 @@ cont { dd: 6.3 dd: 2.7 } + priority: 120 } } } diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index a38288d013491f00d24dc908f9bd010be674707a..d3a85185f2075055999e0cc12a15617ad125d3e2 100644 GIT binary patch delta 497 zcmZqt!oTz@{{~$R#5JW>K2tF9bil=$}HKLjuWMR~D`@?jO_$0{m-D(VU}8)UE`sxVYk2&B6|gCEGVgYq;u1cX$kJ6vN_;!vm%(%=vT v@+QD}LMS|8AaB)GMkN-73a;tX&s}Adq`J{e3Ki|Qt}y~J)An1}nAMd5**>@X delta 482 zcmZ4bmA~-|{{~$R##xi~G<53)I0Teo7U|wQLX;EU1 zZc<`VYJ5?Ca<&jB2agmh$Eqs_7=cV)1d|WJ