diff --git a/data/colors.txt b/data/colors.txt index 878597165..544a2ceda 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -260,7 +260,6 @@ 14209512 14275263 14802147 -14820640 14934482 14951168 14999725 @@ -283,12 +282,10 @@ 15690752 15754290 15763456 -15768856 15790320 -15901479 +15898392 +15900208 15902016 -15907410 -15908188 15921870 16027569 16056407 @@ -307,9 +304,10 @@ 16183529 16248287 16311234 -16370298 16372627 16391736 +16431936 +16433750 16557154 16579778 16579836 @@ -325,13 +323,15 @@ 16760320 16762880 16763432 -16763760 16763913 +16764506 16765952 +16766323 16767702 16770999 16774560 16775925 +16776958 16777215 436602368 437326080 @@ -347,11 +347,12 @@ 443432263 446405263 451800027 -452109095 +452107824 452109632 452377439 452764770 452983541 +452984574 452984831 575358531 587201269 @@ -363,6 +364,7 @@ 660157219 666290539 670074880 +670398976 670414670 671088639 856032768 @@ -410,14 +412,14 @@ 869652178 870704341 871230427 -871406872 -871539495 +871536408 871540032 871741262 871807839 871811973 872195170 872215006 +872414974 872415231 1074136576 1090519039 @@ -473,7 +475,6 @@ 1298092845 1298117829 1298131758 -1298161406 1298227553 1298283903 1298356016 @@ -511,8 +512,7 @@ 1306780114 1307438043 1307504366 -1307609088 -1307747111 +1307744024 1307747648 1307933184 1307948878 @@ -528,6 +528,7 @@ 1308594496 1308601687 1308604747 +1308622590 1308622847 1511594265 1523897290 @@ -573,7 +574,7 @@ 1724368575 1724437644 1725290194 -1727177511 +1727174424 1728053247 1931024665 1943327690 @@ -600,8 +601,10 @@ 2153536593 2153755845 2153769774 +2153799422 2153921919 2153997148 +2154708295 2154984050 2155510394 2155695907 @@ -617,12 +620,12 @@ 2159483932 2160360191 2161168844 -2162304288 2162418130 2162506037 2163123456 2164002331 2164214668 +2164260606 2164260863 2370396489 2371253590 @@ -653,6 +656,7 @@ 2580075660 2582553856 2583432731 +2583691006 2583691263 2787649562 2789826889 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 53df26c4d..cc63ef1f8 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 ac9b0d9e3..271ea294a 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -2820,7 +2820,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2583691263 + color: 2583691006 priority: 70 join: BEVELJOIN cap: BUTTCAP @@ -2830,7 +2830,7 @@ cont { scale: 13 lines { width: 1.5 - color: 2164260863 + color: 2164260606 priority: 70 cap: BUTTCAP } @@ -2839,7 +2839,7 @@ cont { scale: 14 lines { width: 2.4 - color: 1308622847 + color: 1308622590 priority: 70 cap: BUTTCAP } @@ -2848,7 +2848,7 @@ cont { scale: 15 lines { width: 2.4 - color: 1308622847 + color: 1308622590 priority: 70 cap: BUTTCAP } @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2900,7 +2900,7 @@ cont { scale: 14 lines { width: 0.6 - color: 2583691263 + color: 2583691006 priority: 70 cap: BUTTCAP } @@ -2909,7 +2909,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 cap: BUTTCAP } @@ -2918,7 +2918,7 @@ cont { scale: 16 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2926,7 +2926,7 @@ cont { scale: 17 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2934,7 +2934,7 @@ cont { scale: 18 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2942,7 +2942,7 @@ cont { scale: 19 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2950,7 +2950,7 @@ cont { scale: 20 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -16248,7 +16248,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 446405263 dashdot { dd: 3.0 @@ -23592,7 +23592,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -23601,7 +23601,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23617,7 +23617,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23633,7 +23633,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23649,7 +23649,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23665,7 +23665,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23684,7 +23684,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -23693,7 +23693,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23709,7 +23709,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23725,7 +23725,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23741,7 +23741,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23757,7 +23757,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23776,7 +23776,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -23785,7 +23785,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23801,7 +23801,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23817,7 +23817,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23833,7 +23833,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -23849,7 +23849,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -24044,8 +24044,8 @@ cont { scale: 11 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24053,8 +24053,8 @@ cont { scale: 12 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24062,8 +24062,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24071,8 +24071,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 - priority: 220 + color: 1717591806 + priority: 218 cap: BUTTCAP } } @@ -24081,7 +24081,7 @@ cont { lines { width: 1.2 color: 861953790 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -24098,7 +24098,7 @@ cont { lines { width: 1.3 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -24114,7 +24114,7 @@ cont { lines { width: 1.4 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -24130,7 +24130,7 @@ cont { lines { width: 1.6 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -24146,7 +24146,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -24162,7 +24162,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -24180,8 +24180,8 @@ cont { scale: 11 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24189,8 +24189,8 @@ cont { scale: 12 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24198,8 +24198,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24207,8 +24207,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 - priority: 220 + color: 1717591806 + priority: 218 cap: BUTTCAP } } @@ -24223,7 +24223,7 @@ cont { lines { width: 1.2 color: 861953790 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -24246,7 +24246,7 @@ cont { lines { width: 1.3 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -24274,7 +24274,7 @@ cont { lines { width: 1.4 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -24302,7 +24302,7 @@ cont { lines { width: 1.6 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -24330,7 +24330,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -24358,7 +24358,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -24376,8 +24376,8 @@ cont { scale: 11 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24385,8 +24385,8 @@ cont { scale: 12 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24394,8 +24394,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -24403,8 +24403,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 - priority: 220 + color: 1717591806 + priority: 218 cap: BUTTCAP } } @@ -24413,7 +24413,7 @@ cont { lines { width: 1.2 color: 861953790 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -24430,7 +24430,7 @@ cont { lines { width: 1.3 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -24446,7 +24446,7 @@ cont { lines { width: 1.4 color: 442523390 - priority: 220 + priority: 218 } lines { width: 4.8 @@ -24478,7 +24478,7 @@ cont { lines { width: 1.6 color: 6315774 - priority: 220 + priority: 218 } lines { width: 7.2 @@ -24510,7 +24510,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } lines { width: 8.6 @@ -24542,7 +24542,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } lines { width: 8.6 @@ -24990,19 +24990,19 @@ cont { element { scale: 11 lines { - width: 1.2 - color: 1298161406 + width: 1.5 + color: 861953790 dashdot { dd: 7.0 dd: 9.6 } - priority: 190 + priority: 220 cap: BUTTCAP } lines { width: 1.5 color: 587201269 - priority: 180 + priority: 219 cap: BUTTCAP } path_text { @@ -25011,25 +25011,25 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 12 lines { - width: 1.2 - color: 1298161406 + width: 1.5 + color: 861953790 dashdot { dd: 7.0 dd: 9.6 } - priority: 190 + priority: 220 cap: BUTTCAP } lines { width: 1.5 color: 587201269 - priority: 180 + priority: 219 cap: BUTTCAP } path_text { @@ -25038,25 +25038,25 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 13 lines { - width: 1.2 - color: 1298161406 + width: 1.5 + color: 861953790 dashdot { dd: 7.0 dd: 9.6 } - priority: 190 + priority: 220 cap: BUTTCAP } lines { width: 1.5 color: 587201269 - priority: 180 + priority: 219 cap: BUTTCAP } path_text { @@ -25065,25 +25065,25 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 14 lines { - width: 1.2 - color: 1298161406 + width: 1.5 + color: 861953790 dashdot { dd: 7.0 dd: 9.6 } - priority: 190 + priority: 220 cap: BUTTCAP } lines { width: 1.5 color: 587201269 - priority: 180 + priority: 219 cap: BUTTCAP } path_text { @@ -25092,25 +25092,25 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 15 lines { - width: 1.2 - color: 1298161406 + width: 1.5 + color: 861953790 dashdot { dd: 7.0 dd: 9.6 } - priority: 190 + priority: 220 cap: BUTTCAP } lines { width: 1.5 color: 587201269 - priority: 180 + priority: 219 cap: BUTTCAP } path_text { @@ -25119,24 +25119,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 16 lines { - width: 1.3 - color: 1298161406 + width: 2.0 + color: 861953790 dashdot { dd: 7.5 dd: 9.5 } - priority: 190 + priority: 220 } lines { width: 2.0 color: 587201269 - priority: 180 + priority: 219 } path_text { primary { @@ -25144,24 +25144,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 17 lines { - width: 1.4 - color: 6315774 + width: 2.4 + color: 442523390 dashdot { dd: 8.0 dd: 9.4 } - priority: 190 + priority: 220 } lines { width: 2.4 color: 452983541 - priority: 180 + priority: 219 } path_text { primary { @@ -25169,24 +25169,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 18 lines { - width: 1.6 + width: 3.2 color: 6315774 dashdot { dd: 8.5 dd: 9.3 } - priority: 190 + priority: 220 } lines { width: 3.2 color: 16775925 - priority: 180 + priority: 219 } path_text { primary { @@ -25194,24 +25194,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 19 lines { - width: 1.8 + width: 4.2 color: 6315774 dashdot { dd: 9.0 dd: 9.2 } - priority: 190 + priority: 220 } lines { width: 4.2 color: 16775925 - priority: 180 + priority: 219 } path_text { primary { @@ -25219,24 +25219,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 20 lines { - width: 1.8 + width: 4.2 color: 6315774 dashdot { dd: 9.0 dd: 9.2 } - priority: 190 + priority: 220 } lines { width: 4.2 color: 16775925 - priority: 180 + priority: 219 } path_text { primary { @@ -25244,7 +25244,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } } @@ -26189,7 +26189,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -26199,7 +26199,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -26208,7 +26208,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -26225,7 +26225,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -26242,7 +26242,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -26258,7 +26258,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26274,7 +26274,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26290,7 +26290,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26306,7 +26306,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26325,7 +26325,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -26335,7 +26335,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -26344,7 +26344,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -26361,7 +26361,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -26378,7 +26378,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -26394,7 +26394,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26410,7 +26410,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26426,7 +26426,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26442,7 +26442,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26461,7 +26461,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -26471,7 +26471,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -26480,7 +26480,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -26497,7 +26497,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -26524,7 +26524,7 @@ cont { } lines { width: 3.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -26550,7 +26550,7 @@ cont { } lines { width: 4.7 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -26576,7 +26576,7 @@ cont { } lines { width: 6.4 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -26602,7 +26602,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -26628,7 +26628,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -26646,7 +26646,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 16087552 priority: 310 join: BEVELJOIN @@ -26656,7 +26656,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -26666,7 +26666,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -26676,7 +26676,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -26686,8 +26686,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1307609088 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26710,8 +26710,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1307609088 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26734,8 +26734,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 1307609088 + width: 2.1 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26758,8 +26758,8 @@ cont { element { scale: 13 lines { - width: 2.9 - color: 670074880 + width: 3.0 + color: 670398976 priority: 310 cap: BUTTCAP } @@ -26940,7 +26940,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 16087552 priority: 310 join: BEVELJOIN @@ -26950,7 +26950,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -26960,7 +26960,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -26970,7 +26970,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -26980,8 +26980,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1307609088 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -27004,8 +27004,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1307609088 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -27028,8 +27028,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 1307609088 + width: 2.1 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -27052,20 +27052,20 @@ cont { element { scale: 13 lines { - width: 6.6 + width: 6.8 color: 1306645694 priority: 140 cap: BUTTCAP } lines { - width: 6.2 + width: 6.4 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 2.9 - color: 670074880 + width: 3.0 + color: 670398976 priority: 310 cap: BUTTCAP } @@ -27330,7 +27330,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 16087552 priority: 310 join: BEVELJOIN @@ -27340,7 +27340,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -27350,7 +27350,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -27360,7 +27360,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -27370,8 +27370,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1307609088 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -27394,8 +27394,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1307609088 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -27418,7 +27418,7 @@ cont { element { scale: 12 lines { - width: 3.0 + width: 3.1 color: 1300267136 dashdot { dd: 2.0 @@ -27428,7 +27428,7 @@ cont { cap: BUTTCAP } lines { - width: 2.0 + width: 2.1 color: 452109632 priority: 310 join: BEVELJOIN @@ -27452,7 +27452,7 @@ cont { element { scale: 13 lines { - width: 4.5 + width: 4.6 color: 1300267136 dashdot { dd: 4.0 @@ -27462,7 +27462,7 @@ cont { cap: BUTTCAP } lines { - width: 2.9 + width: 3.0 color: 871540032 priority: 310 cap: BUTTCAP @@ -28880,7 +28880,7 @@ cont { scale: 11 lines { width: 1.1 - color: 1298161406 + color: 1717591806 dashdot { dd: 7.0 dd: 9.6 @@ -28903,7 +28903,7 @@ cont { scale: 12 lines { width: 1.1 - color: 1298161406 + color: 1717591806 dashdot { dd: 7.0 dd: 9.6 @@ -28926,7 +28926,7 @@ cont { scale: 13 lines { width: 1.1 - color: 1298161406 + color: 1717591806 dashdot { dd: 7.0 dd: 9.6 @@ -28949,7 +28949,7 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 + color: 1717591806 dashdot { dd: 7.0 dd: 9.6 @@ -28972,7 +28972,7 @@ cont { scale: 15 lines { width: 1.2 - color: 861953790 + color: 6315774 dashdot { dd: 7.0 dd: 9.6 @@ -30812,7 +30812,7 @@ cont { } lines { width: 2.4 - color: 1308622847 + color: 1308622590 dashdot { dd: 8.0 dd: 1.5 @@ -30842,7 +30842,7 @@ cont { } lines { width: 3.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 9.0 dd: 1.8 @@ -30872,7 +30872,7 @@ cont { } lines { width: 4.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 11.0 dd: 2.3 @@ -30902,7 +30902,7 @@ cont { } lines { width: 5.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 13.0 dd: 2.7 @@ -30932,7 +30932,7 @@ cont { } lines { width: 5.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 13.0 dd: 2.7 @@ -30999,7 +30999,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31023,7 +31023,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31047,7 +31047,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -31070,7 +31070,7 @@ cont { scale: 14 lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -31093,7 +31093,7 @@ cont { scale: 15 lines { width: 3.8 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -31116,7 +31116,7 @@ cont { scale: 16 lines { width: 5.0 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31138,7 +31138,7 @@ cont { scale: 17 lines { width: 6.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31160,7 +31160,7 @@ cont { scale: 18 lines { width: 9.4 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31182,7 +31182,7 @@ cont { scale: 19 lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31204,7 +31204,7 @@ cont { scale: 20 lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31273,7 +31273,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31297,7 +31297,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31321,7 +31321,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -31356,7 +31356,7 @@ cont { } lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -31391,7 +31391,7 @@ cont { } lines { width: 3.8 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -31426,7 +31426,7 @@ cont { } lines { width: 5.0 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31460,7 +31460,7 @@ cont { } lines { width: 6.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31494,7 +31494,7 @@ cont { } lines { width: 9.4 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31528,7 +31528,7 @@ cont { } lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31562,7 +31562,7 @@ cont { } lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31631,7 +31631,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31655,7 +31655,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31679,7 +31679,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -31931,7 +31931,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -31955,7 +31955,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -31979,7 +31979,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -32002,7 +32002,7 @@ cont { scale: 14 lines { width: 1.8 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -32025,7 +32025,7 @@ cont { scale: 15 lines { width: 2.5 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -32048,7 +32048,7 @@ cont { scale: 16 lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32070,7 +32070,7 @@ cont { scale: 17 lines { width: 4.7 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32092,7 +32092,7 @@ cont { scale: 18 lines { width: 6.4 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32114,7 +32114,7 @@ cont { scale: 19 lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32136,7 +32136,7 @@ cont { scale: 20 lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32161,7 +32161,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -32185,7 +32185,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -32209,7 +32209,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -32244,7 +32244,7 @@ cont { } lines { width: 1.8 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -32279,7 +32279,7 @@ cont { } lines { width: 2.5 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -32314,7 +32314,7 @@ cont { } lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32348,7 +32348,7 @@ cont { } lines { width: 4.7 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32382,7 +32382,7 @@ cont { } lines { width: 6.4 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32416,7 +32416,7 @@ cont { } lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32450,7 +32450,7 @@ cont { } lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32475,7 +32475,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -32499,7 +32499,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -32523,7 +32523,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -32876,7 +32876,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -32886,7 +32886,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32903,7 +32903,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -32920,7 +32920,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -32943,7 +32943,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -32965,7 +32965,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32987,7 +32987,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33009,7 +33009,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33031,7 +33031,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33056,7 +33056,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33066,7 +33066,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33083,7 +33083,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33100,7 +33100,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33123,7 +33123,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -33145,7 +33145,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33167,7 +33167,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33189,7 +33189,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33211,7 +33211,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33236,7 +33236,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33246,7 +33246,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33275,7 +33275,7 @@ cont { } lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33304,7 +33304,7 @@ cont { } lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33339,7 +33339,7 @@ cont { } lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -33373,7 +33373,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33407,7 +33407,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33441,7 +33441,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33475,7 +33475,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33500,7 +33500,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33510,7 +33510,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33527,7 +33527,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33544,7 +33544,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33577,7 +33577,7 @@ cont { } lines { width: 3.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -33609,7 +33609,7 @@ cont { } lines { width: 4.7 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -33641,7 +33641,7 @@ cont { } lines { width: 6.4 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -33673,7 +33673,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -33705,7 +33705,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -33847,7 +33847,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33857,7 +33857,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33866,7 +33866,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33883,7 +33883,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -33900,7 +33900,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -33916,7 +33916,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33932,7 +33932,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33948,7 +33948,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33964,7 +33964,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33983,7 +33983,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33993,7 +33993,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -34002,7 +34002,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -34019,7 +34019,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -34048,7 +34048,7 @@ cont { } lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -34076,7 +34076,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34104,7 +34104,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34132,7 +34132,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34160,7 +34160,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34179,7 +34179,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -34189,7 +34189,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -34198,7 +34198,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -34215,7 +34215,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -34232,7 +34232,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -34248,7 +34248,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34264,7 +34264,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34280,7 +34280,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34296,7 +34296,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -34315,7 +34315,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34333,7 +34333,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34351,7 +34351,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34375,7 +34375,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -34398,7 +34398,7 @@ cont { scale: 14 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34421,7 +34421,7 @@ cont { scale: 15 lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34444,7 +34444,7 @@ cont { scale: 16 lines { width: 5.0 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34466,7 +34466,7 @@ cont { scale: 17 lines { width: 6.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34488,7 +34488,7 @@ cont { scale: 18 lines { width: 9.4 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34510,7 +34510,7 @@ cont { scale: 19 lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34532,7 +34532,7 @@ cont { scale: 20 lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34557,7 +34557,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34575,7 +34575,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34593,7 +34593,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34617,7 +34617,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -34652,7 +34652,7 @@ cont { } lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34687,7 +34687,7 @@ cont { } lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34722,7 +34722,7 @@ cont { } lines { width: 5.0 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34756,7 +34756,7 @@ cont { } lines { width: 6.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34790,7 +34790,7 @@ cont { } lines { width: 9.4 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34824,7 +34824,7 @@ cont { } lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34858,7 +34858,7 @@ cont { } lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34883,7 +34883,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34901,7 +34901,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34919,7 +34919,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34943,7 +34943,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -34966,7 +34966,7 @@ cont { scale: 14 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34989,7 +34989,7 @@ cont { scale: 15 lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -35175,7 +35175,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -35184,7 +35183,7 @@ cont { scale: 14 lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35193,7 +35192,7 @@ cont { scale: 15 lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35202,7 +35201,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35218,7 +35217,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35234,7 +35233,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35250,7 +35249,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35266,7 +35265,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35285,7 +35284,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -35306,7 +35304,7 @@ cont { } lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35327,7 +35325,7 @@ cont { } lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35348,7 +35346,7 @@ cont { } lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35376,7 +35374,7 @@ cont { } lines { width: 4.7 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35404,7 +35402,7 @@ cont { } lines { width: 6.4 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35432,7 +35430,7 @@ cont { } lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35460,7 +35458,7 @@ cont { } lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35479,7 +35477,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -35488,7 +35485,7 @@ cont { scale: 14 lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35497,7 +35494,7 @@ cont { scale: 15 lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35639,7 +35636,7 @@ cont { scale: 13 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35648,7 +35645,7 @@ cont { scale: 14 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35657,7 +35654,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35666,7 +35663,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35682,7 +35679,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35698,7 +35695,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35714,7 +35711,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35730,7 +35727,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35749,7 +35746,7 @@ cont { scale: 13 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35758,7 +35755,7 @@ cont { scale: 14 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35767,7 +35764,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35776,7 +35773,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35792,7 +35789,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35808,7 +35805,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35824,7 +35821,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35840,7 +35837,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35859,7 +35856,7 @@ cont { scale: 13 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35868,7 +35865,7 @@ cont { scale: 14 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35877,7 +35874,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -35898,7 +35895,7 @@ cont { } lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35926,7 +35923,7 @@ cont { } lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35954,7 +35951,7 @@ cont { } lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -35982,7 +35979,7 @@ cont { } lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36010,7 +36007,7 @@ cont { } lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36029,7 +36026,7 @@ cont { scale: 15 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36045,7 +36042,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36061,7 +36058,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36077,7 +36074,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36093,7 +36090,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36109,7 +36106,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36128,7 +36125,7 @@ cont { scale: 14 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -36137,7 +36134,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -36146,7 +36143,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36162,7 +36159,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36178,7 +36175,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36194,7 +36191,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36210,7 +36207,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36229,7 +36226,7 @@ cont { scale: 13 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -36238,7 +36235,7 @@ cont { scale: 14 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -36247,7 +36244,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -36256,7 +36253,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36272,7 +36269,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36288,7 +36285,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36304,7 +36301,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36320,7 +36317,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -39358,7 +39355,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1727177511 + color: 1727174424 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39368,7 +39365,7 @@ cont { scale: 7 lines { width: 0.9 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39378,7 +39375,7 @@ cont { scale: 8 lines { width: 1.1 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39388,7 +39385,7 @@ cont { scale: 9 lines { width: 1.2 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39398,7 +39395,7 @@ cont { scale: 10 lines { width: 1.5 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39422,7 +39419,7 @@ cont { scale: 11 lines { width: 1.7 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39446,7 +39443,7 @@ cont { scale: 12 lines { width: 1.9 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39470,7 +39467,7 @@ cont { scale: 13 lines { width: 2.8 - color: 452109095 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39493,7 +39490,7 @@ cont { scale: 14 lines { width: 3.8 - color: 452109095 + color: 452107824 priority: 310 cap: BUTTCAP } @@ -39516,7 +39513,7 @@ cont { scale: 15 lines { width: 4.4 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39539,7 +39536,7 @@ cont { scale: 16 lines { width: 6.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39561,7 +39558,7 @@ cont { scale: 17 lines { width: 8.2 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39583,7 +39580,7 @@ cont { scale: 18 lines { width: 11.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39605,7 +39602,7 @@ cont { scale: 19 lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39627,7 +39624,7 @@ cont { scale: 20 lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39652,7 +39649,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1727177511 + color: 1727174424 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39662,7 +39659,7 @@ cont { scale: 7 lines { width: 0.9 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39672,7 +39669,7 @@ cont { scale: 8 lines { width: 1.1 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39682,7 +39679,7 @@ cont { scale: 9 lines { width: 1.2 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39692,7 +39689,7 @@ cont { scale: 10 lines { width: 1.5 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39716,7 +39713,7 @@ cont { scale: 11 lines { width: 1.7 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39740,7 +39737,7 @@ cont { scale: 12 lines { width: 1.9 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39776,7 +39773,7 @@ cont { } lines { width: 2.8 - color: 452109095 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39811,7 +39808,7 @@ cont { } lines { width: 3.8 - color: 452109095 + color: 452107824 priority: 310 cap: BUTTCAP } @@ -39846,7 +39843,7 @@ cont { } lines { width: 4.4 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39881,7 +39878,7 @@ cont { } lines { width: 6.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39915,7 +39912,7 @@ cont { } lines { width: 8.2 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39949,7 +39946,7 @@ cont { } lines { width: 11.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39983,7 +39980,7 @@ cont { } lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -40017,7 +40014,7 @@ cont { } lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -40042,7 +40039,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1727177511 + color: 1727174424 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -40052,7 +40049,7 @@ cont { scale: 7 lines { width: 0.9 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -40062,7 +40059,7 @@ cont { scale: 8 lines { width: 1.1 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -40072,7 +40069,7 @@ cont { scale: 9 lines { width: 1.2 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -40082,7 +40079,7 @@ cont { scale: 10 lines { width: 1.5 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -40106,7 +40103,7 @@ cont { scale: 11 lines { width: 1.7 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -44470,7 +44467,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 446405263 dashdot { dd: 3.0 @@ -50158,35 +50155,35 @@ cont { element { scale: 12 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 13 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 14 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 15 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 16 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50198,7 +50195,7 @@ cont { element { scale: 17 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50218,7 +50215,7 @@ cont { element { scale: 18 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50238,7 +50235,7 @@ cont { element { scale: 19 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50258,7 +50255,7 @@ cont { element { scale: 20 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50281,49 +50278,49 @@ cont { element { scale: 10 area { - color: 14820640 + color: 15022389 priority: 20 } } element { scale: 11 area { - color: 14820640 + color: 15022389 priority: 20 } } element { scale: 12 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 13 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 14 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 15 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 16 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50335,7 +50332,7 @@ cont { element { scale: 17 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50355,7 +50352,7 @@ cont { element { scale: 18 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50375,7 +50372,7 @@ cont { element { scale: 19 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50395,7 +50392,7 @@ cont { element { scale: 20 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -76305,7 +76302,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -76322,7 +76319,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76339,7 +76336,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76356,7 +76353,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76373,7 +76370,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76450,7 +76447,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -76479,7 +76476,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76508,7 +76505,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76537,7 +76534,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76566,7 +76563,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -77439,7 +77436,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -77456,7 +77453,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -77473,7 +77470,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -77490,7 +77487,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -77507,7 +77504,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -78197,7 +78194,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -78226,7 +78223,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -78255,7 +78252,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -78284,7 +78281,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -78313,7 +78310,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -79515,7 +79512,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -79532,7 +79529,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79549,7 +79546,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79566,7 +79563,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79638,7 +79635,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -79667,7 +79664,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79696,7 +79693,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79725,7 +79722,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79781,7 +79778,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -79808,7 +79805,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -79835,7 +79832,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -79862,7 +79859,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -79918,7 +79915,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -79935,7 +79932,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79952,7 +79949,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -79969,7 +79966,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -80051,7 +80048,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -80080,7 +80077,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -80109,7 +80106,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -80138,7 +80135,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -80214,7 +80211,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -80241,7 +80238,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -80268,7 +80265,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -80295,7 +80292,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -81153,7 +81150,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 4.6 @@ -81180,7 +81177,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -81207,7 +81204,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -81234,7 +81231,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -81261,7 +81258,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -81335,7 +81332,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -81352,7 +81349,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -81369,7 +81366,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -81386,7 +81383,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -81498,7 +81495,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -81527,7 +81524,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -81556,7 +81553,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -81585,7 +81582,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -81679,7 +81676,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -81706,7 +81703,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -81733,7 +81730,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -81760,7 +81757,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -103579,7 +103576,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -103596,7 +103593,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -103613,7 +103610,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -103630,7 +103627,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -103647,7 +103644,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -103724,7 +103721,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -103753,7 +103750,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -103782,7 +103779,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -103811,7 +103808,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -103840,7 +103837,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index b68b28402..8f22df154 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 a3b075bb0..75d37754a 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -15502,7 +15502,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 443115881 dashdot { dd: 3.0 @@ -22554,8 +22554,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1718500679 - priority: 220 + color: 2154708295 + priority: 218 cap: BUTTCAP } } @@ -22563,8 +22563,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1299070279 - priority: 220 + color: 1718500679 + priority: 218 cap: BUTTCAP } } @@ -22573,7 +22573,7 @@ cont { lines { width: 1.2 color: 862862663 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -22590,7 +22590,7 @@ cont { lines { width: 1.3 color: 443432263 - priority: 220 + priority: 218 } path_text { primary { @@ -22606,7 +22606,7 @@ cont { lines { width: 1.4 color: 443432263 - priority: 220 + priority: 218 } path_text { primary { @@ -22622,7 +22622,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 220 + priority: 218 } path_text { primary { @@ -22638,7 +22638,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 220 + priority: 218 } path_text { primary { @@ -22654,7 +22654,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 220 + priority: 218 } path_text { primary { @@ -22672,8 +22672,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1718500679 - priority: 220 + color: 2154708295 + priority: 218 cap: BUTTCAP } } @@ -22681,8 +22681,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1299070279 - priority: 220 + color: 1718500679 + priority: 218 cap: BUTTCAP } } @@ -22697,7 +22697,7 @@ cont { lines { width: 1.2 color: 862862663 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -22720,7 +22720,7 @@ cont { lines { width: 1.3 color: 443432263 - priority: 220 + priority: 218 } path_text { primary { @@ -22748,7 +22748,7 @@ cont { lines { width: 1.4 color: 443432263 - priority: 220 + priority: 218 } path_text { primary { @@ -22776,7 +22776,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 220 + priority: 218 } path_text { primary { @@ -22804,7 +22804,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 220 + priority: 218 } path_text { primary { @@ -22832,7 +22832,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 220 + priority: 218 } path_text { primary { @@ -22850,8 +22850,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1718500679 - priority: 220 + color: 2154708295 + priority: 218 cap: BUTTCAP } } @@ -22859,8 +22859,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1299070279 - priority: 220 + color: 1718500679 + priority: 218 cap: BUTTCAP } } @@ -22869,7 +22869,7 @@ cont { lines { width: 1.2 color: 862862663 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -22886,7 +22886,7 @@ cont { lines { width: 1.3 color: 443432263 - priority: 220 + priority: 218 } path_text { primary { @@ -22902,7 +22902,7 @@ cont { lines { width: 1.4 color: 443432263 - priority: 220 + priority: 218 } lines { width: 4.8 @@ -22934,7 +22934,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 220 + priority: 218 } lines { width: 7.2 @@ -22966,7 +22966,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 220 + priority: 218 } lines { width: 8.6 @@ -22998,7 +22998,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 220 + priority: 218 } lines { width: 8.6 @@ -23341,19 +23341,19 @@ cont { element { scale: 15 lines { - width: 1.2 - color: 1299070279 + width: 1.5 + color: 862862663 dashdot { dd: 7.0 dd: 9.6 } - priority: 190 + priority: 220 cap: BUTTCAP } lines { width: 1.5 color: 575358531 - priority: 180 + priority: 219 cap: BUTTCAP } path_text { @@ -23362,24 +23362,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 16 lines { - width: 1.3 - color: 1299070279 + width: 2.0 + color: 862862663 dashdot { dd: 7.5 dd: 9.5 } - priority: 190 + priority: 220 } lines { width: 2.0 color: 575358531 - priority: 180 + priority: 219 } path_text { primary { @@ -23387,24 +23387,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 17 lines { - width: 1.4 - color: 7224647 + width: 2.4 + color: 443432263 dashdot { dd: 8.0 dd: 9.4 } - priority: 190 + priority: 220 } lines { width: 2.4 color: 441140803 - priority: 180 + priority: 219 } path_text { primary { @@ -23412,24 +23412,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 18 lines { - width: 1.6 + width: 3.2 color: 7224647 dashdot { dd: 8.5 dd: 9.3 } - priority: 190 + priority: 220 } lines { width: 3.2 color: 4933187 - priority: 180 + priority: 219 } path_text { primary { @@ -23437,24 +23437,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 19 lines { - width: 1.8 + width: 4.2 color: 7224647 dashdot { dd: 9.0 dd: 9.2 } - priority: 190 + priority: 220 } lines { width: 4.2 color: 4933187 - priority: 180 + priority: 219 } path_text { primary { @@ -23462,24 +23462,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 20 lines { - width: 1.8 + width: 4.2 color: 7224647 dashdot { dd: 9.0 dd: 9.2 } - priority: 190 + priority: 220 } lines { width: 4.2 color: 4933187 - priority: 180 + priority: 219 } path_text { primary { @@ -23487,7 +23487,7 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } } @@ -24681,7 +24681,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 3874837 priority: 310 join: BEVELJOIN @@ -24691,7 +24691,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 3874837 priority: 310 join: BEVELJOIN @@ -24701,7 +24701,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 3874837 priority: 310 join: BEVELJOIN @@ -24711,7 +24711,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 3874837 priority: 310 join: BEVELJOIN @@ -24721,8 +24721,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1295720469 + width: 1.9 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -24746,8 +24746,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1295720469 + width: 2.0 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -24771,8 +24771,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 1295720469 + width: 2.1 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -24796,7 +24796,7 @@ cont { element { scale: 13 lines { - width: 2.9 + width: 3.0 color: 658186261 priority: 310 cap: BUTTCAP @@ -24986,7 +24986,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 3874837 priority: 310 join: BEVELJOIN @@ -24996,7 +24996,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 3874837 priority: 310 join: BEVELJOIN @@ -25006,7 +25006,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 3874837 priority: 310 join: BEVELJOIN @@ -25016,7 +25016,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 3874837 priority: 310 join: BEVELJOIN @@ -25026,8 +25026,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1295720469 + width: 1.9 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25051,8 +25051,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1295720469 + width: 2.0 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25076,8 +25076,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 1295720469 + width: 2.1 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25101,19 +25101,19 @@ cont { element { scale: 13 lines { - width: 6.6 + width: 6.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.2 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.9 + width: 3.0 color: 658186261 priority: 310 cap: BUTTCAP @@ -25387,7 +25387,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 3874837 priority: 310 join: BEVELJOIN @@ -25397,7 +25397,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 3874837 priority: 310 join: BEVELJOIN @@ -25407,7 +25407,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 3874837 priority: 310 join: BEVELJOIN @@ -25417,7 +25417,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 3874837 priority: 310 join: BEVELJOIN @@ -25427,8 +25427,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1295720469 + width: 1.9 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25452,8 +25452,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1295720469 + width: 2.0 + color: 3874837 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25477,7 +25477,7 @@ cont { element { scale: 12 lines { - width: 3.0 + width: 3.1 color: 1291845632 dashdot { dd: 2.0 @@ -25487,7 +25487,7 @@ cont { cap: BUTTCAP } lines { - width: 2.0 + width: 2.1 color: 438572045 priority: 310 join: BEVELJOIN @@ -25512,7 +25512,7 @@ cont { element { scale: 13 lines { - width: 4.5 + width: 4.6 color: 1291845632 dashdot { dd: 4.0 @@ -25522,7 +25522,7 @@ cont { cap: BUTTCAP } lines { - width: 2.9 + width: 3.0 color: 858002445 priority: 310 cap: BUTTCAP @@ -26942,7 +26942,7 @@ cont { scale: 14 lines { width: 1.1 - color: 1299070279 + color: 1718500679 dashdot { dd: 7.0 dd: 9.6 @@ -26965,7 +26965,7 @@ cont { scale: 15 lines { width: 1.2 - color: 862862663 + color: 7224647 dashdot { dd: 7.0 dd: 9.6 @@ -33070,7 +33070,6 @@ cont { scale: 13 lines { width: 1.3 - color: 5717555 priority: 224 cap: BUTTCAP } @@ -33180,7 +33179,6 @@ cont { scale: 13 lines { width: 1.3 - color: 5717555 priority: 224 cap: BUTTCAP } @@ -33374,7 +33372,6 @@ cont { scale: 13 lines { width: 1.3 - color: 5717555 priority: 224 cap: BUTTCAP } @@ -36769,7 +36766,7 @@ cont { scale: 10 lines { width: 1.5 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36794,7 +36791,7 @@ cont { scale: 11 lines { width: 1.7 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36819,7 +36816,7 @@ cont { scale: 12 lines { width: 1.9 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36844,7 +36841,7 @@ cont { scale: 13 lines { width: 2.8 - color: 441002267 + color: 4794651 priority: 310 cap: BUTTCAP } @@ -37074,7 +37071,7 @@ cont { scale: 10 lines { width: 1.5 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37099,7 +37096,7 @@ cont { scale: 11 lines { width: 1.7 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37124,7 +37121,7 @@ cont { scale: 12 lines { width: 1.9 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37161,7 +37158,7 @@ cont { } lines { width: 2.8 - color: 441002267 + color: 4794651 priority: 310 cap: BUTTCAP } @@ -37475,7 +37472,7 @@ cont { scale: 10 lines { width: 1.5 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37500,7 +37497,7 @@ cont { scale: 11 lines { width: 1.7 - color: 860432667 + color: 4794651 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -41907,7 +41904,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 443115881 dashdot { dd: 3.0 @@ -71411,7 +71408,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -71428,7 +71425,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71445,7 +71442,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71462,7 +71459,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71479,7 +71476,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71556,7 +71553,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -71585,7 +71582,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71614,7 +71611,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71643,7 +71640,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71672,7 +71669,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -72445,7 +72442,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -72462,7 +72459,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -72479,7 +72476,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -72496,7 +72493,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -72513,7 +72510,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -73163,7 +73160,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -73192,7 +73189,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -73221,7 +73218,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -73250,7 +73247,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -73279,7 +73276,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -74473,7 +74470,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74490,7 +74487,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74507,7 +74504,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74524,7 +74521,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74576,7 +74573,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74605,7 +74602,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74634,7 +74631,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74663,7 +74660,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74701,7 +74698,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -74728,7 +74725,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74755,7 +74752,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74782,7 +74779,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74829,7 +74826,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74846,7 +74843,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74863,7 +74860,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74880,7 +74877,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74947,7 +74944,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74976,7 +74973,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -75005,7 +75002,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -75034,7 +75031,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -75091,7 +75088,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -75118,7 +75115,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -75145,7 +75142,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -75172,7 +75169,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -76020,7 +76017,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 4.6 @@ -76047,7 +76044,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -76074,7 +76071,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -76101,7 +76098,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -76128,7 +76125,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -76193,7 +76190,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76210,7 +76207,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76227,7 +76224,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76244,7 +76241,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76341,7 +76338,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76370,7 +76367,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76399,7 +76396,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76428,7 +76425,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76513,7 +76510,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -76540,7 +76537,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -76567,7 +76564,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -76594,7 +76591,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -98413,7 +98410,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -98430,7 +98427,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98447,7 +98444,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98464,7 +98461,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98481,7 +98478,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98558,7 +98555,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -98587,7 +98584,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98616,7 +98613,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98645,7 +98642,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98674,7 +98671,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index 5170fb3a4..4f5a59ed9 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 462cc2c66..0ff3ce2c2 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -2820,7 +2820,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2583691263 + color: 2583691006 priority: 70 join: BEVELJOIN cap: BUTTCAP @@ -2830,7 +2830,7 @@ cont { scale: 13 lines { width: 1.5 - color: 2164260863 + color: 2164260606 priority: 70 cap: BUTTCAP } @@ -2839,7 +2839,7 @@ cont { scale: 14 lines { width: 2.4 - color: 1308622847 + color: 1308622590 priority: 70 cap: BUTTCAP } @@ -2848,7 +2848,7 @@ cont { scale: 15 lines { width: 2.4 - color: 1308622847 + color: 1308622590 priority: 70 cap: BUTTCAP } @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2900,7 +2900,7 @@ cont { scale: 14 lines { width: 0.6 - color: 2583691263 + color: 2583691006 priority: 70 cap: BUTTCAP } @@ -2909,7 +2909,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 cap: BUTTCAP } @@ -2918,7 +2918,7 @@ cont { scale: 16 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2926,7 +2926,7 @@ cont { scale: 17 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2934,7 +2934,7 @@ cont { scale: 18 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2942,7 +2942,7 @@ cont { scale: 19 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2950,7 +2950,7 @@ cont { scale: 20 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -15502,7 +15502,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 446405263 dashdot { dd: 3.0 @@ -22128,7 +22128,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -22137,7 +22137,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22153,7 +22153,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22169,7 +22169,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22185,7 +22185,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22201,7 +22201,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22220,7 +22220,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -22229,7 +22229,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22245,7 +22245,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22261,7 +22261,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22277,7 +22277,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22293,7 +22293,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22312,7 +22312,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -22321,7 +22321,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22337,7 +22337,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22353,7 +22353,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22369,7 +22369,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22385,7 +22385,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -22554,8 +22554,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -22563,8 +22563,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 - priority: 220 + color: 1717591806 + priority: 218 cap: BUTTCAP } } @@ -22573,7 +22573,7 @@ cont { lines { width: 1.2 color: 861953790 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -22590,7 +22590,7 @@ cont { lines { width: 1.3 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -22606,7 +22606,7 @@ cont { lines { width: 1.4 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -22622,7 +22622,7 @@ cont { lines { width: 1.6 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -22638,7 +22638,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -22654,7 +22654,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -22672,8 +22672,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -22681,8 +22681,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 - priority: 220 + color: 1717591806 + priority: 218 cap: BUTTCAP } } @@ -22697,7 +22697,7 @@ cont { lines { width: 1.2 color: 861953790 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -22720,7 +22720,7 @@ cont { lines { width: 1.3 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -22748,7 +22748,7 @@ cont { lines { width: 1.4 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -22776,7 +22776,7 @@ cont { lines { width: 1.6 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -22804,7 +22804,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -22832,7 +22832,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } path_text { primary { @@ -22850,8 +22850,8 @@ cont { scale: 13 lines { width: 0.9 - color: 1717591806 - priority: 220 + color: 2153799422 + priority: 218 cap: BUTTCAP } } @@ -22859,8 +22859,8 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 - priority: 220 + color: 1717591806 + priority: 218 cap: BUTTCAP } } @@ -22869,7 +22869,7 @@ cont { lines { width: 1.2 color: 861953790 - priority: 220 + priority: 218 cap: BUTTCAP } path_text { @@ -22886,7 +22886,7 @@ cont { lines { width: 1.3 color: 442523390 - priority: 220 + priority: 218 } path_text { primary { @@ -22902,7 +22902,7 @@ cont { lines { width: 1.4 color: 442523390 - priority: 220 + priority: 218 } lines { width: 4.8 @@ -22934,7 +22934,7 @@ cont { lines { width: 1.6 color: 6315774 - priority: 220 + priority: 218 } lines { width: 7.2 @@ -22966,7 +22966,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } lines { width: 8.6 @@ -22998,7 +22998,7 @@ cont { lines { width: 1.8 color: 6315774 - priority: 220 + priority: 218 } lines { width: 8.6 @@ -23341,19 +23341,19 @@ cont { element { scale: 15 lines { - width: 1.2 - color: 1298161406 + width: 1.5 + color: 861953790 dashdot { dd: 7.0 dd: 9.6 } - priority: 190 + priority: 220 cap: BUTTCAP } lines { width: 1.5 color: 587201269 - priority: 180 + priority: 219 cap: BUTTCAP } path_text { @@ -23362,24 +23362,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 16 lines { - width: 1.3 - color: 1298161406 + width: 2.0 + color: 861953790 dashdot { dd: 7.5 dd: 9.5 } - priority: 190 + priority: 220 } lines { width: 2.0 color: 587201269 - priority: 180 + priority: 219 } path_text { primary { @@ -23387,24 +23387,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 17 lines { - width: 1.4 - color: 6315774 + width: 2.4 + color: 442523390 dashdot { dd: 8.0 dd: 9.4 } - priority: 190 + priority: 220 } lines { width: 2.4 color: 452983541 - priority: 180 + priority: 219 } path_text { primary { @@ -23412,24 +23412,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 18 lines { - width: 1.6 + width: 3.2 color: 6315774 dashdot { dd: 8.5 dd: 9.3 } - priority: 190 + priority: 220 } lines { width: 3.2 color: 16775925 - priority: 180 + priority: 219 } path_text { primary { @@ -23437,24 +23437,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 19 lines { - width: 1.8 + width: 4.2 color: 6315774 dashdot { dd: 9.0 dd: 9.2 } - priority: 190 + priority: 220 } lines { width: 4.2 color: 16775925 - priority: 180 + priority: 219 } path_text { primary { @@ -23462,24 +23462,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 20 lines { - width: 1.8 + width: 4.2 color: 6315774 dashdot { dd: 9.0 dd: 9.2 } - priority: 190 + priority: 220 } lines { width: 4.2 color: 16775925 - priority: 180 + priority: 219 } path_text { primary { @@ -23487,7 +23487,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } } @@ -24224,7 +24224,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -24234,7 +24234,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -24243,7 +24243,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -24260,7 +24260,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -24277,7 +24277,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -24293,7 +24293,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24309,7 +24309,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24325,7 +24325,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24341,7 +24341,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24360,7 +24360,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -24370,7 +24370,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -24379,7 +24379,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -24396,7 +24396,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -24413,7 +24413,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -24429,7 +24429,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24445,7 +24445,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24461,7 +24461,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24477,7 +24477,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -24496,7 +24496,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -24506,7 +24506,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -24515,7 +24515,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -24532,7 +24532,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -24559,7 +24559,7 @@ cont { } lines { width: 3.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -24585,7 +24585,7 @@ cont { } lines { width: 4.7 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -24611,7 +24611,7 @@ cont { } lines { width: 6.4 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -24637,7 +24637,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -24663,7 +24663,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -24681,7 +24681,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 16087552 priority: 310 join: BEVELJOIN @@ -24691,7 +24691,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -24701,7 +24701,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -24711,7 +24711,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -24721,8 +24721,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1307609088 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -24745,8 +24745,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1307609088 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -24769,8 +24769,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 1307609088 + width: 2.1 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -24793,8 +24793,8 @@ cont { element { scale: 13 lines { - width: 2.9 - color: 670074880 + width: 3.0 + color: 670398976 priority: 310 cap: BUTTCAP } @@ -24975,7 +24975,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 16087552 priority: 310 join: BEVELJOIN @@ -24985,7 +24985,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -24995,7 +24995,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -25005,7 +25005,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -25015,8 +25015,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1307609088 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25039,8 +25039,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1307609088 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25063,8 +25063,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 1307609088 + width: 2.1 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25087,20 +25087,20 @@ cont { element { scale: 13 lines { - width: 6.6 + width: 6.8 color: 1306645694 priority: 140 cap: BUTTCAP } lines { - width: 6.2 + width: 6.4 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 2.9 - color: 670074880 + width: 3.0 + color: 670398976 priority: 310 cap: BUTTCAP } @@ -25365,7 +25365,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 16087552 priority: 310 join: BEVELJOIN @@ -25375,7 +25375,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -25385,7 +25385,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -25395,7 +25395,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -25405,8 +25405,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 1307609088 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25429,8 +25429,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 1307609088 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -25453,7 +25453,7 @@ cont { element { scale: 12 lines { - width: 3.0 + width: 3.1 color: 1300267136 dashdot { dd: 2.0 @@ -25463,7 +25463,7 @@ cont { cap: BUTTCAP } lines { - width: 2.0 + width: 2.1 color: 452109632 priority: 310 join: BEVELJOIN @@ -25487,7 +25487,7 @@ cont { element { scale: 13 lines { - width: 4.5 + width: 4.6 color: 1300267136 dashdot { dd: 4.0 @@ -25497,7 +25497,7 @@ cont { cap: BUTTCAP } lines { - width: 2.9 + width: 3.0 color: 871540032 priority: 310 cap: BUTTCAP @@ -26876,7 +26876,7 @@ cont { scale: 14 lines { width: 1.1 - color: 1298161406 + color: 1717591806 dashdot { dd: 7.0 dd: 9.6 @@ -26899,7 +26899,7 @@ cont { scale: 15 lines { width: 1.2 - color: 861953790 + color: 6315774 dashdot { dd: 7.0 dd: 9.6 @@ -28544,7 +28544,7 @@ cont { } lines { width: 2.4 - color: 1308622847 + color: 1308622590 dashdot { dd: 8.0 dd: 1.5 @@ -28574,7 +28574,7 @@ cont { } lines { width: 3.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 9.0 dd: 1.8 @@ -28604,7 +28604,7 @@ cont { } lines { width: 4.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 11.0 dd: 2.3 @@ -28634,7 +28634,7 @@ cont { } lines { width: 5.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 13.0 dd: 2.7 @@ -28664,7 +28664,7 @@ cont { } lines { width: 5.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 13.0 dd: 2.7 @@ -28731,7 +28731,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -28755,7 +28755,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -28779,7 +28779,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -28802,7 +28802,7 @@ cont { scale: 14 lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -28825,7 +28825,7 @@ cont { scale: 15 lines { width: 3.8 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -28848,7 +28848,7 @@ cont { scale: 16 lines { width: 5.0 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -28870,7 +28870,7 @@ cont { scale: 17 lines { width: 6.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -28892,7 +28892,7 @@ cont { scale: 18 lines { width: 9.4 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -28914,7 +28914,7 @@ cont { scale: 19 lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -28936,7 +28936,7 @@ cont { scale: 20 lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -29005,7 +29005,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -29029,7 +29029,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -29053,7 +29053,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -29088,7 +29088,7 @@ cont { } lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -29123,7 +29123,7 @@ cont { } lines { width: 3.8 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -29158,7 +29158,7 @@ cont { } lines { width: 5.0 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -29192,7 +29192,7 @@ cont { } lines { width: 6.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -29226,7 +29226,7 @@ cont { } lines { width: 9.4 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -29260,7 +29260,7 @@ cont { } lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -29294,7 +29294,7 @@ cont { } lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -29363,7 +29363,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -29387,7 +29387,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -29411,7 +29411,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -29663,7 +29663,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -29687,7 +29687,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -29711,7 +29711,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -29734,7 +29734,7 @@ cont { scale: 14 lines { width: 1.8 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -29757,7 +29757,7 @@ cont { scale: 15 lines { width: 2.5 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -29780,7 +29780,7 @@ cont { scale: 16 lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -29802,7 +29802,7 @@ cont { scale: 17 lines { width: 4.7 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -29824,7 +29824,7 @@ cont { scale: 18 lines { width: 6.4 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -29846,7 +29846,7 @@ cont { scale: 19 lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -29868,7 +29868,7 @@ cont { scale: 20 lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -29893,7 +29893,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -29917,7 +29917,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -29941,7 +29941,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -29976,7 +29976,7 @@ cont { } lines { width: 1.8 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -30011,7 +30011,7 @@ cont { } lines { width: 2.5 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -30046,7 +30046,7 @@ cont { } lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -30080,7 +30080,7 @@ cont { } lines { width: 4.7 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -30114,7 +30114,7 @@ cont { } lines { width: 6.4 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -30148,7 +30148,7 @@ cont { } lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -30182,7 +30182,7 @@ cont { } lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -30207,7 +30207,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -30231,7 +30231,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -30255,7 +30255,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -30608,7 +30608,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -30618,7 +30618,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -30635,7 +30635,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -30652,7 +30652,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -30675,7 +30675,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -30697,7 +30697,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30719,7 +30719,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30741,7 +30741,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30763,7 +30763,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30788,7 +30788,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -30798,7 +30798,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -30815,7 +30815,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -30832,7 +30832,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -30855,7 +30855,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -30877,7 +30877,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30899,7 +30899,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30921,7 +30921,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30943,7 +30943,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -30968,7 +30968,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -30978,7 +30978,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -31007,7 +31007,7 @@ cont { } lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31036,7 +31036,7 @@ cont { } lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31071,7 +31071,7 @@ cont { } lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -31105,7 +31105,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31139,7 +31139,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31173,7 +31173,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31207,7 +31207,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31232,7 +31232,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31242,7 +31242,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -31259,7 +31259,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31276,7 +31276,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31309,7 +31309,7 @@ cont { } lines { width: 3.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -31341,7 +31341,7 @@ cont { } lines { width: 4.7 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -31373,7 +31373,7 @@ cont { } lines { width: 6.4 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -31405,7 +31405,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -31437,7 +31437,7 @@ cont { } lines { width: 8.2 - color: 1308622847 + color: 1308622590 priority: 230 } path_text { @@ -31562,7 +31562,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31572,7 +31572,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -31581,7 +31581,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31598,7 +31598,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31615,7 +31615,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -31631,7 +31631,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31647,7 +31647,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31663,7 +31663,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31679,7 +31679,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31698,7 +31698,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31708,7 +31708,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -31717,7 +31717,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31734,7 +31734,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31763,7 +31763,7 @@ cont { } lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -31791,7 +31791,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31819,7 +31819,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31847,7 +31847,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31875,7 +31875,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31894,7 +31894,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31904,7 +31904,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -31913,7 +31913,7 @@ cont { scale: 14 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31930,7 +31930,7 @@ cont { scale: 15 lines { width: 2.4 - color: 452984831 + color: 452984574 priority: 230 cap: BUTTCAP } @@ -31947,7 +31947,7 @@ cont { scale: 16 lines { width: 3.2 - color: 452984831 + color: 452984574 priority: 230 } path_text { @@ -31963,7 +31963,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31979,7 +31979,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -31995,7 +31995,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32011,7 +32011,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32030,7 +32030,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32048,7 +32048,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32066,7 +32066,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32090,7 +32090,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -32113,7 +32113,7 @@ cont { scale: 14 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -32136,7 +32136,7 @@ cont { scale: 15 lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -32159,7 +32159,7 @@ cont { scale: 16 lines { width: 5.0 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32181,7 +32181,7 @@ cont { scale: 17 lines { width: 6.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32203,7 +32203,7 @@ cont { scale: 18 lines { width: 9.4 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32225,7 +32225,7 @@ cont { scale: 19 lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32247,7 +32247,7 @@ cont { scale: 20 lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32272,7 +32272,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32290,7 +32290,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32308,7 +32308,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32332,7 +32332,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -32367,7 +32367,7 @@ cont { } lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -32402,7 +32402,7 @@ cont { } lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -32437,7 +32437,7 @@ cont { } lines { width: 5.0 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32471,7 +32471,7 @@ cont { } lines { width: 6.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32505,7 +32505,7 @@ cont { } lines { width: 9.4 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32539,7 +32539,7 @@ cont { } lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32573,7 +32573,7 @@ cont { } lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -32598,7 +32598,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32616,7 +32616,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32634,7 +32634,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32658,7 +32658,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -32681,7 +32681,7 @@ cont { scale: 14 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -32704,7 +32704,7 @@ cont { scale: 15 lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -32890,7 +32890,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -32899,7 +32898,7 @@ cont { scale: 14 lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -32908,7 +32907,7 @@ cont { scale: 15 lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -32917,7 +32916,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -32933,7 +32932,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -32949,7 +32948,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -32965,7 +32964,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -32981,7 +32980,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -33000,7 +32999,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -33021,7 +33019,7 @@ cont { } lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -33042,7 +33040,7 @@ cont { } lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -33063,7 +33061,7 @@ cont { } lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -33091,7 +33089,7 @@ cont { } lines { width: 4.7 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -33119,7 +33117,7 @@ cont { } lines { width: 6.4 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -33147,7 +33145,7 @@ cont { } lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -33175,7 +33173,7 @@ cont { } lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -33194,7 +33192,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -33203,7 +33200,7 @@ cont { scale: 14 lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -33212,7 +33209,7 @@ cont { scale: 15 lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -33354,7 +33351,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -33363,7 +33360,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33379,7 +33376,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33395,7 +33392,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33411,7 +33408,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33427,7 +33424,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33446,7 +33443,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -33455,7 +33452,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33471,7 +33468,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33487,7 +33484,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33503,7 +33500,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33519,7 +33516,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33538,7 +33535,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -33559,7 +33556,7 @@ cont { } lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33587,7 +33584,7 @@ cont { } lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33615,7 +33612,7 @@ cont { } lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33643,7 +33640,7 @@ cont { } lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33671,7 +33668,7 @@ cont { } lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33690,7 +33687,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33706,7 +33703,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33722,7 +33719,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33738,7 +33735,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33754,7 +33751,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33773,7 +33770,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -33782,7 +33779,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33798,7 +33795,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33814,7 +33811,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33830,7 +33827,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33846,7 +33843,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33865,7 +33862,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 222 cap: BUTTCAP } @@ -33874,7 +33871,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33890,7 +33887,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33906,7 +33903,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33922,7 +33919,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -33938,7 +33935,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 222 } path_text { @@ -36525,7 +36522,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1727177511 + color: 1727174424 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36535,7 +36532,7 @@ cont { scale: 7 lines { width: 0.9 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36545,7 +36542,7 @@ cont { scale: 8 lines { width: 1.1 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36555,7 +36552,7 @@ cont { scale: 9 lines { width: 1.2 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36565,7 +36562,7 @@ cont { scale: 10 lines { width: 1.5 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36589,7 +36586,7 @@ cont { scale: 11 lines { width: 1.7 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36613,7 +36610,7 @@ cont { scale: 12 lines { width: 1.9 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36637,7 +36634,7 @@ cont { scale: 13 lines { width: 2.8 - color: 452109095 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -36660,7 +36657,7 @@ cont { scale: 14 lines { width: 3.8 - color: 452109095 + color: 452107824 priority: 310 cap: BUTTCAP } @@ -36683,7 +36680,7 @@ cont { scale: 15 lines { width: 4.4 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -36706,7 +36703,7 @@ cont { scale: 16 lines { width: 6.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -36728,7 +36725,7 @@ cont { scale: 17 lines { width: 8.2 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -36750,7 +36747,7 @@ cont { scale: 18 lines { width: 11.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -36772,7 +36769,7 @@ cont { scale: 19 lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -36794,7 +36791,7 @@ cont { scale: 20 lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -36819,7 +36816,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1727177511 + color: 1727174424 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36829,7 +36826,7 @@ cont { scale: 7 lines { width: 0.9 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36839,7 +36836,7 @@ cont { scale: 8 lines { width: 1.1 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36849,7 +36846,7 @@ cont { scale: 9 lines { width: 1.2 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36859,7 +36856,7 @@ cont { scale: 10 lines { width: 1.5 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36883,7 +36880,7 @@ cont { scale: 11 lines { width: 1.7 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36907,7 +36904,7 @@ cont { scale: 12 lines { width: 1.9 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -36943,7 +36940,7 @@ cont { } lines { width: 2.8 - color: 452109095 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -36978,7 +36975,7 @@ cont { } lines { width: 3.8 - color: 452109095 + color: 452107824 priority: 310 cap: BUTTCAP } @@ -37013,7 +37010,7 @@ cont { } lines { width: 4.4 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -37048,7 +37045,7 @@ cont { } lines { width: 6.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -37082,7 +37079,7 @@ cont { } lines { width: 8.2 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -37116,7 +37113,7 @@ cont { } lines { width: 11.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -37150,7 +37147,7 @@ cont { } lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -37184,7 +37181,7 @@ cont { } lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -37209,7 +37206,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1727177511 + color: 1727174424 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37219,7 +37216,7 @@ cont { scale: 7 lines { width: 0.9 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37229,7 +37226,7 @@ cont { scale: 8 lines { width: 1.1 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37239,7 +37236,7 @@ cont { scale: 9 lines { width: 1.2 - color: 871406872 + color: 871536408 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37249,7 +37246,7 @@ cont { scale: 10 lines { width: 1.5 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -37273,7 +37270,7 @@ cont { scale: 11 lines { width: 1.7 - color: 871539495 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -41637,7 +41634,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 446405263 dashdot { dd: 3.0 @@ -47279,35 +47276,35 @@ cont { element { scale: 12 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 13 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 14 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 15 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 16 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47319,7 +47316,7 @@ cont { element { scale: 17 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47339,7 +47336,7 @@ cont { element { scale: 18 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47359,7 +47356,7 @@ cont { element { scale: 19 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47379,7 +47376,7 @@ cont { element { scale: 20 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47402,49 +47399,49 @@ cont { element { scale: 10 area { - color: 14820640 + color: 15022389 priority: 20 } } element { scale: 11 area { - color: 14820640 + color: 15022389 priority: 20 } } element { scale: 12 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 13 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 14 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 15 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 16 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47456,7 +47453,7 @@ cont { element { scale: 17 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47476,7 +47473,7 @@ cont { element { scale: 18 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47496,7 +47493,7 @@ cont { element { scale: 19 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -47516,7 +47513,7 @@ cont { element { scale: 20 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -71196,7 +71193,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -71213,7 +71210,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71230,7 +71227,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71247,7 +71244,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71264,7 +71261,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71341,7 +71338,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -71370,7 +71367,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71399,7 +71396,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71428,7 +71425,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -71457,7 +71454,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -72230,7 +72227,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -72247,7 +72244,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -72264,7 +72261,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -72281,7 +72278,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -72298,7 +72295,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -72948,7 +72945,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -72977,7 +72974,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -73006,7 +73003,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -73035,7 +73032,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -73064,7 +73061,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.0 @@ -74258,7 +74255,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74275,7 +74272,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74292,7 +74289,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74309,7 +74306,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74361,7 +74358,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74390,7 +74387,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74419,7 +74416,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74448,7 +74445,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74486,7 +74483,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -74513,7 +74510,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74540,7 +74537,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74567,7 +74564,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74614,7 +74611,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74631,7 +74628,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74648,7 +74645,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74665,7 +74662,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74732,7 +74729,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -74761,7 +74758,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74790,7 +74787,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74819,7 +74816,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -74876,7 +74873,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -74903,7 +74900,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74930,7 +74927,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -74957,7 +74954,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -75805,7 +75802,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 4.6 @@ -75832,7 +75829,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -75859,7 +75856,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -75886,7 +75883,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -75913,7 +75910,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.0 @@ -75978,7 +75975,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -75995,7 +75992,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76012,7 +76009,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76029,7 +76026,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76126,7 +76123,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -76155,7 +76152,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76184,7 +76181,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76213,7 +76210,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 3.4 @@ -76298,7 +76295,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 4.9 @@ -76325,7 +76322,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -76352,7 +76349,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -76379,7 +76376,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 5.4 @@ -98198,7 +98195,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -98215,7 +98212,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98232,7 +98229,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98249,7 +98246,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98266,7 +98263,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98343,7 +98340,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 220 + priority: 221 } lines { width: 2.6 @@ -98372,7 +98369,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98401,7 +98398,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98430,7 +98427,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 @@ -98459,7 +98456,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 220 + priority: 221 } lines { width: 2.9 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 96a952c14..17fdafeca 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 c1b5da86d..eff447f0d 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -16050,7 +16050,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 443115881 dashdot { dd: 3.0 @@ -26188,7 +26188,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 1295720469 priority: 310 join: BEVELJOIN @@ -26198,7 +26198,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 3874837 priority: 310 join: BEVELJOIN @@ -26208,7 +26208,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 3874837 priority: 310 join: BEVELJOIN @@ -26218,7 +26218,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 3874837 priority: 310 join: BEVELJOIN @@ -26228,7 +26228,7 @@ cont { element { scale: 10 lines { - width: 1.7 + width: 1.9 color: 3874837 priority: 310 join: BEVELJOIN @@ -26253,7 +26253,7 @@ cont { element { scale: 11 lines { - width: 1.8 + width: 2.0 color: 3874837 priority: 310 join: BEVELJOIN @@ -26278,7 +26278,7 @@ cont { element { scale: 12 lines { - width: 2.0 + width: 2.1 color: 3874837 priority: 310 join: BEVELJOIN @@ -26303,7 +26303,7 @@ cont { element { scale: 13 lines { - width: 2.9 + width: 3.0 color: 3874837 priority: 310 cap: BUTTCAP @@ -26493,7 +26493,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 1295720469 priority: 310 join: BEVELJOIN @@ -26503,7 +26503,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 3874837 priority: 310 join: BEVELJOIN @@ -26513,7 +26513,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 3874837 priority: 310 join: BEVELJOIN @@ -26523,7 +26523,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 3874837 priority: 310 join: BEVELJOIN @@ -26533,7 +26533,7 @@ cont { element { scale: 10 lines { - width: 1.7 + width: 1.9 color: 3874837 priority: 310 join: BEVELJOIN @@ -26558,7 +26558,7 @@ cont { element { scale: 11 lines { - width: 1.8 + width: 2.0 color: 3874837 priority: 310 join: BEVELJOIN @@ -26583,7 +26583,7 @@ cont { element { scale: 12 lines { - width: 2.0 + width: 2.1 color: 3874837 priority: 310 join: BEVELJOIN @@ -26608,19 +26608,19 @@ cont { element { scale: 13 lines { - width: 6.6 + width: 6.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.2 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.9 + width: 3.0 color: 3874837 priority: 310 cap: BUTTCAP @@ -26894,7 +26894,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 1295720469 priority: 310 join: BEVELJOIN @@ -26904,7 +26904,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 3874837 priority: 310 join: BEVELJOIN @@ -26914,7 +26914,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 3874837 priority: 310 join: BEVELJOIN @@ -26924,7 +26924,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 3874837 priority: 310 join: BEVELJOIN @@ -26934,7 +26934,7 @@ cont { element { scale: 10 lines { - width: 1.7 + width: 1.9 color: 3874837 priority: 310 join: BEVELJOIN @@ -26959,7 +26959,7 @@ cont { element { scale: 11 lines { - width: 1.8 + width: 2.0 color: 3874837 priority: 310 join: BEVELJOIN @@ -26984,7 +26984,7 @@ cont { element { scale: 12 lines { - width: 3.0 + width: 3.1 color: 1291845632 dashdot { dd: 2.0 @@ -26994,7 +26994,7 @@ cont { cap: BUTTCAP } lines { - width: 2.0 + width: 2.1 color: 2364429 priority: 310 join: BEVELJOIN @@ -27019,7 +27019,7 @@ cont { element { scale: 13 lines { - width: 4.5 + width: 4.6 color: 1291845632 dashdot { dd: 4.0 @@ -27029,7 +27029,7 @@ cont { cap: BUTTCAP } lines { - width: 2.9 + width: 3.0 color: 2364429 priority: 310 cap: BUTTCAP @@ -34996,7 +34996,6 @@ cont { scale: 13 lines { width: 1.3 - color: 5717555 priority: 224 cap: BUTTCAP } @@ -35106,7 +35105,6 @@ cont { scale: 13 lines { width: 1.3 - color: 5717555 priority: 224 cap: BUTTCAP } @@ -35300,7 +35298,6 @@ cont { scale: 13 lines { width: 1.3 - color: 5717555 priority: 224 cap: BUTTCAP } @@ -44382,7 +44379,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 443115881 dashdot { dd: 3.0 diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 1e86d15b5..f21cab40c 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 bcf73cd6b..cc11b72b4 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -2820,7 +2820,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2583691263 + color: 2583691006 priority: 70 join: BEVELJOIN cap: BUTTCAP @@ -2830,7 +2830,7 @@ cont { scale: 13 lines { width: 1.5 - color: 2164260863 + color: 2164260606 priority: 70 cap: BUTTCAP } @@ -2839,7 +2839,7 @@ cont { scale: 14 lines { width: 2.4 - color: 1308622847 + color: 1308622590 priority: 70 cap: BUTTCAP } @@ -2848,7 +2848,7 @@ cont { scale: 15 lines { width: 2.4 - color: 1308622847 + color: 1308622590 priority: 70 cap: BUTTCAP } @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 872415231 + color: 872414974 priority: 70 } } @@ -2900,7 +2900,7 @@ cont { scale: 14 lines { width: 0.6 - color: 2583691263 + color: 2583691006 priority: 70 cap: BUTTCAP } @@ -2909,7 +2909,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 cap: BUTTCAP } @@ -2918,7 +2918,7 @@ cont { scale: 16 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2926,7 +2926,7 @@ cont { scale: 17 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2934,7 +2934,7 @@ cont { scale: 18 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2942,7 +2942,7 @@ cont { scale: 19 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -2950,7 +2950,7 @@ cont { scale: 20 lines { width: 1.2 - color: 2164260863 + color: 2164260606 priority: 70 } } @@ -16050,7 +16050,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 446405263 dashdot { dd: 3.0 @@ -23101,7 +23101,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 190 cap: BUTTCAP } @@ -23110,7 +23110,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23126,7 +23126,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23142,7 +23142,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23158,7 +23158,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23174,7 +23174,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23193,7 +23193,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 190 cap: BUTTCAP } @@ -23202,7 +23202,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23218,7 +23218,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23234,7 +23234,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23250,7 +23250,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23266,7 +23266,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23285,7 +23285,7 @@ cont { scale: 15 lines { width: 1.2 - color: 452984831 + color: 452984574 priority: 190 cap: BUTTCAP } @@ -23294,7 +23294,7 @@ cont { scale: 16 lines { width: 1.6 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23310,7 +23310,7 @@ cont { scale: 17 lines { width: 2.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23326,7 +23326,7 @@ cont { scale: 18 lines { width: 3.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23342,7 +23342,7 @@ cont { scale: 19 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -23358,7 +23358,7 @@ cont { scale: 20 lines { width: 4.0 - color: 452984831 + color: 452984574 priority: 190 } path_text { @@ -25731,7 +25731,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -25741,7 +25741,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -25750,7 +25750,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -25767,7 +25767,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -25784,7 +25784,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25800,7 +25800,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25816,7 +25816,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25832,7 +25832,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25848,7 +25848,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25867,7 +25867,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -25877,7 +25877,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -25886,7 +25886,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -25903,7 +25903,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -25920,7 +25920,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25936,7 +25936,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25952,7 +25952,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25968,7 +25968,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -25984,7 +25984,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26003,7 +26003,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -26013,7 +26013,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -26022,7 +26022,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -26039,7 +26039,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -26066,7 +26066,7 @@ cont { } lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26092,7 +26092,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26118,7 +26118,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26144,7 +26144,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26170,7 +26170,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -26188,7 +26188,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 1307933184 priority: 310 join: BEVELJOIN @@ -26198,7 +26198,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -26208,7 +26208,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -26218,7 +26218,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -26228,8 +26228,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 15763456 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26252,8 +26252,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 15763456 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26276,8 +26276,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 15763456 + width: 2.1 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26300,8 +26300,8 @@ cont { element { scale: 13 lines { - width: 2.9 - color: 15763456 + width: 3.0 + color: 16087552 priority: 310 cap: BUTTCAP } @@ -26482,7 +26482,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 1307933184 priority: 310 join: BEVELJOIN @@ -26492,7 +26492,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -26502,7 +26502,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -26512,7 +26512,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -26522,8 +26522,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 15763456 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26546,8 +26546,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 15763456 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26570,8 +26570,8 @@ cont { element { scale: 12 lines { - width: 2.0 - color: 15763456 + width: 2.1 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26594,20 +26594,20 @@ cont { element { scale: 13 lines { - width: 6.6 + width: 6.8 color: 1306645694 priority: 140 cap: BUTTCAP } lines { - width: 6.2 + width: 6.4 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 2.9 - color: 15763456 + width: 3.0 + color: 16087552 priority: 310 cap: BUTTCAP } @@ -26872,7 +26872,7 @@ cont { element { scale: 6 lines { - width: 0.9 + width: 1.5 color: 1307933184 priority: 310 join: BEVELJOIN @@ -26882,7 +26882,7 @@ cont { element { scale: 7 lines { - width: 1.0 + width: 1.6 color: 16087552 priority: 310 join: BEVELJOIN @@ -26892,7 +26892,7 @@ cont { element { scale: 8 lines { - width: 1.2 + width: 1.7 color: 16087552 priority: 310 join: BEVELJOIN @@ -26902,7 +26902,7 @@ cont { element { scale: 9 lines { - width: 1.3 + width: 1.8 color: 16087552 priority: 310 join: BEVELJOIN @@ -26912,8 +26912,8 @@ cont { element { scale: 10 lines { - width: 1.7 - color: 15763456 + width: 1.9 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26936,8 +26936,8 @@ cont { element { scale: 11 lines { - width: 1.8 - color: 15763456 + width: 2.0 + color: 16087552 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -26960,7 +26960,7 @@ cont { element { scale: 12 lines { - width: 3.0 + width: 3.1 color: 1300267136 dashdot { dd: 2.0 @@ -26970,7 +26970,7 @@ cont { cap: BUTTCAP } lines { - width: 2.0 + width: 2.1 color: 15902016 priority: 310 join: BEVELJOIN @@ -26994,7 +26994,7 @@ cont { element { scale: 13 lines { - width: 4.5 + width: 4.6 color: 1300267136 dashdot { dd: 4.0 @@ -27004,7 +27004,7 @@ cont { cap: BUTTCAP } lines { - width: 2.9 + width: 3.0 color: 15902016 priority: 310 cap: BUTTCAP @@ -30463,7 +30463,7 @@ cont { } lines { width: 2.4 - color: 1308622847 + color: 1308622590 dashdot { dd: 8.0 dd: 1.5 @@ -30493,7 +30493,7 @@ cont { } lines { width: 3.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 9.0 dd: 1.8 @@ -30523,7 +30523,7 @@ cont { } lines { width: 4.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 11.0 dd: 2.3 @@ -30553,7 +30553,7 @@ cont { } lines { width: 5.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 13.0 dd: 2.7 @@ -30583,7 +30583,7 @@ cont { } lines { width: 5.0 - color: 1308622847 + color: 1308622590 dashdot { dd: 13.0 dd: 2.7 @@ -30650,7 +30650,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -30674,7 +30674,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -30698,7 +30698,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -30721,7 +30721,7 @@ cont { scale: 14 lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -30744,7 +30744,7 @@ cont { scale: 15 lines { width: 3.8 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -30767,7 +30767,7 @@ cont { scale: 16 lines { width: 5.0 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -30789,7 +30789,7 @@ cont { scale: 17 lines { width: 6.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -30811,7 +30811,7 @@ cont { scale: 18 lines { width: 9.4 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -30833,7 +30833,7 @@ cont { scale: 19 lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -30855,7 +30855,7 @@ cont { scale: 20 lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -30924,7 +30924,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -30948,7 +30948,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -30972,7 +30972,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -31007,7 +31007,7 @@ cont { } lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -31042,7 +31042,7 @@ cont { } lines { width: 3.8 - color: 15908188 + color: 16433750 priority: 290 cap: BUTTCAP } @@ -31077,7 +31077,7 @@ cont { } lines { width: 5.0 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31111,7 +31111,7 @@ cont { } lines { width: 6.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31145,7 +31145,7 @@ cont { } lines { width: 9.4 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31179,7 +31179,7 @@ cont { } lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31213,7 +31213,7 @@ cont { } lines { width: 11.6 - color: 15908188 + color: 16433750 priority: 290 } path_text { @@ -31282,7 +31282,7 @@ cont { scale: 11 lines { width: 1.5 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31306,7 +31306,7 @@ cont { scale: 12 lines { width: 1.7 - color: 15907410 + color: 16431936 priority: 290 join: BEVELJOIN cap: BUTTCAP @@ -31330,7 +31330,7 @@ cont { scale: 13 lines { width: 2.3 - color: 15907410 + color: 16431936 priority: 290 cap: BUTTCAP } @@ -31582,7 +31582,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -31606,7 +31606,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -31630,7 +31630,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -31653,7 +31653,7 @@ cont { scale: 14 lines { width: 1.8 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -31676,7 +31676,7 @@ cont { scale: 15 lines { width: 2.5 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -31699,7 +31699,7 @@ cont { scale: 16 lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -31721,7 +31721,7 @@ cont { scale: 17 lines { width: 4.7 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -31743,7 +31743,7 @@ cont { scale: 18 lines { width: 6.4 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -31765,7 +31765,7 @@ cont { scale: 19 lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -31787,7 +31787,7 @@ cont { scale: 20 lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -31812,7 +31812,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -31836,7 +31836,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -31860,7 +31860,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -31895,7 +31895,7 @@ cont { } lines { width: 1.8 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -31930,7 +31930,7 @@ cont { } lines { width: 2.5 - color: 15908188 + color: 16433750 priority: 226 cap: BUTTCAP } @@ -31965,7 +31965,7 @@ cont { } lines { width: 3.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -31999,7 +31999,7 @@ cont { } lines { width: 4.7 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32033,7 +32033,7 @@ cont { } lines { width: 6.4 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32067,7 +32067,7 @@ cont { } lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32101,7 +32101,7 @@ cont { } lines { width: 8.2 - color: 15908188 + color: 16433750 priority: 226 } path_text { @@ -32126,7 +32126,7 @@ cont { scale: 11 lines { width: 0.8 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -32150,7 +32150,7 @@ cont { scale: 12 lines { width: 1.0 - color: 15907410 + color: 16431936 priority: 226 join: BEVELJOIN cap: BUTTCAP @@ -32174,7 +32174,7 @@ cont { scale: 13 lines { width: 1.3 - color: 15907410 + color: 16431936 priority: 226 cap: BUTTCAP } @@ -32527,7 +32527,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -32537,7 +32537,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32554,7 +32554,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32571,7 +32571,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32594,7 +32594,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32616,7 +32616,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32638,7 +32638,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32660,7 +32660,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32682,7 +32682,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32707,7 +32707,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -32717,7 +32717,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32734,7 +32734,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32751,7 +32751,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32774,7 +32774,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32796,7 +32796,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32818,7 +32818,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32840,7 +32840,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32862,7 +32862,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -32887,7 +32887,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -32897,7 +32897,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32926,7 +32926,7 @@ cont { } lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32955,7 +32955,7 @@ cont { } lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -32990,7 +32990,7 @@ cont { } lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33024,7 +33024,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33058,7 +33058,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33092,7 +33092,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33126,7 +33126,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33151,7 +33151,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33161,7 +33161,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33178,7 +33178,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33195,7 +33195,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33228,7 +33228,7 @@ cont { } lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33260,7 +33260,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33292,7 +33292,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33324,7 +33324,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33356,7 +33356,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33488,7 +33488,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33498,7 +33498,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33507,7 +33507,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33524,7 +33524,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33541,7 +33541,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33557,7 +33557,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33573,7 +33573,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33589,7 +33589,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33605,7 +33605,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33624,7 +33624,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33634,7 +33634,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33643,7 +33643,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33660,7 +33660,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33689,7 +33689,7 @@ cont { } lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33717,7 +33717,7 @@ cont { } lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33745,7 +33745,7 @@ cont { } lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33773,7 +33773,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33801,7 +33801,7 @@ cont { } lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33820,7 +33820,7 @@ cont { scale: 12 lines { width: 0.7 - color: 16777215 + color: 16776958 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33830,7 +33830,7 @@ cont { scale: 13 lines { width: 1.0 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33839,7 +33839,7 @@ cont { scale: 14 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33856,7 +33856,7 @@ cont { scale: 15 lines { width: 2.4 - color: 16777215 + color: 16776958 priority: 230 cap: BUTTCAP } @@ -33873,7 +33873,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33889,7 +33889,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33905,7 +33905,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33921,7 +33921,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33937,7 +33937,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16777215 + color: 16776958 priority: 230 } path_text { @@ -33956,7 +33956,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33974,7 +33974,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33992,7 +33992,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34016,7 +34016,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -34039,7 +34039,7 @@ cont { scale: 14 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34062,7 +34062,7 @@ cont { scale: 15 lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34085,7 +34085,7 @@ cont { scale: 16 lines { width: 5.0 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34107,7 +34107,7 @@ cont { scale: 17 lines { width: 6.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34129,7 +34129,7 @@ cont { scale: 18 lines { width: 9.4 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34151,7 +34151,7 @@ cont { scale: 19 lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34173,7 +34173,7 @@ cont { scale: 20 lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34198,7 +34198,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34216,7 +34216,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34234,7 +34234,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34258,7 +34258,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -34293,7 +34293,7 @@ cont { } lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34328,7 +34328,7 @@ cont { } lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34363,7 +34363,7 @@ cont { } lines { width: 5.0 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34397,7 +34397,7 @@ cont { } lines { width: 6.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34431,7 +34431,7 @@ cont { } lines { width: 9.4 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34465,7 +34465,7 @@ cont { } lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34499,7 +34499,7 @@ cont { } lines { width: 11.6 - color: 16370298 + color: 16766323 priority: 270 } path_text { @@ -34524,7 +34524,7 @@ cont { scale: 10 lines { width: 1.2 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34542,7 +34542,7 @@ cont { scale: 11 lines { width: 1.5 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34560,7 +34560,7 @@ cont { scale: 12 lines { width: 1.7 - color: 16763760 + color: 16764506 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34584,7 +34584,7 @@ cont { scale: 13 lines { width: 2.3 - color: 16370298 + color: 16764506 priority: 270 cap: BUTTCAP } @@ -34607,7 +34607,7 @@ cont { scale: 14 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34630,7 +34630,7 @@ cont { scale: 15 lines { width: 3.8 - color: 16370298 + color: 16766323 priority: 270 cap: BUTTCAP } @@ -34816,7 +34816,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -34825,7 +34824,7 @@ cont { scale: 14 lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -34834,7 +34833,7 @@ cont { scale: 15 lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -34843,7 +34842,7 @@ cont { scale: 16 lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -34859,7 +34858,7 @@ cont { scale: 17 lines { width: 4.7 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -34875,7 +34874,7 @@ cont { scale: 18 lines { width: 6.4 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -34891,7 +34890,7 @@ cont { scale: 19 lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -34907,7 +34906,7 @@ cont { scale: 20 lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -34926,7 +34925,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -34947,7 +34945,7 @@ cont { } lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -34968,7 +34966,7 @@ cont { } lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -34989,7 +34987,7 @@ cont { } lines { width: 3.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35017,7 +35015,7 @@ cont { } lines { width: 4.7 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35045,7 +35043,7 @@ cont { } lines { width: 6.4 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35073,7 +35071,7 @@ cont { } lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35101,7 +35099,7 @@ cont { } lines { width: 8.2 - color: 16370298 + color: 16766323 priority: 224 } path_text { @@ -35120,7 +35118,6 @@ cont { scale: 13 lines { width: 1.3 - color: 16370298 priority: 224 cap: BUTTCAP } @@ -35129,7 +35126,7 @@ cont { scale: 14 lines { width: 1.8 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35138,7 +35135,7 @@ cont { scale: 15 lines { width: 2.5 - color: 16370298 + color: 16766323 priority: 224 cap: BUTTCAP } @@ -35280,7 +35277,7 @@ cont { scale: 13 lines { width: 0.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35289,7 +35286,7 @@ cont { scale: 14 lines { width: 1.2 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35298,7 +35295,7 @@ cont { scale: 15 lines { width: 1.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35307,7 +35304,7 @@ cont { scale: 16 lines { width: 2.5 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35323,7 +35320,7 @@ cont { scale: 17 lines { width: 3.3 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35339,7 +35336,7 @@ cont { scale: 18 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35355,7 +35352,7 @@ cont { scale: 19 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35371,7 +35368,7 @@ cont { scale: 20 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35390,7 +35387,7 @@ cont { scale: 13 lines { width: 0.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35399,7 +35396,7 @@ cont { scale: 14 lines { width: 1.2 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35408,7 +35405,7 @@ cont { scale: 15 lines { width: 1.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35417,7 +35414,7 @@ cont { scale: 16 lines { width: 2.5 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35433,7 +35430,7 @@ cont { scale: 17 lines { width: 3.3 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35449,7 +35446,7 @@ cont { scale: 18 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35465,7 +35462,7 @@ cont { scale: 19 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35481,7 +35478,7 @@ cont { scale: 20 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35500,7 +35497,7 @@ cont { scale: 13 lines { width: 0.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35509,7 +35506,7 @@ cont { scale: 14 lines { width: 1.2 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35518,7 +35515,7 @@ cont { scale: 15 lines { width: 1.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35539,7 +35536,7 @@ cont { } lines { width: 2.5 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35567,7 +35564,7 @@ cont { } lines { width: 3.3 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35595,7 +35592,7 @@ cont { } lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35623,7 +35620,7 @@ cont { } lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35651,7 +35648,7 @@ cont { } lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35670,7 +35667,7 @@ cont { scale: 16 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35686,7 +35683,7 @@ cont { scale: 17 lines { width: 2.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35702,7 +35699,7 @@ cont { scale: 18 lines { width: 3.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35718,7 +35715,7 @@ cont { scale: 19 lines { width: 4.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35734,7 +35731,7 @@ cont { scale: 20 lines { width: 4.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35753,7 +35750,7 @@ cont { scale: 15 lines { width: 1.2 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35762,7 +35759,7 @@ cont { scale: 16 lines { width: 1.6 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35778,7 +35775,7 @@ cont { scale: 17 lines { width: 2.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35794,7 +35791,7 @@ cont { scale: 18 lines { width: 3.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35810,7 +35807,7 @@ cont { scale: 19 lines { width: 4.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35826,7 +35823,7 @@ cont { scale: 20 lines { width: 4.0 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35845,7 +35842,7 @@ cont { scale: 13 lines { width: 0.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35854,7 +35851,7 @@ cont { scale: 14 lines { width: 1.2 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35863,7 +35860,7 @@ cont { scale: 15 lines { width: 1.8 - color: 16777215 + color: 16776958 priority: 190 cap: BUTTCAP } @@ -35872,7 +35869,7 @@ cont { scale: 16 lines { width: 2.5 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35888,7 +35885,7 @@ cont { scale: 17 lines { width: 3.3 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35904,7 +35901,7 @@ cont { scale: 18 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35920,7 +35917,7 @@ cont { scale: 19 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -35936,7 +35933,7 @@ cont { scale: 20 lines { width: 4.2 - color: 16777215 + color: 16776958 priority: 190 } path_text { @@ -39000,7 +38997,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1307747111 + color: 1307744024 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39010,7 +39007,7 @@ cont { scale: 7 lines { width: 0.9 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39020,7 +39017,7 @@ cont { scale: 8 lines { width: 1.1 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39030,7 +39027,7 @@ cont { scale: 9 lines { width: 1.2 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39040,7 +39037,7 @@ cont { scale: 10 lines { width: 1.5 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39064,7 +39061,7 @@ cont { scale: 11 lines { width: 1.7 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39088,7 +39085,7 @@ cont { scale: 12 lines { width: 1.9 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39112,7 +39109,7 @@ cont { scale: 13 lines { width: 2.8 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39135,7 +39132,7 @@ cont { scale: 14 lines { width: 3.8 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39158,7 +39155,7 @@ cont { scale: 15 lines { width: 4.4 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39181,7 +39178,7 @@ cont { scale: 16 lines { width: 6.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39203,7 +39200,7 @@ cont { scale: 17 lines { width: 8.2 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39225,7 +39222,7 @@ cont { scale: 18 lines { width: 11.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39247,7 +39244,7 @@ cont { scale: 19 lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39269,7 +39266,7 @@ cont { scale: 20 lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39294,7 +39291,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1307747111 + color: 1307744024 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39304,7 +39301,7 @@ cont { scale: 7 lines { width: 0.9 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39314,7 +39311,7 @@ cont { scale: 8 lines { width: 1.1 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39324,7 +39321,7 @@ cont { scale: 9 lines { width: 1.2 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39334,7 +39331,7 @@ cont { scale: 10 lines { width: 1.5 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39358,7 +39355,7 @@ cont { scale: 11 lines { width: 1.7 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39382,7 +39379,7 @@ cont { scale: 12 lines { width: 1.9 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39418,7 +39415,7 @@ cont { } lines { width: 2.8 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39453,7 +39450,7 @@ cont { } lines { width: 3.8 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39488,7 +39485,7 @@ cont { } lines { width: 4.4 - color: 15901479 + color: 15900208 priority: 310 cap: BUTTCAP } @@ -39523,7 +39520,7 @@ cont { } lines { width: 6.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39557,7 +39554,7 @@ cont { } lines { width: 8.2 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39591,7 +39588,7 @@ cont { } lines { width: 11.0 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39625,7 +39622,7 @@ cont { } lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39659,7 +39656,7 @@ cont { } lines { width: 13.5 - color: 15901479 + color: 15900208 priority: 310 } path_text { @@ -39684,7 +39681,7 @@ cont { scale: 6 lines { width: 0.8 - color: 1307747111 + color: 1307744024 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39694,7 +39691,7 @@ cont { scale: 7 lines { width: 0.9 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39704,7 +39701,7 @@ cont { scale: 8 lines { width: 1.1 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39714,7 +39711,7 @@ cont { scale: 9 lines { width: 1.2 - color: 15768856 + color: 15898392 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39724,7 +39721,7 @@ cont { scale: 10 lines { width: 1.5 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -39748,7 +39745,7 @@ cont { scale: 11 lines { width: 1.7 - color: 15901479 + color: 15900208 priority: 310 join: BEVELJOIN cap: BUTTCAP @@ -44112,7 +44109,7 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 4.5 color: 446405263 dashdot { dd: 3.0 @@ -49934,35 +49931,35 @@ cont { element { scale: 12 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 13 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 14 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 15 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 16 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -49974,7 +49971,7 @@ cont { element { scale: 17 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -49994,7 +49991,7 @@ cont { element { scale: 18 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50014,7 +50011,7 @@ cont { element { scale: 19 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50034,7 +50031,7 @@ cont { element { scale: 20 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50057,49 +50054,49 @@ cont { element { scale: 10 area { - color: 14820640 + color: 15022389 priority: 20 } } element { scale: 11 area { - color: 14820640 + color: 15022389 priority: 20 } } element { scale: 12 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 13 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 14 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 15 area { - color: 2162304288 + color: 2162506037 priority: 20 } } element { scale: 16 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50111,7 +50108,7 @@ cont { element { scale: 17 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50131,7 +50128,7 @@ cont { element { scale: 18 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50151,7 +50148,7 @@ cont { element { scale: 19 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol { @@ -50171,7 +50168,7 @@ cont { element { scale: 20 area { - color: 2162304288 + color: 2162506037 priority: 20 } symbol {