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 cec8cadb8..14876d5f8 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 21c9ed0cd..7d44d6a9a 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -6886,28 +6886,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 { @@ -6927,7 +6927,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6947,7 +6947,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6967,7 +6967,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6990,28 +6990,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 { @@ -7031,7 +7031,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -7051,7 +7051,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -7071,7 +7071,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48363,28 +48363,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 { @@ -48398,7 +48398,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48412,7 +48412,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48426,7 +48426,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48440,7 +48440,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48454,7 +48454,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48537,14 +48537,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -48564,7 +48564,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48584,7 +48584,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48604,7 +48604,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48624,7 +48624,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48644,7 +48644,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48667,14 +48667,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -48694,7 +48694,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48714,7 +48714,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48734,7 +48734,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48754,7 +48754,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48774,7 +48774,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -49000,42 +49000,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 { @@ -49049,7 +49049,7 @@ cont { element { scale: 16 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -49063,7 +49063,7 @@ cont { element { scale: 17 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -49077,7 +49077,7 @@ cont { element { scale: 18 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -49091,7 +49091,7 @@ cont { element { scale: 19 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -49105,7 +49105,7 @@ cont { element { scale: 20 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -49244,35 +49244,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 } } @@ -49282,28 +49282,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 { @@ -49315,7 +49315,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49323,7 +49323,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49346,7 +49346,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49354,7 +49354,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49377,7 +49377,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49385,7 +49385,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49415,7 +49415,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49423,7 +49423,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49453,7 +49453,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49461,7 +49461,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49491,7 +49491,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49503,7 +49503,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49533,7 +49533,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49545,7 +49545,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49575,7 +49575,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49590,28 +49590,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 { @@ -49623,7 +49623,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49631,7 +49631,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49654,7 +49654,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49662,7 +49662,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49685,7 +49685,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49693,7 +49693,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49723,7 +49723,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49731,7 +49731,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49761,7 +49761,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49769,7 +49769,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49799,7 +49799,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49811,7 +49811,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49841,7 +49841,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49853,7 +49853,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49883,7 +49883,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49898,28 +49898,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 { @@ -49931,7 +49931,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49939,7 +49939,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49962,7 +49962,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49970,7 +49970,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49993,7 +49993,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -50001,7 +50001,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50031,7 +50031,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -50039,7 +50039,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50069,7 +50069,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -50077,7 +50077,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50107,7 +50107,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50119,7 +50119,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50149,7 +50149,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50161,7 +50161,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50191,7 +50191,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50206,28 +50206,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 { @@ -50239,7 +50239,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -50247,7 +50247,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -50270,7 +50270,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -50278,7 +50278,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -50301,7 +50301,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -50309,7 +50309,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50339,7 +50339,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -50347,7 +50347,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50377,7 +50377,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -50385,7 +50385,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50415,7 +50415,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50427,7 +50427,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50457,7 +50457,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50469,7 +50469,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50499,7 +50499,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50573,35 +50573,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 } } @@ -51021,21 +51021,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 } } @@ -51056,35 +51056,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 } } @@ -51354,28 +51354,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 { @@ -51389,7 +51389,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51403,7 +51403,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51417,7 +51417,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51431,7 +51431,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51445,7 +51445,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -51462,42 +51462,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 { @@ -51517,7 +51517,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -51537,7 +51537,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -51557,7 +51557,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -51818,14 +51818,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -52423,14 +52423,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -52489,28 +52489,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 { @@ -52524,7 +52524,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52538,7 +52538,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52552,7 +52552,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52566,7 +52566,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52580,7 +52580,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -53439,35 +53439,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 { @@ -53497,7 +53497,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -53505,7 +53505,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53535,7 +53535,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -53543,7 +53543,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53573,7 +53573,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53585,7 +53585,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53615,7 +53615,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53627,7 +53627,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53657,7 +53657,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53672,63 +53672,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 } } @@ -53738,14 +53738,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1860 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1860 } } @@ -54426,35 +54426,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 { @@ -54477,7 +54477,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54485,7 +54485,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54508,7 +54508,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54516,7 +54516,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54546,7 +54546,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54554,7 +54554,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54584,7 +54584,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54592,7 +54592,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54622,7 +54622,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54634,7 +54634,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54664,7 +54664,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54676,7 +54676,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54706,7 +54706,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54721,35 +54721,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 { @@ -54772,7 +54772,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54780,7 +54780,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54803,7 +54803,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54811,7 +54811,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54841,7 +54841,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54849,7 +54849,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54879,7 +54879,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54887,7 +54887,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54917,7 +54917,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54929,7 +54929,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54959,7 +54959,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54971,7 +54971,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55001,7 +55001,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55016,35 +55016,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 { @@ -55067,7 +55067,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55075,7 +55075,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -55098,7 +55098,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55106,7 +55106,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55136,7 +55136,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55144,7 +55144,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55174,7 +55174,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55182,7 +55182,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55212,7 +55212,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55224,7 +55224,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55254,7 +55254,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55266,7 +55266,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55296,7 +55296,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55311,35 +55311,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 { @@ -55362,7 +55362,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55370,7 +55370,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -55393,7 +55393,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55401,7 +55401,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55431,7 +55431,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55439,7 +55439,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55469,7 +55469,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -55477,7 +55477,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55507,7 +55507,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55519,7 +55519,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55549,7 +55549,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55561,7 +55561,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55591,7 +55591,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -57718,7 +57718,7 @@ cont { scale: 13 lines { width: 1.0 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -57727,7 +57727,7 @@ cont { scale: 14 lines { width: 1.0 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -57736,7 +57736,7 @@ cont { scale: 15 lines { width: 1.5 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -57745,7 +57745,7 @@ cont { scale: 16 lines { width: 2.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -57753,7 +57753,7 @@ cont { scale: 17 lines { width: 3.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -57761,7 +57761,7 @@ cont { scale: 18 lines { width: 4.5 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -57769,7 +57769,7 @@ cont { scale: 19 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -57777,7 +57777,7 @@ cont { scale: 20 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -61545,21 +61545,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 } } @@ -61580,35 +61580,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 } } @@ -61618,21 +61618,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 } } @@ -62484,70 +62484,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 } } @@ -62863,8 +62863,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62879,8 +62879,8 @@ cont { element { scale: 12 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62895,8 +62895,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62911,8 +62911,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62927,8 +62927,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -62943,8 +62943,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -62958,8 +62958,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -62973,8 +62973,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -62988,8 +62988,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -63003,8 +63003,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -133798,8 +133798,8 @@ cont { element { scale: 12 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133814,8 +133814,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133830,8 +133830,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133846,8 +133846,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -133862,8 +133862,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133877,8 +133877,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133892,8 +133892,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133907,8 +133907,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -133922,8 +133922,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134091,7 +134091,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -134104,7 +134104,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -134117,7 +134117,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -134336,7 +134336,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -134349,7 +134349,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -134362,7 +134362,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -134438,8 +134438,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134454,8 +134454,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134470,8 +134470,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134486,8 +134486,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134501,8 +134501,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134516,8 +134516,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134531,8 +134531,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134546,8 +134546,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134602,8 +134602,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134612,8 +134612,8 @@ cont { element { scale: 11 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134629,8 +134629,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134646,8 +134646,8 @@ cont { element { scale: 13 lines { - width: 1.6 - color: 1298117829 + width: 1.7 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134662,8 +134662,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 1298117829 + width: 2.0 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134678,8 +134678,8 @@ cont { element { scale: 15 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134694,8 +134694,8 @@ cont { element { scale: 16 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -134709,8 +134709,8 @@ cont { element { scale: 17 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -134724,8 +134724,8 @@ cont { element { scale: 18 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -134739,8 +134739,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -134754,8 +134754,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -134772,8 +134772,8 @@ cont { element { scale: 12 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134788,8 +134788,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134804,8 +134804,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134820,8 +134820,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134836,8 +134836,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134851,8 +134851,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134866,8 +134866,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134881,8 +134881,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134896,8 +134896,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134914,8 +134914,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134930,8 +134930,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134946,8 +134946,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -134962,8 +134962,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134977,8 +134977,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -134992,8 +134992,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -135007,8 +135007,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -135022,8 +135022,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -135040,8 +135040,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -135060,8 +135060,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -135080,8 +135080,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -135100,8 +135100,8 @@ cont { element { scale: 16 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -135119,8 +135119,8 @@ cont { element { scale: 17 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -135138,8 +135138,8 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -135157,8 +135157,8 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -135176,8 +135176,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 5f686ab45..3585e485a 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index 0d730e5ef..46d71723f 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -6762,7 +6762,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -6866,7 +6866,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -45190,28 +45190,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 { @@ -45225,7 +45225,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -45239,7 +45239,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -45253,7 +45253,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -45267,7 +45267,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -45281,7 +45281,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -45364,7 +45364,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -45494,7 +45494,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -46109,28 +46109,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 { @@ -46142,7 +46142,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46150,7 +46150,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46173,7 +46173,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46181,7 +46181,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46204,7 +46204,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46212,7 +46212,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46242,7 +46242,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46250,7 +46250,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46280,7 +46280,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46288,7 +46288,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46318,7 +46318,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46330,7 +46330,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46360,7 +46360,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46372,7 +46372,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46402,7 +46402,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46417,28 +46417,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 { @@ -46450,7 +46450,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46458,7 +46458,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46481,7 +46481,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46489,7 +46489,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46512,7 +46512,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46520,7 +46520,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46550,7 +46550,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46558,7 +46558,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46588,7 +46588,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46596,7 +46596,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46626,7 +46626,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46638,7 +46638,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46668,7 +46668,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46680,7 +46680,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46710,7 +46710,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46725,28 +46725,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 { @@ -46758,7 +46758,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46766,7 +46766,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46789,7 +46789,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46797,7 +46797,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46820,7 +46820,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46828,7 +46828,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46858,7 +46858,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46866,7 +46866,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46896,7 +46896,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -46904,7 +46904,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46934,7 +46934,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46946,7 +46946,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46976,7 +46976,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -46988,7 +46988,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47018,7 +47018,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47033,28 +47033,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 { @@ -47066,7 +47066,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -47074,7 +47074,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47097,7 +47097,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -47105,7 +47105,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47128,7 +47128,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -47136,7 +47136,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47166,7 +47166,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -47174,7 +47174,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47204,7 +47204,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -47212,7 +47212,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47242,7 +47242,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47254,7 +47254,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47284,7 +47284,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47296,7 +47296,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47326,7 +47326,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -47392,70 +47392,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 } } @@ -47840,35 +47840,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 } } @@ -48173,28 +48173,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 { @@ -48208,7 +48208,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48222,7 +48222,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48236,7 +48236,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48250,7 +48250,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48264,7 +48264,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48281,42 +48281,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 { @@ -48336,7 +48336,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -48356,7 +48356,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -48376,7 +48376,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -48637,28 +48637,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 { @@ -48672,7 +48672,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48686,7 +48686,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48700,7 +48700,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48714,7 +48714,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48728,7 +48728,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -49234,63 +49234,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 } } @@ -49300,28 +49300,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 { @@ -49335,7 +49335,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -49349,7 +49349,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -49363,7 +49363,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -49377,7 +49377,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -49391,7 +49391,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -50445,63 +50445,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 } } @@ -50511,28 +50502,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 { @@ -50544,7 +50535,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50556,7 +50547,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50577,7 +50568,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50598,7 +50589,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50619,7 +50610,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50869,28 +50860,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 { @@ -50911,7 +50902,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50932,7 +50923,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -50953,7 +50944,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -51185,35 +51176,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 { @@ -51236,7 +51222,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51244,7 +51229,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -51267,7 +51251,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51275,7 +51258,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -51305,7 +51287,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51313,7 +51294,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -51343,7 +51323,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51351,7 +51330,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51381,7 +51359,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51393,7 +51370,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51423,7 +51399,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51435,7 +51410,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51465,7 +51439,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51480,35 +51453,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 { @@ -51531,7 +51499,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51539,7 +51506,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -51562,7 +51528,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51570,7 +51535,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -51600,7 +51564,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51608,7 +51571,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -51638,7 +51600,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51646,7 +51607,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51676,7 +51636,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51688,7 +51647,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51718,7 +51676,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -51730,7 +51687,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51760,7 +51716,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -51775,35 +51730,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 { @@ -51826,7 +51776,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51834,7 +51783,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -51857,7 +51805,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -51865,7 +51812,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -51895,7 +51841,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51903,7 +51848,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -51933,7 +51877,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -51941,7 +51884,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51971,7 +51913,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -51983,7 +51924,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -52013,7 +51953,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -52025,7 +51964,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -52055,7 +51993,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -52070,35 +52007,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 { @@ -52121,7 +52053,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -52129,7 +52060,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -52152,7 +52082,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -52160,7 +52089,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -52190,7 +52118,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -52198,7 +52125,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -52228,7 +52154,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -52236,7 +52161,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -52266,7 +52190,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -52278,7 +52201,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -52308,7 +52230,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -52320,7 +52241,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -52350,7 +52270,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -54342,7 +54261,7 @@ cont { scale: 14 lines { width: 1.0 - color: 2567902208 + color: 1317888 priority: 80 cap: BUTTCAP } @@ -54351,7 +54270,7 @@ cont { scale: 15 lines { width: 1.5 - color: 2567902208 + color: 1317888 priority: 80 cap: BUTTCAP } @@ -54360,7 +54279,7 @@ cont { scale: 16 lines { width: 2.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -54368,7 +54287,7 @@ cont { scale: 17 lines { width: 3.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -54376,7 +54295,7 @@ cont { scale: 18 lines { width: 4.5 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -54384,7 +54303,7 @@ cont { scale: 19 lines { width: 6.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -54392,7 +54311,7 @@ cont { scale: 20 lines { width: 6.0 - color: 2567902208 + color: 1317888 priority: 80 } } @@ -57453,35 +57372,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 } } @@ -57526,70 +57445,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 } } @@ -58245,35 +58164,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 } } @@ -58596,8 +58515,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -58612,8 +58531,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -58628,8 +58547,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -58644,8 +58563,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -58659,8 +58578,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -58674,8 +58593,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -58689,8 +58608,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -58704,8 +58623,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } caption { @@ -127584,8 +127503,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127600,8 +127519,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127616,8 +127535,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -127632,8 +127551,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127647,8 +127566,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127662,8 +127581,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127677,8 +127596,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127692,8 +127611,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -127861,7 +127780,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -127874,7 +127793,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -127887,7 +127806,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -128106,7 +128025,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -128119,7 +128038,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -128132,7 +128051,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1291855390 dashdot { dd: 2.7 @@ -128208,8 +128127,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128224,8 +128143,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128240,8 +128159,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128256,8 +128175,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128271,8 +128190,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128286,8 +128205,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128301,8 +128220,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128316,8 +128235,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128372,8 +128291,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -128382,8 +128301,8 @@ cont { element { scale: 11 lines { - width: 1.2 - color: 1292247078 + width: 1.4 + color: 218112546 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -128399,8 +128318,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1292247078 + width: 1.4 + color: 218112546 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -128416,8 +128335,8 @@ cont { element { scale: 13 lines { - width: 1.6 - color: 1292247078 + width: 1.7 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128432,8 +128351,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 1292247078 + width: 2.0 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128448,8 +128367,8 @@ cont { element { scale: 15 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128464,8 +128383,8 @@ cont { element { scale: 16 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -128479,8 +128398,8 @@ cont { element { scale: 17 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -128494,8 +128413,8 @@ cont { element { scale: 18 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -128509,8 +128428,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -128524,8 +128443,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 1292247078 + width: 2.4 + color: 218112546 priority: -990 } path_text { @@ -128542,8 +128461,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128558,8 +128477,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128574,8 +128493,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128590,8 +128509,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128605,8 +128524,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128620,8 +128539,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128635,8 +128554,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128650,8 +128569,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128668,8 +128587,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128684,8 +128603,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128700,8 +128619,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 cap: BUTTCAP } @@ -128716,8 +128635,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128731,8 +128650,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128746,8 +128665,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128761,8 +128680,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128776,8 +128695,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1292247078 + width: 1.8 + color: 218112546 priority: -990 } path_text { @@ -128794,8 +128713,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1292247078 + width: 0.9 + color: 218112546 dashdot { dd: 2.7 dd: 2.7 @@ -128814,8 +128733,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1292247078 + width: 1.2 + color: 218112546 dashdot { dd: 2.7 dd: 2.7 @@ -128834,8 +128753,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -128854,8 +128773,8 @@ cont { element { scale: 16 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -128873,8 +128792,8 @@ cont { element { scale: 17 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -128892,8 +128811,8 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -128911,8 +128830,8 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1292247078 + width: 1.6 + color: 218112546 dashdot { dd: 4.95 dd: 4.95 @@ -128930,8 +128849,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 9d79ce371..888b8f3a3 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 37483c290..8859f4153 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -6792,28 +6792,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 { @@ -6833,7 +6833,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6853,7 +6853,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6873,7 +6873,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6896,28 +6896,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 { @@ -6937,7 +6937,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6957,7 +6957,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6977,7 +6977,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45084,28 +45084,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 { @@ -45119,7 +45119,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -45133,7 +45133,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -45147,7 +45147,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -45161,7 +45161,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -45175,7 +45175,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -45258,14 +45258,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -45285,7 +45285,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45305,7 +45305,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45325,7 +45325,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45345,7 +45345,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45365,7 +45365,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45388,14 +45388,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -45415,7 +45415,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45435,7 +45435,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45455,7 +45455,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45475,7 +45475,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45495,7 +45495,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -45721,42 +45721,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 { @@ -45770,7 +45770,7 @@ cont { element { scale: 16 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45784,7 +45784,7 @@ cont { element { scale: 17 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45798,7 +45798,7 @@ cont { element { scale: 18 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45812,7 +45812,7 @@ cont { element { scale: 19 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45826,7 +45826,7 @@ cont { element { scale: 20 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -45965,35 +45965,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 } } @@ -46003,28 +46003,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 { @@ -46036,7 +46036,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -46044,7 +46044,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -46067,7 +46067,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46075,7 +46075,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -46098,7 +46098,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46106,7 +46106,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46136,7 +46136,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46144,7 +46144,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46174,7 +46174,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46182,7 +46182,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46212,7 +46212,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46224,7 +46224,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46254,7 +46254,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46266,7 +46266,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46296,7 +46296,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46311,28 +46311,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 { @@ -46344,7 +46344,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -46352,7 +46352,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -46375,7 +46375,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46383,7 +46383,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -46406,7 +46406,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46414,7 +46414,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46444,7 +46444,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46452,7 +46452,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46482,7 +46482,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46490,7 +46490,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46520,7 +46520,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46532,7 +46532,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46562,7 +46562,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46574,7 +46574,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46604,7 +46604,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46619,28 +46619,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 { @@ -46652,7 +46652,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -46660,7 +46660,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -46683,7 +46683,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46691,7 +46691,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -46714,7 +46714,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46722,7 +46722,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46752,7 +46752,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46760,7 +46760,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46790,7 +46790,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46798,7 +46798,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46828,7 +46828,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46840,7 +46840,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46870,7 +46870,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46882,7 +46882,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46912,7 +46912,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -46927,28 +46927,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 { @@ -46960,7 +46960,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -46968,7 +46968,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -46991,7 +46991,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -46999,7 +46999,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -47022,7 +47022,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -47030,7 +47030,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47060,7 +47060,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -47068,7 +47068,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47098,7 +47098,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -47106,7 +47106,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47136,7 +47136,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47148,7 +47148,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47178,7 +47178,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47190,7 +47190,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47220,7 +47220,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -47294,35 +47294,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 } } @@ -47742,21 +47742,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 } } @@ -47777,35 +47777,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 } } @@ -48075,28 +48075,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 { @@ -48110,7 +48110,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48124,7 +48124,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48138,7 +48138,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48152,7 +48152,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48166,7 +48166,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -48183,42 +48183,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 { @@ -48238,7 +48238,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -48258,7 +48258,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -48278,7 +48278,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -48539,14 +48539,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -49144,14 +49144,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -49210,28 +49210,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 { @@ -49245,7 +49245,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -49259,7 +49259,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -49273,7 +49273,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -49287,7 +49287,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -49301,7 +49301,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50128,35 +50128,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 { @@ -50186,7 +50186,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -50194,7 +50194,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -50224,7 +50224,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -50232,7 +50232,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -50262,7 +50262,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -50274,7 +50274,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -50304,7 +50304,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -50316,7 +50316,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -50346,7 +50346,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -50361,63 +50361,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 } } @@ -50427,14 +50427,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1860 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1860 } } @@ -51101,35 +51101,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 { @@ -51152,7 +51152,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51160,7 +51160,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -51183,7 +51183,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51191,7 +51191,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51221,7 +51221,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51229,7 +51229,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51259,7 +51259,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51267,7 +51267,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51297,7 +51297,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51309,7 +51309,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51339,7 +51339,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51351,7 +51351,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51381,7 +51381,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51396,35 +51396,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 { @@ -51447,7 +51447,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51455,7 +51455,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -51478,7 +51478,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51486,7 +51486,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51516,7 +51516,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51524,7 +51524,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51554,7 +51554,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51562,7 +51562,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51592,7 +51592,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51604,7 +51604,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51634,7 +51634,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51646,7 +51646,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51676,7 +51676,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51691,35 +51691,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 { @@ -51742,7 +51742,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51750,7 +51750,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -51773,7 +51773,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51781,7 +51781,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51811,7 +51811,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51819,7 +51819,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51849,7 +51849,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -51857,7 +51857,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51887,7 +51887,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51899,7 +51899,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51929,7 +51929,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51941,7 +51941,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51971,7 +51971,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -51986,35 +51986,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 { @@ -52037,7 +52037,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -52045,7 +52045,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -52068,7 +52068,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -52076,7 +52076,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -52106,7 +52106,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -52114,7 +52114,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -52144,7 +52144,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -52152,7 +52152,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -52182,7 +52182,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -52194,7 +52194,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -52224,7 +52224,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -52236,7 +52236,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -52266,7 +52266,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54283,7 +54283,7 @@ cont { scale: 14 lines { width: 1.0 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -54292,7 +54292,7 @@ cont { scale: 15 lines { width: 1.5 - color: 2580075660 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -54301,7 +54301,7 @@ cont { scale: 16 lines { width: 2.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -54309,7 +54309,7 @@ cont { scale: 17 lines { width: 3.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -54317,7 +54317,7 @@ cont { scale: 18 lines { width: 4.5 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -54325,7 +54325,7 @@ cont { scale: 19 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -54333,7 +54333,7 @@ cont { scale: 20 lines { width: 6.0 - color: 2580075660 + color: 12898689 priority: 80 } } @@ -57403,21 +57403,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 } } @@ -57438,35 +57438,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 } } @@ -57476,21 +57476,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 } } @@ -58215,70 +58215,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 } } @@ -58566,8 +58566,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -58582,8 +58582,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -58598,8 +58598,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -58614,8 +58614,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -58629,8 +58629,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -58644,8 +58644,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -58659,8 +58659,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -58674,8 +58674,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } caption { @@ -127579,8 +127579,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127595,8 +127595,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127611,8 +127611,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -127627,8 +127627,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127642,8 +127642,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127657,8 +127657,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127672,8 +127672,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127687,8 +127687,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -127856,7 +127856,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -127869,7 +127869,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -127882,7 +127882,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -128101,7 +128101,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -128114,7 +128114,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -128127,7 +128127,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 1301661112 dashdot { dd: 2.7 @@ -128203,8 +128203,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128219,8 +128219,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128235,8 +128235,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128251,8 +128251,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128266,8 +128266,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128281,8 +128281,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128296,8 +128296,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128311,8 +128311,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128367,8 +128367,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -128377,8 +128377,8 @@ cont { element { scale: 11 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -128394,8 +128394,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1298117829 + width: 1.4 + color: 227203303 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -128411,8 +128411,8 @@ cont { element { scale: 13 lines { - width: 1.6 - color: 1298117829 + width: 1.7 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128427,8 +128427,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 1298117829 + width: 2.0 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128443,8 +128443,8 @@ cont { element { scale: 15 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128459,8 +128459,8 @@ cont { element { scale: 16 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -128474,8 +128474,8 @@ cont { element { scale: 17 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -128489,8 +128489,8 @@ cont { element { scale: 18 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -128504,8 +128504,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -128519,8 +128519,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 1298117829 + width: 2.4 + color: 227203303 priority: -990 } path_text { @@ -128537,8 +128537,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128553,8 +128553,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128569,8 +128569,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128585,8 +128585,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128600,8 +128600,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128615,8 +128615,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128630,8 +128630,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128645,8 +128645,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128663,8 +128663,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128679,8 +128679,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128695,8 +128695,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 cap: BUTTCAP } @@ -128711,8 +128711,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128726,8 +128726,8 @@ cont { element { scale: 17 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128741,8 +128741,8 @@ cont { element { scale: 18 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128756,8 +128756,8 @@ cont { element { scale: 19 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128771,8 +128771,8 @@ cont { element { scale: 20 lines { - width: 1.6 - color: 1298117829 + width: 1.8 + color: 227203303 priority: -990 } path_text { @@ -128789,8 +128789,8 @@ cont { element { scale: 13 lines { - width: 0.7 - color: 1298117829 + width: 0.9 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -128809,8 +128809,8 @@ cont { element { scale: 14 lines { - width: 1.0 - color: 1298117829 + width: 1.2 + color: 227203303 dashdot { dd: 2.7 dd: 2.7 @@ -128829,8 +128829,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -128849,8 +128849,8 @@ cont { element { scale: 16 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -128868,8 +128868,8 @@ cont { element { scale: 17 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -128887,8 +128887,8 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -128906,8 +128906,8 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1298117829 + width: 1.6 + color: 227203303 dashdot { dd: 4.95 dd: 4.95 @@ -128925,8 +128925,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 beb2ecc2a..0545c0ebf 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index e2ad8f5de..c719fc438 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -6849,7 +6849,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -6953,7 +6953,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -47870,28 +47870,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 { @@ -47905,7 +47905,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47919,7 +47919,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47933,7 +47933,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47947,7 +47947,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -47961,7 +47961,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -48044,7 +48044,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -48174,7 +48174,7 @@ cont { element { scale: 14 area { - color: 655629312 + color: 1317888 priority: -1820 } } @@ -48789,21 +48789,21 @@ 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 } symbol { @@ -48815,7 +48815,7 @@ cont { element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -48823,7 +48823,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -48845,7 +48845,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -48853,7 +48853,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -48876,7 +48876,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -48884,7 +48884,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -48907,7 +48907,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -48915,7 +48915,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -48945,7 +48945,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -48953,7 +48953,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -48983,7 +48983,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -48991,7 +48991,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49021,7 +49021,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49033,7 +49033,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49063,7 +49063,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49075,7 +49075,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49105,7 +49105,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49120,21 +49120,21 @@ 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 } symbol { @@ -49146,7 +49146,7 @@ cont { element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49154,7 +49154,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49176,7 +49176,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49184,7 +49184,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49207,7 +49207,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49215,7 +49215,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49238,7 +49238,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49246,7 +49246,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49276,7 +49276,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49284,7 +49284,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49314,7 +49314,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49322,7 +49322,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49352,7 +49352,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49364,7 +49364,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49394,7 +49394,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49406,7 +49406,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49436,7 +49436,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49451,21 +49451,21 @@ 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 } symbol { @@ -49477,7 +49477,7 @@ cont { element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49485,7 +49485,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49507,7 +49507,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49515,7 +49515,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49538,7 +49538,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49546,7 +49546,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49569,7 +49569,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49577,7 +49577,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49607,7 +49607,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49615,7 +49615,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49645,7 +49645,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49653,7 +49653,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49683,7 +49683,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49695,7 +49695,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49725,7 +49725,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49737,7 +49737,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49767,7 +49767,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49782,21 +49782,21 @@ 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 } symbol { @@ -49808,7 +49808,7 @@ cont { element { scale: 12 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49816,7 +49816,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49838,7 +49838,7 @@ cont { element { scale: 13 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49846,7 +49846,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49869,7 +49869,7 @@ cont { element { scale: 14 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49877,7 +49877,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49900,7 +49900,7 @@ cont { element { scale: 15 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49908,7 +49908,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49938,7 +49938,7 @@ cont { element { scale: 16 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49946,7 +49946,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -49976,7 +49976,7 @@ cont { element { scale: 17 area { - color: 1317888 + color: 1449728 priority: -1940 } apply_if: "!name" @@ -49984,7 +49984,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -50014,7 +50014,7 @@ cont { element { scale: 18 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -50026,7 +50026,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -50056,7 +50056,7 @@ cont { element { scale: 19 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -50068,7 +50068,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -50098,7 +50098,7 @@ cont { element { scale: 20 area { - color: 1317888 + color: 1449728 priority: -1940 } symbol { @@ -50164,70 +50164,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 } } @@ -50612,35 +50612,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 } } @@ -50945,28 +50945,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 { @@ -50980,7 +50980,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -50994,7 +50994,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51008,7 +51008,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51022,7 +51022,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51036,7 +51036,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51053,42 +51053,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 { @@ -51108,7 +51108,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -51128,7 +51128,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -51148,7 +51148,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1930 } symbol { @@ -51409,28 +51409,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 { @@ -51444,7 +51444,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51458,7 +51458,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51472,7 +51472,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51486,7 +51486,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -51500,7 +51500,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -52006,63 +52006,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 } } @@ -52072,28 +52072,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 { @@ -52107,7 +52107,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -52121,7 +52121,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -52135,7 +52135,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -52149,7 +52149,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -52163,7 +52163,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1920 } caption { @@ -53240,63 +53240,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 } } @@ -53306,28 +53297,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 { @@ -53339,7 +53330,7 @@ cont { element { scale: 16 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53351,7 +53342,7 @@ cont { element { scale: 17 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53372,7 +53363,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53393,7 +53384,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53414,7 +53405,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53664,28 +53655,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 { @@ -53706,7 +53697,7 @@ cont { element { scale: 18 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53727,7 +53718,7 @@ cont { element { scale: 19 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53748,7 +53739,7 @@ cont { element { scale: 20 area { - color: 1251584 + color: 1317888 priority: -1860 } symbol { @@ -53994,35 +53985,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 { @@ -54045,7 +54031,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54053,7 +54038,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -54076,7 +54060,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54084,7 +54067,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -54114,7 +54096,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -54122,7 +54103,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -54152,7 +54132,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -54160,7 +54139,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -54190,7 +54168,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -54202,7 +54179,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -54232,7 +54208,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -54244,7 +54219,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -54274,7 +54248,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -54289,35 +54262,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 { @@ -54340,7 +54308,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54348,7 +54315,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -54371,7 +54337,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54379,7 +54344,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -54409,7 +54373,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -54417,7 +54380,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -54447,7 +54409,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -54455,7 +54416,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -54485,7 +54445,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -54497,7 +54456,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -54527,7 +54485,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -54539,7 +54496,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -54569,7 +54525,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -54584,35 +54539,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 { @@ -54635,7 +54585,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54643,7 +54592,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -54666,7 +54614,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54674,7 +54621,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -54704,7 +54650,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -54712,7 +54657,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -54742,7 +54686,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -54750,7 +54693,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -54780,7 +54722,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -54792,7 +54733,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -54822,7 +54762,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -54834,7 +54773,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -54864,7 +54802,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -54879,35 +54816,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 { @@ -54930,7 +54862,6 @@ cont { element { scale: 14 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54938,7 +54869,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } symbol { @@ -54961,7 +54891,6 @@ cont { element { scale: 15 area { - color: 1251584 priority: -1930 } apply_if: "!name" @@ -54969,7 +54898,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } symbol { @@ -54999,7 +54927,6 @@ cont { element { scale: 16 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -55007,7 +54934,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } symbol { @@ -55037,7 +54963,6 @@ cont { element { scale: 17 area { - color: 1317888 priority: -1930 } apply_if: "!name" @@ -55045,7 +54970,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -55075,7 +54999,6 @@ cont { element { scale: 18 area { - color: 1317888 priority: -1930 } symbol { @@ -55087,7 +55010,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -55117,7 +55039,6 @@ cont { element { scale: 19 area { - color: 1317888 priority: -1930 } symbol { @@ -55129,7 +55050,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -55159,7 +55079,6 @@ cont { element { scale: 20 area { - color: 1317888 priority: -1930 } symbol { @@ -57252,7 +57171,7 @@ cont { scale: 13 lines { width: 1.7 - color: 1712264192 + color: 1317888 priority: 80 cap: BUTTCAP } @@ -57261,7 +57180,7 @@ cont { scale: 14 lines { width: 2.2 - color: 1712264192 + color: 1317888 priority: 80 cap: BUTTCAP } @@ -57270,7 +57189,7 @@ cont { scale: 15 lines { width: 3.0 - color: 1712264192 + color: 1317888 priority: 80 cap: BUTTCAP } @@ -57279,7 +57198,7 @@ cont { scale: 16 lines { width: 4.5 - color: 1712264192 + color: 1317888 priority: 80 } } @@ -57287,7 +57206,7 @@ cont { scale: 17 lines { width: 6.0 - color: 1712264192 + color: 1317888 priority: 80 } } @@ -57295,7 +57214,7 @@ cont { scale: 18 lines { width: 8.0 - color: 1712264192 + color: 1317888 priority: 80 } } @@ -57303,7 +57222,7 @@ cont { scale: 19 lines { width: 8.0 - color: 1712264192 + color: 1317888 priority: 80 } } @@ -57311,7 +57230,7 @@ cont { scale: 20 lines { width: 8.0 - color: 1712264192 + color: 1317888 priority: 80 } } @@ -61591,35 +61510,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 } } @@ -61664,70 +61583,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 } } @@ -62502,35 +62421,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 } } @@ -62900,7 +62819,7 @@ cont { scale: 11 lines { width: 2.0 - color: 1292247078 + color: 1291854370 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -62910,7 +62829,7 @@ cont { scale: 12 lines { width: 2.0 - color: 1292247078 + color: 1291854370 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -62920,7 +62839,7 @@ cont { scale: 13 lines { width: 2.7 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -62937,7 +62856,7 @@ cont { scale: 14 lines { width: 3.5 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -62954,7 +62873,7 @@ cont { scale: 15 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -62971,7 +62890,7 @@ cont { scale: 16 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } caption { @@ -62987,7 +62906,7 @@ cont { scale: 17 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } caption { @@ -63003,7 +62922,7 @@ cont { scale: 18 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } caption { @@ -63019,7 +62938,7 @@ cont { scale: 19 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } caption { @@ -63035,7 +62954,7 @@ cont { scale: 20 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } caption { @@ -134074,7 +133993,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2147885094 + color: 2147492386 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134084,7 +134003,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1292247078 + color: 1291854370 priority: -990 cap: BUTTCAP } @@ -134101,7 +134020,7 @@ cont { scale: 14 lines { width: 1.8 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -134118,7 +134037,7 @@ cont { scale: 15 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -134135,7 +134054,7 @@ cont { scale: 16 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134151,7 +134070,7 @@ cont { scale: 17 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134167,7 +134086,7 @@ cont { scale: 18 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134183,7 +134102,7 @@ cont { scale: 19 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134199,7 +134118,7 @@ cont { scale: 20 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134368,7 +134287,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 9758 dashdot { dd: 2.7 @@ -134381,7 +134300,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 9758 dashdot { dd: 2.7 @@ -134394,7 +134313,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 9758 dashdot { dd: 2.7 @@ -134613,7 +134532,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 9758 dashdot { dd: 2.7 @@ -134626,7 +134545,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 9758 dashdot { dd: 2.7 @@ -134639,7 +134558,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 9758 dashdot { dd: 2.7 @@ -134716,7 +134635,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1292247078 + color: 1291854370 priority: -990 cap: BUTTCAP } @@ -134733,7 +134652,7 @@ cont { scale: 14 lines { width: 1.8 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -134750,7 +134669,7 @@ cont { scale: 15 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -134767,7 +134686,7 @@ cont { scale: 16 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134783,7 +134702,7 @@ cont { scale: 17 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134799,7 +134718,7 @@ cont { scale: 18 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134815,7 +134734,7 @@ cont { scale: 19 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134831,7 +134750,7 @@ cont { scale: 20 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -134888,7 +134807,7 @@ cont { scale: 10 lines { width: 1.4 - color: 1292247078 + color: 1291854370 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134898,7 +134817,7 @@ cont { scale: 11 lines { width: 2.0 - color: 1292247078 + color: 1291854370 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134916,7 +134835,7 @@ cont { scale: 12 lines { width: 2.0 - color: 1292247078 + color: 1291854370 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134934,7 +134853,7 @@ cont { scale: 13 lines { width: 2.7 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -134951,7 +134870,7 @@ cont { scale: 14 lines { width: 3.5 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -134968,7 +134887,7 @@ cont { scale: 15 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -134985,7 +134904,7 @@ cont { scale: 16 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135001,7 +134920,7 @@ cont { scale: 17 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135017,7 +134936,7 @@ cont { scale: 18 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135033,7 +134952,7 @@ cont { scale: 19 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135049,7 +134968,7 @@ cont { scale: 20 lines { width: 4.6 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135068,7 +134987,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2147885094 + color: 2147492386 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -135078,7 +134997,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1292247078 + color: 1291854370 priority: -990 cap: BUTTCAP } @@ -135095,7 +135014,7 @@ cont { scale: 14 lines { width: 1.8 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -135112,7 +135031,7 @@ cont { scale: 15 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 cap: BUTTCAP } @@ -135129,7 +135048,7 @@ cont { scale: 16 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135145,7 +135064,7 @@ cont { scale: 17 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135161,7 +135080,7 @@ cont { scale: 18 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135177,7 +135096,7 @@ cont { scale: 19 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135193,7 +135112,7 @@ cont { scale: 20 lines { width: 2.4 - color: 401446 + color: 8738 priority: -990 } path_text { @@ -135212,7 +135131,7 @@ cont { scale: 13 lines { width: 1.0 - color: 1292247078 + color: 1291854370 dashdot { dd: 2.7 dd: 2.7 @@ -135233,7 +135152,7 @@ cont { scale: 14 lines { width: 1.4 - color: 401446 + color: 8738 dashdot { dd: 3.5 dd: 3.5 @@ -135254,7 +135173,7 @@ cont { scale: 15 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135275,7 +135194,7 @@ cont { scale: 16 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135295,7 +135214,7 @@ cont { scale: 17 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135315,7 +135234,7 @@ cont { scale: 18 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135335,7 +135254,7 @@ cont { scale: 19 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135355,7 +135274,7 @@ cont { scale: 20 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135378,7 +135297,7 @@ cont { scale: 13 lines { width: 1.0 - color: 1292247078 + color: 1291854370 dashdot { dd: 2.7 dd: 2.7 @@ -135399,7 +135318,7 @@ cont { scale: 14 lines { width: 1.4 - color: 401446 + color: 8738 dashdot { dd: 3.5 dd: 3.5 @@ -135420,7 +135339,7 @@ cont { scale: 15 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135441,7 +135360,7 @@ cont { scale: 16 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135461,7 +135380,7 @@ cont { scale: 17 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135481,7 +135400,7 @@ cont { scale: 18 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135501,7 +135420,7 @@ cont { scale: 19 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 @@ -135521,7 +135440,7 @@ cont { scale: 20 lines { width: 2.0 - color: 401446 + color: 8738 dashdot { dd: 5.0 dd: 5.0 diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 272c35ef6..552cf467b 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 06156e711..6fcee911e 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -6879,28 +6879,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 { @@ -6920,7 +6920,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6940,7 +6940,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6960,7 +6960,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -6983,28 +6983,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 { @@ -7024,7 +7024,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -7044,7 +7044,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -7064,7 +7064,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47764,28 +47764,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 { @@ -47799,7 +47799,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47813,7 +47813,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47827,7 +47827,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47841,7 +47841,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47855,7 +47855,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -47938,14 +47938,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -47965,7 +47965,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -47985,7 +47985,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48005,7 +48005,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48025,7 +48025,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48045,7 +48045,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48068,14 +48068,14 @@ cont { element { scale: 14 area { - color: 666290539 + color: 12504182 priority: -1820 } } element { scale: 15 area { - color: 11979115 + color: 12504182 priority: -1820 } symbol { @@ -48095,7 +48095,7 @@ cont { element { scale: 16 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48115,7 +48115,7 @@ cont { element { scale: 17 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48135,7 +48135,7 @@ cont { element { scale: 18 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48155,7 +48155,7 @@ cont { element { scale: 19 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48175,7 +48175,7 @@ cont { element { scale: 20 area { - color: 11585379 + color: 12504182 priority: -1820 } symbol { @@ -48401,42 +48401,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 { @@ -48450,7 +48450,7 @@ cont { element { scale: 16 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48464,7 +48464,7 @@ cont { element { scale: 17 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48478,7 +48478,7 @@ cont { element { scale: 18 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48492,7 +48492,7 @@ cont { element { scale: 19 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48506,7 +48506,7 @@ cont { element { scale: 20 area { - color: 14999725 + color: 14933676 priority: -1920 } caption { @@ -48645,35 +48645,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 } } @@ -48683,21 +48683,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 { @@ -48709,7 +48709,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -48717,7 +48717,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -48739,7 +48739,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -48747,7 +48747,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -48770,7 +48770,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48778,7 +48778,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -48801,7 +48801,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48809,7 +48809,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48839,7 +48839,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48847,7 +48847,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48877,7 +48877,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -48885,7 +48885,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48915,7 +48915,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48927,7 +48927,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48957,7 +48957,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48969,7 +48969,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -48999,7 +48999,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49014,21 +49014,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 { @@ -49040,7 +49040,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -49048,7 +49048,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -49070,7 +49070,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49078,7 +49078,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49101,7 +49101,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49109,7 +49109,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49132,7 +49132,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49140,7 +49140,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49170,7 +49170,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49178,7 +49178,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49208,7 +49208,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49216,7 +49216,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49246,7 +49246,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49258,7 +49258,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49288,7 +49288,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49300,7 +49300,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49330,7 +49330,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49345,21 +49345,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 { @@ -49371,7 +49371,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -49379,7 +49379,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -49401,7 +49401,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49409,7 +49409,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49432,7 +49432,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49440,7 +49440,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49463,7 +49463,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49471,7 +49471,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49501,7 +49501,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49509,7 +49509,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49539,7 +49539,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49547,7 +49547,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49577,7 +49577,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49589,7 +49589,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49619,7 +49619,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49631,7 +49631,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49661,7 +49661,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49676,21 +49676,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 { @@ -49702,7 +49702,7 @@ cont { element { scale: 12 area { - color: 11979115 + color: 11321948 priority: -1940 } apply_if: "!name" @@ -49710,7 +49710,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } symbol { @@ -49732,7 +49732,7 @@ cont { element { scale: 13 area { - color: 11585379 + color: 11058773 priority: -1940 } apply_if: "!name" @@ -49740,7 +49740,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } symbol { @@ -49763,7 +49763,7 @@ cont { element { scale: 14 area { - color: 11716458 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49771,7 +49771,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } symbol { @@ -49794,7 +49794,7 @@ cont { element { scale: 15 area { - color: 11387999 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49802,7 +49802,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49832,7 +49832,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49840,7 +49840,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49870,7 +49870,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 10796367 priority: -1940 } apply_if: "!name" @@ -49878,7 +49878,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49908,7 +49908,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49920,7 +49920,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49950,7 +49950,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49962,7 +49962,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -49992,7 +49992,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 10796367 priority: -1940 } symbol { @@ -50066,35 +50066,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 } } @@ -50514,21 +50514,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 } } @@ -50549,35 +50549,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 } } @@ -50847,28 +50847,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 { @@ -50882,7 +50882,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50896,7 +50896,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50910,7 +50910,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50924,7 +50924,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50938,7 +50938,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -50955,42 +50955,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 { @@ -51010,7 +51010,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -51030,7 +51030,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -51050,7 +51050,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1930 } symbol { @@ -51311,14 +51311,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -51916,14 +51916,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1920 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1920 } } @@ -51982,28 +51982,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 { @@ -52017,7 +52017,7 @@ cont { element { scale: 16 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52031,7 +52031,7 @@ cont { element { scale: 17 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52045,7 +52045,7 @@ cont { element { scale: 18 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52059,7 +52059,7 @@ cont { element { scale: 19 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52073,7 +52073,7 @@ cont { element { scale: 20 area { - color: 12898689 + color: 14013333 priority: -1920 } caption { @@ -52923,35 +52923,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 { @@ -52981,7 +52981,7 @@ cont { element { scale: 16 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -52989,7 +52989,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53019,7 +53019,7 @@ cont { element { scale: 17 area { - color: 11058780 + color: 14013333 priority: -1930 } apply_if: "!name" @@ -53027,7 +53027,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53057,7 +53057,7 @@ cont { element { scale: 18 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53069,7 +53069,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53099,7 +53099,7 @@ cont { element { scale: 19 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53111,7 +53111,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53141,7 +53141,7 @@ cont { element { scale: 20 area { - color: 11058780 + color: 14013333 priority: -1930 } symbol { @@ -53156,63 +53156,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 } } @@ -53222,14 +53222,14 @@ cont { element { scale: 12 area { - color: 13161612 + color: 13227146 priority: -1860 } } element { scale: 13 area { - color: 13161612 + color: 13030021 priority: -1860 } } @@ -53910,35 +53910,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 { @@ -53961,7 +53961,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -53969,7 +53969,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -53992,7 +53992,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54000,7 +54000,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54030,7 +54030,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54038,7 +54038,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54068,7 +54068,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54076,7 +54076,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54106,7 +54106,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54118,7 +54118,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54148,7 +54148,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54160,7 +54160,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54190,7 +54190,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54205,35 +54205,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 { @@ -54256,7 +54256,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54264,7 +54264,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54287,7 +54287,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54295,7 +54295,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54325,7 +54325,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54333,7 +54333,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54363,7 +54363,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54371,7 +54371,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54401,7 +54401,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54413,7 +54413,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54443,7 +54443,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54455,7 +54455,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54485,7 +54485,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54500,35 +54500,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 { @@ -54551,7 +54551,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54559,7 +54559,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54582,7 +54582,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54590,7 +54590,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54620,7 +54620,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54628,7 +54628,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54658,7 +54658,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54666,7 +54666,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54696,7 +54696,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54708,7 +54708,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54738,7 +54738,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54750,7 +54750,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54780,7 +54780,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54795,35 +54795,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 { @@ -54846,7 +54846,7 @@ cont { element { scale: 14 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54854,7 +54854,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } symbol { @@ -54877,7 +54877,7 @@ cont { element { scale: 15 area { - color: 12898689 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54885,7 +54885,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54915,7 +54915,7 @@ cont { element { scale: 16 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54923,7 +54923,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54953,7 +54953,7 @@ cont { element { scale: 17 area { - color: 11979115 + color: 14015375 priority: -1930 } apply_if: "!name" @@ -54961,7 +54961,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -54991,7 +54991,7 @@ cont { element { scale: 18 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55003,7 +55003,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55033,7 +55033,7 @@ cont { element { scale: 19 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55045,7 +55045,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -55075,7 +55075,7 @@ cont { element { scale: 20 area { - color: 11979115 + color: 14015375 priority: -1930 } symbol { @@ -57193,7 +57193,7 @@ cont { scale: 13 lines { width: 1.7 - color: 1724437644 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -57202,7 +57202,7 @@ cont { scale: 14 lines { width: 2.2 - color: 1724437644 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -57211,7 +57211,7 @@ cont { scale: 15 lines { width: 3.0 - color: 1724437644 + color: 12898689 priority: 80 cap: BUTTCAP } @@ -57220,7 +57220,7 @@ cont { scale: 16 lines { width: 4.5 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -57228,7 +57228,7 @@ cont { scale: 17 lines { width: 6.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -57236,7 +57236,7 @@ cont { scale: 18 lines { width: 8.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -57244,7 +57244,7 @@ cont { scale: 19 lines { width: 8.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -57252,7 +57252,7 @@ cont { scale: 20 lines { width: 8.0 - color: 1724437644 + color: 12898689 priority: 80 } } @@ -61541,21 +61541,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 } } @@ -61576,35 +61576,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 } } @@ -61614,21 +61614,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 } } @@ -62472,70 +62472,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 } } @@ -62870,7 +62870,7 @@ cont { scale: 11 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -62880,7 +62880,7 @@ cont { scale: 12 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -62890,7 +62890,7 @@ cont { scale: 13 lines { width: 2.7 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -62907,7 +62907,7 @@ cont { scale: 14 lines { width: 3.5 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -62924,7 +62924,7 @@ cont { scale: 15 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -62941,7 +62941,7 @@ cont { scale: 16 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -62957,7 +62957,7 @@ cont { scale: 17 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -62973,7 +62973,7 @@ cont { scale: 18 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -62989,7 +62989,7 @@ cont { scale: 19 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -63005,7 +63005,7 @@ cont { scale: 20 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } caption { @@ -134069,7 +134069,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2153755845 + color: 2156583143 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134079,7 +134079,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1298117829 + color: 1300945127 priority: -990 cap: BUTTCAP } @@ -134096,7 +134096,7 @@ cont { scale: 14 lines { width: 1.8 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -134113,7 +134113,7 @@ cont { scale: 15 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -134130,7 +134130,7 @@ cont { scale: 16 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134146,7 +134146,7 @@ cont { scale: 17 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134162,7 +134162,7 @@ cont { scale: 18 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134178,7 +134178,7 @@ cont { scale: 19 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134194,7 +134194,7 @@ cont { scale: 20 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134363,7 +134363,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -134376,7 +134376,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -134389,7 +134389,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -134608,7 +134608,7 @@ cont { element { scale: 13 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -134621,7 +134621,7 @@ cont { element { scale: 14 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -134634,7 +134634,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.7 color: 9815480 dashdot { dd: 2.7 @@ -134711,7 +134711,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1298117829 + color: 1300945127 priority: -990 cap: BUTTCAP } @@ -134728,7 +134728,7 @@ cont { scale: 14 lines { width: 1.8 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -134745,7 +134745,7 @@ cont { scale: 15 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -134762,7 +134762,7 @@ cont { scale: 16 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134778,7 +134778,7 @@ cont { scale: 17 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134794,7 +134794,7 @@ cont { scale: 18 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134810,7 +134810,7 @@ cont { scale: 19 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134826,7 +134826,7 @@ cont { scale: 20 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134883,7 +134883,7 @@ cont { scale: 10 lines { width: 1.4 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134893,7 +134893,7 @@ cont { scale: 11 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134911,7 +134911,7 @@ cont { scale: 12 lines { width: 2.0 - color: 1298117829 + color: 1300945127 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -134929,7 +134929,7 @@ cont { scale: 13 lines { width: 2.7 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -134946,7 +134946,7 @@ cont { scale: 14 lines { width: 3.5 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -134963,7 +134963,7 @@ cont { scale: 15 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -134980,7 +134980,7 @@ cont { scale: 16 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -134996,7 +134996,7 @@ cont { scale: 17 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135012,7 +135012,7 @@ cont { scale: 18 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135028,7 +135028,7 @@ cont { scale: 19 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135044,7 +135044,7 @@ cont { scale: 20 lines { width: 4.6 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135063,7 +135063,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2153755845 + color: 2156583143 priority: -990 join: BEVELJOIN cap: BUTTCAP @@ -135073,7 +135073,7 @@ cont { scale: 13 lines { width: 1.3 - color: 1298117829 + color: 1300945127 priority: -990 cap: BUTTCAP } @@ -135090,7 +135090,7 @@ cont { scale: 14 lines { width: 1.8 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -135107,7 +135107,7 @@ cont { scale: 15 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 cap: BUTTCAP } @@ -135124,7 +135124,7 @@ cont { scale: 16 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135140,7 +135140,7 @@ cont { scale: 17 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135156,7 +135156,7 @@ cont { scale: 18 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135172,7 +135172,7 @@ cont { scale: 19 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135188,7 +135188,7 @@ cont { scale: 20 lines { width: 2.4 - color: 6272197 + color: 9099495 priority: -990 } path_text { @@ -135207,7 +135207,7 @@ cont { scale: 13 lines { width: 1.0 - color: 1298117829 + color: 1300945127 dashdot { dd: 2.7 dd: 2.7 @@ -135228,7 +135228,7 @@ cont { scale: 14 lines { width: 1.4 - color: 6272197 + color: 9099495 dashdot { dd: 3.5 dd: 3.5 @@ -135249,7 +135249,7 @@ cont { scale: 15 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135270,7 +135270,7 @@ cont { scale: 16 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135290,7 +135290,7 @@ cont { scale: 17 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135310,7 +135310,7 @@ cont { scale: 18 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135330,7 +135330,7 @@ cont { scale: 19 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135350,7 +135350,7 @@ cont { scale: 20 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135373,7 +135373,7 @@ cont { scale: 13 lines { width: 1.0 - color: 1298117829 + color: 1300945127 dashdot { dd: 2.7 dd: 2.7 @@ -135394,7 +135394,7 @@ cont { scale: 14 lines { width: 1.4 - color: 6272197 + color: 9099495 dashdot { dd: 3.5 dd: 3.5 @@ -135415,7 +135415,7 @@ cont { scale: 15 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135436,7 +135436,7 @@ cont { scale: 16 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135456,7 +135456,7 @@ cont { scale: 17 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135476,7 +135476,7 @@ cont { scale: 18 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135496,7 +135496,7 @@ cont { scale: 19 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 @@ -135516,7 +135516,7 @@ cont { scale: 20 lines { width: 2.0 - color: 6272197 + color: 9099495 dashdot { dd: 5.0 dd: 5.0 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 90365cd65..f9fbef92d 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;} @@ -250,7 +277,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.) */ @@ -280,47 +307,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;} @@ -399,17 +426,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 */ @@ -562,7 +581,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 b4dc638ea..07d6465f5 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.) */ @@ -74,7 +74,7 @@ line[waterway][tunnel] 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],