From 462b73ef5a5960e31a85f18bac917ff6eef88c52 Mon Sep 17 00:00:00 2001 From: hemanggs Date: Sun, 23 Feb 2025 18:56:19 +0530 Subject: [PATCH] [styles] Regenerate drules Signed-off-by: hemanggs --- data/drules_proto.bin | Bin 431024 -> 430538 bytes data/drules_proto.txt | 205 ++---------------- data/drules_proto_default_dark.bin | Bin 414326 -> 413840 bytes data/drules_proto_default_dark.txt | 205 ++---------------- data/drules_proto_default_light.bin | Bin 415683 -> 415197 bytes data/drules_proto_default_light.txt | 205 ++---------------- data/drules_proto_outdoors_dark.bin | Bin 433212 -> 432726 bytes data/drules_proto_outdoors_dark.txt | 205 ++---------------- data/drules_proto_outdoors_light.bin | Bin 434680 -> 434194 bytes data/drules_proto_outdoors_light.txt | 205 ++---------------- .../include/priorities_4_overlays.prio.txt | 24 +- .../include/priorities_4_overlays.prio.txt | 24 +- 12 files changed, 114 insertions(+), 959 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 8ccedf1ea95ef7ebfb68f56a042161157e423ee4..3e0b3a964072085508680308604df06c0701bb59 100644 GIT binary patch delta 342 zcmdn6TF7M3lnZ_bF!W8~r~&d4v&O)O0=$;{6a(&G@Cc9vCt@&-ee z>C9(YbtXT6Ff_NnIm=qjCboc)iw~?JDL+3uH!(Z42&83t?G>mVfvc>1)BCQl%7HaH zKzY*JGq19m3J6Vy=}yki$w^Hv$uF9w$=0zw?is5KAO93aE^e^VX^BZinaN<8$zNIh znWc^~a*07?O7l{S5_95HGK;{vi>DX-WR;&T{gYL0`r4nYG7#2tC`)>~+%MLJf)M9` zJcP?}Ry=GQG=!GH99N!^pOadgn3FnP&y-DkdbmED%=AQ4HZcfmGKf|Fl~rc@QB$_p Fu>i2ZdpQ6A delta 657 zcmX@LSZc#^sfHHD7N!>F7M3lnZ_bGPW8~r~&d4v&O)O0=$;{6a(&G@Ac9vCNSWroT zixVoSn=A2!SwUj@K_fP4Q9TYJ98#0l8M5(X(=+)Vb_uENJ!e^~*`~j`$jZf&pP!wZ zn4MY#a=~=jD=;VIAB7FA+%0v0Kd6Q&1TVdZ0lxE5sd^aeOzYWvD7tfm6qdl|X- zz`jn-&&f$mF3B$v666q2;^krki-Nt&1r!oQ6_OCr26`Sv71$abh;6dd_cO8aL)cQ= z%b&8k@(I6V&-tVk(F!pyOw&4$$xYYKnAFK-n zr-#=u$-n~$!h;15h$p?hjf-uAhSm*O;FM?N=cE=V=A;T407F8EiyJP092?>Wz%aoj WIlbDLO$_F`wQ#o7_It)`Z(;${AF7M3lnD?6tDdBMubomiS&l9`_;q{ksNeQyV={&b&CR-x(V zI#}hV*Fag)+gEn7Ro`!C_XMD>Q&5)l zcD0GDrUKLZZm@E4CgX~kY delta 575 zcmbQRQ1aUn$%Yoj7N!>F7M3lnD?3E~F>>(~XXF>?CYC0bWaj4y>2U~5-`l~eFD$4e zz{Lp_)yQ+C@s+|0ilGLI~ELLI4OlO|}x5^yMgjkh6fz?F7doLr@s^t8f zoYdr!{30Pi4gn=zE;g_Oz<%KZ3JIbLNeF2Jy@sL+;u+t4tb$N~H7o})!In+0TEfb` z-C-fCC7cKMGU5>H3Ylz)|g+_Tseoks}Vos`%0no06?^uPQCeC}uDh6d< SKror!gG3?rn7n6=Ndy4J39HBe diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index 2283017337..cfab49fbb8 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -111110,7 +111110,7 @@ cont { cont { name: "shop-auction" element { - scale: 16 + scale: 18 symbol { name: "auction-m" priority: 500 @@ -111126,46 +111126,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "auction-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "auction-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "auction-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -111182,7 +111148,7 @@ cont { symbol { name: "auction-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -111766,7 +111732,7 @@ cont { cont { name: "shop-bookmaker" element { - scale: 16 + scale: 18 symbol { name: "lottery-m" priority: 500 @@ -111782,46 +111748,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "lottery-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "lottery-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "lottery-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -111838,7 +111770,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -113230,28 +113162,12 @@ cont { } cont { name: "shop-collector" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 500 - min_distance: 24 - } - } element { scale: 18 symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -113268,7 +113184,7 @@ cont { symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -113285,7 +113201,7 @@ cont { symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -114484,40 +114400,6 @@ cont { } cont { name: "shop-fabric" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 18 symbol { @@ -114857,7 +114739,7 @@ cont { cont { name: "shop-funeral_directors" element { - scale: 16 + scale: 18 symbol { name: "funeral_directors-m" priority: 500 @@ -114873,46 +114755,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "funeral_directors-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "funeral_directors-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "funeral_directors-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -114929,7 +114777,7 @@ cont { symbol { name: "funeral_directors-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -116397,7 +116245,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -116414,7 +116262,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -116431,7 +116279,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -119823,29 +119671,12 @@ cont { } cont { name: "shop-wholesale" - element { - scale: 17 - symbol { - name: "wholesale-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 9211020 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 18 symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -119862,7 +119693,7 @@ cont { symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -119879,7 +119710,7 @@ cont { symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index db945275e6ca2d456604a01a86d7622dbf83b36c..04fe60c5b6c176aeef791f3040cac0b0cdfbcc2f 100644 GIT binary patch delta 330 zcmX@SUh?j0$%Yoj7N!>F7M3ln3ws6TF>>(~XXF>?CYC0bWaj5h7wlsdoqqf!tIYHX zXIR;%d-k#NLbwM&+)5Dl`WjZ5?Th+YtJs7VFmmyMwI}80XXhqnrxs0*KZ9g|2wblS zM4S9HRuciC=`d}{`8heM$tC$k(-+=k?bt57oYjSoe+nZPH`vg$#H6CkWQdf{6n delta 588 zcmcb+TJrFE$%Yoj7N!>F7M3ln3w!1NF>>(~XXF>?CYC0bWaj4y>2U}s32<>jxzjf; zWmOW@;}Ap=)6JFm!mJ=M{o^TC+38z)S%nxO?8yZSS*E|}W#xnLm8MJfvGM}hil$N*RAB7F8mfE-VDH7K;SPDt;^y z`Y`L_r?Q#|c<*K8;sbjwIX@>SHMu0eNJtRqJzg$0uqfCcTtFc~R3Ql=Z4Mzcq3H`d zS#^M>JH7x@U_a?DV|C#Ze#gkg4K^+`J6NR|f!^Q2YRM=FqNIU_Puu|v(UKjkG7z>UOy~tf2yCgs zPSyp2)6FB9WTyY0!YTq`=}(2Qq_KT7l+*R6Q5bd7$rc;rvCynw+nt@J(CCkOGUWL diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index e0f1237d93..2fa8663f69 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -110895,7 +110895,7 @@ cont { cont { name: "shop-auction" element { - scale: 16 + scale: 18 symbol { name: "auction-m" priority: 500 @@ -110911,46 +110911,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "auction-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "auction-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "auction-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -110967,7 +110933,7 @@ cont { symbol { name: "auction-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -111551,7 +111517,7 @@ cont { cont { name: "shop-bookmaker" element { - scale: 16 + scale: 18 symbol { name: "lottery-m" priority: 500 @@ -111567,46 +111533,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "lottery-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "lottery-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "lottery-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -111623,7 +111555,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -113015,28 +112947,12 @@ cont { } cont { name: "shop-collector" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 500 - min_distance: 24 - } - } element { scale: 18 symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -113053,7 +112969,7 @@ cont { symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -113070,7 +112986,7 @@ cont { symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -114269,40 +114185,6 @@ cont { } cont { name: "shop-fabric" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 18 symbol { @@ -114642,7 +114524,7 @@ cont { cont { name: "shop-funeral_directors" element { - scale: 16 + scale: 18 symbol { name: "funeral_directors-m" priority: 500 @@ -114658,46 +114540,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "funeral_directors-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "funeral_directors-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "funeral_directors-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -114714,7 +114562,7 @@ cont { symbol { name: "funeral_directors-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -116182,7 +116030,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -116199,7 +116047,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -116216,7 +116064,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -119608,29 +119456,12 @@ cont { } cont { name: "shop-wholesale" - element { - scale: 17 - symbol { - name: "wholesale-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 18 symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -119647,7 +119478,7 @@ cont { symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -119664,7 +119495,7 @@ cont { symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 7b36766f78169e36539eb2aa28d60fc350a0fde5..16cc5a2f80a14d13d994ca67479da371d2bfb34d 100644 GIT binary patch delta 336 zcmdn9L+aWVsfHHD7N!>F7M3lnv8ShR&}QT0PAp9>$;{6a(&G@CUU-^Sf7%&Vq3Pf6 zvdT=?JHsk6{kjpG%=Wl5tW|7c3mCchiZk*Hbd&P)vvU)(Q;Wcw-dzG~Vx9i!607!f zgEOpPmd5s5msw2(gr>tZCFkelq$Zc-7fmlzXY1I0{t2rKAO93aE^e@qX^BZinaL0- zmM^US%u>e~xx^q+rFp4Ei8=8pnMGjz#nT^tXO*Ac^PN?0y4(+-JHf07C`)>K{}0xM zg46$BVwD4W1;bUVx!623l$XI=Ri2TblUkgZlPYAuA*3Y4#SIsj{_!rW()282HZe$O P%mJ~$p>fWbEiVHAowF7M3lnv8P4;F>>(~XXF>?CYC0bWaj4y>2U~5FFehvFD$4e zz{Lp_)yEgy7AcTL?9=CSu<;_<#y*Z_n7G6s>Pz!dixP9DhFd{Ah8#L+1r6` z*)2F-y^2W&5jqeqFeV^j1L8_=|IWeYp}}}#x`QE`h^U~F5EplOMt)9eabiv?a_~F7M3lnl^3R;F<|55PAp9>$;{6a(&G@C-g|*nfAR)Hmgx!? zS^1{VyTB?p`2mm@0Od(hk&CZ5Bfmg5DL+3uH!(Z42&|jy22^(*KO5h4 z=^Iep^PoKG?cZ*&nhH#hQ()udOwP~ANlh-vFPi>dkga3;>zAx9eEd@wxwygRrX?m7 zWhO(U6n?V$Gcz4yoL=~cReIWAR+;H5{;N>CBR?m#I58)6`o$ltO4Hjc*uF7M3lnl@~<*F>>(~XXF>?CYC0bWaj4y>2U~5@4djPFD$4e zz{Lp_)yVAYwvnvacVdd~}1#mO5cvP{3j z$Hp=JA1hns_6Oft{h66|F-4U( vAp@YTg=TERFoVwtGqO)FF=G>e3QQ9L@|Pj_(=VE_i9_V1x3ieD@nr%4xf;tw diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 578c058333..207546f5ed 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -116512,7 +116512,7 @@ cont { cont { name: "shop-auction" element { - scale: 16 + scale: 18 symbol { name: "auction-m" priority: 500 @@ -116528,46 +116528,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "auction-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "auction-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "auction-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -116584,7 +116550,7 @@ cont { symbol { name: "auction-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -117168,7 +117134,7 @@ cont { cont { name: "shop-bookmaker" element { - scale: 16 + scale: 18 symbol { name: "lottery-m" priority: 500 @@ -117184,46 +117150,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "lottery-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "lottery-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "lottery-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -117240,7 +117172,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -118632,28 +118564,12 @@ cont { } cont { name: "shop-collector" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 500 - min_distance: 24 - } - } element { scale: 18 symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -118670,7 +118586,7 @@ cont { symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -118687,7 +118603,7 @@ cont { symbol { name: "shop-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -119886,40 +119802,6 @@ cont { } cont { name: "shop-fabric" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 500 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 18 symbol { @@ -120259,7 +120141,7 @@ cont { cont { name: "shop-funeral_directors" element { - scale: 16 + scale: 18 symbol { name: "funeral_directors-m" priority: 500 @@ -120275,46 +120157,12 @@ cont { priority: -9500 } } - element { - scale: 17 - symbol { - name: "funeral_directors-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } - element { - scale: 18 - symbol { - name: "funeral_directors-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 19 symbol { name: "funeral_directors-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -120331,7 +120179,7 @@ cont { symbol { name: "funeral_directors-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -121799,7 +121647,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -121816,7 +121664,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -121833,7 +121681,7 @@ cont { symbol { name: "lottery-m" priority: 500 - min_distance: 20 + min_distance: 10 } caption { primary { @@ -125225,29 +125073,12 @@ cont { } cont { name: "shop-wholesale" - element { - scale: 17 - symbol { - name: "wholesale-m" - priority: 500 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -9500 - } - } element { scale: 18 symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -125264,7 +125095,7 @@ cont { symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { @@ -125281,7 +125112,7 @@ cont { symbol { name: "wholesale-m" priority: 500 - min_distance: 24 + min_distance: 10 } caption { primary { diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 3f93c67fc1..39c51a10f3 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1132,15 +1132,15 @@ office-diplomatic # icon z17- (also has captio office-ngo # icon z18- (also has caption(optional) z18-) office-telecommunication # icon z18- (also has caption(optional) z18-) shop-agrarian # icon z18- (also has caption(optional) z18-) -shop-auction # icon z16- (also has caption(optional) z16-) -shop-bookmaker # icon z16- (also has caption(optional) z16-) +shop-auction # icon z18- (also has caption(optional) z18-) +shop-bookmaker # icon z18- (also has caption(optional) z18-) shop-carpet # icon z18- (also has caption(optional) z18-) -shop-collector # icon z16- (also has caption(optional) z18-) +shop-collector # icon z18- (also has caption(optional) z18-) shop-craft # icon z18- (also has caption(optional) z18-) shop-curtain # icon z18- (also has caption(optional) z18-) -shop-fabric # icon z16- (also has caption(optional) z16-) +shop-fabric # icon z18- (also has caption(optional) z18-) shop-fishing # icon z18- (also has caption(optional) z18-) -shop-funeral_directors # icon z16- (also has caption(optional) z16-) +shop-funeral_directors # icon z18- (also has caption(optional) z18-) shop-gas # icon z18- (also has caption(optional) z18-) shop-hearing_aids # icon z18- (also has caption(optional) z18-) shop-herbalist # icon z18- (also has caption(optional) z18-) @@ -1152,7 +1152,7 @@ shop-pet_grooming # icon z18- (also has captio shop-storage_rental # icon z18- (also has caption(optional) z18-) shop-trade # icon z18- (also has caption(optional) z18-) shop-watches # icon z18- (also has caption(optional) z18-) -shop-wholesale # icon z17- (also has caption(optional) z17-) +shop-wholesale # icon z18- (also has caption(optional) z18-) === 500 amenity-shower # icon z17- (also has caption(optional) z17-) @@ -2054,15 +2054,15 @@ leisure-swimming_pool-private # icon z17- (also has captio # office-ngo # caption(optional) z18- (also has icon z18-) # office-telecommunication # caption(optional) z18- (also has icon z18-) # shop-agrarian # caption(optional) z18- (also has icon z18-) -# shop-auction # caption(optional) z16- (also has icon z16-) -# shop-bookmaker # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) # shop-carpet # caption(optional) z18- (also has icon z18-) -# shop-collector # caption(optional) z18- (also has icon z16-) +# shop-collector # caption(optional) z18- (also has icon z18-) # shop-craft # caption(optional) z18- (also has icon z18-) # shop-curtain # caption(optional) z18- (also has icon z18-) -# shop-fabric # caption(optional) z16- (also has icon z16-) +# shop-fabric # caption(optional) z18- (also has icon z18-) # shop-fishing # caption(optional) z18- (also has icon z18-) -# shop-funeral_directors # caption(optional) z16- (also has icon z16-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) # shop-gas # caption(optional) z18- (also has icon z18-) # shop-hearing_aids # caption(optional) z18- (also has icon z18-) # shop-herbalist # caption(optional) z18- (also has icon z18-) @@ -2074,7 +2074,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-storage_rental # caption(optional) z18- (also has icon z18-) # shop-trade # caption(optional) z18- (also has icon z18-) # shop-watches # caption(optional) z18- (also has icon z18-) -# shop-wholesale # caption(optional) z17- (also has icon z17-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) # === -9500 # amenity-shower # caption(optional) z17- (also has icon z17-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 1386c98d93..6dfc8b70c9 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1132,15 +1132,15 @@ office-diplomatic # icon z17- (also has captio office-ngo # icon z18- (also has caption(optional) z18-) office-telecommunication # icon z18- (also has caption(optional) z18-) shop-agrarian # icon z18- (also has caption(optional) z18-) -shop-auction # icon z16- (also has caption(optional) z16-) -shop-bookmaker # icon z16- (also has caption(optional) z16-) +shop-auction # icon z18- (also has caption(optional) z18-) +shop-bookmaker # icon z18- (also has caption(optional) z18-) shop-carpet # icon z18- (also has caption(optional) z18-) -shop-collector # icon z16- (also has caption(optional) z18-) +shop-collector # icon z18- (also has caption(optional) z18-) shop-craft # icon z18- (also has caption(optional) z18-) shop-curtain # icon z18- (also has caption(optional) z18-) -shop-fabric # icon z16- (also has caption(optional) z16-) +shop-fabric # icon z18- (also has caption(optional) z18-) shop-fishing # icon z18- (also has caption(optional) z18-) -shop-funeral_directors # icon z16- (also has caption(optional) z16-) +shop-funeral_directors # icon z18- (also has caption(optional) z18-) shop-gas # icon z18- (also has caption(optional) z18-) shop-hearing_aids # icon z18- (also has caption(optional) z18-) shop-herbalist # icon z18- (also has caption(optional) z18-) @@ -1152,7 +1152,7 @@ shop-pet_grooming # icon z18- (also has captio shop-storage_rental # icon z18- (also has caption(optional) z18-) shop-trade # icon z18- (also has caption(optional) z18-) shop-watches # icon z18- (also has caption(optional) z18-) -shop-wholesale # icon z17- (also has caption(optional) z17-) +shop-wholesale # icon z18- (also has caption(optional) z18-) === 500 amenity-shower # icon z17- (also has caption(optional) z17-) @@ -2055,15 +2055,15 @@ leisure-swimming_pool-private # icon z17- (also has captio # office-ngo # caption(optional) z18- (also has icon z18-) # office-telecommunication # caption(optional) z18- (also has icon z18-) # shop-agrarian # caption(optional) z18- (also has icon z18-) -# shop-auction # caption(optional) z16- (also has icon z16-) -# shop-bookmaker # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) # shop-carpet # caption(optional) z18- (also has icon z18-) -# shop-collector # caption(optional) z18- (also has icon z16-) +# shop-collector # caption(optional) z18- (also has icon z18-) # shop-craft # caption(optional) z18- (also has icon z18-) # shop-curtain # caption(optional) z18- (also has icon z18-) -# shop-fabric # caption(optional) z16- (also has icon z16-) +# shop-fabric # caption(optional) z18- (also has icon z18-) # shop-fishing # caption(optional) z18- (also has icon z18-) -# shop-funeral_directors # caption(optional) z16- (also has icon z16-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) # shop-gas # caption(optional) z18- (also has icon z18-) # shop-hearing_aids # caption(optional) z18- (also has icon z18-) # shop-herbalist # caption(optional) z18- (also has icon z18-) @@ -2075,7 +2075,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-storage_rental # caption(optional) z18- (also has icon z18-) # shop-trade # caption(optional) z18- (also has icon z18-) # shop-watches # caption(optional) z18- (also has icon z18-) -# shop-wholesale # caption(optional) z17- (also has icon z17-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) # === -9500 # amenity-shower # caption(optional) z17- (also has icon z17-)