From 3585bd4fadff574d529d2653aa7fa3074db45c0d Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Mon, 30 Jun 2025 13:04:38 +0200 Subject: [PATCH 1/2] [styles] Changed how the greenery system works Signed-off-by: Yannik Bloscheck --- data/styles/default/dark/colors.mapcss | 42 +++-- data/styles/default/include/Basemap.mapcss | 189 +++++++++++--------- data/styles/default/light/colors.mapcss | 43 +++-- data/styles/outdoors/include/Basemap.mapcss | 4 +- 4 files changed, 168 insertions(+), 110 deletions(-) diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index a130b8792..230749be5 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -41,7 +41,6 @@ @glacier: #111111; @water: #002222; @water_bad: #00261e; -@river: #062026; @wetland: #001919; @beach: #28281A; @barerock: #302A2A; @@ -50,17 +49,38 @@ /*3.2 Vegetation*/ -@forest: #141C00; -@heath: #0F1400; -@green0: #0F1400; -@green1: #131900; -@green1b: #141C00; -@green2: #141C00; -@green3: #141C00; -@green4: #141C00; -@green5: #141C00; -@green6: #2F4000; +@residential_garden: #000000; +@residential_garden_13: #000000; +@residential_garden_12: #000000; +@park: #000000; +@park_13: #000000; +@park_12: #000000; +@park_11: #000000; +@park_10: #000000; +@heath: #141C00; +@heath_13: #141C00; +@heath_12: #141C00; +@heath_11: #141C00; +@grass: #141C00; +@grass_13: #141C00; +@grass_12: #141C00; +@grass_11: #141C00; @flowers: #141C00; +@allotments: #141C00; +@allotments_13: #141C00; +@allotments_12: #141C00; +@scrubs: #141C00; +@scrubs_13: #141C00; +@scrubs_12: #141C00; +@scrubs_11: #141C00; +@woods: #161F00; +@woods_13: #161F00; +@woods_12: #161F00; +@woods_11: #161F00; +@woods_10: #161F00; + +@protected_nature: #2F4000; + /* 4.LANDUSE */ /*4.1 Main landuse*/ diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index a5ad0d764..5389b7221 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -115,81 +115,108 @@ area|z14-[leisure=miniature_golf], area|z16-[landuse=flowerbed], {fill-opacity: 1;} -area|z10-12[leisure=park], -{fill-color: @green0;} -area|z13-15[leisure=park], -{fill-color: @green1;} -area|z14-15[natural=scrub], -{fill-color: @green1;} -area|z16-[leisure=park], -{fill-color: @green2;} -area|z16-[natural=scrub], -{fill-color: @green3;} +area|z10[leisure=park], +{fill-color: @park_10;} +area|z11[leisure=park], +{fill-color: @park_11;} +area|z12[leisure=park], +{fill-color: @park_12;} +area|z13[leisure=park], +{fill-color: @park_13;} +area|z14-[leisure=park], +{fill-color: @park;} + +area|z11[natural=heath], +{fill-color: @heath_11;} +area|z12[natural=heath], +{fill-color: @heath_12;} +area|z13[natural=heath], +{fill-color: @heath_13;} +area|z14-[natural=heath], +{fill-color: @heath;} + +area|z11[landuse=grass], +area|z11[natural=grassland], +area|z11[landuse=meadow], +{fill-color: @grass_11;} +area|z12[landuse=grass], +area|z12[natural=grassland], +area|z12[leisure=golf_course], +area|z12[landuse=meadow], +area|z12[landuse=recreation_ground], +area|z12[landuse=village_green], +{fill-color: @grass_12;} +area|z13[landuse=grass], +area|z13[natural=grassland], +area|z13[leisure=golf_course], +area|z13[landuse=meadow], +area|z13[landuse=recreation_ground], +area|z13[landuse=village_green], +{fill-color: @grass_13;} +area|z14-[landuse=grass], +area|z14-[natural=grassland], +area|z14-[leisure=golf_course], +area|z14-[landuse=meadow], +area|z14-[landuse=recreation_ground], +area|z14-[landuse=village_green], +area|z14-[leisure=miniature_golf], +{fill-color: @grass;} + area|z16-[landuse=flowerbed], {fill-color: @flowers;} -area|z14-15[landuse=grass], -{fill-color: @green0;} -area|z10[landuse=forest], -area|z16-[landuse=grass], -area|z14-15[natural=grassland], -area|z14-[leisure=golf_course], -area|z14-[leisure=miniature_golf], +area|z12[leisure=garden], +area|z12[landuse=allotments], +area|z12[landuse=orchard], +area|z12[landuse=plant_nursery], +area|z12[landuse=vineyard], +{fill-color: @allotments_12;} +area|z13[leisure=garden], +area|z13[landuse=allotments], +area|z13[landuse=orchard], +area|z13[landuse=plant_nursery], +area|z13[landuse=vineyard], +{fill-color: @allotments_13;} +area|z14-[leisure=garden], area|z14-[landuse=allotments], area|z14-[landuse=orchard], area|z14-[landuse=plant_nursery], area|z14-[landuse=vineyard], -area|z14-15[landuse=meadow], -area|z14-[landuse=recreation_ground], -area|z14-[landuse=village_green], -{fill-color: @green1;} +{fill-color: @allotments;} + +area|z12[leisure=garden][garden:type=residential], +{fill-color: @residential_garden_12;} +area|z13[leisure=garden][garden:type=residential], +{fill-color: @residential_garden_13;} +area|z14-[leisure=garden][garden:type=residential], +{fill-color: @residential_garden;} + +area|z11[natural=scrub], +{fill-color: @scrubs_11;} +area|z12[natural=scrub], +{fill-color: @scrubs_12;} +area|z13[natural=scrub], +{fill-color: @scrubs_13;} +area|z14-[natural=scrub], +{fill-color: @scrubs;} + +area|z10[landuse=forest], +{fill-color: @woods_10;} area|z11[landuse=forest], -area|z16-[natural=grassland], -area|z16-[landuse=meadow], -{fill-color: @green1b;} +{fill-color: @woods_11;} area|z12[landuse=forest], -area|z12[leisure=garden], -{fill-color: @green2;} +{fill-color: @woods_12;} area|z13[landuse=forest], -area|z13[leisure=garden], -{fill-color: @green3;} -area|z14[landuse=forest], -area|z14[leisure=garden], -{fill-color: @green4;} -area|z15[landuse=forest], -area|z15[leisure=garden], -{fill-color: @green5;} -area|z16-[landuse=forest], -area|z16-[leisure=garden], -{fill-color: @forest;} +{fill-color: @woods_13;} +area|z14-[landuse=forest], +{fill-color: @woods;} -area|z12-[leisure=garden][garden:type=residential], -{fill-color: @green0;} -area|z16-[leisure=garden][garden:type=residential], -{fill-color: @green1;} -area|z17-[leisure=garden][garden:type=residential], -{fill-color: @green2;} - -area|z11-[natural=heath], -{fill-color: @heath;} -area|z11-13[landuse=grass], -area|z11-13[natural=grassland], -area|z12-13[leisure=golf_course], -area|z12-13[landuse=allotments], -area|z12-13[landuse=orchard], -area|z12-13[landuse=plant_nursery], -area|z12-13[landuse=vineyard], -area|z11-13[landuse=meadow], -area|z12-13[landuse=recreation_ground], -area|z12-13[landuse=village_green], -area|z11-13[natural=scrub], -{fill-color: @green0;} /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */ area|z10-17[leisure=nature_reserve], area|z10-17[boundary=national_park], area|z10-17[boundary=protected_area][protect_class=1], -{fill-opacity: 0.2; fill-color: @green6;} +{fill-opacity: 0.2; fill-color: @protected_nature;} area|z10-16[boundary=aboriginal_lands], {fill-opacity: 0.07; fill-color: @indigenous_lands;} @@ -251,7 +278,7 @@ line|z13-[waterway=stream], line|z13-[waterway=canal], line|z13-[waterway=fish_pass], line|z13-[natural=strait], -{opacity: 0.7; color: @river;} +{opacity: 0.95; color: @water;} /* 6.1 Area water(lake,pond etc.) */ @@ -281,47 +308,47 @@ area|z11-[natural=wetland] /* 6.2 Line water(river,canal etc.) */ line|z10[waterway=river], -{width: 1;} - -line|z11-12[waterway=river], {width: 1.2;} +line|z11-12[waterway=river], +{width: 1.4;} + line|z13[waterway=river], -{width: 1.6;} +{width: 1.7;} line|z13[waterway=stream], line|z13[waterway=canal], line|z13[waterway=fish_pass], line|z13[natural=strait], -{width: 0.7;} +{width: 0.9;} line|z13[waterway=stream][intermittent=yes] -{width: 0.7;dashes: 2.7,2.7;} +{width: 0.9;dashes: 2.7,2.7;} line|z14[waterway=river], -{width: 1.8;} +{width: 2.0;} line|z14[waterway=stream], line|z14[waterway=canal], line|z14[waterway=fish_pass], line|z14[natural=strait], -{width: 1;} +{width: 1.2;} line|z14[waterway=stream][intermittent=yes] -{width: 1;dashes: 2.7,2.7;} +{width: 1.2;dashes: 2.7,2.7;} line|z15-[waterway=river], -{width: 2.2;} +{width: 2.4;} line|z15-[waterway=stream], line|z15-[waterway=canal], line|z15-[waterway=fish_pass], line|z15-[natural=strait], -{width: 1.6;} +{width: 1.8;} line|z15-[waterway=stream][intermittent=yes] -{width: 1.4;dashes: 4.95,4.95;} +{width: 1.6;dashes: 4.95,4.95;} node|z16-[waterway=lock_gate], {icon-image: dot-m.svg;} line|z13-[waterway=ditch], line|z13-[waterway=drain], -{opacity: 0.7; color: @water_bad; width: 1.5; dashes: 2.7,2.7;} +{opacity: 0.7; color: @water_bad; width: 1.7; dashes: 2.7,2.7;} line|z16-[waterway=ditch], line|z16-[waterway=drain], {width: 3;} @@ -411,17 +438,9 @@ area|z14-[piste:type=snow_park], /* 7.4 Cemetery */ -area|z14[landuse=cemetery], -area|z14[amenity=grave_yard] -{fill-color: @green2;fill-opacity: 0.85;} - -area|z15-[amenity=grave_yard], -area|z15-[landuse=cemetery] -{fill-color: @green2;} - -area|z16-[amenity=grave_yard], -area|z16-[landuse=cemetery] -{fill-color: @green3;} +area|z14-[landuse=cemetery], +area|z14-[amenity=grave_yard] +{fill-color: @flowers;} /* 7.5 Pedestrian areas */ @@ -557,7 +576,7 @@ line|z19-[waterway=weir], {width: 8;} line|z14-[man_made=cutline], -{width: 1;color: @green0; opacity: 0.4;} +{width: 1;color: @grass;} line|z15[man_made=cutline], {width: 1.5;} line|z16[man_made=cutline], diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 304d2313e..81bc59b60 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -41,7 +41,6 @@ @glacier: #FFFFFF; @water: #8AD8E7; @water_bad: #95C5B8; -@river: #5FB4C5; @wetland: #C3E0D1; @beach: #FADDA0; @barerock: #D9D2BF; @@ -50,17 +49,37 @@ /*3.2 Vegetation*/ +@residential_garden: #EDE5CA; +@residential_garden_13: #EDE5CB; +@residential_garden_12: #EEE6CB; +@park: #D5DB8F; +@park_13: #D6DC93; +@park_12: #D8DD96; +@park_11: #D8DC97; +@park_10: #DBDD9D; @heath: #CED797; -@green0: #C8D48C; -@green1: #C4D181; -@green1b: #BECC76; -@green2: #B6C96B; -@green3: #B0C763; -@green4: #B2C76A; -@green5: #ADC45F; -@forest: #A8BE5C; -@green6: #7B8F35; -@flowers: #B6C96B; +@heath_13: #CFD89A; +@heath_12: #D2D99E; +@heath_11: #D4DAA0; +@grass: #C4D181; +@grass_13: #C6D285; +@grass_12: #C9D48A; +@grass_11: #CCD58E; +@flowers: #BECC76; +@allotments: #D5D395; +@allotments_13: #D6D498; +@allotments_12: #D8D59B; +@scrubs: #B1C765; +@scrubs_13: #B4C96B; +@scrubs_12: #B8CB71; +@scrubs_11: #BCCC76; +@woods: #A4BD4F; +@woods_13: #A8BE55; +@woods_12: #ACC25C; +@woods_11: #B1C462; +@woods_10: #B4C469; + +@protected_nature: #7B8F35; /* 4.LANDUSE */ /*4.1 Main landuse*/ @@ -79,7 +98,7 @@ @parking: #E8EFEC; @military: #DE2D28; @prison: #727272; -@farmland: #E4E0AD; +@farmland: #E3DEAC; @farmyard: #E6D6AF; /*4.2 Aerodrome*/ diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss index 0860fd5f6..38d4571f2 100644 --- a/data/styles/outdoors/include/Basemap.mapcss +++ b/data/styles/outdoors/include/Basemap.mapcss @@ -11,7 +11,7 @@ line|z12-[waterway=stream], line|z13-[waterway=fish_pass], line|z15-[waterway=ditch], line|z15-[waterway=drain], -{opacity: 1; color: @river;} +{opacity: 1; color: @water;} /* 6.2 Line water(river,canal etc.) */ @@ -78,7 +78,7 @@ area|z13-[tourism=camp_site], line|z13-[man_made=cutline], -{width: 1.7; color: @green0; opacity: 0.6;} +{width: 1.7; color: @grass;} line|z14[man_made=cutline], {width: 2.2;} line|z15[man_made=cutline], From fae8849869484034314bb40c8fe6b7ab590548d9 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Sat, 5 Jul 2025 10:18:15 +0200 Subject: [PATCH 2/2] [styles] Regenerated files for changed how the greenery system works Signed-off-by: Yannik Bloscheck --- data/colors.txt | 55 +- data/drules_proto.bin | Bin 436075 -> 436000 bytes data/drules_proto.txt | 862 +++++++++++++-------------- data/drules_proto_default_dark.bin | Bin 416530 -> 416125 bytes data/drules_proto_default_dark.txt | 713 ++++++++++------------ data/drules_proto_default_light.bin | Bin 418327 -> 418257 bytes data/drules_proto_default_light.txt | 844 +++++++++++++------------- data/drules_proto_outdoors_dark.bin | Bin 437208 -> 436809 bytes data/drules_proto_outdoors_dark.txt | 613 +++++++++---------- data/drules_proto_outdoors_light.bin | Bin 439086 -> 439074 bytes data/drules_proto_outdoors_light.txt | 744 +++++++++++------------ 11 files changed, 1841 insertions(+), 1990 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index 1670cbb9d..160b5ccda 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -22,22 +22,20 @@ 328965 352205 394752 -401446 462602 593674 854541 855309 929809 -988160 990018 1118464 1118481 1184274 -1251584 1272880 1317888 1359565 1381632 +1449728 1642503 1643545 1643785 @@ -146,7 +144,6 @@ 6164237 6173981 6247213 -6272197 6291544 6381914 6381921 @@ -220,52 +217,69 @@ 10426903 10592406 10790054 +10796367 11053224 11057133 -11058780 +11058773 11112295 11184810 11250586 -11387999 +11321948 11579812 -11585379 +11650146 +11650917 11711154 -11716458 11720246 11720952 11770767 11836942 11841150 +11846761 +11848043 11898395 -11979115 12000284 12039862 12105912 +12110705 +12373110 12504182 12517551 12837073 12895428 12898689 +13030021 13031851 -13161612 13163437 +13227146 13229526 13407549 13420474 +13424014 13538264 13555607 +13621402 13685196 +13818270 13947850 +13949600 13952918 +14013333 14014162 +14015375 +14079128 +14081171 14209512 +14210459 +14212247 +14212502 14275263 +14409117 14560552 14802147 14806505 +14933676 14934482 14951168 -14999725 15001506 15014691 15022389 @@ -281,9 +295,12 @@ 15263939 15265772 15524822 +15590858 +15590859 15592411 15592899 15656370 +15656651 15658734 15690752 15754290 @@ -338,10 +355,12 @@ 16776442 16776958 16777215 +218112546 221978645 222898459 223036995 223300167 +227203303 233867264 234004016 234880250 @@ -377,11 +396,9 @@ 452984831 609045837 654706176 -655629312 658186261 659106075 659244611 -666290539 670074880 670211632 670398976 @@ -453,10 +470,10 @@ 1090519039 1216522952 1291845632 +1291854370 1291855390 1292174597 1292240384 -1292247078 1292700173 1292700941 1292964096 @@ -498,7 +515,6 @@ 1297898588 1298019613 1298092845 -1298117829 1298131758 1298227553 1298283903 @@ -512,6 +528,7 @@ 1300267136 1300332657 1300793480 +1300945127 1300990719 1301043238 1301056384 @@ -561,7 +578,6 @@ 1711276032 1711670784 1711677478 -1712264192 1713184029 1714046273 1714104359 @@ -595,16 +611,15 @@ 1721782290 1724152575 1724368575 -1724437644 1725290194 1727174424 1728053247 1931024665 1943327690 2147483648 +2147492386 2147812613 2147878400 -2147885094 2148141581 2148214779 2149069336 @@ -622,7 +637,6 @@ 2152615485 2153076053 2153536593 -2153755845 2153769774 2153921919 2153997148 @@ -632,6 +646,7 @@ 2155839359 2155905152 2156431496 +2156583143 2156681254 2156694400 2157291602 @@ -654,7 +669,6 @@ 2566914048 2567571981 2567645179 -2567902208 2568240148 2568499736 2568822045 @@ -675,7 +689,6 @@ 2576782726 2579790591 2580006591 -2580075660 2582553856 2583432731 2583691006 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 0dac813cae5332a8c4b0981224a7702a442a7f36..820e40a3a79617f60eccec0a3094a8880afa2bcb 100644 GIT binary patch delta 6479 zcmd^EYitx%6lTtDXQxYPx3k-_yR@atqX<}9s79>FVuD2U2gN|Z0K(92v7xP`EhWW- zQV~HyD0YF%L+Asrl$RpGfm8%Z1huw?5Mo3U6M+~41_-16ZbzV=^wtQD>q zvTFucd*8Qh-zDC=+$d8&eEiLAKa;a7!R_1F`lE>+#8gC-Oqd4g4l15*P|b9MilrI> zn~qXxRKrhNrom6o9JD!IrBZp(;>u8VVW=!r6{@I-5y7AqK^m2Owl)Tt8sly1O}@hr zqfG zltRem&Xf9ikV)x=rRatsGr?P zB@rZ*r41byC*j@! z`J}w-?{C9W-@1K=dG8+M4nQ}nHEpfrtJ~n_SMJ`1G^t$%Ddfg&7)D(0L!5kJ5p1&O zFjrGYQC&@q#KS5a=b?S3Ri0E0m*L@?QRXT`Gol9D{aD{YOKCuC4Bh)^17e2OjnMFu z7nkBV?1n^I3hr6h0C{h>alfJ)Fnabt>6yZcs%_CUb|O1d(6yW2fpJc8B0EnQZSC1K zUVS_n?Ni`G?PCi#SZ-VfKF5Oxo%%QRl|Nnut?|0RlO9FjV%F)X>||5}3@3SwFl190 zlF9lq;Oz`gZUCQhha-w~EJYJt^;{H&=OWN2VHm=?V`OR^@PguvGYiirRiivX*yX^+LA5kv+QjwFncR2N}r#iWc)@L zp(M{2#+s*(jwLGBZGt&2x zeIuliS9U<2otYRiw{t2x<7xC@a$*NOZJ>)-(cOFdA!LtksaZ!6QM7i}(A)}85r(&l1CX>+llud>661!lXb6{QCkD@vOS zqDKO@nf9!UHfLhFRJFK5D$TB}s*p;m#B8CjI3T|BdwN|Dx_&#fuaq>|ZE5aoAt4sg zFBXxAL>{|to2N?BJ?ERkxm3#D?Y6y>q1aI1x<@>o?+39AY!VO6245vPi#!pUYnx(X^` zRiSPd@AHTw1*;4iW7Po}zdUXOf0z@Lu-yw1j_^ZC;}$;N3dJQPiMeWk)sb@Ft-OPi z>j{795$723uFWax>KB((zBPA|R9T4;cua&QjUVyFlULXcIaX0p9jXumf>TU4*G*>2 zUF}DjTn_i-9IVpx_+oZ-s})qRozHORV17m=6xp<>Ds_!%=u7SLqNFrMm7O1VY*zD> zdzo=GOBFwx!WkZBESI0)bO;Hqmc|{N7l$jkYZ^{4tNPPrlp>DB(F~5o(HxG&(JZ!d zBf7j!{1G!rPaxdhLQ>fiP`}&<j;WOPYVd3ZW=uFGE@B#8y3!j8+ zBC<*%XwAmRCLz0Z3%&kO>m{(0&vgf}<78Wjfuy4uC&m9bJdhQmvuk(pi5~pdg!{p? LCn_zY_b>1d*{DV8 delta 6632 zcmd^DYitx%6lTxvPN&n??(CLs*IKsaC6v|zK}bPcP{I!k6jOmj1cr7CRl1aRDFH%@ zQK&Jbffl@0q0knkULe9{0pa5ICPX@FdkS_X-vqXC|A+{}=3 ziLD;Ib1r2Av7L6+nT`3n1maP zMw4TrRPt!s)EHy;Y>I9EK-Qxo$T9L}o67*X*=`sNa71eU+T3gfV3MDwx1}u4;sT zeb`Ci7s>5v7)5@o00)Cgsv@}O40t#x4CzKVP9ZxKz1JUvamI8?0zEsO8`06Ebj84k zAhSU@mt0u^qn~aCrmuuiPqzZQ-iE-_t-y^nuyHoaKHb(pLvMUEs^=uZ$Jx>wPczk( zJK(WnLp@UipF3!ati24L__?jP^>~@nwuMYw3h6Vs1W2PA3q>4CZ+0|FqZ&ok7wVx8 z;;*P>Q{rj@Cpp^yBWO#@ry52>G!g0{jU`ov*|emp@e3Mp%+!rA@>wR(eQWqM1-joy zE^Y;H3CGgvg@s%WrRgFPeTAhBM2UM76tnV0@4Rd`QF>^-GeiAl6KwmpgR59ZWG2K{ z=iB)7P>84QZ-So0B`l$EO6Up2>Elp6p+ulmOH3*pTFFu`#(gI_)&k>5?@pNRVBP+G z;30t)5VS61)hmom=F|NB2 zPIW-e5S={dka6-(m~Wmuv6PjWRFNHB_!aQuA*`KfufG%g+J<*_VNEsTu(2=Zzs-jY zVUShKvwMi^h(UB5fHz6a0d!BMOydz4t+kNQM8ySrkY?7;52`#HuD)4)9U3hg>C@5!$DY7SV7<>APU3m9<69c8w zY)GUIMx>d<1M7%%(Iva}sfLvpQ{e}zo52g{8ln}KO>@}_dra78g}qU*`quX_DSr}+ zS6pdh#w!jrvwSzXuocqDp&A&=%9w7gjNy#UGKNFVGKNEqGKN&%#oRRN9>}(2l5-Ez zZ7J-Z`omp#Ptx|ueHWVhB-p7E}ShrSu{#d zM!yliNVhL`jJRE6aNF-gu!tYpviV%NDFk8V0hzr&v8EfA9j zWl{!ZQjsy8k((_InUCA(^QU#4;SeJChlQlqO~xXXdx(*sb=jGPT3N)SNVYKXcO|1QsqMZ-7?^LD?3iT-6l9}Y7G&t z{`X;dAJ`>%y@J1wtyebWS60=nT2`af)uG%^l&EC=9%1F&W`~q&p0&2BK3I!CA4+m| z#Jvf0J}`>YLL0{OLcFQjiIdrL$GAa@_X^qGLUhX5jHX}Yt!oi7GkSd}F7?avKhx)- zF=0QFa~L_`nzj-xE?9On%~q5wC5Xwc&VB7RAKF_T*086JltEXr`fLnxz-?oY1D+d$ z9B^Ka%X_qo1j-MZ_S%p7BWAJ~{?$s3OltapjJZ@D8 z<4JW@I2;Ux3i&)ombVGH qt%BQIf(fiZpV~^}S8j(OA?=P&%Q5K!9OxO8@y2BG)%gd6i|`MmKEu@j diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 7e7030f4e..d094f41a6 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -6650,28 +6650,28 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } } element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } } element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6691,7 +6691,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6711,7 +6711,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6731,7 +6731,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6754,28 +6754,28 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } } element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } } element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6795,7 +6795,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6815,7 +6815,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6835,7 +6835,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47837,28 +47837,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47872,7 +47872,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47886,7 +47886,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47900,7 +47900,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47914,7 +47914,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47928,7 +47928,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48011,14 +48011,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -48038,7 +48038,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48058,7 +48058,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48078,7 +48078,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48098,7 +48098,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48118,7 +48118,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48141,14 +48141,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -48168,7 +48168,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48188,7 +48188,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48208,7 +48208,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48228,7 +48228,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48248,7 +48248,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48491,42 +48491,42 @@ cont { element { scale: 10 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 11 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 12 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 13 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 14 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 15 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48540,7 +48540,7 @@ cont { element { scale: 16 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48554,7 +48554,7 @@ cont { element { scale: 17 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48568,7 +48568,7 @@ cont { element { scale: 18 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48582,7 +48582,7 @@ cont { element { scale: 19 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48596,7 +48596,7 @@ cont { element { scale: 20 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48735,35 +48735,35 @@ cont { element { scale: 16 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 17 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 18 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 19 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 20 area { - color: 11979115 + color: 12504182 priority: -1870 } } @@ -48773,28 +48773,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -48806,7 +48806,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -48814,7 +48814,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -48837,7 +48837,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48845,7 +48845,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -48868,7 +48868,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48876,7 +48876,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48906,7 +48906,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48914,7 +48914,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48944,7 +48944,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48952,7 +48952,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48982,7 +48982,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48994,7 +48994,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49024,7 +49024,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49036,7 +49036,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49066,7 +49066,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49081,28 +49081,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -49114,7 +49114,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49122,7 +49122,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49145,7 +49145,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49153,7 +49153,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49176,7 +49176,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49184,7 +49184,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49214,7 +49214,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49222,7 +49222,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49252,7 +49252,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49260,7 +49260,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49290,7 +49290,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49302,7 +49302,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49332,7 +49332,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49344,7 +49344,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49374,7 +49374,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49389,28 +49389,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -49422,7 +49422,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49430,7 +49430,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49453,7 +49453,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49461,7 +49461,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49484,7 +49484,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49492,7 +49492,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49522,7 +49522,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49530,7 +49530,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49560,7 +49560,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49568,7 +49568,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49598,7 +49598,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49610,7 +49610,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49640,7 +49640,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49652,7 +49652,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49682,7 +49682,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49697,28 +49697,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -49730,7 +49730,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49738,7 +49738,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49761,7 +49761,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49769,7 +49769,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49792,7 +49792,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49800,7 +49800,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49830,7 +49830,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49838,7 +49838,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49868,7 +49868,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49876,7 +49876,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49906,7 +49906,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49918,7 +49918,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49948,7 +49948,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49960,7 +49960,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49990,7 +49990,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50050,35 +50050,35 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1880 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1880 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1880 } } element { scale: 14 area { - color: 13161612 + color: 12898689 priority: -1880 } } element { scale: 15 area { - color: 13161612 + color: 12898689 priority: -1880 } } @@ -50456,21 +50456,21 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1920 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -50491,35 +50491,35 @@ cont { element { scale: 16 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 17 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 18 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 19 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 20 area { - color: 12504182 + color: 12898689 priority: -1920 } } @@ -50789,28 +50789,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50824,7 +50824,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50838,7 +50838,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50852,7 +50852,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50866,7 +50866,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50880,7 +50880,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50897,42 +50897,42 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1930 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -50952,7 +50952,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -50972,7 +50972,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -50992,7 +50992,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -51225,14 +51225,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -51771,14 +51771,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -51837,28 +51837,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51872,7 +51872,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51886,7 +51886,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51900,7 +51900,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51914,7 +51914,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51928,7 +51928,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52730,35 +52730,35 @@ cont { element { scale: 12 area { - color: 11979115 + color: 14210459 priority: -1930 } } element { scale: 13 area { - color: 11585379 + color: 14079128 priority: -1930 } } element { scale: 14 area { - color: 11716458 + color: 14013333 priority: -1930 } } element { scale: 15 area { - color: 11387999 + color: 14013333 priority: -1930 } } element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52788,7 +52788,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -52796,7 +52796,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52826,7 +52826,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -52834,7 +52834,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52864,7 +52864,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52876,7 +52876,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52906,7 +52906,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52918,7 +52918,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52948,7 +52948,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52963,63 +52963,63 @@ cont { element { scale: 12 area { - color: 13161612 + color: 15656651 priority: -1930 } } element { scale: 13 area { - color: 13161612 + color: 15590859 priority: -1930 } } element { scale: 14 area { - color: 13161612 + color: 15590858 priority: -1930 } } element { scale: 15 area { - color: 13161612 + color: 15590858 priority: -1930 } } element { scale: 16 area { - color: 12898689 + color: 15590858 priority: -1930 } } element { scale: 17 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 18 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 19 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 20 area { - color: 11979115 + color: 15590858 priority: -1930 } } @@ -53029,14 +53029,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1860 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1860 } } @@ -53717,35 +53717,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53768,7 +53768,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53776,7 +53776,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53799,7 +53799,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53807,7 +53807,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53837,7 +53837,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53845,7 +53845,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53875,7 +53875,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53883,7 +53883,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53913,7 +53913,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53925,7 +53925,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53955,7 +53955,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53967,7 +53967,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53997,7 +53997,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54012,35 +54012,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54063,7 +54063,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54071,7 +54071,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54094,7 +54094,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54102,7 +54102,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54132,7 +54132,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54140,7 +54140,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54170,7 +54170,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54178,7 +54178,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54208,7 +54208,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54220,7 +54220,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54250,7 +54250,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54262,7 +54262,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54292,7 +54292,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54307,35 +54307,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54358,7 +54358,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54366,7 +54366,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54389,7 +54389,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54397,7 +54397,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54427,7 +54427,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54435,7 +54435,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54465,7 +54465,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54473,7 +54473,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54503,7 +54503,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54515,7 +54515,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54545,7 +54545,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54557,7 +54557,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54587,7 +54587,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54602,35 +54602,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54653,7 +54653,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54661,7 +54661,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54684,7 +54684,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54692,7 +54692,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54722,7 +54722,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54730,7 +54730,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54760,7 +54760,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54768,7 +54768,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54798,7 +54798,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54810,7 +54810,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54840,7 +54840,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54852,7 +54852,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54882,7 +54882,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -56932,7 +56932,7 @@ cont { scale: 13 lines { width: 1.0 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -56941,7 +56941,7 @@ cont { scale: 14 lines { width: 1.0 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -56950,7 +56950,7 @@ cont { scale: 15 lines { width: 1.5 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -56959,7 +56959,7 @@ cont { scale: 16 lines { width: 2.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -56967,7 +56967,7 @@ cont { scale: 17 lines { width: 3.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -56975,7 +56975,7 @@ cont { scale: 18 lines { width: 4.5 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -56983,7 +56983,7 @@ cont { scale: 19 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -56991,7 +56991,7 @@ cont { scale: 20 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -60718,21 +60718,21 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1880 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1880 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1880 } } @@ -60753,35 +60753,35 @@ cont { element { scale: 16 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 17 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 18 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 19 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 20 area { - color: 12504182 + color: 12898689 priority: -1880 } } @@ -60791,21 +60791,21 @@ cont { element { scale: 11 area { - color: 13555607 + color: 13949600 priority: -1880 } } element { scale: 12 area { - color: 13555607 + color: 13818270 priority: -1880 } } element { scale: 13 area { - color: 13555607 + color: 13621402 priority: -1880 } } @@ -61657,70 +61657,70 @@ cont { element { scale: 11 area { - color: 13161612 + color: 12373110 priority: -1870 } } element { scale: 12 area { - color: 13161612 + color: 12110705 priority: -1870 } } element { scale: 13 area { - color: 13161612 + color: 11848043 priority: -1870 } } element { scale: 14 area { - color: 12898689 + color: 11650917 priority: -1870 } } element { scale: 15 area { - color: 12898689 + color: 11650917 priority: -1870 } } element { scale: 16 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 17 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 18 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 19 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 20 area { - color: 11585379 + color: 11650917 priority: -1870 } } @@ -62036,8 +62036,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62052,8 +62052,8 @@ cont { element { scale: 12 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62068,8 +62068,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62084,8 +62084,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62100,8 +62100,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62116,8 +62116,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -62131,8 +62131,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -62146,8 +62146,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -62161,8 +62161,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -62176,8 +62176,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -132499,8 +132499,8 @@ cont { element { scale: 12 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -132515,8 +132515,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -132531,8 +132531,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -132547,8 +132547,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -132563,8 +132563,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -132578,8 +132578,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -132593,8 +132593,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -132608,8 +132608,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -132623,8 +132623,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -132792,7 +132792,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -132805,7 +132805,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -132818,7 +132818,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -133037,7 +133037,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -133050,7 +133050,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -133063,7 +133063,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -133139,8 +133139,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133155,8 +133155,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133171,8 +133171,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133187,8 +133187,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133202,8 +133202,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133217,8 +133217,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133232,8 +133232,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133247,8 +133247,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133303,8 +133303,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -133313,8 +133313,8 @@ cont { element { scale: 11 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -133330,8 +133330,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -133347,8 +133347,8 @@ cont { element { scale: 13 lines { - width: 1.6 - color: 1298117829 + width: 1.7 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133363,8 +133363,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 1298117829 + width: 2.0 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133379,8 +133379,8 @@ cont { element { scale: 15 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133395,8 +133395,8 @@ cont { element { scale: 16 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -133410,8 +133410,8 @@ cont { element { scale: 17 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -133425,8 +133425,8 @@ cont { element { scale: 18 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -133440,8 +133440,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -133455,8 +133455,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -133473,8 +133473,8 @@ cont { element { scale: 12 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133489,8 +133489,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133505,8 +133505,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133521,8 +133521,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133537,8 +133537,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133552,8 +133552,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133567,8 +133567,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133582,8 +133582,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133597,8 +133597,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133615,8 +133615,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133631,8 +133631,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133647,8 +133647,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133663,8 +133663,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133678,8 +133678,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133693,8 +133693,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133708,8 +133708,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133723,8 +133723,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133741,8 +133741,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -133761,8 +133761,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -133781,8 +133781,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -133801,8 +133801,8 @@ cont { element { scale: 16 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -133820,8 +133820,8 @@ cont { element { scale: 17 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -133839,8 +133839,8 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -133858,8 +133858,8 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -133877,8 +133877,8 @@ cont { element { scale: 20 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 039563ec05cc84b62d92a87b648920f18538dc38..9d7659dc8d42a063eae10ce26c0e6b550a42c9cc 100644 GIT binary patch delta 5530 zcmeHLU2GIp6lPAlv(wq_&hE_8?DmIlE7s6Ux}Eems1%D^z5H`=`2;sV-*x2XY|_UZ$9Q7X^R0J|d93c1ODyv5FJ4X~;w!RKclE z^%tz#_`7p;0EAa>%aa2Fqoe4&`Vhtn*7efRl*ORJ7kc!r7%Agr)g0(3yjTGUREqJ!mt4;B0 zGsJY)QoN(t>-6cfC_L>GV^K{Q%CshbNURes&q-HTZ zeE&o{v;^kfFVQZ&UjnTrzqLYw9GJwa;wBT5;K$-ZZytIhPk#*#N|WRy^eYW3pt?{i zLT*}w^jgGtG)tg2+3-Yg3+ZRH)c5<;`p+O6m3X&5GwZcU`j9NvRE1f12B*Gdz zju*Fpmvr>QQ;bA@-UCvhxQz3W?Md*HD{CM^4s8aB{IUj~AUj_KkNWf&<2U)R^3Gb= z4f!wH_bdc?EV#7d;JQ_tytxiIwa^-*QELs`2*I%RimRaQU{ilPT~LC8_LFlPP?5YF z0F}&G92$2ks&efGSm$OwC2d<^&OU*2m%0Ksthz2>wYC8sJ0REruO0B&0nrXf6!4h+ zMBx0TE>f};>RL{92EMdfpQN=9J7_e?6whj_Nsd4%Il5KbvkBEWV;K$P?^L64&~$6y z#YS8P?bif{EmBSo!Zc(oNbkkztJJq76>Q{aZ&JJU2;}#(3VL3E=Z-sh_h4*bbSxeV zkI3<@qQLQX1zmRF-*z&J9oI!3O<=bDGz#I064g%G`<0HWVSI%Vqo^bGYe$##y*6BW z@OZe$u`zgryuSw)pX)7wmLDdF>bJr15T`y~+6y5^4~JP|pz5QJ zs+pqus*i|P#(0#hBvrET@V2nr*B2Wd{ZGVOMa2v4Lh(-TgZiA}t)k+gUp1*uLQPHu zyQzZcS3}-N&Y)m7=8%g}zlw<&6zrz5q2Ke4YWnEi4Rctrn@Xs|s)Pot3a7*BBf^!; z2PCo^%Gw{~+RVAu$G_#|{b{*25+B$hCt?pWEx$}t#Qo4vvhO{H_YTR!Jwx)wSh#O2 zF*q(NPK5O!WR^! z<}9o(thoWaXIM^*#pS{9Xd*5TB*c2ISS%}=KBr!no4m)rNp2>upMx@~9`!COT1c;7 z(+R;G@mDHQi<$@ZsSM)7X$VTSsCy1V%tc7K2!A#r@Y3~Zz`p|gD^#veJLGLN*qwOz z;ydN>aGyLZ4`vP4+refJRwpupEpEjT*@A6sWwQsX6PdyKqI5)NusV?$ED{0b;u7`~ z#;NVipQLIzTj%nK5q+~LuppJ4rzDrNg^V(9Df`9U53BtH|Ak=+xoKc@bI*v3-7{O} z{13$>TpQcpeyf1@m@#6}j>Yj+pBF3A4?yVnP2V5|Sf zTG&cb*1>v_^&qS5w$TJqSpnJCj;PlyJ(-(2*agxO>;&OVqLQ?=vL0l8GqPfKwmeG5 RN;9(loNTdjay8rQ{s(0)uUr5C delta 6436 zcmd^DeQXp(6z{&4yY2Sc-tAp`Z7t;rrG>OtN}$p}p%f5|98x}GVjEb>(H{NaxR2Hg zi7jekOwcHj4DbgcCZ-x=v?Oe!i2h^LfCUViln@c41_@$`k<>)Qw;!{&vquS%ps{Rn z*_-!!Z)V!R}Bj;ctsbJ;6;0DY8|}<8z8!eE-my zAt?BPyb=J<(Zo6*$6b8&;Cf$nD*EimdU<3$*ZNJ>Kz%{~^;_D*iEci-D3|ZI8gmrm zV1Ue?18%@~X$yFXuL>sFojQ`VxU3d(u@WY+QErQmV8BbO;0xbd>4LLU>fRcU2K}wU zu3#(}NtjcVzpaKn9Cwt+)liaU%1!}F?2Utgf~%vZoU)YRhMHKTBh^@=Wk1wJ7CsC$ zfbZ9rft%zufL&?qtb-CVIv?g5NM90}PJHvguOoRHFIr4JxwZgi>PV5^k!ma>-R;1W zBg?>J7q#gqg9H_y_ZLE$UFAvZWiuIVL>e_j?F~IQ+dX<1x|fp4^P&8KO@8YlnEt>f z|Mn6nePENnx*XyiC|Lt$9aFcr)kwvS@l?gl>Y1zTE31);o$G`qgO^r-y9&jI=}y-+ z)~IgN!GP?06sj{eV!w>$(z!B5I#Ox#hHn$j} zU95?dru)U3DA9(Vm~tW%68jpMstkR@EWR`k#z+qosZC>$0d<vzzZh;LBZiF;!hmtvN zo^B7ONGNrTQQyi$DXVg8AyT%O2p5^%1|D)Dfamb}H6V}!&5%Xv+92CFTCZ$}N`;8y zW_h8*Ge%m~jUAdk9O{4~67B$ADNCgxi1kJxW4m6r&m+#Tw%gD+Pa9Z^m@Dt;gkkWa z$S@<(Ex&UIxGms69^r*B9ER>IcEQmZ3`OISpg$}{I`Aqe=o-inrrxEj)Q-PGIB`>W z6JArbn`C1gipgtH@RP|4@OFjSo{fS#vx%pfp~E!dh(S4d(d^KwZA!cbp+f~ZxeIEE zvmWeZv<>nyTQznm`fCi)&UPr~TFKcpxXi2K(8N_}-#_R9w;;Ci^p1u7HD^{B&3AiX ziUQLMmJZVOr&ndsVL(51Tk(nsmqqEM7io=(6ju3V$*LIRg(i$Me~ zOZtT0?Sj`_Vg7J1(iMtELp{O!TWo3tlI3yy&GJ95xW3DF!NYPG3H3;^`$M2ngT@vn z39Nz%P>k}YyP-C}Pv!(?m(;zfOWKM*G~=<(P5s-DQYa?+ z`E0Q`bDR47)Zl#cll_-7$l{amkjIZTRh+CT2FXR_-~r|N!yJ=eiB(l(L3~HZrLQ30 zD^_A{-2oKu1iJ48dd35v-+K!1la8MZdGD!7(hik^UKF25uaxk&O5IZD?J3y3(l!nS zI&vEd4ll!)+fhJH*V_saNzI=ksmYU?6}EiuxqPH8HF*=5n!F0ip@p_%oL!TIF|vD! zZI-!FnUyQn=!>hOGvyB(Y#)Q!=Pm*=xXNeJ1<@dMTPWJTDJ(^!6O&Z3?-5(5@3{;i z$H*9uvS37<$_rwNWv}>-jM2aIYB-eQS$r1y%u%1;^j%}|nV%)tc)>Zck1H51zyQbX z0;5k zY>``$WRY8uWQALiWO*CNcR0?BTOi~bi-1}dl)5Hn&DEaE7hXsg3N6X{gW-1kml>6O zVy2yeX}?3p9<%wxMm(Zwm?Mfv4Yq0IrIofE1ak}_!1n{zs#@>Z4Eqsrjf;q>$j*RGiE)pMcv2Agdcd~F@i#&yKk@(o diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index bd50b0537..0c6722019 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -6556,7 +6556,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -6660,7 +6660,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -44652,28 +44652,28 @@ cont { element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -44687,7 +44687,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -44701,7 +44701,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -44715,7 +44715,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -44729,7 +44729,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -44743,7 +44743,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -44826,7 +44826,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -44956,7 +44956,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -45582,28 +45582,28 @@ cont { element { scale: 10 area { - color: 1251584 + color: 1449728 priority: -1940 } } element { scale: 11 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45615,7 +45615,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45623,7 +45623,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45646,7 +45646,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45654,7 +45654,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45677,7 +45677,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45685,7 +45685,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45715,7 +45715,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45723,7 +45723,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45753,7 +45753,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45761,7 +45761,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45791,7 +45791,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45803,7 +45803,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45833,7 +45833,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45845,7 +45845,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45875,7 +45875,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45890,28 +45890,28 @@ cont { element { scale: 10 area { - color: 1251584 + color: 1449728 priority: -1940 } } element { scale: 11 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45923,7 +45923,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45931,7 +45931,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45954,7 +45954,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45962,7 +45962,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -45985,7 +45985,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -45993,7 +45993,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46023,7 +46023,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46031,7 +46031,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46061,7 +46061,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46069,7 +46069,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46099,7 +46099,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46111,7 +46111,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46141,7 +46141,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46153,7 +46153,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46183,7 +46183,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46198,28 +46198,28 @@ cont { element { scale: 10 area { - color: 1251584 + color: 1449728 priority: -1940 } } element { scale: 11 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46231,7 +46231,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46239,7 +46239,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46262,7 +46262,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46270,7 +46270,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46293,7 +46293,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46301,7 +46301,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46331,7 +46331,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46339,7 +46339,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46369,7 +46369,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46377,7 +46377,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46407,7 +46407,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46419,7 +46419,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46449,7 +46449,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46461,7 +46461,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46491,7 +46491,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46506,28 +46506,28 @@ cont { element { scale: 10 area { - color: 1251584 + color: 1449728 priority: -1940 } } element { scale: 11 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } } element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46539,7 +46539,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46547,7 +46547,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46570,7 +46570,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46578,7 +46578,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46601,7 +46601,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46609,7 +46609,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46639,7 +46639,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46647,7 +46647,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46677,7 +46677,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46685,7 +46685,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46715,7 +46715,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46727,7 +46727,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46757,7 +46757,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46769,7 +46769,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46799,7 +46799,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46859,70 +46859,70 @@ cont { element { scale: 11 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 14 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 15 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1880 } } element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1880 } } element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1880 } } element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1880 } } element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1880 } } @@ -47265,35 +47265,35 @@ cont { element { scale: 11 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1920 } } @@ -47598,28 +47598,28 @@ cont { element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47633,7 +47633,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47647,7 +47647,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47661,7 +47661,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47675,7 +47675,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47689,7 +47689,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47706,42 +47706,42 @@ cont { element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1930 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1930 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1930 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1930 } } element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1930 } } element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -47761,7 +47761,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -47781,7 +47781,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -47801,7 +47801,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -48034,28 +48034,28 @@ cont { element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48069,7 +48069,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48083,7 +48083,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48097,7 +48097,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48111,7 +48111,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48125,7 +48125,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48580,63 +48580,63 @@ cont { element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } } @@ -48646,28 +48646,28 @@ cont { element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1920 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1920 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48681,7 +48681,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48695,7 +48695,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48709,7 +48709,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48723,7 +48723,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48737,7 +48737,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -49740,63 +49740,54 @@ cont { element { scale: 12 area { - color: 988160 priority: -1930 } } element { scale: 13 area { - color: 988160 priority: -1930 } } element { scale: 14 area { - color: 988160 priority: -1930 } } element { scale: 15 area { - color: 988160 priority: -1930 } } element { scale: 16 area { - color: 1251584 priority: -1930 } } element { scale: 17 area { - color: 1317888 priority: -1930 } } element { scale: 18 area { - color: 1317888 priority: -1930 } } element { scale: 19 area { - color: 1317888 priority: -1930 } } element { scale: 20 area { - color: 1317888 priority: -1930 } } @@ -49806,28 +49797,28 @@ cont { element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1860 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1860 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1860 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -49839,7 +49830,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -49851,7 +49842,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -49872,7 +49863,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -49893,7 +49884,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -49914,7 +49905,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50164,28 +50155,28 @@ cont { element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1860 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1860 } } element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1860 } } element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50206,7 +50197,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50227,7 +50218,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50248,7 +50239,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50480,35 +50471,30 @@ cont { element { scale: 10 area { - color: 988160 priority: -1930 } } element { scale: 11 area { - color: 988160 priority: -1930 } } element { scale: 12 area { - color: 988160 priority: -1930 } } element { scale: 13 area { - color: 1251584 priority: -1930 } } element { scale: 14 area { - color: 1251584 priority: -1930 } symbol { @@ -50531,7 +50517,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -50539,7 +50524,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -50562,7 +50546,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -50570,7 +50553,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -50600,7 +50582,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -50608,7 +50589,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -50638,7 +50618,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -50646,7 +50625,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -50676,7 +50654,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -50688,7 +50665,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -50718,7 +50694,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -50730,7 +50705,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -50760,7 +50734,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -50775,35 +50748,30 @@ cont { element { scale: 10 area { - color: 988160 priority: -1930 } } element { scale: 11 area { - color: 988160 priority: -1930 } } element { scale: 12 area { - color: 988160 priority: -1930 } } element { scale: 13 area { - color: 1251584 priority: -1930 } } element { scale: 14 area { - color: 1251584 priority: -1930 } symbol { @@ -50826,7 +50794,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -50834,7 +50801,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -50857,7 +50823,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -50865,7 +50830,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -50895,7 +50859,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -50903,7 +50866,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -50933,7 +50895,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -50941,7 +50902,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -50971,7 +50931,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -50983,7 +50942,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51013,7 +50971,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51025,7 +50982,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51055,7 +51011,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51070,35 +51025,30 @@ cont { element { scale: 10 area { - color: 988160 priority: -1930 } } element { scale: 11 area { - color: 988160 priority: -1930 } } element { scale: 12 area { - color: 988160 priority: -1930 } } element { scale: 13 area { - color: 1251584 priority: -1930 } } element { scale: 14 area { - color: 1251584 priority: -1930 } symbol { @@ -51121,7 +51071,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51129,7 +51078,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -51152,7 +51100,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51160,7 +51107,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -51190,7 +51136,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51198,7 +51143,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -51228,7 +51172,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51236,7 +51179,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51266,7 +51208,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51278,7 +51219,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51308,7 +51248,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51320,7 +51259,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51350,7 +51288,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51365,35 +51302,30 @@ cont { element { scale: 10 area { - color: 988160 priority: -1930 } } element { scale: 11 area { - color: 988160 priority: -1930 } } element { scale: 12 area { - color: 988160 priority: -1930 } } element { scale: 13 area { - color: 1251584 priority: -1930 } } element { scale: 14 area { - color: 1251584 priority: -1930 } symbol { @@ -51416,7 +51348,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51424,7 +51355,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -51447,7 +51377,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51455,7 +51384,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -51485,7 +51413,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51493,7 +51420,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -51523,7 +51449,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51531,7 +51456,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51561,7 +51485,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51573,7 +51496,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51603,7 +51525,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51615,7 +51536,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51645,7 +51565,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -53570,7 +53489,7 @@ cont { scale: 14 lines { width: 1.0 - color: 2567902208 + color: 1317888 priority: 80 cap: BUTTCAP } @@ -53579,7 +53498,7 @@ cont { scale: 15 lines { width: 1.5 - color: 2567902208 + color: 1317888 priority: 80 cap: BUTTCAP } @@ -53588,7 +53507,7 @@ cont { scale: 16 lines { width: 2.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -53596,7 +53515,7 @@ cont { scale: 17 lines { width: 3.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -53604,7 +53523,7 @@ cont { scale: 18 lines { width: 4.5 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -53612,7 +53531,7 @@ cont { scale: 19 lines { width: 6.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -53620,7 +53539,7 @@ cont { scale: 20 lines { width: 6.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -56640,35 +56559,35 @@ cont { element { scale: 11 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1880 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1880 } } @@ -56713,70 +56632,70 @@ cont { element { scale: 11 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 14 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 15 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 16 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 17 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 18 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 19 area { - color: 988160 + color: 1317888 priority: -1880 } } element { scale: 20 area { - color: 988160 + color: 1317888 priority: -1880 } } @@ -57432,35 +57351,35 @@ cont { element { scale: 11 area { - color: 988160 + color: 1317888 priority: -1870 } } element { scale: 12 area { - color: 988160 + color: 1317888 priority: -1870 } } element { scale: 13 area { - color: 988160 + color: 1317888 priority: -1870 } } element { scale: 14 area { - color: 1251584 + color: 1317888 priority: -1870 } } element { scale: 15 area { - color: 1251584 + color: 1317888 priority: -1870 } } @@ -57783,8 +57702,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -57799,8 +57718,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -57815,8 +57734,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -57831,8 +57750,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -57846,8 +57765,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -57861,8 +57780,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -57876,8 +57795,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -57891,8 +57810,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -126265,8 +126184,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -126281,8 +126200,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -126297,8 +126216,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -126313,8 +126232,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126328,8 +126247,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126343,8 +126262,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126358,8 +126277,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126373,8 +126292,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126542,7 +126461,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -126555,7 +126474,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -126568,7 +126487,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -126787,7 +126706,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -126800,7 +126719,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -126813,7 +126732,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -126889,8 +126808,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -126905,8 +126824,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -126921,8 +126840,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -126937,8 +126856,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126952,8 +126871,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126967,8 +126886,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126982,8 +126901,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -126997,8 +126916,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127053,8 +126972,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -127063,8 +126982,8 @@ cont { element { scale: 11 lines { - width: 1.2 - color: 1292247078 + width: 1.4 + color: 218112546 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -127080,8 +126999,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1292247078 + width: 1.4 + color: 218112546 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -127097,8 +127016,8 @@ cont { element { scale: 13 lines { - width: 1.6 - color: 1292247078 + width: 1.7 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127113,8 +127032,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 1292247078 + width: 2.0 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127129,8 +127048,8 @@ cont { element { scale: 15 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127145,8 +127064,8 @@ cont { element { scale: 16 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -127160,8 +127079,8 @@ cont { element { scale: 17 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -127175,8 +127094,8 @@ cont { element { scale: 18 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -127190,8 +127109,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -127205,8 +127124,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -127223,8 +127142,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127239,8 +127158,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127255,8 +127174,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127271,8 +127190,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127286,8 +127205,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127301,8 +127220,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127316,8 +127235,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127331,8 +127250,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127349,8 +127268,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127365,8 +127284,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127381,8 +127300,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127397,8 +127316,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127412,8 +127331,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127427,8 +127346,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127442,8 +127361,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127457,8 +127376,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127475,8 +127394,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 dashdot { dd: 2.7 dd: 2.7 @@ -127495,8 +127414,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 dashdot { dd: 2.7 dd: 2.7 @@ -127515,8 +127434,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -127535,8 +127454,8 @@ cont { element { scale: 16 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -127554,8 +127473,8 @@ cont { element { scale: 17 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -127573,8 +127492,8 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -127592,8 +127511,8 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -127611,8 +127530,8 @@ cont { element { scale: 20 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index 867adbdcdc15cc31f7520a086ca2ede8e37806f3..8bb02a24d26c8cc51987b675a7ab09a72b0f5f84 100644 GIT binary patch delta 6462 zcmd^DYitx%6n4*UXQxByZl_DxEfls;3N5U(h=RNdLh;dnTMHzH5*T5zHKk%7yfkhB zA84Xg8n{rDmm!Lv7SN0awIrGtMer43eEd;RLnK;4LQp_F=gxz9Y)K@d0VdgG?)RN@ z=bpzs=iX%>M!xtU(lM>d^KIMos+@|Dn3)?CPj5Jz7Cv_Jg7$dikQhjb22-GAVwQ%s zova$;m(BMHUYwOTlqzqX+RxFZl{6N@0ma%Ny;i^7?LBa@ZZsn$+A}3e4s_0-1S$dPl~nKBYeJV#i|Es(=HCV}An?9a7q z&q%n3zs$Q8a`{XCI4ET2#=|f^YPszqJf6*+36G=O z^no%Kij0paezKL;faoB0z>q_m;zo$g{il z3E@|)#e;VG(>q^g+d3gzcznkuq}jyTSTEL0g`VuU_aT?9o(i&BH5H!nY5KNCX6RF& z^P)a`V>%3E^Jc?i>fQ=C2AAIiJE|eiPt}v!9UmBtkOsVV@*asJtyyvzYCpO{F57uG zm;|pBv==U`7Y|W)W9g}9vakH0|or#ViOo^ zl0zJttfbtcn$MbQp)h&y(0;!=u?`+o9VjK%CoYr{%Z*ZExlu}d7kV>4in(BJmK&v1 zBa}^l0E#1+WkUE}YaO6Hf!kMo{s9;$&VF(K@3!0yiF8h2?>Ki7?f&)qohZ%K_6{C- zEjy`_A3a;uuUViG;$C{8__5@}7)=@_ZSe01`w$jbS0mhKic1T4xD8@3Yj1+FR+i2} z7umdK7^}@v-3*21e1q9*CUL?}j9+4CJhB8PT>(GDO+WNc!rjKwbG5a#wBSMI)uni1 zB9HL=p3nCIHwoE7mbc7eFne&B;U**%tCs1A=T^cTo+*5edCOst_ASH}?G3Sfe&Xa3 zT%NMUknhLZSHQq4;EJm;C8BJ{qtO2fIO8hJ3w7Hn*qW2<@JPW$O8wkL$^yJ#G#!sm=Qi^7E9peNU&Vc0wRMd3wVs z$Nh{-=gIX)9VnH~U)SO#&32cg4)W8pcuBLN)Ir=Rbr2VN7cZMGnAZh2O4lhjN;Lsd zwe@58*<1J*NSXCYQ*(n-7i(;4P->gxnAlV9lYZz^dQOxDf7!FEj=gXQ`ew&48TzE( z#Gg}kB4BEqvk<+8Vmd_hsdOTW_s%2GJ4YUhNzpwgUxLfN1Q+Utd-D8Yz@Ha?KK1^2CO(M*}iHCz@O zgv(qaBI+~c!kZqy7OAt$Qy~oPktvtxq2s`CD_f+_s}Ou1^@lrzqyJp3c$HU@O-C-Q zZLFEQSZQp$R-DPYrU~~aSNo())5eC{C5Z+(UzFrL`*w(KKV$qSQ{urgIb7_4A`AI* zTH6>7kue#PUzCE|w`}%=4~J19Bc;MHKCOo)b!ce2RS&hk_b@XfIXIiPVYTXw)tK*O z;>tNkiL2>(HO{g${WBTn!nAa@iBqcerq5^@-5p0s-5p1H-5p1%?dFOPhouW31@~w3z2@ZYLVwn8hLDA9 zCbC)*7!AkD29RyvNY5X7=C{s7-LrAjEyLCmbF&4kq*9QO&AKEjr($Cv`k%a8CgfyP JT+Nz{zX2N@&G)%PU}u zCP0iqut^VSlvj)pC#&mR7rPeJWzNqKQ-`FBKfHSJECjyo`%}AIvR_Oa;$?7x z9rY4=ZP$4lS|+AzXjf7F<6Sk2JZ`dJ<3yi{&(N_cAbr>MPJQ@4zwe9Q#j1C)>-v}O zmyaICzIosiXdnbS(KQ<~aCj9YW6uH*aBw{g_1wskM_@%2__4emQs71wE~tkQ_~uwh z!Xh#dn1SfSf_li-#(q9VX&hXfe8Mex*D5V5+uIuQS2Q#?L>gK*$#DW*W(1l7HWUl< zVR)h*V*|+5L#MI0J0FYy>-Nzo>ww=3I|o7_y@xmfvcv!5GpIEM&<#tDeb|*4=(OrA znI6`Oro==C$3#;#6f26r=V4o6#Zm~HqY#&;frms{--KC(@M;lwG}B(|qM$l*612LO z@Dp&#`n*i*PLyrxMA@5hqU`k$ioX=YsNlB4T|(f;o0fye0@Ab2!0Hkh`3SoG_H@X5^xW>QfbgT|H7=@z%}aQFIbzKnEUP(Dmergn%W6)PRb@ie zakJsLC&+nQHr4MCv%rm>Lun9)G!(BCLxy^|3Vw!rDW`Z~DJ0;` zD)8}gs!eO_DQgj-6;usl$(YwyK6U9e_3%Q-9mZYlx8_MRZ2dQJ&l>Opedkcg_S>vj zF{K=fIW?3-*~0*ltmT8hBk^Ue3ao6@Z2gGi7f}j8#NA0^#@mhKdF|t zqijlK9`0|W&VkKpBaq3(z&&_20;4gsg~Y(8TnsH+=$#wvGf_fXX+{b8x?sDpPT2~h z%q64os7dtMiK*+272BSNFz#IsIrkwhHD+A?=%l!mbikx&Tx!g?5Sfd|I`p`(pyAC9 z!}U9z)NX}4jmM?HWbp2j$Ay!xZ?up>&3hsgZPd37a`=fb7A%X-h#P6zFT-`4sd43I zL}X+4X2`t{L3zN%Qg$Cg@<8iEed7f)!^mp%_72c_YGOhWsEi#)Q8)`N`Hq>l>j_~FOpE?J*6Y<3RLcnIm(y$X{ zX_!#;-E)wZG>JdG?Kh>Fyltpi5Ki%e;5vojD#+-t+35cjBm`_IbBx!08_FDWqRcTT z%IfR@RQlQ_rL`z3ehOc?M{jpasVz#Ry;WJ8-xg_Anj&(6I9LuPHS+8GGVjON@7(a< z?h6p|7m%_-QDxbfG-6)c$FAROYbKDkh74qSdmxx0Pau88rR4aOFFxgWP&?>e^l{V2 zqxSYByUqIEJpIZZCq-y&zns+CoO$EAKUN4WOSmyLhP zEy-p$8=KlzFJGs$wLM%R#S7KKs;XTcDb@6}wP}4rEB$*Y$=L&rMEKAxqiHR4QQj>S zlgXx-U%wiMfQdt6V?6r3(kh z(qu?5S!_?MG-HradBz~43XMTVMQS6*_XMOJZYj--CuN@orTO8K4M=|)kWS;=Iw9=v!OqJoHuz64B{*r{$P*eui8w`r=c52c^;@?M(R#=gtHg diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 5b1ce9f4f..30968099e 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -6556,28 +6556,28 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } } element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } } element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6597,7 +6597,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6617,7 +6617,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6637,7 +6637,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6660,28 +6660,28 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } } element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } } element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6701,7 +6701,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6721,7 +6721,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6741,7 +6741,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44457,28 +44457,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -44492,7 +44492,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -44506,7 +44506,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -44520,7 +44520,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -44534,7 +44534,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -44548,7 +44548,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -44631,14 +44631,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -44658,7 +44658,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44678,7 +44678,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44698,7 +44698,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44718,7 +44718,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44738,7 +44738,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44761,14 +44761,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -44788,7 +44788,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44808,7 +44808,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44828,7 +44828,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44848,7 +44848,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -44868,7 +44868,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45111,42 +45111,42 @@ cont { element { scale: 10 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 11 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 12 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 13 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 14 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 15 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45160,7 +45160,7 @@ cont { element { scale: 16 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45174,7 +45174,7 @@ cont { element { scale: 17 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45188,7 +45188,7 @@ cont { element { scale: 18 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45202,7 +45202,7 @@ cont { element { scale: 19 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45216,7 +45216,7 @@ cont { element { scale: 20 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45355,35 +45355,35 @@ cont { element { scale: 16 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 17 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 18 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 19 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 20 area { - color: 11979115 + color: 12504182 priority: -1870 } } @@ -45393,28 +45393,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -45426,7 +45426,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -45434,7 +45434,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -45457,7 +45457,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45465,7 +45465,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -45488,7 +45488,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45496,7 +45496,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45526,7 +45526,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45534,7 +45534,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45564,7 +45564,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45572,7 +45572,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45602,7 +45602,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45614,7 +45614,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45644,7 +45644,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45656,7 +45656,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45686,7 +45686,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45701,28 +45701,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -45734,7 +45734,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -45742,7 +45742,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -45765,7 +45765,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45773,7 +45773,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -45796,7 +45796,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45804,7 +45804,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45834,7 +45834,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45842,7 +45842,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45872,7 +45872,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -45880,7 +45880,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45910,7 +45910,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45922,7 +45922,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45952,7 +45952,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45964,7 +45964,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -45994,7 +45994,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46009,28 +46009,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -46042,7 +46042,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -46050,7 +46050,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -46073,7 +46073,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46081,7 +46081,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -46104,7 +46104,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46112,7 +46112,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46142,7 +46142,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46150,7 +46150,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46180,7 +46180,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46188,7 +46188,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46218,7 +46218,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46230,7 +46230,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46260,7 +46260,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46272,7 +46272,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46302,7 +46302,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46317,28 +46317,28 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } } element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -46350,7 +46350,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -46358,7 +46358,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -46381,7 +46381,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46389,7 +46389,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -46412,7 +46412,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46420,7 +46420,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46450,7 +46450,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46458,7 +46458,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46488,7 +46488,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46496,7 +46496,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46526,7 +46526,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46538,7 +46538,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46568,7 +46568,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46580,7 +46580,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46610,7 +46610,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46670,35 +46670,35 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1880 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1880 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1880 } } element { scale: 14 area { - color: 13161612 + color: 12898689 priority: -1880 } } element { scale: 15 area { - color: 13161612 + color: 12898689 priority: -1880 } } @@ -47076,21 +47076,21 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1920 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -47111,35 +47111,35 @@ cont { element { scale: 16 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 17 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 18 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 19 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 20 area { - color: 12504182 + color: 12898689 priority: -1920 } } @@ -47409,28 +47409,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47444,7 +47444,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47458,7 +47458,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47472,7 +47472,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47486,7 +47486,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47500,7 +47500,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47517,42 +47517,42 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1930 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -47572,7 +47572,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -47592,7 +47592,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -47612,7 +47612,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -47845,14 +47845,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -48391,14 +48391,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -48457,28 +48457,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48492,7 +48492,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48506,7 +48506,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48520,7 +48520,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48534,7 +48534,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48548,7 +48548,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -49318,35 +49318,35 @@ cont { element { scale: 12 area { - color: 11979115 + color: 14210459 priority: -1930 } } element { scale: 13 area { - color: 11585379 + color: 14079128 priority: -1930 } } element { scale: 14 area { - color: 11716458 + color: 14013333 priority: -1930 } } element { scale: 15 area { - color: 11387999 + color: 14013333 priority: -1930 } } element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49376,7 +49376,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -49384,7 +49384,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49414,7 +49414,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -49422,7 +49422,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49452,7 +49452,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49464,7 +49464,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49494,7 +49494,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49506,7 +49506,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49536,7 +49536,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -49551,63 +49551,63 @@ cont { element { scale: 12 area { - color: 13161612 + color: 15656651 priority: -1930 } } element { scale: 13 area { - color: 13161612 + color: 15590859 priority: -1930 } } element { scale: 14 area { - color: 13161612 + color: 15590858 priority: -1930 } } element { scale: 15 area { - color: 13161612 + color: 15590858 priority: -1930 } } element { scale: 16 area { - color: 12898689 + color: 15590858 priority: -1930 } } element { scale: 17 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 18 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 19 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 20 area { - color: 11979115 + color: 15590858 priority: -1930 } } @@ -49617,14 +49617,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1860 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1860 } } @@ -50291,35 +50291,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -50342,7 +50342,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50350,7 +50350,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -50373,7 +50373,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50381,7 +50381,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50411,7 +50411,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50419,7 +50419,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50449,7 +50449,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50457,7 +50457,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50487,7 +50487,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50499,7 +50499,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50529,7 +50529,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50541,7 +50541,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50571,7 +50571,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50586,35 +50586,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -50637,7 +50637,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50645,7 +50645,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -50668,7 +50668,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50676,7 +50676,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50706,7 +50706,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50714,7 +50714,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50744,7 +50744,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50752,7 +50752,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50782,7 +50782,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50794,7 +50794,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50824,7 +50824,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50836,7 +50836,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50866,7 +50866,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -50881,35 +50881,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -50932,7 +50932,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50940,7 +50940,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -50963,7 +50963,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -50971,7 +50971,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51001,7 +51001,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51009,7 +51009,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51039,7 +51039,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51047,7 +51047,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51077,7 +51077,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51089,7 +51089,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51119,7 +51119,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51131,7 +51131,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51161,7 +51161,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51176,35 +51176,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -51227,7 +51227,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51235,7 +51235,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -51258,7 +51258,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51266,7 +51266,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51296,7 +51296,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51304,7 +51304,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51334,7 +51334,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51342,7 +51342,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51372,7 +51372,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51384,7 +51384,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51414,7 +51414,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51426,7 +51426,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51456,7 +51456,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53396,7 +53396,7 @@ cont { scale: 14 lines { width: 1.0 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -53405,7 +53405,7 @@ cont { scale: 15 lines { width: 1.5 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -53414,7 +53414,7 @@ cont { scale: 16 lines { width: 2.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -53422,7 +53422,7 @@ cont { scale: 17 lines { width: 3.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -53430,7 +53430,7 @@ cont { scale: 18 lines { width: 4.5 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -53438,7 +53438,7 @@ cont { scale: 19 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -53446,7 +53446,7 @@ cont { scale: 20 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -56475,21 +56475,21 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1880 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1880 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1880 } } @@ -56510,35 +56510,35 @@ cont { element { scale: 16 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 17 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 18 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 19 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 20 area { - color: 12504182 + color: 12898689 priority: -1880 } } @@ -56548,21 +56548,21 @@ cont { element { scale: 11 area { - color: 13555607 + color: 13949600 priority: -1880 } } element { scale: 12 area { - color: 13555607 + color: 13818270 priority: -1880 } } element { scale: 13 area { - color: 13555607 + color: 13621402 priority: -1880 } } @@ -57287,70 +57287,70 @@ cont { element { scale: 11 area { - color: 13161612 + color: 12373110 priority: -1870 } } element { scale: 12 area { - color: 13161612 + color: 12110705 priority: -1870 } } element { scale: 13 area { - color: 13161612 + color: 11848043 priority: -1870 } } element { scale: 14 area { - color: 12898689 + color: 11650917 priority: -1870 } } element { scale: 15 area { - color: 12898689 + color: 11650917 priority: -1870 } } element { scale: 16 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 17 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 18 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 19 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 20 area { - color: 11585379 + color: 11650917 priority: -1870 } } @@ -57638,8 +57638,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -57654,8 +57654,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -57670,8 +57670,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -57686,8 +57686,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -57701,8 +57701,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -57716,8 +57716,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -57731,8 +57731,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -57746,8 +57746,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -126137,8 +126137,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -126153,8 +126153,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -126169,8 +126169,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -126185,8 +126185,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126200,8 +126200,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126215,8 +126215,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126230,8 +126230,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126245,8 +126245,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126414,7 +126414,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -126427,7 +126427,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -126440,7 +126440,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -126659,7 +126659,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -126672,7 +126672,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -126685,7 +126685,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -126761,8 +126761,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -126777,8 +126777,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -126793,8 +126793,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -126809,8 +126809,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126824,8 +126824,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126839,8 +126839,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126854,8 +126854,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126869,8 +126869,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -126925,8 +126925,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -126935,8 +126935,8 @@ cont { element { scale: 11 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -126952,8 +126952,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -126969,8 +126969,8 @@ cont { element { scale: 13 lines { - width: 1.6 - color: 1298117829 + width: 1.7 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -126985,8 +126985,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 1298117829 + width: 2.0 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127001,8 +127001,8 @@ cont { element { scale: 15 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127017,8 +127017,8 @@ cont { element { scale: 16 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -127032,8 +127032,8 @@ cont { element { scale: 17 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -127047,8 +127047,8 @@ cont { element { scale: 18 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -127062,8 +127062,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -127077,8 +127077,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -127095,8 +127095,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127111,8 +127111,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127127,8 +127127,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127143,8 +127143,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127158,8 +127158,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127173,8 +127173,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127188,8 +127188,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127203,8 +127203,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127221,8 +127221,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127237,8 +127237,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127253,8 +127253,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127269,8 +127269,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127284,8 +127284,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127299,8 +127299,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127314,8 +127314,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127329,8 +127329,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127347,8 +127347,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -127367,8 +127367,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -127387,8 +127387,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -127407,8 +127407,8 @@ cont { element { scale: 16 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -127426,8 +127426,8 @@ cont { element { scale: 17 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -127445,8 +127445,8 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -127464,8 +127464,8 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -127483,8 +127483,8 @@ cont { element { scale: 20 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 44f785b741b6fd771a97b3a7c87f5d787a2f886a..ee79c908142b669eb94fc1565694e2039498cad3 100644 GIT binary patch delta 5309 zcmeH~e{54#6vug|>+7TK`r6k*%a~m|WQL5w01^LyFcdT}gkhY5n2oY^xJWBox0!{E zE&7M3TNr_H1ot~ejR`?x%)^L8BZ8}Zh&IQnTA~d#idS;w$x{2# z^0&@Z+$9L#?t8r=G&KdEIa8sYsStku1+T=xjX$@7mG|=Xmjdl0e`t@Oge6&93C}$U zek?8nI~*<72I~w1=Z}7}RSdQo@m@!K27=#|!O7sO7Q1_UG*Q!(j76$r@mOQ5p(X8t z+OiHh1mR6AUkAao6ATA!bB}KfTpCX8)+;&K>Y1=aa%vDg4?_?`RiMD}jrdtL#%_unkOc2&ZCH;b;^0e{Ey2ZsAZxsJ z6eRVXIIOfxw!DQ|WsBAWZ>ikn<3K%qty;Ouw;4)VzV=~iGc!c<_;hEhxetIcDq ztehC@F?+#kbb>EoHG1M#3!Z|@+F>xEzDW93;fJjx(Ik(M8`W67xC_uJyp8QIK(I}w zlI{pxO&5My$~6O*8OUbfHUp0tC}!a0z?C|1WXYH3!1Wza>_1u_IF>#)y|f{I0^{Be z@R}wIQ-|t`PRO$>g%UqaD4n$NQfVxdG+v?|All?omW>>a9iue3QyuAqQ^2M^=%Van zJHh%<@c9fIn)I5N_rh6tbjW6RZjaR^n;K$~9npp-6j`#HMRAzHUj=6^T~8c1*iGrP zz8fO9O=n|6IM-Oi3A)uNYe^?=x0*~c!#8G9MbbIYgK!7V?1RN*ml@Tx9R*jj>(T5o zgPpdcm@~V_th4AkC7D+rAiB?y~lF5HW zyfQ9c*GnYcoI#j7u6Si!JhCgqobFmxw9Tq+G=_brF9?m%HiLRH*!Jfv}74 zp@ZxZN)1>hJcU0}8ha(TBI{VuG5xmjq+o#H3br&+B}GGNQ*SotGePyjG4L#!)SYVQ zq^!59uZ%!)Dz2*Fx3(1({MN=B7xG5tjY`+A3pv7f-8Gi5W#~kE_ijtLh}w%ep`mMI z$7YE@I+l>UGjtuTrS74X-Je^+o)S`bhOU>>KxLw}{2>)}+j*p|-$*e6mY|}{BYCrP zWgPAuhx;=5v$Q__<{-{k2Pc_eNe6dU4r)aW+c`{I{!vq)q{z?-px?*Ko}NJ*J7V z&dCGfY*Y`3GIxfJD5j=NW}y!HP6a5(P1$UiF=aH?Vk!>|iOzPD&z8DAsnav&v`){M z6FWU)N^Smsa!v*8$FcQAv5-6WpGjyQGT{WSIwa1u@?wKW_K0De-z)k&D=7vMy-Hl= zAEK*QTuhjyw^pyG@DK4^FU395E84L1peTFpq3Tj>HdsX1lN~G9uUE7Cyp#J>vZTk3;JDKJkk4PZg@^9smFU delta 5786 zcmds4T}%{L6m||UJG&yVGfP-EWcg7+Q&13Tnm`m{niw?#My$44TyRT?LS#`|Qx$0A z1BxisM0yd?dyf1o;ZvJHOcLbZOOTDt!i43v@!i$SCJ=0>~^EhSma#=WW)(#XCgkl;!Q zBrEO6SO}>=nC4oDOLgRUMA~PkFD`)*={PyM6nyqs>CMZaOOj5I#mgY*B!VtFU{5t@ zX~UKNo3|bqm!uXbiFEAYN^-Iq3IOlrt3c~r2`>7KSdiqdgt?p`O(s*d9+q3+6%+h& z3``}JFJX~5MqwDjW@aiW>jZ_oy&6i$tuV|o;Q+mNtcG=l3>XyD!*rKsPK+|7Vzn_E zGVC=3*{B$25%>zsh4zS!KS3)WDD@AFTKi8^rcj$Z z!K7GVvH_COKR{bKv{W3%OGzhawiPjx?JH-d*kAUVCm=$IHxCHI>lo62}+ ztc{JyD1b~xoSy(P8L=CNBG?T@a-qVfay|m{t*(s0Lh4Tj@?MNVi5_i%w;ow6ws=+r z-qXpxR;%x)TZ2=^=yk>yA>GA)0hy`#)HmQ}LM%C{_8X}7_JuOPH6qBZA!KrE2q3qH z0P^X4yd7r7nh5{mvDM=rI~H&;S@56hs$bm!BvJZ_ytx~Ki!|fI^!Ur{%;dX;F0)r$ zW=-*u!U*^z)wpTwX6TMzpJ`q29QD^JyRv+n3Ly8F4a`=!zk2pSz@ug>ToM|Svt6LD zR<{S{dDK#ctAZqp%@rU#=KB(3h%3i3Y(J&(pAtdt0b6FN7LJcT92=^4$Ro zE02QauHs+X$q^_fd&A%&vpONwU1zAl*_vKtKk9^Z zB$zA)vBsTig~2|^@ThePKa$|6l;$C)*Q|5OCLNN?~BJjVem%&x^4Zj^% zt@KPgti^_X<6wQ)N$?gu!J!q~xp2JYeHjm}-A^zaeul>nhbK{X26mF{yx{~{OLu~- z135v~cm_)K`M03Wy$abO`vHJ|!32<>3Ivd!3Ix#9!9T=~%KEIo;Yz%8jVKQwEAH6o zK9YwIx%hBBKJ)#%{O>`5gl;KB8wE_aB$TBbJMAZzFd6YA#0|3~3V1T&udxfgV&%_4 z5BUW=>W<4$=b(pT!fI?-iw*l6@XnFAog?u(M-o08k-zDb&X5DUWTVnyd`MuGl9b&t zujA}@^t!iz&DX?f9me*FGwN8kAM=em1U#c(=7q$7AGFmmv_mZ zN-jh1yQH#5&a;BDZZXIqKljMD_3pj$$^Z3+^db5FU3tbcs1Dh5K(3bt$>js)D&OM| znNfKjb2vWCh-GG6>|p9Se=I+bQR6H<8nvt-SRI!(osKr%)?|!wTH8iB?QNr+7H3ra zIlt#?5=Z20R^&5kZt#3d&h*K7rt`erau!*4NcO2OVw0I|HjO*R<}5iV7bBjGxUm@~ z8Jn|%;tR3K^n$mB!voM*BC9ZQ}$-A|r$tk%!8F7)abgLI}g)Ip^Nn-ahz4T_6N+(&YSp z-}jxK?{Us|&c16F?={Q*`9+J*L!`-G?xg~TTeHzNfhGmUm*jz)L#JbiMPjD@qs~6~OeC$z;FZ;$5HNCFG#kLub;Gfs0mWZh( zn(}_3ZSNJ_G!4wz&3k?!Np)(^Sv!$k+EZ8|6ejdM1h%}bjE0$KhLL_0)jPr)SuNQ-Rx6sEf#>^>rVu*;|weS7dCX^r9v1hut8iA zScG%;y!dPp%+{R4)cKGQQOLLJ>ARcJSPZkU<4syu46Q4I1YGr&jHv8&PS05c3A|pI zj;#bTv2-3xQbZO$p!7?4tQgXHAu~m8#X`eC-h6Oyy`BY-hBc+2SFBX@afhF_>si4u zQ))2^bKiL4gYe1|Uj)1CV143)P`nJPg{Hk-cxD-xM>Ou)O_DxWA0O=b?x31ZXYv2itw^DTDmYIvEuKnJ<}q++Y4;6-stC42cFu!DEgN%5q6gA(W&^}w zfftBM$IM%;thbaK;HQm{8f99>+pa7r^#Lx$k&U2NW-m3czQPol?A6-tQ%CfnW!2p+ z2C=NHPKL0otU_7lW+=<7eefkmtEqtMn4 zV>n;XuHrM$xs~1&m_Fqb_|{Tv7W-*-1}Jm}wt8TaG;@y|M*IFF12eZPf>I0+9QFzN z5b_7d@!5XISGH2e_jkZ^e8rcV6$dGwhAAyDMqX_T4C5uvU7^C!*xaeCxTgh@B{eRv zcvXU7ya*I4yXX&Bs!H2>%Q!KHgw78D-w2@bn29=VPZOsc4grwy9WiST;V06?>1u)|`KT`9XU5 znTrDh5RLQuAzJA8<}ANOC40KM!`z};4;&NS{ZJEGd%O7-eU7P5TK3NBcV7u&*^T7J zX8KYK&}FUTY7>2_1+c7jgtDx4gs_-f2)d~uG(R;$S$2mCW!c$4S@FU>*r(NAKd|>E zHfaRg(`=-*dG9DM%dr|-139!dhRZde%QI3PE#`rchIceVEHjp27O3DjNsuoHR=nsT zMio2(f*Rfpgjs?t{g~R)pO*e~V!l9{HnKT3;F;~jrsE4mqnD(i#YN;*a9H4jr5!|G z#Yq>{JLDoU(kdv-mPYnYV#N_#l;v?)poTVa{T9-tF(^9&`&&smUTh%|fm9riQ>-c5 zw}-f<_=B5Vg+SGRW(^vg-bO}0JcsfAHd4=`a}%BI#3qftZYSe?qo*+1qYAkdCwquV ziYLv06*EDQVS`7>K);7(;8%~50Se^|aKT?7$f@CQte}Ec+_Rmev*{ml>Ssz0|K=t( z9PTB_c%zfV2y`8|={=1Zhk8j4N1Y2a33zM=iNv=%NFu)PC9wf~ES`4}qiHHV1GD6l maR}c5uHs)`%>MK70 delta 5967 zcmeHLeQXp(6ldSvZLdd5uiHC%lzv>Vv;q-mK~e(57KIohkQPe8@X;P^AtY_3wIyP# zMU4WMuX4~wq2D!#iF}C0l>|{VMiWhd|4fPkf+SP|cm6?0AmYsI?%YnVttO@-37a%G z@ArE%v-6ub^WL`SM$+*cNheno<@SL?@mEz;Z>-xgWkaohb4AG(e{H$qwvS1QxBtGc z?+fr;4?WZ#NpacZlAII{G#4d|ySDoqo0-kC#}k&I7SvkbDPz1bU(J-33U(?{jHd+@%^ zjON&>T(r}?HIQwgjdLp@iG@q^8Yp0moRtm#}#qj74WT$O4^bFpb3nm_+=l6eeInDH)j#7%YZK zLRaQ6(cm)C>DN7tskITJs4n^dKAgQ0GM|V;_GK_}Zm)(3PsABQoNhmOpNKPrI0ftB zwY4nu9W`HS^md6v^@J#U1Ydd?NBYuRMnf^D65Mzt2xV&52AE-;#$X}S^63QBlz%gD z#p{qPvukiGW-kNxJi(P-w;E|)1-)(~QF^UVRBf+>ApA|<$1fYeCh2*fwd1wyPTMSf zutI>kMdLwI5@;Rt5};!fWTdd=-ZkIoT*tdX> zJXUvcgRWgSp10_YxoUnbygSU2RZ{BAjT&AOwiTVj`^^7WvZ+yTz@F&UEKv#?P~BMl zDWEj|NS3pC1XRy*0=k~n0VJi^aPJP7gyXlv94j*myCH$)IL%~im&npQ$JtVr-ZXRP zdyqa_Sf#oFqHxPm_;lza)iNx#l?apLe!adUaANK z^HN1X^-{%#+nQiaI3#I!E^RikuOMVnn;vi1HzniOcKDdd4CJZ zr-~Nejr&QpL*u)!16+8gjT9r)x?_UJvTdg;$I=6^&dOSJ#~tNd6Usb=jusLSX4=q3 zqjz!o#}>%a99h2k;fG#on$~+32vR#zyA_E;q$ zdIo#$=Q+vM@tN!`m?aTn3?UA+(nrb{h&V!wVvpTSxb03QUMCbzkZv7#wyDgw>zUz=0WB(IeDN{I(NN{RYLhAmnNF&QY!25xjW4BcQzA5m2Mv!Q2q} zEc+w`iWGwki2#gP@0Zd-WE{(|3(8o zr|HTfed)>~QMxkvrK?_e0LQHpzrFcqzt!7w&q$it5(yBWJw{2@w|i8+lltHh$>Oz= z7T`n4G68Q(mRN4)@RkodJLEXcJP#HhHi6;C%(G^5n#r%KQ`W~Lerel^EEe)-C4V-x z$RfYIhq}In-|dsxOZ4N#!*T+iI4mpZ3>ZDr1G4@mi+f}rz8WyzNpIHakY_sgG3QQEP%hdC|sRBl{tH5r7Nh|eC9AF5xYeC?n1P)UzW ziLUQIT^0V(ChyQ@ZEQDG?Q54a@%wg7w|*q%Guj>zY18ngWKm3JDi~%%hao)CD+SMY z$hx0l+AzHFVQeayowAV?-x&As8DE&@kihWSi_vSYS_3rU*xFpbIwj8uJQ$4q diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index abb5ffd63..00f993ffd 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -6643,28 +6643,28 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } } element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } } element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6684,7 +6684,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6704,7 +6704,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6724,7 +6724,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6747,28 +6747,28 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } } element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } } element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6788,7 +6788,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6808,7 +6808,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6828,7 +6828,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47149,28 +47149,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47184,7 +47184,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47198,7 +47198,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47212,7 +47212,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47226,7 +47226,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47240,7 +47240,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47323,14 +47323,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -47350,7 +47350,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47370,7 +47370,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47390,7 +47390,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47410,7 +47410,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47430,7 +47430,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47453,14 +47453,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -47480,7 +47480,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47500,7 +47500,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47520,7 +47520,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47540,7 +47540,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47560,7 +47560,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47803,42 +47803,42 @@ cont { element { scale: 10 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 11 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 12 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 13 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 14 area { - color: 14999725 + color: 14933676 priority: -1920 } } element { scale: 15 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -47852,7 +47852,7 @@ cont { element { scale: 16 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -47866,7 +47866,7 @@ cont { element { scale: 17 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -47880,7 +47880,7 @@ cont { element { scale: 18 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -47894,7 +47894,7 @@ cont { element { scale: 19 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -47908,7 +47908,7 @@ cont { element { scale: 20 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48047,35 +48047,35 @@ cont { element { scale: 16 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 17 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 18 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 19 area { - color: 11979115 + color: 12504182 priority: -1870 } } element { scale: 20 area { - color: 11979115 + color: 12504182 priority: -1870 } } @@ -48085,21 +48085,21 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } symbol { @@ -48111,7 +48111,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -48119,7 +48119,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -48141,7 +48141,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -48149,7 +48149,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -48172,7 +48172,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48180,7 +48180,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -48203,7 +48203,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48211,7 +48211,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48241,7 +48241,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48249,7 +48249,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48279,7 +48279,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48287,7 +48287,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48317,7 +48317,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48329,7 +48329,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48359,7 +48359,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48371,7 +48371,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48401,7 +48401,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48416,21 +48416,21 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } symbol { @@ -48442,7 +48442,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -48450,7 +48450,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -48472,7 +48472,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -48480,7 +48480,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -48503,7 +48503,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48511,7 +48511,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -48534,7 +48534,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48542,7 +48542,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48572,7 +48572,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48580,7 +48580,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48610,7 +48610,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48618,7 +48618,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48648,7 +48648,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48660,7 +48660,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48690,7 +48690,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48702,7 +48702,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48732,7 +48732,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48747,21 +48747,21 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } symbol { @@ -48773,7 +48773,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -48781,7 +48781,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -48803,7 +48803,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -48811,7 +48811,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -48834,7 +48834,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48842,7 +48842,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -48865,7 +48865,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48873,7 +48873,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48903,7 +48903,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48911,7 +48911,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48941,7 +48941,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48949,7 +48949,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48979,7 +48979,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48991,7 +48991,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49021,7 +49021,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49033,7 +49033,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49063,7 +49063,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49078,21 +49078,21 @@ cont { element { scale: 10 area { - color: 12898689 + color: 11846761 priority: -1940 } } element { scale: 11 area { - color: 12504182 + color: 11650146 priority: -1940 } } element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } symbol { @@ -49104,7 +49104,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -49112,7 +49112,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -49134,7 +49134,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49142,7 +49142,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49165,7 +49165,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49173,7 +49173,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49196,7 +49196,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49204,7 +49204,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49234,7 +49234,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49242,7 +49242,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49272,7 +49272,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49280,7 +49280,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49310,7 +49310,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49322,7 +49322,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49352,7 +49352,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49364,7 +49364,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49394,7 +49394,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49454,35 +49454,35 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1880 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1880 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1880 } } element { scale: 14 area { - color: 13161612 + color: 12898689 priority: -1880 } } element { scale: 15 area { - color: 13161612 + color: 12898689 priority: -1880 } } @@ -49860,21 +49860,21 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1920 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -49895,35 +49895,35 @@ cont { element { scale: 16 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 17 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 18 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 19 area { - color: 12504182 + color: 12898689 priority: -1920 } } element { scale: 20 area { - color: 12504182 + color: 12898689 priority: -1920 } } @@ -50193,28 +50193,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50228,7 +50228,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50242,7 +50242,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50256,7 +50256,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50270,7 +50270,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50284,7 +50284,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50301,42 +50301,42 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1930 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1930 } } element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -50356,7 +50356,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -50376,7 +50376,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -50396,7 +50396,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -50629,14 +50629,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -51175,14 +51175,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -51241,28 +51241,28 @@ cont { element { scale: 12 area { - color: 13161612 + color: 14210459 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 14079128 priority: -1920 } } element { scale: 14 area { - color: 12898689 + color: 14013333 priority: -1920 } } element { scale: 15 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51276,7 +51276,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51290,7 +51290,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51304,7 +51304,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51318,7 +51318,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51332,7 +51332,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52125,35 +52125,35 @@ cont { element { scale: 12 area { - color: 11979115 + color: 14210459 priority: -1930 } } element { scale: 13 area { - color: 11585379 + color: 14079128 priority: -1930 } } element { scale: 14 area { - color: 11716458 + color: 14013333 priority: -1930 } } element { scale: 15 area { - color: 11387999 + color: 14013333 priority: -1930 } } element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52183,7 +52183,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -52191,7 +52191,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52221,7 +52221,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -52229,7 +52229,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52259,7 +52259,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52271,7 +52271,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52301,7 +52301,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52313,7 +52313,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52343,7 +52343,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -52358,63 +52358,63 @@ cont { element { scale: 12 area { - color: 13161612 + color: 15656651 priority: -1930 } } element { scale: 13 area { - color: 13161612 + color: 15590859 priority: -1930 } } element { scale: 14 area { - color: 13161612 + color: 15590858 priority: -1930 } } element { scale: 15 area { - color: 13161612 + color: 15590858 priority: -1930 } } element { scale: 16 area { - color: 12898689 + color: 15590858 priority: -1930 } } element { scale: 17 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 18 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 19 area { - color: 11979115 + color: 15590858 priority: -1930 } } element { scale: 20 area { - color: 11979115 + color: 15590858 priority: -1930 } } @@ -52424,14 +52424,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1860 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1860 } } @@ -53112,35 +53112,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53163,7 +53163,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53171,7 +53171,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53194,7 +53194,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53202,7 +53202,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53232,7 +53232,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53240,7 +53240,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53270,7 +53270,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53278,7 +53278,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53308,7 +53308,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53320,7 +53320,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53350,7 +53350,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53362,7 +53362,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53392,7 +53392,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53407,35 +53407,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53458,7 +53458,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53466,7 +53466,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53489,7 +53489,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53497,7 +53497,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53527,7 +53527,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53535,7 +53535,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53565,7 +53565,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53573,7 +53573,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53603,7 +53603,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53615,7 +53615,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53645,7 +53645,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53657,7 +53657,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53687,7 +53687,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53702,35 +53702,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53753,7 +53753,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53761,7 +53761,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53784,7 +53784,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53792,7 +53792,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53822,7 +53822,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53830,7 +53830,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53860,7 +53860,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53868,7 +53868,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53898,7 +53898,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53910,7 +53910,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53940,7 +53940,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53952,7 +53952,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53982,7 +53982,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -53997,35 +53997,35 @@ cont { element { scale: 10 area { - color: 13161612 + color: 14409117 priority: -1930 } } element { scale: 11 area { - color: 13161612 + color: 14212247 priority: -1930 } } element { scale: 12 area { - color: 13161612 + color: 14212502 priority: -1930 } } element { scale: 13 area { - color: 12898689 + color: 14081171 priority: -1930 } } element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54048,7 +54048,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54056,7 +54056,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54079,7 +54079,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54087,7 +54087,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54117,7 +54117,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54125,7 +54125,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54155,7 +54155,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54163,7 +54163,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54193,7 +54193,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54205,7 +54205,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54235,7 +54235,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54247,7 +54247,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54277,7 +54277,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -56318,7 +56318,7 @@ cont { scale: 13 lines { width: 1.7 - color: 1724437644 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -56327,7 +56327,7 @@ cont { scale: 14 lines { width: 2.2 - color: 1724437644 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -56336,7 +56336,7 @@ cont { scale: 15 lines { width: 3.0 - color: 1724437644 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -56345,7 +56345,7 @@ cont { scale: 16 lines { width: 4.5 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -56353,7 +56353,7 @@ cont { scale: 17 lines { width: 6.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -56361,7 +56361,7 @@ cont { scale: 18 lines { width: 8.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -56369,7 +56369,7 @@ cont { scale: 19 lines { width: 8.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -56377,7 +56377,7 @@ cont { scale: 20 lines { width: 8.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -60625,21 +60625,21 @@ cont { element { scale: 11 area { - color: 13161612 + color: 13424014 priority: -1880 } } element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1880 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1880 } } @@ -60660,35 +60660,35 @@ cont { element { scale: 16 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 17 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 18 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 19 area { - color: 12504182 + color: 12898689 priority: -1880 } } element { scale: 20 area { - color: 12504182 + color: 12898689 priority: -1880 } } @@ -60698,21 +60698,21 @@ cont { element { scale: 11 area { - color: 13555607 + color: 13949600 priority: -1880 } } element { scale: 12 area { - color: 13555607 + color: 13818270 priority: -1880 } } element { scale: 13 area { - color: 13555607 + color: 13621402 priority: -1880 } } @@ -61556,70 +61556,70 @@ cont { element { scale: 11 area { - color: 13161612 + color: 12373110 priority: -1870 } } element { scale: 12 area { - color: 13161612 + color: 12110705 priority: -1870 } } element { scale: 13 area { - color: 13161612 + color: 11848043 priority: -1870 } } element { scale: 14 area { - color: 12898689 + color: 11650917 priority: -1870 } } element { scale: 15 area { - color: 12898689 + color: 11650917 priority: -1870 } } element { scale: 16 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 17 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 18 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 19 area { - color: 11585379 + color: 11650917 priority: -1870 } } element { scale: 20 area { - color: 11585379 + color: 11650917 priority: -1870 } } @@ -61954,7 +61954,7 @@ cont { scale: 11 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -61964,7 +61964,7 @@ cont { scale: 12 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -61974,7 +61974,7 @@ cont { scale: 13 lines { width: 2.7 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -61991,7 +61991,7 @@ cont { scale: 14 lines { width: 3.5 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -62008,7 +62008,7 @@ cont { scale: 15 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -62025,7 +62025,7 @@ cont { scale: 16 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -62041,7 +62041,7 @@ cont { scale: 17 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -62057,7 +62057,7 @@ cont { scale: 18 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -62073,7 +62073,7 @@ cont { scale: 19 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -62089,7 +62089,7 @@ cont { scale: 20 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -132665,7 +132665,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2153755845 + color: 2156583143 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -132675,7 +132675,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1298117829 + color: 1300945127 priority: -990 cap: BUTTCAP } @@ -132692,7 +132692,7 @@ cont { scale: 14 lines { width: 1.8 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -132709,7 +132709,7 @@ cont { scale: 15 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -132726,7 +132726,7 @@ cont { scale: 16 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -132742,7 +132742,7 @@ cont { scale: 17 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -132758,7 +132758,7 @@ cont { scale: 18 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -132774,7 +132774,7 @@ cont { scale: 19 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -132790,7 +132790,7 @@ cont { scale: 20 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -132959,7 +132959,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -132972,7 +132972,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -132985,7 +132985,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -133204,7 +133204,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -133217,7 +133217,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -133230,7 +133230,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -133307,7 +133307,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1298117829 + color: 1300945127 priority: -990 cap: BUTTCAP } @@ -133324,7 +133324,7 @@ cont { scale: 14 lines { width: 1.8 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -133341,7 +133341,7 @@ cont { scale: 15 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -133358,7 +133358,7 @@ cont { scale: 16 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133374,7 +133374,7 @@ cont { scale: 17 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133390,7 +133390,7 @@ cont { scale: 18 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133406,7 +133406,7 @@ cont { scale: 19 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133422,7 +133422,7 @@ cont { scale: 20 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133479,7 +133479,7 @@ cont { scale: 10 lines { width: 1.4 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -133489,7 +133489,7 @@ cont { scale: 11 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -133507,7 +133507,7 @@ cont { scale: 12 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -133525,7 +133525,7 @@ cont { scale: 13 lines { width: 2.7 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -133542,7 +133542,7 @@ cont { scale: 14 lines { width: 3.5 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -133559,7 +133559,7 @@ cont { scale: 15 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -133576,7 +133576,7 @@ cont { scale: 16 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133592,7 +133592,7 @@ cont { scale: 17 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133608,7 +133608,7 @@ cont { scale: 18 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133624,7 +133624,7 @@ cont { scale: 19 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133640,7 +133640,7 @@ cont { scale: 20 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133659,7 +133659,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2153755845 + color: 2156583143 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -133669,7 +133669,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1298117829 + color: 1300945127 priority: -990 cap: BUTTCAP } @@ -133686,7 +133686,7 @@ cont { scale: 14 lines { width: 1.8 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -133703,7 +133703,7 @@ cont { scale: 15 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -133720,7 +133720,7 @@ cont { scale: 16 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133736,7 +133736,7 @@ cont { scale: 17 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133752,7 +133752,7 @@ cont { scale: 18 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133768,7 +133768,7 @@ cont { scale: 19 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133784,7 +133784,7 @@ cont { scale: 20 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -133803,7 +133803,7 @@ cont { scale: 13 lines { width: 1.0 - color: 1298117829 + color: 1300945127 dashdot { dd: 2.7 dd: 2.7 @@ -133824,7 +133824,7 @@ cont { scale: 14 lines { width: 1.4 - color: 6272197 + color: 9099495 dashdot { dd: 3.5 dd: 3.5 @@ -133845,7 +133845,7 @@ cont { scale: 15 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -133866,7 +133866,7 @@ cont { scale: 16 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -133886,7 +133886,7 @@ cont { scale: 17 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -133906,7 +133906,7 @@ cont { scale: 18 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -133926,7 +133926,7 @@ cont { scale: 19 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -133946,7 +133946,7 @@ cont { scale: 20 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -133969,7 +133969,7 @@ cont { scale: 13 lines { width: 1.0 - color: 1298117829 + color: 1300945127 dashdot { dd: 2.7 dd: 2.7 @@ -133990,7 +133990,7 @@ cont { scale: 14 lines { width: 1.4 - color: 6272197 + color: 9099495 dashdot { dd: 3.5 dd: 3.5 @@ -134011,7 +134011,7 @@ cont { scale: 15 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -134032,7 +134032,7 @@ cont { scale: 16 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -134052,7 +134052,7 @@ cont { scale: 17 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -134072,7 +134072,7 @@ cont { scale: 18 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -134092,7 +134092,7 @@ cont { scale: 19 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -134112,7 +134112,7 @@ cont { scale: 20 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0