From 48dba27018a8b689b26311b30511551c1571a8b6 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 21 Jun 2025 15:05:52 +0700 Subject: [PATCH] [styles] Regenerate for generic amenities and camp sites area fills Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 434573 -> 435154 bytes data/drules_proto.txt | 295 +++++++++++++----- data/drules_proto_default_dark.bin | Bin 416898 -> 417576 bytes data/drules_proto_default_dark.txt | 157 ++++++++++ data/drules_proto_default_light.bin | Bin 418260 -> 418938 bytes data/drules_proto_default_light.txt | 257 ++++++++++++--- data/drules_proto_outdoors_dark.bin | Bin 436903 -> 437613 bytes data/drules_proto_outdoors_dark.txt | 162 ++++++++++ data/drules_proto_outdoors_light.bin | Bin 438376 -> 439086 bytes data/drules_proto_outdoors_light.txt | 262 +++++++++++++--- .../include/priorities_1_BG-by-size.prio.txt | 26 +- .../include/priorities_4_overlays.prio.txt | 52 +-- .../include/priorities_1_BG-by-size.prio.txt | 26 +- .../include/priorities_4_overlays.prio.txt | 52 +-- 14 files changed, 1025 insertions(+), 264 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 44fe04c56b10743124ab1d7e24d86b3d07875d70..6f5f69db49478da5ac6fd2d7ff3c9095a6e42fc8 100644 GIT binary patch delta 1731 zcmaKs%}*0S7{=4?LfeUatw6D9NEYHjY!iqF5Ys~O#I5`R#x%GIYbeFG#CTFlT|P@w zhNjUI;h+}@nwW4ka4_DCHw|gfgE8SGUc6YH*`0TGmMk{e?DM|Q?ELnb&TQ!@^yz)* zb*bQai8l-3z@)!5)b9WG^%PGPReV@bNvDl>5=fc!w>!%YXQ?>L%g(ZsmlN`D38}bJ z=)wC%6i9IHpm7C%D5|6b+(F|eQWBg?N_^+3PoghL^^UFSFd(w0fH-K3%1>m}M~R)$ z>6xsa%j>B*WrBknMhNd3YG8tc8%E3rX&XkuB+?#aq#AHk1FLoAmV79q8)iCf<@~BX zTXC*x|JItyIa5Vi;_+44#91XLvJ#+XdDR}++l0;}bj{=%Yf4~@hg)0^;umWw>AW_M+18J_940h zRm^8D2)ADm!v(R;BwA!r3z$>`lWJfFvBm5cg4MT!=DxSLMt$3c5G_Ke1rVwMLN!3@ z+avK^FKSJtwK+ZiC_0~+)u%P36Hc(N=gUvnBuWha9I=Zd)q!x#&(4|X^tB*AnXmR{ zTiPO}Wr5!6-Cglh&4Qn_%Ll{MFiD z`W5y-;(?PFOAjVoh{0&$#egx~Fd^PNsV6T+;>_;Olyca7@6FD<_kC~X>nC67gRfay z;+CPjG{}bqJ7ib-;AqK@u><2KfcbVU~|3tWhh1d)eMQ z7W9or60w29HN=nMp?izr4;B63J%GRZ1c*~xeUmw zQrDzFuVJec(MLHp>&3FcXUw`)4s##jU3CzCm2G<47b-^E>(u~En{8z)le$W_GQk2N zn8uDVG>gWF*-E$r5y_DroPy*)LOi3!l(_y%NFL8?E#YJ>%(5Vu=0GsbfM7a*vUb~O z7pZvKbV4LSf3F3xm4jFrt01pm)%%^Px8wtvWcIrt_&Y!II8P%kpMwN4Sp=ZEsmC+}#{ntY&6akEan z79-0KW-i6ahE0+@Nu?<%8JWc;LXKdq@{@ZS6qy~t+MG5&Xz*oZYG9eH-=xay1U33x z6Yu2ICPg40V)VHtgU!2|f*4s2v2YnrHf&R#Y}_J<;*gjYWQT}N=4+GNytSo*k@3@H zy*6EDd!WIBePWZ7+BAS{elYu5yZU6iE~&{Nx*kd&fYSYa5b+COT7&VyM1yPq(YEanx(-Zd+AU(@;!Dg;&C4vQ z)Gf%*$xKca65$Y#65v>LWCo+et&jg9fKkYnLl9GR^7{!|qP84DSY%`-f@Fko%7|c< z(QKYSar^v*!o&jB!lbTsvT9m3=lvl@k1bf0__?@}6LSlu8>q9XOg`DeErc)%RgS9{mz?tUJT*2EGXT^U Bt33b! delta 659 zcmX|-!E4h{9LIUSEY_fD8#lX*A-03ACT&v@oVU7*>>^Z8-n4Fk#;r?jQp8KwuIo}Y zTig7=90a|JAWVXkffOn`Zx>JEKcI)fE_x8e_Y%9qe2F z=n#h68Jr36j+G_|dyCc+#C*owWtsqvIxJ3;*MD|o!muYjUq$Eun)WRBSbeG)C4orc z@P)61{>v=rRt)aj^YFo%@p=58N+;+mK2!c9bJQ62?LeL1l_AodfyRymd)74E+PMmi zevI~x?E})g`M`bBC~51aPTdn>E);YyY9#0mAoXM~(!D)SY8G|+6RB6X7kEYcK~m8P zl2X#7lr$+NO)5I6O9zPKi)D3PGoNKD`kJ<^3UVk48;*qKkN`tRav$>eEPQd2ZtrA* zg^`nNsW4ChE&djM5%rp?8MUgKsj7xvHQi2@t+_{8b{ej{XIxQX1;2CuEU*{cg2JAo z?UcpaXUM_iFazG6c=cNRi@2z%*Q%OP&MX(pl?R4qs${Q-n@q8EvFNxE+#e}cX2|T~ MX*D?@cljIt0Bs)K@&Et; diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index ba3fa4c1c..4e367dc3b 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -9672,6 +9672,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9689,6 +9693,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -9814,6 +9822,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -9831,6 +9843,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -9956,6 +9972,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -9973,6 +9993,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -10098,6 +10122,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10115,6 +10143,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10240,6 +10272,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10257,6 +10293,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10382,6 +10422,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10399,6 +10443,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10524,6 +10572,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10541,6 +10593,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10666,6 +10722,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10683,6 +10743,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -10808,6 +10872,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -10825,6 +10893,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -10950,6 +11022,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 2499106 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -10967,6 +11043,10 @@ cont { } element { scale: 15 + area { + color: 2499106 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -11090,8 +11170,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11108,6 +11199,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11124,6 +11219,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11140,6 +11239,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -52098,8 +52201,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 16 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52117,6 +52231,10 @@ cont { } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52134,6 +52252,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52151,6 +52273,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -52168,6 +52294,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -124298,8 +124428,19 @@ cont { } cont { name: "tourism-camp_site" + element { + scale: 15 + area { + color: 2499106 + priority: -1830 + } + } element { scale: 16 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124316,6 +124457,10 @@ cont { } element { scale: 17 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124332,6 +124477,10 @@ cont { } element { scale: 18 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124348,6 +124497,10 @@ cont { } element { scale: 19 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124364,6 +124517,10 @@ cont { } element { scale: 20 + area { + color: 2499106 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index e17a1dec92b525c3638a1461cf8de24e299d3d41..46dc2bbd7fdba8e3a9472d299566950951239923 100644 GIT binary patch delta 1674 zcmaKs&ubGw6vxT$WWcsr`vTg;niNAH^`WmGG(ah0d`?-sl@pQx3iLiZ{%ieQxUe4U zN&>Jc^Jab6JnUdSVUCdvYrM(EZ8jckjJgi7Q4+=5>AOmHPT-E3j+=ZmWOMeiG>U(0 zT0KDZg$mb*902BM>RO4X@KdhGOy;1id}_JJY=uVo)N%ttH9&~ALud*hR0BjUTM$vq zk_u|-DaQ88c4H%(4JOsVB-+lTDPU3!%#lsT?9gPDbbEt|>y=i2^-6<9HL!@bvuFxf zR0FGC8B1=vQJcJwUR1Pu@g;R$nN16waBl;>Uuw`NLL$hT&mP5Bx1wSK{w;eZas~y- zdDT>#XOOI57w$hR*fl(5MWlGLwRf`R`tvjSjlA)ETFK@z>3AlcRWllSV|HQeyGg&Z z?~grNZP(qj;T_CW!^3`>V!hY2i=`ZFz%GaPr>Ur3)7|9pkjJ}M(|z~1Q%7zT*3=yN zm@UL-<%Ol|Sw*8|cQP^IXd)c*cUPZ8{oP#?&Q5H3M>{e95ZUTz$4WWciTPuDcVd2J FgwPs^^hE@z5+0p|7D)pWH}^kh?tJGz=hQzs_uo6W z-eygC*v$4bLCyw4&o9E?>>$>5tb1VasoUb{b8v?Thaf6$2t66H@GY^>5_h%4-RI%~ zGumg+5d2(qc0No;B8!ro5(2n1|IE(>aM}6XC@sn7rf4~$jZ%Cr#1Kn32i07AL*Fu^ z?+kJgG#uv;Gm5F!d;s5exR<}7zbZ^OiC9x&L8RXe!+c@Vj9#{*u?DdN>II=OrU^Qt zP37!}<|tiM<|tiM?r3zJgFQv}D=MNHePPfwN}nxqj1POhU-aVJ4zHK}bP~1VBy3gm zKe47{qK$zQZFsL0gKg*?*jHSP7b9=4csjkD-DN|TMd?u_4PnLAF~b?F-C3E|{M8%x zWJ!-RjeDmQG<|>{tNmarTQrX&W!>Y}ss{+B_=HXi%J^7Kt`29+k00LUmhl z*DgEa;%PZ1#o;bCP5OVac8*03}Wf)d}A86ugeiycP!F2kk_r!#3v8W`clTlwX zDkqXD!OJ<+f6Hwi78#q?3{y_br6uOAllz6~)7IsBRxin&mZd!N&=BX^1>gU-{W9IMLOb=sufp KZ}Waun)nY%b*+T} diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index ecfcd66a7..d76ee1c17 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -9672,6 +9672,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9689,6 +9693,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -9707,7 +9715,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9728,7 +9736,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9749,7 +9757,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9770,7 +9778,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9791,7 +9799,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9814,6 +9822,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -9831,6 +9843,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -9849,7 +9865,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9870,7 +9886,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9891,7 +9907,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9912,7 +9928,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9933,7 +9949,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9956,6 +9972,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -9973,6 +9993,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -9991,7 +10015,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10012,7 +10036,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10033,7 +10057,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10054,7 +10078,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10075,7 +10099,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10098,6 +10122,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10115,6 +10143,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10133,7 +10165,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10154,7 +10186,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10175,7 +10207,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10196,7 +10228,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10217,7 +10249,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10240,6 +10272,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10257,6 +10293,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10275,7 +10315,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10296,7 +10336,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10317,7 +10357,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10338,7 +10378,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10359,7 +10399,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10382,6 +10422,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10399,6 +10443,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10417,7 +10465,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10438,7 +10486,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10459,7 +10507,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10480,7 +10528,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10501,7 +10549,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10524,6 +10572,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10541,6 +10593,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10559,7 +10615,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10580,7 +10636,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10601,7 +10657,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10622,7 +10678,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10643,7 +10699,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10666,6 +10722,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10683,6 +10743,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -10701,7 +10765,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10722,7 +10786,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10743,7 +10807,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10764,7 +10828,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10785,7 +10849,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10808,6 +10872,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -10825,6 +10893,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -10843,7 +10915,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10864,7 +10936,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10885,7 +10957,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10906,7 +10978,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10927,7 +10999,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10950,6 +11022,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -10967,6 +11043,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -10985,7 +11065,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11006,7 +11086,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11027,7 +11107,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11048,7 +11128,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11069,7 +11149,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11090,8 +11170,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11108,6 +11199,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11124,6 +11219,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11140,6 +11239,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -51834,8 +51937,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51853,6 +51967,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51870,6 +51988,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51887,6 +52009,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -51904,6 +52030,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -124083,8 +124213,19 @@ cont { } cont { name: "tourism-camp_site" + element { + scale: 15 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124101,6 +124242,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124117,6 +124262,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124133,6 +124282,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -124149,6 +124302,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index fe6615a5c5eb57b7804656c2a9db64d5585cbaf3..d7a19f1a0364298b2bdb8ad6e4239632d2f3ebf8 100644 GIT binary patch delta 1110 zcmZ`&J8aWX6xEAOVi`3bH;zI|O9O)Z8pOuZB$P@>VL~iyK~WS5OL0@h@c@dzq-j2_ z@@ei6x*)Yn+ofvdAyb74NJwlMShCOw%78>WF%{mkL!gSW^mOih=lPs-{p77rp6`9n zo>QT>Xx0r=MK{gG87rJ9K8Pz`D$dw&eIE+tAnd*Lsy~zPGPaq7|CGij^*bwZu|)HL-C>ERR8;gS*dFdfSZ=tt*8~f;<)8#*& z0hq0L)k0ZD^eM##bit~Fis6%o)k)1ZhQ$u6chncvc|;#k?38xubInXe2e#j8L0s#W zk5*>X`IRU_$6#+>hS#f>ftU-X>lRQ~y|^cWr1wFq>Cy0@s^i%JV>P{3H1z9gtSCzv zLF7ofUSkrT)pfC6Bccg?ZTR4zIswOx8*nzjSWWL04Skx>wPB>)mgS!rU9j8osjcR{ zL3%cy%nDLo^CN-LntvExZtLL*lJEpcc!DH6K@whW`=gsC)|wR43qt;Bcrlw1Qfbb~ z*gbY;^ZhI2?w|b9AH+o%$LKB`wVm*x?cyU0XUGOIGyY%3X~+bYQcy_&>ZZU%@zF0h zVJ0m|axNXtrKM~xj}zKP-{hi3xjThzQ;3fmh41XkX1?=g+vLK$LHu*P!4T(ogHeV& zUrFqk@S^adyNR6(&3B;-~xlmGw# delta 632 zcmX|;&ui0Q7{_`0#u$SpHtV{s8_GJ$=+dn5)XPL=xPzdFT|G#dfkvCA%Ma!bvaGGG zE7&c2T5{V-5H=JchaMDEtT!15dJ+EunLB#bH_6t+%k%xd&+~lV=i&YHGyUpE`fb9Y z8Wfv?o2?Wj6d4X&XB_T3Gq}j`zU#b3=sVn~XK{g~HtGu`^6;-N`^WXWi28-u4C%~J zf=tqOvw&rizV+;y|GT+@&^}ym6$vPU?zciHd0+y*wrBi{Z5vTXn9UKw?3kt-nqCzo zhRg6Q6FS&x&SHrG?{q|8-d;x3d(2)T)sq*>YW1Nl ztgB}E3>7&zdY%bcsjdj}b{eL;b9)d5a9#|fPFAzcimC;j@U)u`>$i3m{NwIY#16*c zpu8KUPTUApbLTj|Za=|1l*(z9*+`zX+*8jM78zqN`2S5!K#2jFE%Mp$40W=U#rEbTJ#ZblXr( yOm`S5V<~RwW~?e54m@**=%yQmu+@4W240P4{P;?%Nyg zyIbTxE?I?0zDv2EiAJa6sk9R2B^>0s;LUT@6Xqox=htJsu6~2grOQ?66>SFkxTBOyUaI} zNhRVl3U44(iyiQ7U9~i>TD;0Bh=$80W5dyLT%T%D)9L6KZh~rYq(#P{{uF6Ydd>{8 zu2is9mJDBSpt)wJB@>fs#H1QAsYXny5%aWUV#3shNQm$#@0U9ux?yG9FPlMBV-VFC zL^TFcjY0e6QSFse_THO`&BoJ@hv(-K@dq)bU1BFk?EHR=dr}EW>(<`Bd^(%&OMvrxo1;;fy_xR7rBI;$ac%eug*=O;!C>Q{bA{h@iDR% zUAd5SUm_M;+y-meuxwB(x;0_T`yuHbBB#)1p(@O>!)2BoEwgN3>4bwjn<@8~@qe*< B5RL!< delta 1118 zcmYk5&rcIU6vxv}yWLE%r3?Om5VR#Bfl_Go&`O|@#EV?|ClG|jt^r%STfHc$)P)wX z(7raC7~+qUa8W$xwvi-d8yzV~#*8Tmc zdncW<<>6+o2Sr3Tcnc??p7Rm*5Izl|MW3s^yInl|atO`bWk}z1pccC%tMBSK#+{re zocJTcK4=!Y+OB42XOps`N+V>TEC)Cv9V_BtnED<6oM#74sxzIM5+g-i{}mX z!<7iUE1F{{yH_lZAL9+qQO7HUd+FBU=Zb)ah!n2|NcF(vYS@r2td1LXw^jeOYHZEy zFRVpud+@Z>gRduU%SuwB$$qSv$zDDf=8H&{taOxFI?5~^WtJ{kiW=fR-;<<2Hte2D$VxVo z2xbyWDx>O+J3>}(Y}rrg*X{~uOsWxD-rTm63z5rF-`sX?z3nO^>{V0QjI7KDXQt=V uQ;Mu6$ftQiPpJa^Hr@Jf6Fepa#ddw{mJo1|<9j(toH{sl*2#0f#{L7{4ZiOH diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index aaaa54dd3..d8113dabc 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -9814,6 +9814,10 @@ cont { name: "amenity-place_of_worship" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4150 @@ -9831,6 +9835,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4150 @@ -9849,7 +9857,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9870,7 +9878,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9891,7 +9899,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9912,7 +9920,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9933,7 +9941,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -9956,6 +9964,10 @@ cont { name: "amenity-place_of_worship-buddhist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-s" priority: 4200 @@ -9973,6 +9985,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "buddhist-m" priority: 4200 @@ -9991,7 +10007,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10012,7 +10028,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10033,7 +10049,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10054,7 +10070,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10075,7 +10091,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10098,6 +10114,10 @@ cont { name: "amenity-place_of_worship-christian" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-s" priority: 4200 @@ -10115,6 +10135,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "christian-m" priority: 4200 @@ -10133,7 +10157,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10154,7 +10178,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10175,7 +10199,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10196,7 +10220,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10217,7 +10241,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10240,6 +10264,10 @@ cont { name: "amenity-place_of_worship-christian-jehovahs_witness" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-s" priority: 4200 @@ -10257,6 +10285,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "place-of-worship-m" priority: 4200 @@ -10275,7 +10307,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10296,7 +10328,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10317,7 +10349,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10338,7 +10370,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10359,7 +10391,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10382,6 +10414,10 @@ cont { name: "amenity-place_of_worship-christian-mormon" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-s" priority: 4200 @@ -10399,6 +10435,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "mormon-m" priority: 4200 @@ -10417,7 +10457,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10438,7 +10478,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10459,7 +10499,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10480,7 +10520,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10501,7 +10541,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10524,6 +10564,10 @@ cont { name: "amenity-place_of_worship-hindu" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-s" priority: 4200 @@ -10541,6 +10585,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "hindu-m" priority: 4200 @@ -10559,7 +10607,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10580,7 +10628,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10601,7 +10649,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10622,7 +10670,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10643,7 +10691,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10666,6 +10714,10 @@ cont { name: "amenity-place_of_worship-jewish" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-s" priority: 4200 @@ -10683,6 +10735,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "jewish-m" priority: 4200 @@ -10701,7 +10757,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10722,7 +10778,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10743,7 +10799,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10764,7 +10820,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10785,7 +10841,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10808,6 +10864,10 @@ cont { name: "amenity-place_of_worship-muslim" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-s" priority: 4200 @@ -10825,6 +10885,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "muslim-m" priority: 4200 @@ -10843,7 +10907,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10864,7 +10928,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10885,7 +10949,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10906,7 +10970,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10927,7 +10991,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -10950,6 +11014,10 @@ cont { name: "amenity-place_of_worship-shinto" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-s" priority: 4200 @@ -10967,6 +11035,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "shinto-m" priority: 4200 @@ -10985,7 +11057,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11006,7 +11078,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11027,7 +11099,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11048,7 +11120,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11069,7 +11141,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11092,6 +11164,10 @@ cont { name: "amenity-place_of_worship-taoist" element { scale: 14 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-s" priority: 4200 @@ -11109,6 +11185,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1760 + } symbol { name: "taoist-m" priority: 4200 @@ -11127,7 +11207,7 @@ cont { element { scale: 16 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11148,7 +11228,7 @@ cont { element { scale: 17 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11169,7 +11249,7 @@ cont { element { scale: 18 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11190,7 +11270,7 @@ cont { element { scale: 19 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11211,7 +11291,7 @@ cont { element { scale: 20 area { - color: 16248287 + color: 16445666 priority: -1760 } symbol { @@ -11232,8 +11312,19 @@ cont { } cont { name: "amenity-police" + element { + scale: 16 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11250,6 +11341,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11266,6 +11361,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -11282,6 +11381,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "police-m" priority: 500 @@ -54525,8 +54628,19 @@ cont { } cont { name: "leisure-resort" + element { + scale: 15 + area { + color: 16445666 + priority: -1830 + } + } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54544,6 +54658,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54561,6 +54679,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54578,6 +54700,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -54595,6 +54721,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "hotel-m" priority: 2750 @@ -130074,6 +130204,10 @@ cont { name: "tourism-camp_site" element { scale: 13 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-s" priority: 3800 @@ -130091,6 +130225,10 @@ cont { } element { scale: 14 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130108,6 +130246,10 @@ cont { } element { scale: 15 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130125,6 +130267,10 @@ cont { } element { scale: 16 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130141,6 +130287,10 @@ cont { } element { scale: 17 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130157,6 +130307,10 @@ cont { } element { scale: 18 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130173,6 +130327,10 @@ cont { } element { scale: 19 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 @@ -130189,6 +130347,10 @@ cont { } element { scale: 20 + area { + color: 16445666 + priority: -1830 + } symbol { name: "campsite-m" priority: 3800 diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 8cebc5183..dc27c5c86 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -17,16 +17,16 @@ leisure-stadium # area z15- (also has icon z13-, caption(optional) z13-) === 250 -amenity-place_of_worship # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-buddhist # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-jehovahs_witness # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-mormon # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-hindu # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-jewish # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-muslim # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-shinto # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-taoist # area z16- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-buddhist # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-jehovahs_witness # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-mormon # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-hindu # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-jewish # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-muslim # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-shinto # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-taoist # area z14- (also has icon z14-, caption(optional) z14-) === 240 amenity-doctors # area z14- (also has icon z17-, caption(optional) z17-) @@ -50,10 +50,10 @@ landuse-cemetery # area z14- (also has icon z landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-) === 180 +amenity-police # area z16- (also has icon z17-, caption(optional) z17-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) -tourism-camp_site -leisure-resort -amenity-police +leisure-resort # area z15- (also has icon z16-, caption(optional) z16-) +tourism-camp_site # area z15- (also has icon z16-, caption(optional) z16-) === 170 highway-footway-area # area z14- (also has line z15-, pathtext z15-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index abfdbf799..ccc6eeaff 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -377,18 +377,18 @@ amenity-fuel # icon z14- (also has captio highway-services # icon z14- (also has caption(optional) z14-) === 4250 -amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z14-) === 4200 -amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z14-) historic-memorial # icon z15- (also has caption(optional) z15-) === 4150 @@ -414,7 +414,7 @@ tourism-wilderness_hut # icon z16- (also has captio === 3900 highway-rest_area # icon z15- (also has caption(optional) z15-) -tourism-camp_site # icon z16- (also has caption(optional) z16-) +tourism-camp_site # icon z16- (also has caption(optional) z16-, area z15-) tourism-caravan_site # icon z16- (also has caption(optional) z16-) tourism-chalet # icon z16- (also has caption(optional) z16-) === 3800 @@ -747,7 +747,7 @@ piste:type-snow_park # caption z15- (also has are === 2770 amenity-townhall # icon z16- (also has caption(optional) z16-) -leisure-resort # icon z16- (also has caption(optional) z16-) +leisure-resort # icon z16- (also has caption(optional) z16-, area z15-) tourism-hotel # icon z16- (also has caption(optional) z16-) === 2750 @@ -1117,7 +1117,7 @@ amenity-fire_station # icon z18- (also has captio amenity-gambling # icon z17- (also has caption(optional) z17-) amenity-internet_cafe # icon z18- (also has caption(optional) z19-) amenity-love_hotel # icon z18- (also has caption(optional) z18-) -amenity-police # icon z17- (also has caption(optional) z17-) +amenity-police # icon z17- (also has caption(optional) z17-, area z16-) amenity-stripclub # icon z18- (also has caption(optional) z18-) craft # icon z18- (also has caption(optional) z18-) craft-beekeeper # icon z17- (also has caption(optional) z18-) @@ -1523,18 +1523,18 @@ leisure-swimming_pool-private # icon z17- (also has captio # highway-services # caption(optional) z14- (also has icon z14-) # === -5750 -# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z14-) # === -5800 -# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z14-) # historic-memorial # caption(optional) z15- (also has icon z15-) # === -5850 @@ -1560,7 +1560,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -6100 # highway-rest_area # caption(optional) z15- (also has icon z15-) -# tourism-camp_site # caption(optional) z16- (also has icon z16-) +# tourism-camp_site # caption(optional) z16- (also has icon z16-, area z15-) # tourism-caravan_site # caption(optional) z16- (also has icon z16-) # tourism-chalet # caption(optional) z16- (also has icon z16-) # === -6200 @@ -1719,7 +1719,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -7150 # amenity-townhall # caption(optional) z16- (also has icon z16-) -# leisure-resort # caption(optional) z16- (also has icon z16-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z15-) # tourism-hotel # caption(optional) z16- (also has icon z16-) # === -7250 @@ -2050,7 +2050,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-gambling # caption(optional) z17- (also has icon z17-) # amenity-internet_cafe # caption(optional) z19- (also has icon z18-) # amenity-love_hotel # caption(optional) z18- (also has icon z18-) -# amenity-police # caption(optional) z17- (also has icon z17-) +# amenity-police # caption(optional) z17- (also has icon z17-, area z16-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) # craft # caption(optional) z18- (also has icon z18-) # craft-beekeeper # caption(optional) z18- (also has icon z17-) diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 1da8e4d8d..9e6643e4f 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -17,16 +17,16 @@ leisure-stadium # area z15- (also has icon z13-, caption(optional) z13-) === 250 -amenity-place_of_worship # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-buddhist # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-jehovahs_witness # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-mormon # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-hindu # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-jewish # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-muslim # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-shinto # area z16- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-taoist # area z16- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-buddhist # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-jehovahs_witness # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-mormon # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-hindu # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-jewish # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-muslim # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-shinto # area z14- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-taoist # area z14- (also has icon z14-, caption(optional) z14-) === 240 amenity-doctors # area z14- (also has icon z17-, caption(optional) z17-) @@ -50,10 +50,10 @@ landuse-cemetery # area z14- (also has icon z landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-) === 180 +amenity-police # area z16- (also has icon z17-, caption(optional) z17-) highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) -tourism-camp_site -leisure-resort -amenity-police +leisure-resort # area z15- (also has icon z16-, caption(optional) z16-) +tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) === 170 highway-footway-area # area z14- (also has line z11-, pathtext z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 3a9529933..7e5f6b0b1 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -377,18 +377,18 @@ amenity-fuel # icon z14- (also has captio highway-services # icon z14- (also has caption(optional) z14-) === 4250 -amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z16-) -amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z14-) +amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z14-) === 4200 -amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z14-) historic-memorial # icon z15- (also has caption(optional) z15-) === 4150 @@ -414,7 +414,7 @@ tourism-wilderness_hut # icon z12- (also has captio === 3900 highway-rest_area # icon z14- (also has caption(optional) z15-) -tourism-camp_site # icon z13- (also has caption(optional) z13-) +tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-) tourism-caravan_site # icon z13- (also has caption(optional) z13-) tourism-chalet # icon z14- (also has caption(optional) z14-) === 3800 @@ -747,7 +747,7 @@ piste:type-snow_park # caption z15- (also has are === 2770 amenity-townhall # icon z16- (also has caption(optional) z16-) -leisure-resort # icon z16- (also has caption(optional) z16-) +leisure-resort # icon z16- (also has caption(optional) z16-, area z15-) tourism-hotel # icon z16- (also has caption(optional) z16-) === 2750 @@ -1118,7 +1118,7 @@ amenity-fire_station # icon z18- (also has captio amenity-gambling # icon z17- (also has caption(optional) z17-) amenity-internet_cafe # icon z18- (also has caption(optional) z19-) amenity-love_hotel # icon z18- (also has caption(optional) z18-) -amenity-police # icon z17- (also has caption(optional) z17-) +amenity-police # icon z17- (also has caption(optional) z17-, area z16-) amenity-stripclub # icon z18- (also has caption(optional) z18-) craft # icon z18- (also has caption(optional) z18-) craft-beekeeper # icon z17- (also has caption(optional) z18-) @@ -1526,18 +1526,18 @@ leisure-swimming_pool-private # icon z17- (also has captio # highway-services # caption(optional) z14- (also has icon z14-) # === -5750 -# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z16-) -# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z14-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z14-) # === -5800 -# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z14-) # historic-memorial # caption(optional) z15- (also has icon z15-) # === -5850 @@ -1563,7 +1563,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -6100 # highway-rest_area # caption(optional) z15- (also has icon z14-) -# tourism-camp_site # caption(optional) z13- (also has icon z13-) +# tourism-camp_site # caption(optional) z13- (also has icon z13-, area z13-) # tourism-caravan_site # caption(optional) z13- (also has icon z13-) # tourism-chalet # caption(optional) z14- (also has icon z14-) # === -6200 @@ -1722,7 +1722,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -7150 # amenity-townhall # caption(optional) z16- (also has icon z16-) -# leisure-resort # caption(optional) z16- (also has icon z16-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z15-) # tourism-hotel # caption(optional) z16- (also has icon z16-) # === -7250 @@ -2054,7 +2054,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-gambling # caption(optional) z17- (also has icon z17-) # amenity-internet_cafe # caption(optional) z19- (also has icon z18-) # amenity-love_hotel # caption(optional) z18- (also has icon z18-) -# amenity-police # caption(optional) z17- (also has icon z17-) +# amenity-police # caption(optional) z17- (also has icon z17-, area z16-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) # craft # caption(optional) z18- (also has icon z18-) # craft-beekeeper # caption(optional) z18- (also has icon z17-)