From 5ed3ccc612affafda6b23e9bf7e7ca53cc869da7 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Fri, 29 Sep 2023 11:26:57 +0300 Subject: [PATCH] [styles] Regenerate for tertiary/residential shields Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 346027 -> 346294 bytes data/drules_proto.txt | 108 +++++++++++++ data/drules_proto_clear.bin | Bin 347000 -> 347267 bytes data/drules_proto_clear.txt | 108 +++++++++++++ data/drules_proto_dark.bin | Bin 345291 -> 345648 bytes data/drules_proto_dark.txt | 126 +++++++++++++++ data/drules_proto_vehicle_clear.bin | Bin 247208 -> 247475 bytes data/drules_proto_vehicle_clear.txt | 108 +++++++++++++ data/drules_proto_vehicle_dark.bin | Bin 246595 -> 247042 bytes data/drules_proto_vehicle_dark.txt | 144 ++++++++++++++++++ .../clear/include/priorities_3_FG.prio.txt | 26 ++-- .../include/priorities_4_overlays.prio.txt | 28 ++-- .../vehicle/include/priorities_3_FG.prio.txt | 36 ++--- .../include/priorities_4_overlays.prio.txt | 28 ++-- 14 files changed, 653 insertions(+), 59 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index fbea24ba6515571fda20d94d9538a2ae147481c9..cd406c8a6eedf414d9ea9399e76f5e8f0b667722 100644 GIT binary patch delta 563 zcmZ48FS>1_Xu}ppM+c@g%+sA67`qv*rW+PB3QwPq!zjkPL)?j%gHz!D|Nra?-P3Ec z7 z7hD-9<8iNTK4TbK$SeQ~LF|W_3J#fs$#;LLZ%=S%)Ky~qI=wHGF^#_fSQj9(cU7fg50L(xTw#qCb{j6lo;#LU~B@>w!(008f!x>x`J delta 319 zcmdlsQFL{`Xu}ppM+c_=Ow*km7`qv@r=NEK68n4^*{2_IVpN&_(w9+m`r86V5vCpD z(+!;&iy2#{e{^J=NQ}y+=}Vm%_cDe~cg$rBX4xSw6g>T75u@#NIY&mZ>5K~)?coOZ zyD}bUTs1x1jd3#6U?!oU>3#)_0U&Kb(>DTHKnHAp?ammc#CT)6Qx;>~^h@&?MW(OI zXOx)!X*ST2@3VlcMkkjFlh>A~5I&lqn{x5{BmMN;{19?({>%0w5S!$2yxFUw`@ dV`OZeZkmsx6xGmnpi&@a0%GRv)&(rpHvkRSZ|492 diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 54b37bfd04..50700dd2ca 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -25225,6 +25225,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 250 + } } element { scale: 16 @@ -25241,6 +25247,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 17 @@ -25257,6 +25269,12 @@ cont { } priority: 3000 } + shield { + height: 10 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 18 @@ -25365,6 +25383,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 250 + } } element { scale: 16 @@ -25381,6 +25405,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 17 @@ -25397,6 +25427,12 @@ cont { } priority: 3000 } + shield { + height: 10 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 18 @@ -25529,6 +25565,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 250 + } } element { scale: 16 @@ -25557,6 +25599,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 17 @@ -25585,6 +25633,12 @@ cont { } priority: 3000 } + shield { + height: 10 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 18 @@ -25717,6 +25771,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 250 + } } element { scale: 16 @@ -25743,6 +25803,12 @@ cont { } priority: 3000 } + shield { + height: 9 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 17 @@ -25769,6 +25835,12 @@ cont { } priority: 3000 } + shield { + height: 10 + color: 16777215 + priority: 2955 + min_distance: 300 + } } element { scale: 18 @@ -28734,6 +28806,12 @@ cont { } priority: 3150 } + shield { + height: 9 + color: 16777215 + priority: 2960 + min_distance: 120 + } } element { scale: 14 @@ -28751,6 +28829,12 @@ cont { } priority: 3150 } + shield { + height: 9 + color: 16777215 + priority: 2960 + min_distance: 175 + } } element { scale: 15 @@ -28910,6 +28994,12 @@ cont { } priority: 3150 } + shield { + height: 9 + color: 16777215 + priority: 2960 + min_distance: 120 + } } element { scale: 14 @@ -28939,6 +29029,12 @@ cont { } priority: 3150 } + shield { + height: 9 + color: 16777215 + priority: 2960 + min_distance: 175 + } } element { scale: 15 @@ -29158,6 +29254,12 @@ cont { } priority: 3150 } + shield { + height: 9 + color: 16777215 + priority: 2960 + min_distance: 120 + } } element { scale: 14 @@ -29175,6 +29277,12 @@ cont { } priority: 3150 } + shield { + height: 9 + color: 16777215 + priority: 2960 + min_distance: 175 + } } element { scale: 15 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 2120add6ab5c2ca507439ae50085510d0691852f..67504d0a2e1d55e39d1339b188eb46fbe2b5b867 100644 GIT binary patch delta 509 zcmew{O|*HYXu}r9Dm$h%%+qV^7`vxWN@LXG-68J8%fTt||Nnn>h3@Gm(-?JyQG~=b z)-VZKOn3BV6rQe^!zeO+qdkytNoQ1@ZsEx2&A4&;Uwg)hR56QXJu8>gGzXyZvmF_i zO`n&+7=q@!{~3(oSe%zM{hbqIFh9^ETu_gITs_^q;W zJg`ulAg)m%WHr6Og;8_*o-{^&ruB^5C#EqfGcx{|zBQdO6{nt*>5j7)ZKuDpV-$mH joSVV;m6375^vPLxG@@G89+=Gt#7scUyge|RMg0K)Me?cH delta 404 zcma)%ze@rE9L0HeSDIkM>FEsy6@^3%K~OlPU8va5U?D`A8BwMQ*3#h6FN20k62Vsy zL_ErD+R1qp3JOD&DjBDmREA&m`h`SN-1eP8BGsTGu+2c+FnT`*brroqCT8=L57 zB#Az51<=Op7`k~IfSq+8Y?3@;lo|A6n4ccFq?aKBh3rZ4JE~@L~yfJnkr!Z=*Ip?DZa705K;HN7s`z$gTe=yBtn{JfJn1W=MI5x8~Irye4sxwMVzn95qJ^f}D(4|71j3V3B ovKap}GOnF&mSCS#-xa9S$C+^%b0`P@^mra-iRlWKjB?Wz z3K?0a8@Mn^Ot<%DWS`#hhDmg~eJmr}^g0(tVAE?LflNEZr|Y>go@bml{hur2 zWVmg<(|d~;m8P%DW7M1;8pX&zx$cKJh{rxX-knipdO$v-_w)x&jN;pWx-*(8FuiA< zZjiwkJAKnEptJAhGD=J?{3beGHV*=!UKudl&Gx}`@YTC}o*fu>SmoXKg9*fEC-Fb{a%ml>D+q?5vmR<({ Dg~)eC diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 48375313e0..14c5b1d3b6 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -25164,6 +25164,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 250 + text_color: 11711154 + } } element { scale: 16 @@ -25180,6 +25187,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 17 @@ -25196,6 +25210,13 @@ cont { } priority: 3000 } + shield { + height: 10 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 18 @@ -25306,6 +25327,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 250 + text_color: 11711154 + } } element { scale: 16 @@ -25322,6 +25350,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 17 @@ -25338,6 +25373,13 @@ cont { } priority: 3000 } + shield { + height: 10 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 18 @@ -25472,6 +25514,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 250 + text_color: 11711154 + } } element { scale: 16 @@ -25500,6 +25549,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 17 @@ -25528,6 +25584,13 @@ cont { } priority: 3000 } + shield { + height: 10 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 18 @@ -25662,6 +25725,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 250 + text_color: 11711154 + } } element { scale: 16 @@ -25687,6 +25757,13 @@ cont { } priority: 3000 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 17 @@ -25712,6 +25789,13 @@ cont { } priority: 3000 } + shield { + height: 10 + stroke_color: 11711154 + priority: 2955 + min_distance: 300 + text_color: 11711154 + } } element { scale: 18 @@ -28527,6 +28611,13 @@ cont { } priority: 3150 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2960 + min_distance: 120 + text_color: 11711154 + } } element { scale: 14 @@ -28544,6 +28635,13 @@ cont { } priority: 3150 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2960 + min_distance: 175 + text_color: 11711154 + } } element { scale: 15 @@ -28708,6 +28806,13 @@ cont { } priority: 3150 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2960 + min_distance: 120 + text_color: 11711154 + } } element { scale: 14 @@ -28737,6 +28842,13 @@ cont { } priority: 3150 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2960 + min_distance: 175 + text_color: 11711154 + } } element { scale: 15 @@ -28961,6 +29073,13 @@ cont { } priority: 3150 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2960 + min_distance: 120 + text_color: 11711154 + } } element { scale: 14 @@ -28978,6 +29097,13 @@ cont { } priority: 3150 } + shield { + height: 9 + stroke_color: 11711154 + priority: 2960 + min_distance: 175 + text_color: 11711154 + } } element { scale: 15 diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 119a36e15e9f0bad30376a195e2d18037c332d51..45a9ff424552950251f181be70340038995c5c4e 100644 GIT binary patch delta 521 zcmZ3{&A+*qf5Ve$EGt>KgeO0oD?Iu4v@S;f$z3xYxSe=8I0gRy|Ie;)Z1U-4l9TVx z)D}b%lhatkB;-4pXOcMjtf{WLm&B`Tkt7 z$^U2VU@V`!V|E6rTYfPLl} zEN+Zkt2_DqJWNj~PL`P;gl^R4y!m(K81GH?*%!xXIoa@twty24Ec`CWX;cVVO^!RF zJ^AzzUZ(YolRJ+DZ4TXU#mIPd@`MAa5Dh|T8j?8prvLlMC_eq)BSyB#P6tgun%UMf z3YBy4PdAWa7N5NDxYFc#M{GBLICzVZX)EjGi3fxy-#;8k*#73uBki3>7=f5+d*=~m Gc}4(p57BS{ delta 311 zcmdno%fF(Vf5Ve$On;asKbtn6(P1+0d{x{CI0Pr_%(a=kWY%29#>s*+ zm*SRZ`pi1ndGnqsfNJ(v$g)@otV- zuw0Ju;H3R=jM|gq_X7>oo;+*6Hj9uy2mj;=hx|6H9k60#+%Y-vU@Albi%>8J-*ny= zjN;SzeloI6Ry<_FBvd|m!wKujFZbJSzIW&rBjb$8JC8t>qnp?K>}dP5ql`ezH2v98 G=Cc69=Xt9D diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 19a34eab4e..b3164a416d 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -11867,6 +11867,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 250 + } } element { scale: 16 @@ -11889,6 +11895,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 300 + } } element { scale: 17 @@ -11911,6 +11923,12 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 16777215 + priority: 3910 + min_distance: 350 + } } element { scale: 18 @@ -12045,6 +12063,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 250 + } } element { scale: 16 @@ -12067,6 +12091,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 300 + } } element { scale: 17 @@ -12089,6 +12119,12 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 16777215 + priority: 3910 + min_distance: 350 + } } element { scale: 18 @@ -12247,6 +12283,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 250 + } } element { scale: 16 @@ -12281,6 +12323,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 300 + } } element { scale: 17 @@ -12315,6 +12363,12 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 16777215 + priority: 3910 + min_distance: 350 + } } element { scale: 18 @@ -12473,6 +12527,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 250 + } } element { scale: 16 @@ -12499,6 +12559,12 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 16777215 + priority: 3910 + min_distance: 300 + } } element { scale: 17 @@ -12525,6 +12591,12 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 16777215 + priority: 3910 + min_distance: 350 + } } element { scale: 18 @@ -15223,6 +15295,12 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 16777215 + priority: 3920 + min_distance: 120 + } } element { scale: 14 @@ -15240,6 +15318,12 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 16777215 + priority: 3920 + min_distance: 175 + } } element { scale: 15 @@ -15429,6 +15513,12 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 16777215 + priority: 3920 + min_distance: 120 + } } element { scale: 14 @@ -15458,6 +15548,12 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 16777215 + priority: 3920 + min_distance: 175 + } } element { scale: 15 @@ -15707,6 +15803,12 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 16777215 + priority: 3920 + min_distance: 120 + } } element { scale: 14 @@ -15724,6 +15826,12 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 16777215 + priority: 3920 + min_distance: 175 + } } element { scale: 15 diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index c046951ba0f22c02fae12287cbb3db1624a8a5d3..f74b123d11cbe6d638c4d9c1cb6a6d6f739ff9d7 100644 GIT binary patch delta 550 zcmX@y#^2P%zv13Y#w(NW&s@M5F?r$~djThL4o-oYo1d{rY>LS#YlHHX`7I~NpYbK|c8BRVv-w5bRnaO|Ve`A`>I{C|jWw@NlwNZDn{Yl=*HD5R; z3ojDGV{+PL?M1#|zjwan-rTatSDtAu>*UJ^V;P+%8y?b@auP!c&I@uH6%Z%8OpZIG zJ-O$o5chhhCn7lbC;J}_-~8lI3?owq`(&phDTEBkntbI*Ajpu(38f;_BP5u4H`^bL fW@3CYdG_&CLYi^9pn1!Q_AMtEw{JPY)c*?rnq}Xu delta 271 zcmZqb;y>KRzv13Y#?Hz2XD(p0pWHCZesaJTk;!jnX)_7gPVSp)JGo=_TE@P~W^5 zZ1z18z{qr+ZSwr1DKK?`9DLIYpEHV0PCRDGB2>r0Kb=pCS!{B`S%uASk6AM@Zl0`p YG8Lv6-O%RZQ|-m47`GRnV(R||0Lo}?EC2ui diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index c0dc308953..9463ee413e 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -12069,6 +12069,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 250 + text_color: 3158064 + } } element { scale: 16 @@ -12091,6 +12099,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 300 + text_color: 3158064 + } } element { scale: 17 @@ -12113,6 +12129,14 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 350 + text_color: 3158064 + } } element { scale: 18 @@ -12251,6 +12275,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 250 + text_color: 3158064 + } } element { scale: 16 @@ -12273,6 +12305,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 300 + text_color: 3158064 + } } element { scale: 17 @@ -12295,6 +12335,14 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 350 + text_color: 3158064 + } } element { scale: 18 @@ -12457,6 +12505,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 250 + text_color: 3158064 + } } element { scale: 16 @@ -12491,6 +12547,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 300 + text_color: 3158064 + } } element { scale: 17 @@ -12525,6 +12589,14 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 350 + text_color: 3158064 + } } element { scale: 18 @@ -12687,6 +12759,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 250 + text_color: 3158064 + } } element { scale: 16 @@ -12712,6 +12792,14 @@ cont { } priority: 3950 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 300 + text_color: 3158064 + } } element { scale: 17 @@ -12737,6 +12825,14 @@ cont { } priority: 3950 } + shield { + height: 10 + color: 10066329 + stroke_color: 3158064 + priority: 3910 + min_distance: 350 + text_color: 3158064 + } } element { scale: 18 @@ -15477,6 +15573,14 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3920 + min_distance: 120 + text_color: 3158064 + } } element { scale: 14 @@ -15494,6 +15598,14 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3920 + min_distance: 175 + text_color: 3158064 + } } element { scale: 15 @@ -15693,6 +15805,14 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3920 + min_distance: 120 + text_color: 3158064 + } } element { scale: 14 @@ -15722,6 +15842,14 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3920 + min_distance: 175 + text_color: 3158064 + } } element { scale: 15 @@ -15981,6 +16109,14 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3920 + min_distance: 120 + text_color: 3158064 + } } element { scale: 14 @@ -15998,6 +16134,14 @@ cont { } priority: 4100 } + shield { + height: 9 + color: 10066329 + stroke_color: 3158064 + priority: 3920 + min_distance: 175 + text_color: 3158064 + } } element { scale: 15 diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index ab9deb3631..34b9027e6e 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -160,17 +160,17 @@ highway-secondary_link-tunnel # line z14- (also has line(c # highway-secondary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z16-) # === 259 -highway-residential # line z12- (also has pathtext z13-, shield::shield z18-) -highway-residential-area # line z12- (also has pathtext z13-, shield::shield z18-) -highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z18-) -highway-residential-tunnel # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z18-) -highway-tertiary # line z11- (also has pathtext z12-, shield::shield z15-) -highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-) -highway-tertiary-tunnel # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z15-) +highway-residential # line z12- (also has pathtext z13-, shield::shield z15-) +highway-residential-area # line z12- (also has pathtext z13-, shield::shield z15-) +highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +highway-residential-tunnel # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-) +highway-tertiary # line z11- (also has pathtext z12-, shield::shield z13-) +highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +highway-tertiary-tunnel # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-) === 250 -# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z18-) -# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z15-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-) # === 249 highway-tertiary_link # line z15- (also has pathtext z18-) @@ -325,13 +325,13 @@ highway-path-bridge::bridgewhite # line::bridgewhite z15- (al highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-) highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z18-) +highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z16-) highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z15-, line::bridgeblack z16-, pathtext z16-) highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-) -highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z15-) +highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) @@ -359,13 +359,13 @@ highway-path-bridge::bridgeblack # line::bridgeblack z17- (al highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-) highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z18-) +highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z16-) highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z16-, pathtext z16-) highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-) -highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-) +highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index d323ed9562..3a73d95407 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -653,9 +653,9 @@ highway-pedestrian # pathtext z14- (also has li highway-pedestrian-area # pathtext z14- (also has line z13-, area z14-) highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-) highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line(casing) z16-) -highway-tertiary # pathtext z12- (also has shield::shield z15-, line z11-) -highway-tertiary-bridge # pathtext z12- (also has shield::shield z15-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel # pathtext z12- (also has shield::shield z15-, line z11-, line(casing) z16-) +highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-) +highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-) natural-strait # caption z13- (also has line z13-) waterway-river # pathtext z11- (also has line z10-) waterway-riverbank # pathtext z11- (also has line z10-, area z1-) @@ -671,10 +671,10 @@ amenity-fountain # icon z16- (also has captio highway-raceway # pathtext z16- (also has line z14-) === 3050 -highway-residential # pathtext z13- (also has shield::shield z18-, line z12-) -highway-residential-area # pathtext z13- (also has shield::shield z18-, line z12-) -highway-residential-bridge # pathtext z13- (also has shield::shield z18-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel # pathtext z13- (also has shield::shield z18-, line z12-, line(casing) z16-) +highway-residential # pathtext z13- (also has shield::shield z15-, line z12-) +highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-) +highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-) highway-road # pathtext z14- (also has line z12-) highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-) highway-road-tunnel # pathtext z14- (also has line z12-) @@ -698,15 +698,15 @@ highway-secondary-bridge::shield # shield::shield z12- (also highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-) === 2965 -highway-tertiary::shield # shield::shield z15- (also has pathtext z12-, line z11-) -highway-tertiary-bridge::shield # shield::shield z15- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel::shield # shield::shield z15- (also has pathtext z12-, line z11-, line(casing) z16-) +highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-) +highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-) === 2960 -highway-residential::shield # shield::shield z18- (also has pathtext z13-, line z12-) -highway-residential-area::shield # shield::shield z18- (also has pathtext z13-, line z12-) -highway-residential-bridge::shield # shield::shield z18- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel::shield # shield::shield z18- (also has pathtext z13-, line z12-, line(casing) z16-) +highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-) +highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-) +highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-) === 2955 highway-cycleway # pathtext z15- (also has line z13-) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 207053b2df..d7c8e2d714 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -141,22 +141,22 @@ highway-secondary_link-tunnel # line z14- (also has line(c # highway-secondary_link-tunnel # line(casing) z14- (also has line z14-, pathtext z16-) # === 199 -highway-residential # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-) -highway-residential-area # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-) -highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z18-) -highway-residential-tunnel # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-) -highway-tertiary # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z15-) -highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) -highway-tertiary-tunnel # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z15-) +highway-residential # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z15-) +highway-residential-area # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z15-) +highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) +highway-residential-tunnel # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z15-) +highway-tertiary # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z13-) +highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z13-) +highway-tertiary-tunnel # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z13-) === 190 -# highway-residential # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-) -# highway-residential-area # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-) -# highway-residential-bridge # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z18-) -# highway-residential-tunnel # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-) -# highway-tertiary # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z15-) -# highway-tertiary-bridge # line(casing) z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-) -# highway-tertiary-tunnel # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z15-) +# highway-residential # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) +# highway-residential-area # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) +# highway-residential-bridge # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-) +# highway-residential-tunnel # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) +# highway-tertiary # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z13-) +# highway-tertiary-bridge # line(casing) z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary-tunnel # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z13-) # === 189 highway-tertiary_link # line z15- (also has line(casing) z15-, pathtext z18-) @@ -295,10 +295,10 @@ highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (al highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z18-) +highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, line(casing) z14-, pathtext z16-) -highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) +highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, line(casing) z15-, pathtext z18-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) @@ -320,10 +320,10 @@ highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (al highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z18-) +highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-) -highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) +highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, line(casing) z15-, pathtext z18-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 3bdbd96e08..fdc7e87aaf 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -72,9 +72,9 @@ highway-secondary-bridge # pathtext z10- (also has sh highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z14-) === 4150 -highway-tertiary # pathtext z12- (also has shield::shield z15-, line z11-, line(casing) z15-) -highway-tertiary-bridge # pathtext z12- (also has shield::shield z15-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) -highway-tertiary-tunnel # pathtext z12- (also has shield::shield z15-, line z11-, line(casing) z15-) +highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z15-) +highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) +highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z15-) === 4100 highway-secondary_link # pathtext z16- (also has line(casing) z14-, line z14-) @@ -88,10 +88,10 @@ highway-unclassified-bridge # pathtext z14- (also has li highway-unclassified-tunnel # pathtext z14- (also has line z11-, line(casing) z16-) === 4000 -highway-residential # pathtext z12- (also has shield::shield z18-, line z12-, line(casing) z15-) -highway-residential-area # pathtext z12- (also has shield::shield z18-, line z12-, line(casing) z15-) -highway-residential-bridge # pathtext z12- (also has shield::shield z18-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) -highway-residential-tunnel # pathtext z12- (also has shield::shield z18-, line z12-, line(casing) z15-) +highway-residential # pathtext z12- (also has shield::shield z15-, line z12-, line(casing) z15-) +highway-residential-area # pathtext z12- (also has shield::shield z15-, line z12-, line(casing) z15-) +highway-residential-bridge # pathtext z12- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) +highway-residential-tunnel # pathtext z12- (also has shield::shield z15-, line z12-, line(casing) z15-) === 3950 highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-) @@ -104,15 +104,15 @@ highway-secondary-bridge::shield # shield::shield z12- (also highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z14-) === 3930 -highway-tertiary::shield # shield::shield z15- (also has pathtext z12-, line z11-, line(casing) z15-) -highway-tertiary-bridge::shield # shield::shield z15- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) -highway-tertiary-tunnel::shield # shield::shield z15- (also has pathtext z12-, line z11-, line(casing) z15-) +highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z15-) +highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) +highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z15-) === 3920 -highway-residential::shield # shield::shield z18- (also has pathtext z12-, line z12-, line(casing) z15-) -highway-residential-area::shield # shield::shield z18- (also has pathtext z12-, line z12-, line(casing) z15-) -highway-residential-bridge::shield # shield::shield z18- (also has pathtext z12-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) -highway-residential-tunnel::shield # shield::shield z18- (also has pathtext z12-, line z12-, line(casing) z15-) +highway-residential::shield # shield::shield z15- (also has pathtext z12-, line z12-, line(casing) z15-) +highway-residential-area::shield # shield::shield z15- (also has pathtext z12-, line z12-, line(casing) z15-) +highway-residential-bridge::shield # shield::shield z15- (also has pathtext z12-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) +highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z12-, line z12-, line(casing) z15-) === 3910 highway-road # pathtext z14- (also has line z12-)