From f4c5a787041a48ce267e1aa6c06e34421572962e Mon Sep 17 00:00:00 2001 From: Constantin Shalnev Date: Mon, 14 Dec 2015 19:50:04 +0300 Subject: [PATCH] Styles were rebuilt --- data/drules_proto_clear.bin | Bin 191213 -> 193203 bytes data/drules_proto_clear.txt | 1060 ++++++++++++++++++++++++----------- data/drules_proto_dark.bin | Bin 187847 -> 189824 bytes data/drules_proto_dark.txt | 1060 ++++++++++++++++++++++++----------- 4 files changed, 1480 insertions(+), 640 deletions(-) diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index ac42d591ad69bba6f03ee4228f2416a099afd0cc..fb5938364d3dc598a8924d846865cc395bd999c0 100644 GIT binary patch delta 5758 zcmeHKZ)h8381MTwX|8Y5{JAvt+G?p~%vue$g!Rw5X|45(f@3HJKglh|OoSmg84Y8#Q`}aEr3E3r?_KVinYS^r~Xd;T*G{L zGNmklpPKbgW3O4?tR1H6@SByBi8d;C|jTF_|z)~ zp2fm@h9XCN@yA;xW+`^Crva|NAN#ZWU||4Qk1h5b$b3&uJng{I+fc@PQ{RETS^zy1 zIe*3ew5t3zgbaL;=VB+E^)afizXEuCs_*jpv$GJTqrp9Li-;1vbpgA9aaHj+SPr5X^6FE2NK2atnj!x4e?yJfD_)6kIf zGM_4DoMXe|S)S&lnFP3MeTuNIqC#FFa-Z&pmby zuMM4v*mWD$M>{FI=5}3&!GToCftWJ`aa3$U7qX~MrGU7&A_w9u1i~0C5Q`QF`UfIc zHm&Y(gy*>}v3qFC^gayiwsca(*p<#)hlh;OPq4x@Lj6JSQToYJ>Hrv0LJkB{@cfmd zB@idwq{>^bLvi>9^mct|%*Z3b_YNn}9tvry(PxDiOu~lfAZ5lFkGvk}B@TK4uIEdi ze{EnAvuZuh&Avg(vQ-~ZErkc=q(4stlP4cZ(w7qmDFaupkoB+r&*bqDP3daMAf;3W z5(pT`SA7ZuvYCDKpezmL&*b${mG%+Mr8Ub55l+cx@<(ZLY6novVwfnx)tNsi*Gyfa;L{!2NtNmgzLeIu>)rn)A%GK#-M zn>Q@lfT%HtS2y?eI2YjXL{#Y*^7^*skcWX`kJ2bt!tf1|S%$6AA>7<`WoxyGPInZ> z0c}%a${WICNLTihSDu&dtYNVqH+b#oVAhl_v8guQH97|}Vo>zmk9)bY;Q6H9j|YHl z7}Iq7p0Xk(Q{wae_)e_sV;Q-yCNBIAoAAiHbF+6I&CA)GF?*NP+W%fw($is~K%_rb HU^V;?k8ec~ delta 4322 zcmds4Z)jUp6z{o<-Ro_Vm%Jox*2!pxNH+-#B3o@~~Dfq-7z=8_ zWgehX50(CMc(y_6rP9Soy+O)T>7|?RG)R3`>7(>+cCp_oE=z@`(turx-`i07j^{yZ zgNv*2aC=#~nTtWcqXrAW#-+}`smAW;gQe>w8a!Dmsh1!#Bkk+leuq1Re=(+ zluPJToZv0;Y+TJhdvs;guMkyAeFUjTvDWzFvxj?P}kdUv2$*ZZ+77# z^q=6#nz8_KS9_>Z!sYaa2#Gey3 zH7UVoU9<#1A$!iNkUiy9$ewT$!lRfBEuc~DysM5~YH~tW=>)>GOi|-3mYG1UU{L+8x`n4lsTEv-T`amEA|%v#deN zrrK(4Sp$9ZH9P;V)|B;Eqp8Lk>^59x)o-+QFzq(G)krd9$BL$!rJ6>j+;z5$J}cTf znBohrx^^~bRcU7{yEJonwToUY*`=981{+7#hF&cxqBV5H8q>>xBIZEX!Ujj$MK1@6 z(DtY78oD!jo$Mrk|BRM3E1A}vOIp*JxPDyH>PNBd+4ggZc8|St){#rfT8t_kVZQo* zIGa;tDc$x3tG0Zx4s}|vYMS;1s}8d-SXMCj;O7W$Y6vqTA4te)neM4~VZiV%QI=4@ zN2I&*w#u$d7M9RvR9=-S}IioR8d(mCpU9n}lMY4Z3r)JH!L+WYBHqg}Jm>pvZ8n*Wd4`kCwK8vF+U CZ8@+2 diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 62f61f510a..3437748dd6 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -985,60 +985,234 @@ cont { } cont { name: "aeroway-aerodrome" + element { + scale: 10 + area { + color: 13942770 + priority: -15987 + } + } + element { + scale: 11 + area { + color: 13942770 + priority: -15987 + } + } element { scale: 12 area { color: 13746411 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 13 area { color: 13615592 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 14 area { color: 13484259 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 15 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 16 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 17 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-l" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 18 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-l" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 19 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-l" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } } @@ -1122,54 +1296,209 @@ cont { scale: 13 area { color: 13615592 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 14 area { color: 13484259 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 15 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 16 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-m" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 17 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-l" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 18 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-l" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } element { scale: 19 area { color: 13155550 - priority: -15987 + priority: -15068 + } + symbol { + name: "airport-l" + priority: 16932 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 7 + } + secondary { + height: 11 + color: 3355443 + stroke_color: 1308622847 + offset_y: 20 + text: "int_name" + } + priority: 15932 } } } cont { name: "aeroway-gate" + element { + scale: 17 + symbol { + name: "gate-l" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15837 + } + } element { scale: 18 symbol { @@ -4496,7 +4825,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4533,7 +4862,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4570,7 +4899,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4607,7 +4936,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4615,7 +4944,7 @@ cont { scale: 17 area { color: 16311482 - priority: -15149 + priority: -15136 } caption { primary { @@ -4623,7 +4952,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15864 } apply_if: "!name" } @@ -4644,7 +4973,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4652,7 +4981,7 @@ cont { scale: 17 area { color: 16311482 - priority: -15149 + priority: -15136 } caption { primary { @@ -4660,7 +4989,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15864 } apply_if: "!name" } @@ -4680,7 +5009,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4688,7 +5017,7 @@ cont { scale: 18 area { color: 16311482 - priority: -15149 + priority: -15136 } caption { primary { @@ -4696,7 +5025,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15864 } apply_if: "!name" } @@ -4716,7 +5045,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4724,7 +5053,7 @@ cont { scale: 18 area { color: 16311482 - priority: -15149 + priority: -15136 } caption { primary { @@ -4732,7 +5061,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15864 } apply_if: "!name" } @@ -4752,7 +5081,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4760,11 +5089,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15149 + priority: -15136 } symbol { name: "none" - priority: 16851 + priority: 16864 } caption { primary { @@ -4772,7 +5101,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15864 } apply_if: "!name" } @@ -4792,7 +5121,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15013 + priority: 16000 } apply_if: "name" } @@ -4800,11 +5129,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15149 + priority: -15136 } symbol { name: "none" - priority: 16851 + priority: 16864 } caption { primary { @@ -4812,7 +5141,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15851 + priority: 15864 } apply_if: "!name" } @@ -25426,6 +25755,13 @@ cont { } cont { name: "landuse-allotments" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -25888,6 +26224,13 @@ cont { } cont { name: "landuse-farmland" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -25975,6 +26318,13 @@ cont { } cont { name: "landuse-field" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -29420,6 +29770,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 12 + area { + color: 13620648 + priority: -15825 + } + } element { scale: 13 area { @@ -29658,6 +30015,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -29758,6 +30122,13 @@ cont { } cont { name: "landuse-orchard" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -29991,6 +30362,13 @@ cont { } cont { name: "landuse-recreation_ground" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -30494,6 +30872,13 @@ cont { } cont { name: "landuse-village_green" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -30546,6 +30931,13 @@ cont { } cont { name: "landuse-vineyard" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -30948,6 +31340,13 @@ cont { } cont { name: "leisure-golf_course" + element { + scale: 12 + area { + color: 13620648 + priority: -15825 + } + } element { scale: 13 area { @@ -36657,6 +37056,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 12 + area { + color: 13620648 + priority: -15825 + } + } element { scale: 13 area { @@ -36709,6 +37115,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 12 + area { + color: 13620648 + priority: -15825 + } + } element { scale: 13 area { @@ -37887,6 +38300,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 12 + area { + color: 13620648 + priority: -15865 + } + } element { scale: 13 area { @@ -59603,15 +60023,15 @@ cont { element { scale: 13 lines { - width: 0.2 + width: 0.7 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -59620,15 +60040,15 @@ cont { element { scale: 14 lines { - width: 0.2 + width: 1.0 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -59637,15 +60057,15 @@ cont { element { scale: 15 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -59656,13 +60076,13 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -59673,7 +60093,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -59690,7 +60110,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -59707,7 +60127,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -59725,15 +60145,15 @@ cont { element { scale: 13 lines { - width: 0.2 + width: 0.7 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -59742,15 +60162,15 @@ cont { element { scale: 14 lines { - width: 0.2 + width: 1.0 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -59759,15 +60179,15 @@ cont { element { scale: 15 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -59778,13 +60198,13 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -59795,7 +60215,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -59812,7 +60232,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -59829,7 +60249,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -60260,7 +60680,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -60270,7 +60690,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -60280,7 +60700,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -60290,7 +60710,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -60336,9 +60756,9 @@ cont { element { scale: 10 lines { - width: 0.6 + width: 1.0 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } @@ -60350,190 +60770,190 @@ cont { element { scale: 11 lines { - width: 0.8 + width: 1.2 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 12 lines { - width: 0.8 + width: 1.2 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 13 lines { - width: 1.2 + width: 1.6 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 14 lines { - width: 1.2 + width: 1.8 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 15 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 10 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 16 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 10 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 17 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 11 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 18 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 19 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } } @@ -60542,9 +60962,9 @@ cont { element { scale: 10 lines { - width: 0.6 + width: 1.0 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } @@ -60556,190 +60976,190 @@ cont { element { scale: 11 lines { - width: 0.8 + width: 1.2 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 12 lines { - width: 0.8 + width: 1.2 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 13 lines { - width: 1.2 + width: 1.6 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 14 lines { - width: 1.2 + width: 1.8 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 15 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 10 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 16 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 10 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 17 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 11 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 18 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 19 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } } @@ -60818,9 +61238,9 @@ cont { element { scale: 10 lines { - width: 0.6 + width: 1.0 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } @@ -60832,190 +61252,190 @@ cont { element { scale: 11 lines { - width: 0.8 + width: 1.2 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 12 lines { - width: 0.8 + width: 1.2 color: 3584191 - priority: 1216 + priority: -15800 join: BEVELJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 13 lines { - width: 1.2 + width: 1.6 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 14 lines { - width: 1.2 + width: 1.8 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 10 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 15 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 10 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 16 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 10 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 17 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { - height: 11 + height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 18 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } element { scale: 19 lines { - width: 1.8 + width: 2.2 color: 3584191 - priority: 1216 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } area { color: 9163744 - priority: -15784 + priority: -15041 } path_text { primary { height: 12 color: 4495803 } - priority: 16216 + priority: 16959 } } } @@ -61024,15 +61444,15 @@ cont { element { scale: 13 lines { - width: 0.2 + width: 0.7 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -61041,9 +61461,26 @@ cont { element { scale: 14 lines { - width: 0.2 + width: 1.0 color: 3584191 - priority: 1959 + priority: -15800 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4495803 + } + priority: 16959 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 3584191 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -61055,35 +61492,18 @@ cont { priority: 16959 } } - element { - scale: 15 - lines { - width: 1.0 - color: 3584191 - priority: 1959 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16959 - } - } element { scale: 16 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -61092,9 +61512,9 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61109,9 +61529,9 @@ cont { element { scale: 18 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61126,9 +61546,9 @@ cont { element { scale: 19 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61146,15 +61566,15 @@ cont { element { scale: 13 lines { - width: 0.2 + width: 0.7 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -61163,9 +61583,26 @@ cont { element { scale: 14 lines { - width: 0.2 + width: 1.0 color: 3584191 - priority: 1959 + priority: -15800 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4495803 + } + priority: 16959 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 3584191 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -61177,35 +61614,18 @@ cont { priority: 16959 } } - element { - scale: 15 - lines { - width: 1.0 - color: 3584191 - priority: 1959 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16959 - } - } element { scale: 16 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -61214,9 +61634,9 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61231,9 +61651,9 @@ cont { element { scale: 18 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61248,9 +61668,9 @@ cont { element { scale: 19 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61268,19 +61688,19 @@ cont { element { scale: 13 lines { - width: 0.2 + width: 0.7 color: 3584191 dashdot { dd: 2.7 dd: 2.7 } - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -61289,13 +61709,33 @@ cont { element { scale: 14 lines { - width: 0.2 + width: 1.0 color: 3584191 dashdot { dd: 2.7 dd: 2.7 } - priority: 1959 + priority: -15800 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4495803 + } + priority: 16959 + } + } + element { + scale: 15 + lines { + width: 1.4 + color: 3584191 + dashdot { + dd: 4.95 + } + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -61307,41 +61747,21 @@ cont { priority: 16959 } } - element { - scale: 15 - lines { - width: 1.0 - color: 3584191 - dashdot { - dd: 4.95 - } - priority: 1959 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16959 - } - } element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 3584191 dashdot { dd: 4.95 } - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -61350,12 +61770,12 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.4 color: 3584191 dashdot { dd: 4.95 } - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61370,12 +61790,12 @@ cont { element { scale: 18 lines { - width: 1.0 + width: 1.4 color: 3584191 dashdot { dd: 4.95 } - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61390,12 +61810,12 @@ cont { element { scale: 19 lines { - width: 1.0 + width: 1.4 color: 3584191 dashdot { dd: 4.95 } - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61413,15 +61833,15 @@ cont { element { scale: 13 lines { - width: 0.2 + width: 0.7 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 11 + height: 10 color: 4495803 } priority: 16959 @@ -61430,9 +61850,26 @@ cont { element { scale: 14 lines { - width: 0.2 + width: 1.0 color: 3584191 - priority: 1959 + priority: -15800 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4495803 + } + priority: 16959 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 3584191 + priority: -15800 join: ROUNDJOIN cap: BUTTCAP } @@ -61444,35 +61881,18 @@ cont { priority: 16959 } } - element { - scale: 15 - lines { - width: 1.0 - color: 3584191 - priority: 1959 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16959 - } - } element { scale: 16 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 4495803 } priority: 16959 @@ -61481,9 +61901,9 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61498,9 +61918,9 @@ cont { element { scale: 18 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } @@ -61515,9 +61935,9 @@ cont { element { scale: 19 lines { - width: 1.0 + width: 1.6 color: 3584191 - priority: 1959 + priority: -15800 join: ROUNDJOIN cap: ROUNDCAP } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 40631f609b3edea417f3b14093061ce869c48ace..e32d54ac10778d55ef4ce3d97e59579d8c48ee25 100644 GIT binary patch delta 5175 zcmeH~UuauZ9LM`RYr4CW~u=^}GY>Sng7AQWWyGDL*#HoZ-QH#c&V zv6)7$xZX`rdb{O z(4L3f1NofaIltfi{(kp&X3to2Us?@z)5+p&XbYLmMYm~RcXoIQ+hcg(zHcfi_l+E1KLW1As_n2;7ZKjYeJ z!yR-UkkngV&&)H9hk8-&h??CQr;i)PqhEcke}^Y`WUyTphgp zp~aWfqy3MW1F)zTLc1&f=avmP!(A=>|4w*!Z}|WrhA*$5S}G3MigCM~ltuL@?^fRp z@45qgh9CIpPv0?wIZ2R5GAS`2NK!JL5ao1=;~AUg9|pJfd=40G@DcbXKffIY+r2r2 zod!QDC#rkSgweaLCyGIRysa%)_4i%^~oi z&QAcdhUJ7Pj3g&&_NS(`>0vnDwFKBdmnT#|&CI22PvQEsq%Rg}i#vUtd3XF-O`8}3;E%u8ZCl~Ke%EGdl+MUxpN zCF+LDVaSs(Xis#X0ql~6bVd=RfF3M*rfO0%0;WgSfX753J=OsHI1g^NicCe7%y0v* zj-Ngc`P1joK?q($n4KUgq|gEz6=Xr;`WQR6dDEyq7WOzl_{{6SFloqCdt(;yJ$(#I zkT!kXG(#K&Iq^0ff7K!TidLLuD~ol=d=YW2fIQvDaOOy`E!_4fsS>14FT4WY!Xyy) zcynHR_yXcXzaZ?X4oV=Mk!5i`Hhg~k3$)Ra)ksk&M@ULWUm)eU$;%|K0cgQC4}6Je z{wk>r{pEG)%B$DRtxG5xJZ7nov=Sc|6)wo&^49fw{caAqvs{F+5@v@!{-{-B5W?VN znUha?3$Gffpz8{kbroT3|6+X>$N^~HnPd!&&x!}2NqO;WI{vP6V1@Nrk{Jfm__)mHj_m!>if-#X0jPlY9>t(a_+{>qzSJ#lklr{Ou-%N4T>l&y4P3&5J94 Jhe91Ulg;X8MrL=j z6s4nBQ6KuWl|dgPt!YKN5@Em!1{9>Rt$zs?g(4J$8iazj_#ni4=g!Q|W_GumMe~&V zva|Pm=bm%E``x)`Ui-%P^(9~RJHPrR;9fyg>IDb6MeKkK1vD0s? zu>oW@&~P@`a5mI%He5gZ1X-Id+*?0w&hiasBkox|zinYT6aw{sNO2<>?lZxSQapnF z7SUOuC@#DjNe-d2rOHQ-4z#$ria;ME_${!(Ip9FEA|`QXvnoY+>y1jXUTM&~^_)zxL@AB(%j5xTp_42oqg>tAN9KL7FTT#N?Eq%+P1; zlPTD5fO_Wu2W)dr%p0~d`rb60-dktPDng;4JynLInsf=q^p__gj`$A%2QBv*QJ9p= zI$3)MM1BVxvJA44nHCgBRQ=jCya~Jh0=(VAC}KttgUxbyO?H2$? zE#Pb}pBJ(sL5ZS73prC);%rV5Pt*sSD8NtK`o9Mp$&0x{NfDD-IX`tgBbStdsFRB3 z9)ok*?av5#&y?YaQJzt{Bos@EkWWsN#HJmkXFrFPKpmoxQA#fu$-H%U3G};5=y_1* z5e}A#SQYwu$Ow{<=ZCle-{*b*JvuIrh0iU<20jcO@Qgs(k9&xuetR2YUz`Gh3$}?1 z5uC>ux7V$w_Hfv-VAux!?Erd=z)oCm3!F1Sz6H)t_jv63DfU`jgS3wv0;a|5C;5Y%zcV*_#8@JK(r9XIfR%8saP-JI{MvP+V!C>T zj(_ap2>o_6m6hkJj&7UV&tv;Faie?MuA3n}HD-`Wcf4Ic zxM`iuR;wP$jceQvxN(dG)(jeV@}R5BV}WfTUeIpcK)Xnuo7ZGI2{QRno8;NJ$#fUq zF+pbB9ksT4Jwfkk&;E)A)HER|QP+jXdGl}gxc$($Gf$Jwyi?y47vgt&Jx+q+Uh{U1 zj637ixJnVx5g!MqE|>NCOOd{>m5WNcL*`SXI>qrVeQXz7ZG4K0Y|sT)5x%c1sOBdT iJI_{Quz9Lg>9