diff --git a/data/colors.txt b/data/colors.txt index 8ab5c1694a..51c9bd3442 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -123,12 +123,14 @@ 5064516 5072410 5131837 +5196359 5263440 5286655 5378955 5395026 5592405 5666134 +5717555 5845795 5862272 5918280 @@ -238,6 +240,7 @@ 14802147 14934482 14951168 +14999213 15000299 15014691 15022389 @@ -249,7 +252,6 @@ 15214341 15260347 15263452 -15459493 15590876 15591638 15592899 @@ -290,7 +292,9 @@ 16750592 16752972 16756055 +16757286 16760320 +16760658 16762880 16763432 16763913 @@ -301,21 +305,27 @@ 67108863 436207616 437326080 +441925171 442905727 443432263 451800027 452954029 +452968274 452984831 609045837 655429888 655629312 657139751 -657206298 +659106075 659244611 659375940 +659507783 +660157219 666683518 -669903835 670628088 +671054374 +671057702 +671061056 671088639 856756480 856756497 @@ -325,10 +335,12 @@ 857551774 857809179 858401322 +858466343 858532890 859519289 860111940 860571203 +861355571 861690961 861690972 861885229 @@ -350,6 +362,8 @@ 869585866 870704341 871230427 +871954680 +872395302 872415231 1074860288 1078675011 @@ -392,6 +406,7 @@ 1296845900 1296910148 1296977469 +1297041991 1297109072 1297438037 1297691427 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 9edfb3872a..a6bf2c8fad 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 2954077ca4..1a85f0006f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -21553,7 +21553,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21562,7 +21562,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21578,7 +21578,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21594,7 +21594,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21610,7 +21610,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21626,7 +21626,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21645,7 +21645,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21654,7 +21654,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21670,7 +21670,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21686,7 +21686,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21702,7 +21702,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21718,7 +21718,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21737,7 +21737,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21746,7 +21746,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21762,7 +21762,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21778,7 +21778,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21794,7 +21794,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21810,7 +21810,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -24859,8 +24859,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -24869,8 +24869,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -24878,7 +24878,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -24895,7 +24895,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -24912,7 +24912,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -24928,7 +24928,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -24944,7 +24944,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -24960,7 +24960,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -24976,7 +24976,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -24995,8 +24995,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -25005,8 +25005,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -25014,7 +25014,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -25031,7 +25031,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -25048,7 +25048,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -25064,7 +25064,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -25080,7 +25080,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -25096,7 +25096,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -25112,7 +25112,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -25131,8 +25131,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -25141,8 +25141,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -25150,7 +25150,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -25167,7 +25167,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -25184,7 +25184,7 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 @@ -25194,7 +25194,7 @@ cont { cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 671088639 priority: 230 } @@ -25210,7 +25210,7 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 @@ -25220,7 +25220,7 @@ cont { cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 16777215 priority: 230 } @@ -25236,7 +25236,7 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 @@ -25246,7 +25246,7 @@ cont { cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 16777215 priority: 230 } @@ -25262,7 +25262,7 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 @@ -25272,7 +25272,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16777215 priority: 230 } @@ -25288,7 +25288,7 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 @@ -25298,7 +25298,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16777215 priority: 230 } @@ -25420,7 +25420,7 @@ cont { scale: 13 lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -25443,7 +25443,7 @@ cont { scale: 14 lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -25488,7 +25488,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -25716,7 +25716,7 @@ cont { } lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -25751,7 +25751,7 @@ cont { } lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -25808,19 +25808,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -26192,7 +26192,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1300267136 dashdot { dd: 5.0 @@ -26202,7 +26202,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -26419,8 +26419,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26443,8 +26443,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26466,9 +26466,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26491,8 +26491,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -26513,9 +26513,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -26536,9 +26536,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -26559,9 +26559,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -26581,9 +26581,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26603,9 +26603,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -26625,9 +26625,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26647,9 +26647,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26673,8 +26673,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26697,8 +26697,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26720,9 +26720,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26745,8 +26745,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -26767,21 +26767,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -26802,21 +26802,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -26837,21 +26837,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -26871,21 +26871,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26905,21 +26905,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -26939,21 +26939,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26973,21 +26973,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27011,8 +27011,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27035,8 +27035,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27058,15 +27058,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1300267136 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27094,13 +27094,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -27121,19 +27121,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -27154,19 +27154,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -27187,19 +27187,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -27219,19 +27219,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27251,19 +27251,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -27283,19 +27283,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27315,19 +27315,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -30210,7 +30210,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1308591910 priority: 290 join: BEVELJOIN @@ -30302,8 +30302,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 + width: 2.3 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -30326,7 +30326,7 @@ cont { scale: 14 lines { width: 3.2 - color: 1308595264 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -30371,7 +30371,7 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -30484,7 +30484,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1308591910 priority: 290 join: BEVELJOIN @@ -30576,8 +30576,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 + width: 2.3 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -30612,7 +30612,7 @@ cont { } lines { width: 3.2 - color: 1308595264 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -30669,19 +30669,19 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -30842,7 +30842,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1308591910 priority: 290 join: BEVELJOIN @@ -30934,8 +30934,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 + width: 2.3 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -31023,7 +31023,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -31033,7 +31033,7 @@ cont { cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -31186,9 +31186,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31210,9 +31210,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31234,9 +31234,9 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 - priority: 280 + width: 1.3 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -31257,9 +31257,9 @@ cont { element { scale: 14 lines { - width: 3.2 - color: 1308595264 - priority: 280 + width: 1.8 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -31280,9 +31280,9 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 2.5 color: 16752972 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31303,9 +31303,9 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 3.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31325,9 +31325,9 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 4.7 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31347,9 +31347,9 @@ cont { element { scale: 18 lines { - width: 9.4 + width: 6.4 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31369,9 +31369,9 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31391,9 +31391,9 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31416,9 +31416,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31440,9 +31440,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31464,9 +31464,9 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 - priority: 280 + width: 1.3 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -31486,334 +31486,22 @@ cont { } element { scale: 14 - lines { - width: 7.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.2 - color: 1308595264 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 175 - } - } - element { - scale: 15 - lines { - width: 8.4 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 7.6 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.8 - color: 16752972 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 11 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 250 - } - } - element { - scale: 16 - lines { - width: 9.6 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 8.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } lines { width: 4.4 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 872415231 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 17 - lines { - width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 872415231 - } - priority: 6100 - } - shield { - height: 10 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 18 - lines { - width: 22.8 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 20.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 9.4 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 10 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 19 - lines { - width: 27.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 25.2 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 11.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 11 - color: 16777215 - priority: 2970 - min_distance: 350 - } - } - element { - scale: 20 - lines { - width: 27.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 25.2 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 11.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 11 - color: 16777215 - priority: 2970 - min_distance: 350 - } - } -} -cont { - name: "highway-primary_link-tunnel" - element { - scale: 11 - lines { - width: 1.5 - color: 1308595264 - priority: 280 - join: BEVELJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 90 - } - } - element { - scale: 12 - lines { - width: 1.7 - color: 1308595264 - priority: 280 - join: BEVELJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 451800027 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 90 - } - } - element { - scale: 13 - lines { - width: 2.4 - color: 1308595264 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 451800027 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 120 - } - } - element { - scale: 14 - lines { - width: 5.2 - color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 - cap: BUTTCAP - } - lines { - width: 3.2 - color: 1308402786 - priority: 280 + width: 1.8 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -31836,17 +31524,19 @@ cont { lines { width: 5.8 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 3.8 + width: 5.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 color: 16752972 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31867,19 +31557,21 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.2 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 4.4 + width: 6.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 3.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31899,19 +31591,21 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 12.6 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 6.6 + width: 11.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 4.7 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31931,19 +31625,21 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 16.8 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 14.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31963,19 +31659,21 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 20.4 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 11.6 + width: 18.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31995,19 +31693,321 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 20.4 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 18.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 11 + color: 16777215 + priority: 2970 + min_distance: 350 + } + } +} +cont { + name: "highway-primary_link-tunnel" + element { + scale: 11 + lines { + width: 0.8 + color: 1308595264 + priority: 226 + join: BEVELJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 90 + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1308595264 + priority: 226 + join: BEVELJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 451800027 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 90 + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 671061056 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 451800027 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 120 + } + } + element { + scale: 14 + lines { + width: 3.8 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 11.6 + width: 1.8 + color: 1308402786 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 175 + } + } + element { + scale: 15 + lines { + width: 4.5 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 2.5 color: 16752972 - priority: 280 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 250 + } + } + element { + scale: 16 + lines { + width: 5.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 3.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 17 + lines { + width: 6.7 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 4.7 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 6100 + } + shield { + height: 10 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 18 + lines { + width: 8.4 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 10 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 19 + lines { + width: 10.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 11 + color: 16777215 + priority: 2970 + min_distance: 350 + } + } + element { + scale: 20 + lines { + width: 10.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 } path_text { primary { @@ -32131,9 +32131,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32141,9 +32141,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -32158,9 +32158,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32175,9 +32175,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32198,9 +32198,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 670628088 - priority: 250 + priority: 230 } path_text { primary { @@ -32220,9 +32220,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32242,9 +32242,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32264,9 +32264,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32286,9 +32286,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32311,9 +32311,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32321,9 +32321,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -32338,9 +32338,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32355,9 +32355,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32378,9 +32378,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 670628088 - priority: 250 + priority: 230 } path_text { primary { @@ -32400,9 +32400,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32422,9 +32422,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32444,9 +32444,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32466,9 +32466,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32491,9 +32491,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32501,9 +32501,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -32518,21 +32518,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 4.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 3.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32547,21 +32547,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 5.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 4.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32582,21 +32582,21 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 670628088 - priority: 250 + priority: 230 } path_text { primary { @@ -32616,21 +32616,21 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32650,21 +32650,21 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32684,21 +32684,21 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32718,21 +32718,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32755,9 +32755,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32765,9 +32765,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -32782,9 +32782,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32799,9 +32799,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32822,19 +32822,19 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 671088639 - priority: 250 + priority: 230 } path_text { primary { @@ -32854,19 +32854,19 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -32886,19 +32886,19 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -32918,19 +32918,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -32950,19 +32950,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -33102,8 +33102,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33112,8 +33112,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -33121,7 +33121,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -33138,7 +33138,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -33155,7 +33155,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -33171,7 +33171,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -33187,7 +33187,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -33203,7 +33203,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33219,7 +33219,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33238,8 +33238,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33248,8 +33248,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -33257,7 +33257,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -33274,7 +33274,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -33291,19 +33291,19 @@ cont { element { scale: 16 lines { - width: 8.4 + width: 6.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -33319,19 +33319,19 @@ cont { element { scale: 17 lines { - width: 11.2 + width: 9.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.8 + width: 9.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -33347,19 +33347,19 @@ cont { element { scale: 18 lines { - width: 16.4 + width: 13.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 16.0 + width: 12.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -33375,19 +33375,19 @@ cont { element { scale: 19 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33403,19 +33403,19 @@ cont { element { scale: 20 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33434,8 +33434,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -33444,8 +33444,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -33453,7 +33453,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -33470,7 +33470,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -33487,7 +33487,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -33503,7 +33503,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -33519,7 +33519,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -33535,7 +33535,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33551,7 +33551,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33570,8 +33570,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 872415231 + width: 1.2 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33588,8 +33588,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 872415231 + width: 1.5 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33606,8 +33606,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 872415231 + width: 1.7 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33630,8 +33630,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 872415231 + width: 2.3 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -33653,8 +33653,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 872415231 + width: 3.2 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -33676,8 +33676,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 872415231 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -33699,8 +33699,8 @@ cont { element { scale: 16 lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -33722,7 +33722,7 @@ cont { scale: 17 lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -33744,7 +33744,7 @@ cont { scale: 18 lines { width: 9.4 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -33766,7 +33766,7 @@ cont { scale: 19 lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -33788,7 +33788,7 @@ cont { scale: 20 lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -33812,8 +33812,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 872415231 + width: 1.2 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33830,8 +33830,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 872415231 + width: 1.5 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33848,8 +33848,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 872415231 + width: 1.7 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33872,8 +33872,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 872415231 + width: 2.3 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -33895,20 +33895,20 @@ cont { element { scale: 14 lines { - width: 6.8 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 872415231 + width: 3.2 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -33930,20 +33930,20 @@ cont { element { scale: 15 lines { - width: 8.6 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 7.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 872415231 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -33965,20 +33965,20 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -34012,7 +34012,7 @@ cont { } lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34046,7 +34046,7 @@ cont { } lines { width: 9.4 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34080,7 +34080,7 @@ cont { } lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34114,7 +34114,7 @@ cont { } lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34138,8 +34138,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 872415231 + width: 1.2 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34156,8 +34156,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 872415231 + width: 1.5 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34174,8 +34174,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 872415231 + width: 1.7 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34198,8 +34198,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 872415231 + width: 2.3 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -34221,8 +34221,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 872415231 + width: 3.2 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -34244,8 +34244,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 872415231 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34267,7 +34267,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -34277,8 +34277,8 @@ cont { cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -34310,7 +34310,7 @@ cont { } lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34427,30 +34427,39 @@ cont { } cont { name: "highway-secondary_link" + element { + scale: 13 + lines { + width: 1.3 + color: 452968274 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 872415231 - priority: 260 + width: 1.8 + color: 452968274 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 872415231 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34464,9 +34473,9 @@ cont { element { scale: 17 lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -34480,9 +34489,9 @@ cont { element { scale: 18 lines { - width: 9.4 - color: 16777215 - priority: 260 + width: 6.4 + color: 16760658 + priority: 224 } path_text { primary { @@ -34496,9 +34505,9 @@ cont { element { scale: 19 lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34512,9 +34521,9 @@ cont { element { scale: 20 lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34528,66 +34537,75 @@ cont { } cont { name: "highway-secondary_link-bridge" + element { + scale: 13 + lines { + width: 1.3 + color: 452968274 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 6.8 + width: 4.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 872415231 - priority: 260 + width: 1.8 + color: 452968274 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 8.6 + width: 5.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 5.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 872415231 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.6 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34601,21 +34619,21 @@ cont { element { scale: 17 lines { - width: 16.4 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -34629,21 +34647,21 @@ cont { element { scale: 18 lines { - width: 22.8 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.8 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 9.4 - color: 16777215 - priority: 260 + width: 6.4 + color: 16760658 + priority: 224 } path_text { primary { @@ -34657,21 +34675,21 @@ cont { element { scale: 19 lines { - width: 27.2 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34685,21 +34703,21 @@ cont { element { scale: 20 lines { - width: 27.2 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34713,40 +34731,49 @@ cont { } cont { name: "highway-secondary_link-tunnel" + element { + scale: 13 + lines { + width: 1.3 + color: 452968274 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 872415231 - priority: 260 + width: 1.8 + color: 452968274 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 872415231 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.4 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34760,19 +34787,19 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -34786,19 +34813,19 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -34812,19 +34839,19 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -34838,19 +34865,19 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -34868,7 +34895,7 @@ cont { scale: 13 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -34877,7 +34904,7 @@ cont { scale: 14 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -34886,7 +34913,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -34895,7 +34922,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -34911,7 +34938,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -34927,7 +34954,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -34943,7 +34970,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -34959,7 +34986,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -34978,7 +35005,7 @@ cont { scale: 13 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -34987,7 +35014,7 @@ cont { scale: 14 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -34996,7 +35023,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35005,7 +35032,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35021,7 +35048,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35037,7 +35064,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35053,7 +35080,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35069,7 +35096,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35088,7 +35115,7 @@ cont { scale: 13 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35097,7 +35124,7 @@ cont { scale: 14 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35106,7 +35133,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35127,7 +35154,7 @@ cont { } lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35155,7 +35182,7 @@ cont { } lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35183,7 +35210,7 @@ cont { } lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35211,7 +35238,7 @@ cont { } lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35239,7 +35266,7 @@ cont { } lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35258,7 +35285,7 @@ cont { scale: 15 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35274,7 +35301,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35290,7 +35317,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35306,7 +35333,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35322,7 +35349,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35338,7 +35365,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35357,7 +35384,7 @@ cont { scale: 14 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35366,7 +35393,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35375,7 +35402,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35391,7 +35418,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35407,7 +35434,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35423,7 +35450,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35439,7 +35466,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35458,7 +35485,7 @@ cont { scale: 13 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35467,7 +35494,7 @@ cont { scale: 14 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35476,7 +35503,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -35485,7 +35512,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35501,7 +35528,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35517,7 +35544,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35533,7 +35560,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -35549,7 +35576,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -36378,7 +36405,7 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36387,8 +36414,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 1.3 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36405,8 +36432,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.8 + color: 1308622847 priority: 250 cap: BUTTCAP } @@ -36428,8 +36455,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 + width: 2.7 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -36451,8 +36478,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 + width: 3.8 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -36474,8 +36501,8 @@ cont { element { scale: 16 lines { - width: 4.2 - color: 670628088 + width: 5.0 + color: 16777215 priority: 250 } path_text { @@ -36496,8 +36523,8 @@ cont { element { scale: 17 lines { - width: 5.5 - color: 16316664 + width: 6.6 + color: 16777215 priority: 250 } path_text { @@ -36518,8 +36545,8 @@ cont { element { scale: 18 lines { - width: 8.2 - color: 16316664 + width: 9.4 + color: 16777215 priority: 250 } path_text { @@ -36540,8 +36567,8 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -36562,8 +36589,8 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -36588,7 +36615,7 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36597,8 +36624,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 1.3 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36615,8 +36642,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.8 + color: 1308622847 priority: 250 cap: BUTTCAP } @@ -36638,20 +36665,20 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 5.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 670628088 + width: 2.7 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -36673,20 +36700,20 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 7.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 670628088 + width: 3.8 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -36708,20 +36735,20 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 670628088 + width: 5.0 + color: 16777215 priority: 250 } path_text { @@ -36742,20 +36769,20 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 16316664 + width: 6.6 + color: 16777215 priority: 250 } path_text { @@ -36776,20 +36803,20 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.2 - color: 16316664 + width: 9.4 + color: 16777215 priority: 250 } path_text { @@ -36810,20 +36837,20 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -36844,20 +36871,20 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -36882,7 +36909,7 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36891,8 +36918,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 1.3 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36909,8 +36936,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.8 + color: 1308622847 priority: 250 cap: BUTTCAP } @@ -36932,8 +36959,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 + width: 2.7 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -36955,8 +36982,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 + width: 3.8 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -36978,7 +37005,7 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -36988,8 +37015,8 @@ cont { cap: BUTTCAP } lines { - width: 4.2 - color: 671088639 + width: 5.0 + color: 872415231 priority: 250 } path_text { @@ -37010,7 +37037,7 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 @@ -37020,7 +37047,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.6 color: 16777215 priority: 250 } @@ -37042,7 +37069,7 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 @@ -37052,7 +37079,7 @@ cont { cap: BUTTCAP } lines { - width: 8.2 + width: 9.4 color: 16777215 priority: 250 } @@ -37074,7 +37101,7 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 @@ -37084,7 +37111,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 16777215 priority: 250 } @@ -37106,7 +37133,7 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 @@ -37116,7 +37143,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 16777215 priority: 250 } @@ -37138,37 +37165,46 @@ cont { } cont { name: "highway-tertiary_link" + element { + scale: 14 + lines { + width: 1.8 + color: 1308622847 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 240 + width: 2.5 + color: 671088639 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.2 - color: 670628088 - priority: 240 + width: 3.2 + color: 671088639 + priority: 222 } } element { scale: 17 lines { - width: 5.5 - color: 16316664 - priority: 240 + width: 4.7 + color: 16777215 + priority: 222 } } element { scale: 18 lines { - width: 8.2 - color: 16316664 - priority: 240 + width: 6.4 + color: 16777215 + priority: 222 } path_text { primary { @@ -37182,9 +37218,9 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -37198,9 +37234,9 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -37215,68 +37251,117 @@ cont { cont { name: "highway-tertiary_link-bridge" element { - scale: 15 + scale: 14 lines { - width: 6.8 + width: 4.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 670628088 - priority: 240 + width: 1.8 + color: 1308622847 + priority: 222 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 5.8 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 5.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 + color: 671088639 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 670628088 - priority: 240 + width: 3.2 + color: 671088639 + priority: 222 } } element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 16316664 - priority: 240 + width: 4.7 + color: 16777215 + priority: 222 } } element { scale: 18 + lines { + width: 16.8 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 14.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 16777215 + priority: 222 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 2950 + } + } + element { + scale: 19 lines { width: 20.4 color: 1300267136 @@ -37291,36 +37376,8 @@ cont { } lines { width: 8.2 - color: 16316664 - priority: 240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 2950 - } - } - element { - scale: 19 - lines { - width: 24.8 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 22.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 10.4 - color: 16316664 - priority: 240 + color: 16777215 + priority: 222 } path_text { primary { @@ -37334,21 +37391,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -37362,67 +37419,76 @@ cont { } cont { name: "highway-tertiary_link-tunnel" + element { + scale: 14 + lines { + width: 1.8 + color: 1308622847 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 240 + width: 2.5 + color: 671088639 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 4.2 - color: 671088639 - priority: 240 + width: 3.2 + color: 872415231 + priority: 222 } } element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16777215 - priority: 240 + priority: 222 } } element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -37436,19 +37502,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -37462,19 +37528,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -39478,7 +39544,7 @@ cont { scale: 13 lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -39501,7 +39567,7 @@ cont { scale: 14 lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -39546,7 +39612,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -39774,7 +39840,7 @@ cont { } lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -39809,7 +39875,7 @@ cont { } lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -39866,19 +39932,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -40250,7 +40316,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1300267136 dashdot { dd: 5.0 @@ -40260,7 +40326,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -40414,8 +40480,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40438,8 +40504,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40461,9 +40527,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40486,8 +40552,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -40508,9 +40574,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -40531,9 +40597,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -40554,9 +40620,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -40576,9 +40642,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -40598,9 +40664,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -40620,9 +40686,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -40642,9 +40708,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -40668,8 +40734,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40692,8 +40758,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40715,9 +40781,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40740,8 +40806,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -40762,21 +40828,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -40797,21 +40863,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -40832,21 +40898,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -40866,21 +40932,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -40900,21 +40966,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -40934,21 +41000,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -40968,21 +41034,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41006,8 +41072,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41030,8 +41096,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41053,15 +41119,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1300267136 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41089,13 +41155,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -41116,19 +41182,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -41149,19 +41215,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -41182,19 +41248,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -41214,19 +41280,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41246,19 +41312,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -41278,19 +41344,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41310,19 +41376,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41346,8 +41412,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41355,9 +41421,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41365,9 +41431,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -41382,9 +41448,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41399,9 +41465,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41416,9 +41482,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 670628088 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -41432,9 +41498,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41448,9 +41514,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -41464,9 +41530,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41480,9 +41546,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41500,8 +41566,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41509,9 +41575,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41519,9 +41585,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -41536,9 +41602,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41553,9 +41619,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41570,9 +41636,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 670628088 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -41586,9 +41652,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41602,9 +41668,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -41618,9 +41684,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41634,9 +41700,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41654,8 +41720,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41663,9 +41729,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41673,9 +41739,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -41690,21 +41756,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 - color: 669903835 + width: 5.4 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41719,21 +41785,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 - color: 669903835 + width: 7.6 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41748,21 +41814,21 @@ cont { element { scale: 16 lines { - width: 8.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 - color: 669903835 + width: 10.0 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.0 - color: 670628088 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -41776,21 +41842,21 @@ cont { element { scale: 17 lines { - width: 14.0 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.4 - color: 669903835 + width: 14.8 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41804,21 +41870,21 @@ cont { element { scale: 18 lines { - width: 20.0 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.0 - color: 669903835 + width: 20.8 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -41832,21 +41898,21 @@ cont { element { scale: 19 lines { - width: 24.0 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 669903835 + width: 25.2 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41860,21 +41926,21 @@ cont { element { scale: 20 lines { - width: 24.0 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 669903835 + width: 25.2 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41892,8 +41958,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41901,9 +41967,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41911,9 +41977,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -41928,9 +41994,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41945,9 +42011,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -41962,19 +42028,19 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 4.0 - color: 671088639 - priority: 230 + width: 5.0 + color: 872415231 + priority: 250 } path_text { primary { @@ -41988,19 +42054,19 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 5.4 + width: 6.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -42014,19 +42080,19 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 8.0 + width: 9.4 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -42040,19 +42106,19 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -42066,19 +42132,19 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -48027,42 +48093,42 @@ cont { element { scale: 10 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 11 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 12 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 13 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 14 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 15 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48076,7 +48142,7 @@ cont { element { scale: 16 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48090,7 +48156,7 @@ cont { element { scale: 17 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48104,7 +48170,7 @@ cont { element { scale: 18 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48118,7 +48184,7 @@ cont { element { scale: 19 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48132,7 +48198,7 @@ cont { element { scale: 20 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 83b9371faa..7169c63a9e 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 277f3ca94a..6f373d7038 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -20947,7 +20947,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -20956,7 +20956,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -20972,7 +20972,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -20988,7 +20988,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21004,7 +21004,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21020,7 +21020,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21039,7 +21039,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21048,7 +21048,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21064,7 +21064,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21080,7 +21080,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21096,7 +21096,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21112,7 +21112,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21131,7 +21131,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21140,7 +21140,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21156,7 +21156,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21172,7 +21172,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21188,7 +21188,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21204,7 +21204,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -23642,8 +23642,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -23652,8 +23652,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -23661,7 +23661,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -23678,7 +23678,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -23695,7 +23695,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -23711,7 +23711,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -23727,7 +23727,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -23743,7 +23743,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -23759,7 +23759,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -23778,8 +23778,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -23788,8 +23788,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -23797,7 +23797,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -23814,7 +23814,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -23831,7 +23831,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -23847,7 +23847,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -23863,7 +23863,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -23879,7 +23879,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -23895,7 +23895,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -23914,8 +23914,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -23924,8 +23924,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -23933,7 +23933,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -23950,7 +23950,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -23967,7 +23967,7 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 @@ -23977,7 +23977,7 @@ cont { cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 671088639 priority: 230 } @@ -23993,7 +23993,7 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 @@ -24003,7 +24003,7 @@ cont { cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 16777215 priority: 230 } @@ -24019,7 +24019,7 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 @@ -24029,7 +24029,7 @@ cont { cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 16777215 priority: 230 } @@ -24045,7 +24045,7 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 @@ -24055,7 +24055,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16777215 priority: 230 } @@ -24071,7 +24071,7 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 @@ -24081,7 +24081,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16777215 priority: 230 } @@ -24203,7 +24203,7 @@ cont { scale: 13 lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -24226,7 +24226,7 @@ cont { scale: 14 lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -24271,7 +24271,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -24499,7 +24499,7 @@ cont { } lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -24534,7 +24534,7 @@ cont { } lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -24591,19 +24591,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -24975,7 +24975,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1300267136 dashdot { dd: 5.0 @@ -24985,7 +24985,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -25202,8 +25202,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25226,8 +25226,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25249,9 +25249,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25274,8 +25274,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -25296,9 +25296,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -25319,9 +25319,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -25342,9 +25342,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -25364,9 +25364,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -25386,9 +25386,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -25408,9 +25408,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -25430,9 +25430,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -25456,8 +25456,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25480,8 +25480,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25503,9 +25503,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25528,8 +25528,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -25550,21 +25550,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -25585,21 +25585,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -25620,21 +25620,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -25654,21 +25654,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -25688,21 +25688,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -25722,21 +25722,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -25756,21 +25756,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -25794,8 +25794,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25818,8 +25818,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25841,15 +25841,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1300267136 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25877,13 +25877,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -25904,19 +25904,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -25937,19 +25937,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -25970,19 +25970,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -26002,19 +26002,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26034,19 +26034,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -26066,19 +26066,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26098,19 +26098,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -28564,7 +28564,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1308591910 priority: 290 join: BEVELJOIN @@ -28656,8 +28656,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 + width: 2.3 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -28680,7 +28680,7 @@ cont { scale: 14 lines { width: 3.2 - color: 1308595264 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -28725,7 +28725,7 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -28838,7 +28838,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1308591910 priority: 290 join: BEVELJOIN @@ -28930,8 +28930,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 + width: 2.3 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -28966,7 +28966,7 @@ cont { } lines { width: 3.2 - color: 1308595264 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -29023,19 +29023,19 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -29196,7 +29196,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1308591910 priority: 290 join: BEVELJOIN @@ -29288,8 +29288,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 + width: 2.3 + color: 671061056 priority: 290 cap: BUTTCAP } @@ -29377,7 +29377,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -29387,7 +29387,7 @@ cont { cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -29540,9 +29540,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29564,9 +29564,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29588,9 +29588,9 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 - priority: 280 + width: 1.3 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -29611,9 +29611,9 @@ cont { element { scale: 14 lines { - width: 3.2 - color: 1308595264 - priority: 280 + width: 1.8 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -29634,9 +29634,9 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 2.5 color: 16752972 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -29657,9 +29657,9 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 3.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -29679,9 +29679,9 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 4.7 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -29701,9 +29701,9 @@ cont { element { scale: 18 lines { - width: 9.4 + width: 6.4 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -29723,9 +29723,9 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -29745,9 +29745,9 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -29770,9 +29770,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29794,9 +29794,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 1308595264 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29818,9 +29818,9 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1308595264 - priority: 280 + width: 1.3 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -29840,334 +29840,22 @@ cont { } element { scale: 14 - lines { - width: 7.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.2 - color: 1308595264 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 175 - } - } - element { - scale: 15 - lines { - width: 8.4 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 7.6 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.8 - color: 16752972 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 11 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 250 - } - } - element { - scale: 16 - lines { - width: 9.6 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 8.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } lines { width: 4.4 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 872415231 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 17 - lines { - width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 872415231 - } - priority: 6100 - } - shield { - height: 10 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 18 - lines { - width: 22.8 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 20.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 9.4 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 10 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 19 - lines { - width: 27.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 25.2 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 11.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 11 - color: 16777215 - priority: 2970 - min_distance: 350 - } - } - element { - scale: 20 - lines { - width: 27.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 25.2 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 11.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 11 - color: 16777215 - priority: 2970 - min_distance: 350 - } - } -} -cont { - name: "highway-primary_link-tunnel" - element { - scale: 11 - lines { - width: 1.5 - color: 1308595264 - priority: 280 - join: BEVELJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 90 - } - } - element { - scale: 12 - lines { - width: 1.7 - color: 1308595264 - priority: 280 - join: BEVELJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 451800027 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 90 - } - } - element { - scale: 13 - lines { - width: 2.4 - color: 1308595264 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 451800027 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 120 - } - } - element { - scale: 14 - lines { - width: 5.2 - color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 - cap: BUTTCAP - } - lines { - width: 3.2 - color: 1308402786 - priority: 280 + width: 1.8 + color: 671061056 + priority: 226 cap: BUTTCAP } path_text { @@ -30190,17 +29878,19 @@ cont { lines { width: 5.8 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 3.8 + width: 5.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 color: 16752972 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -30221,19 +29911,21 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.2 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 4.4 + width: 6.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 3.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -30253,19 +29945,21 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 12.6 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 6.6 + width: 11.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 4.7 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -30285,19 +29979,21 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 16.8 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 14.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -30317,19 +30013,21 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 20.4 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 11.6 + width: 18.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -30349,19 +30047,321 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 20.4 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 18.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 11 + color: 16777215 + priority: 2970 + min_distance: 350 + } + } +} +cont { + name: "highway-primary_link-tunnel" + element { + scale: 11 + lines { + width: 0.8 + color: 1308595264 + priority: 226 + join: BEVELJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 90 + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1308595264 + priority: 226 + join: BEVELJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 451800027 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 90 + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 671061056 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 451800027 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 120 + } + } + element { + scale: 14 + lines { + width: 3.8 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 11.6 + width: 1.8 + color: 1308402786 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 175 + } + } + element { + scale: 15 + lines { + width: 4.5 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 2.5 color: 16752972 - priority: 280 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 250 + } + } + element { + scale: 16 + lines { + width: 5.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 3.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 17 + lines { + width: 6.7 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 4.7 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 6100 + } + shield { + height: 10 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 18 + lines { + width: 8.4 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 10 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 19 + lines { + width: 10.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 11 + color: 16777215 + priority: 2970 + min_distance: 350 + } + } + element { + scale: 20 + lines { + width: 10.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 } path_text { primary { @@ -30485,9 +30485,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -30495,9 +30495,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -30512,9 +30512,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30529,9 +30529,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30552,9 +30552,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 670628088 - priority: 250 + priority: 230 } path_text { primary { @@ -30574,9 +30574,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30596,9 +30596,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30618,9 +30618,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30640,9 +30640,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30665,9 +30665,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -30675,9 +30675,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -30692,9 +30692,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30709,9 +30709,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30732,9 +30732,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 670628088 - priority: 250 + priority: 230 } path_text { primary { @@ -30754,9 +30754,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30776,9 +30776,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30798,9 +30798,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30820,9 +30820,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -30845,9 +30845,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -30855,9 +30855,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -30872,21 +30872,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 4.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 3.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30901,21 +30901,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 5.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 4.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30936,21 +30936,21 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 670628088 - priority: 250 + priority: 230 } path_text { primary { @@ -30970,21 +30970,21 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -31004,21 +31004,21 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -31038,21 +31038,21 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -31072,21 +31072,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -31109,9 +31109,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 0.7 + color: 1308162296 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -31119,9 +31119,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 250 + width: 1.0 + color: 1308162296 + priority: 230 cap: BUTTCAP } path_text { @@ -31136,9 +31136,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -31153,9 +31153,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -31176,19 +31176,19 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 671088639 - priority: 250 + priority: 230 } path_text { primary { @@ -31208,19 +31208,19 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -31240,19 +31240,19 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -31272,19 +31272,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -31304,19 +31304,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -31439,8 +31439,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31449,8 +31449,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -31458,7 +31458,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -31475,7 +31475,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -31492,7 +31492,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -31508,7 +31508,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -31524,7 +31524,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -31540,7 +31540,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -31556,7 +31556,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -31575,8 +31575,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31585,8 +31585,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -31594,7 +31594,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -31611,7 +31611,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -31628,19 +31628,19 @@ cont { element { scale: 16 lines { - width: 8.4 + width: 6.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -31656,19 +31656,19 @@ cont { element { scale: 17 lines { - width: 11.2 + width: 9.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.8 + width: 9.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -31684,19 +31684,19 @@ cont { element { scale: 18 lines { - width: 16.4 + width: 13.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 16.0 + width: 12.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -31712,19 +31712,19 @@ cont { element { scale: 19 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -31740,19 +31740,19 @@ cont { element { scale: 20 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -31771,8 +31771,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 0.7 + color: 1308162296 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31781,8 +31781,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.0 + color: 1308162296 priority: 230 cap: BUTTCAP } @@ -31790,7 +31790,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 670628088 priority: 230 cap: BUTTCAP @@ -31807,7 +31807,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 670628088 priority: 230 cap: BUTTCAP @@ -31824,7 +31824,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 670628088 priority: 230 } @@ -31840,7 +31840,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -31856,7 +31856,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -31872,7 +31872,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -31888,7 +31888,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -31907,8 +31907,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 872415231 + width: 1.2 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -31925,8 +31925,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 872415231 + width: 1.5 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -31943,8 +31943,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 872415231 + width: 1.7 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -31967,8 +31967,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 872415231 + width: 2.3 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -31990,8 +31990,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 872415231 + width: 3.2 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -32013,8 +32013,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 872415231 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -32036,8 +32036,8 @@ cont { element { scale: 16 lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -32059,7 +32059,7 @@ cont { scale: 17 lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32081,7 +32081,7 @@ cont { scale: 18 lines { width: 9.4 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32103,7 +32103,7 @@ cont { scale: 19 lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32125,7 +32125,7 @@ cont { scale: 20 lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32149,8 +32149,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 872415231 + width: 1.2 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32167,8 +32167,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 872415231 + width: 1.5 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32185,8 +32185,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 872415231 + width: 1.7 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32209,8 +32209,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 872415231 + width: 2.3 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -32232,20 +32232,20 @@ cont { element { scale: 14 lines { - width: 6.8 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 872415231 + width: 3.2 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -32267,20 +32267,20 @@ cont { element { scale: 15 lines { - width: 8.6 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 7.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 872415231 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -32302,20 +32302,20 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -32349,7 +32349,7 @@ cont { } lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32383,7 +32383,7 @@ cont { } lines { width: 9.4 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32417,7 +32417,7 @@ cont { } lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32451,7 +32451,7 @@ cont { } lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32475,8 +32475,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 872415231 + width: 1.2 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32493,8 +32493,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 872415231 + width: 1.5 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32511,8 +32511,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 872415231 + width: 1.7 + color: 872395302 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32535,8 +32535,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 872415231 + width: 2.3 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -32558,8 +32558,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 872415231 + width: 3.2 + color: 452968274 priority: 270 cap: BUTTCAP } @@ -32581,8 +32581,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 872415231 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -32604,7 +32604,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -32614,8 +32614,8 @@ cont { cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -32647,7 +32647,7 @@ cont { } lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -32764,30 +32764,39 @@ cont { } cont { name: "highway-secondary_link" + element { + scale: 13 + lines { + width: 1.3 + color: 452968274 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 872415231 - priority: 260 + width: 1.8 + color: 452968274 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 872415231 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -32801,9 +32810,9 @@ cont { element { scale: 17 lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -32817,9 +32826,9 @@ cont { element { scale: 18 lines { - width: 9.4 - color: 16777215 - priority: 260 + width: 6.4 + color: 16760658 + priority: 224 } path_text { primary { @@ -32833,9 +32842,9 @@ cont { element { scale: 19 lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -32849,9 +32858,9 @@ cont { element { scale: 20 lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -32865,66 +32874,75 @@ cont { } cont { name: "highway-secondary_link-bridge" + element { + scale: 13 + lines { + width: 1.3 + color: 452968274 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 6.8 + width: 4.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 872415231 - priority: 260 + width: 1.8 + color: 452968274 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 8.6 + width: 5.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 5.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 872415231 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.6 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -32938,21 +32956,21 @@ cont { element { scale: 17 lines { - width: 16.4 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -32966,21 +32984,21 @@ cont { element { scale: 18 lines { - width: 22.8 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.8 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 9.4 - color: 16777215 - priority: 260 + width: 6.4 + color: 16760658 + priority: 224 } path_text { primary { @@ -32994,21 +33012,21 @@ cont { element { scale: 19 lines { - width: 27.2 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -33022,21 +33040,21 @@ cont { element { scale: 20 lines { - width: 27.2 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -33050,40 +33068,49 @@ cont { } cont { name: "highway-secondary_link-tunnel" + element { + scale: 13 + lines { + width: 1.3 + color: 452968274 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 872415231 - priority: 260 + width: 1.8 + color: 452968274 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 872415231 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.4 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -33097,19 +33124,19 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -33123,19 +33150,19 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -33149,19 +33176,19 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -33175,19 +33202,19 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -33205,7 +33232,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -33214,7 +33241,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33230,7 +33257,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33246,7 +33273,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33262,7 +33289,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33278,7 +33305,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33297,7 +33324,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -33306,7 +33333,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33322,7 +33349,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33338,7 +33365,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33354,7 +33381,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33370,7 +33397,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33389,7 +33416,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -33410,7 +33437,7 @@ cont { } lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33438,7 +33465,7 @@ cont { } lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33466,7 +33493,7 @@ cont { } lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33494,7 +33521,7 @@ cont { } lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33522,7 +33549,7 @@ cont { } lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33541,7 +33568,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33557,7 +33584,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33573,7 +33600,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33589,7 +33616,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33605,7 +33632,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33624,7 +33651,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -33633,7 +33660,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33649,7 +33676,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33665,7 +33692,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33681,7 +33708,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33697,7 +33724,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33716,7 +33743,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -33725,7 +33752,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33741,7 +33768,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33757,7 +33784,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33773,7 +33800,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -33789,7 +33816,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -34397,7 +34424,7 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34406,8 +34433,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 1.3 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34424,8 +34451,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.8 + color: 1308622847 priority: 250 cap: BUTTCAP } @@ -34447,8 +34474,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 + width: 2.7 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -34470,8 +34497,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 + width: 3.8 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -34493,8 +34520,8 @@ cont { element { scale: 16 lines { - width: 4.2 - color: 670628088 + width: 5.0 + color: 16777215 priority: 250 } path_text { @@ -34515,8 +34542,8 @@ cont { element { scale: 17 lines { - width: 5.5 - color: 16316664 + width: 6.6 + color: 16777215 priority: 250 } path_text { @@ -34537,8 +34564,8 @@ cont { element { scale: 18 lines { - width: 8.2 - color: 16316664 + width: 9.4 + color: 16777215 priority: 250 } path_text { @@ -34559,8 +34586,8 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -34581,8 +34608,8 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -34607,7 +34634,7 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34616,8 +34643,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 1.3 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34634,8 +34661,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.8 + color: 1308622847 priority: 250 cap: BUTTCAP } @@ -34657,20 +34684,20 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 5.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 670628088 + width: 2.7 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -34692,20 +34719,20 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 7.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 670628088 + width: 3.8 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -34727,20 +34754,20 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 670628088 + width: 5.0 + color: 16777215 priority: 250 } path_text { @@ -34761,20 +34788,20 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 16316664 + width: 6.6 + color: 16777215 priority: 250 } path_text { @@ -34795,20 +34822,20 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.2 - color: 16316664 + width: 9.4 + color: 16777215 priority: 250 } path_text { @@ -34829,20 +34856,20 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -34863,20 +34890,20 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -34901,7 +34928,7 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34910,8 +34937,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 + width: 1.3 + color: 1308622847 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34928,8 +34955,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 + width: 1.8 + color: 1308622847 priority: 250 cap: BUTTCAP } @@ -34951,8 +34978,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 + width: 2.7 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -34974,8 +35001,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 + width: 3.8 + color: 671088639 priority: 250 cap: BUTTCAP } @@ -34997,7 +35024,7 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -35007,8 +35034,8 @@ cont { cap: BUTTCAP } lines { - width: 4.2 - color: 671088639 + width: 5.0 + color: 872415231 priority: 250 } path_text { @@ -35029,7 +35056,7 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 @@ -35039,7 +35066,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.6 color: 16777215 priority: 250 } @@ -35061,7 +35088,7 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 @@ -35071,7 +35098,7 @@ cont { cap: BUTTCAP } lines { - width: 8.2 + width: 9.4 color: 16777215 priority: 250 } @@ -35093,7 +35120,7 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 @@ -35103,7 +35130,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 16777215 priority: 250 } @@ -35125,7 +35152,7 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 @@ -35135,7 +35162,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 16777215 priority: 250 } @@ -35157,37 +35184,46 @@ cont { } cont { name: "highway-tertiary_link" + element { + scale: 14 + lines { + width: 1.8 + color: 1308622847 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 240 + width: 2.5 + color: 671088639 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.2 - color: 670628088 - priority: 240 + width: 3.2 + color: 671088639 + priority: 222 } } element { scale: 17 lines { - width: 5.5 - color: 16316664 - priority: 240 + width: 4.7 + color: 16777215 + priority: 222 } } element { scale: 18 lines { - width: 8.2 - color: 16316664 - priority: 240 + width: 6.4 + color: 16777215 + priority: 222 } path_text { primary { @@ -35201,9 +35237,9 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -35217,9 +35253,9 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -35234,68 +35270,117 @@ cont { cont { name: "highway-tertiary_link-bridge" element { - scale: 15 + scale: 14 lines { - width: 6.8 + width: 4.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 670628088 - priority: 240 + width: 1.8 + color: 1308622847 + priority: 222 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 5.8 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 5.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 + color: 671088639 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 670628088 - priority: 240 + width: 3.2 + color: 671088639 + priority: 222 } } element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 16316664 - priority: 240 + width: 4.7 + color: 16777215 + priority: 222 } } element { scale: 18 + lines { + width: 16.8 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 14.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 16777215 + priority: 222 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 2950 + } + } + element { + scale: 19 lines { width: 20.4 color: 1300267136 @@ -35310,36 +35395,8 @@ cont { } lines { width: 8.2 - color: 16316664 - priority: 240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 2950 - } - } - element { - scale: 19 - lines { - width: 24.8 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 22.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 10.4 - color: 16316664 - priority: 240 + color: 16777215 + priority: 222 } path_text { primary { @@ -35353,21 +35410,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -35381,67 +35438,76 @@ cont { } cont { name: "highway-tertiary_link-tunnel" + element { + scale: 14 + lines { + width: 1.8 + color: 1308622847 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 240 + width: 2.5 + color: 671088639 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 4.2 - color: 671088639 - priority: 240 + width: 3.2 + color: 872415231 + priority: 222 } } element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16777215 - priority: 240 + priority: 222 } } element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -35455,19 +35521,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -35481,19 +35547,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -37107,7 +37173,7 @@ cont { scale: 13 lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -37130,7 +37196,7 @@ cont { scale: 14 lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -37175,7 +37241,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -37403,7 +37469,7 @@ cont { } lines { width: 2.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -37438,7 +37504,7 @@ cont { } lines { width: 3.8 - color: 1308588582 + color: 671054374 priority: 310 cap: BUTTCAP } @@ -37495,19 +37561,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -37879,7 +37945,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1300267136 dashdot { dd: 5.0 @@ -37889,7 +37955,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -38043,8 +38109,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38067,8 +38133,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38090,9 +38156,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38115,8 +38181,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -38137,9 +38203,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -38160,9 +38226,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -38183,9 +38249,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -38205,9 +38271,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38227,9 +38293,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -38249,9 +38315,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38271,9 +38337,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38297,8 +38363,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38321,8 +38387,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38344,9 +38410,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38369,8 +38435,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 cap: BUTTCAP } path_text { @@ -38391,21 +38457,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 1308588582 - priority: 300 + width: 2.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -38426,21 +38492,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1308588582 - priority: 300 + width: 3.6 + color: 671057702 + priority: 228 cap: BUTTCAP } path_text { @@ -38461,21 +38527,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 1308588582 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -38495,21 +38561,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 1308588582 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38529,21 +38595,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -38563,21 +38629,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38597,21 +38663,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38635,8 +38701,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38659,8 +38725,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1308588582 - priority: 300 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38682,15 +38748,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1300267136 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 1308588582 - priority: 300 + width: 1.3 + color: 1308591910 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38718,13 +38784,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -38745,19 +38811,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 1308402786 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -38778,19 +38844,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -38811,19 +38877,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -38843,19 +38909,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38875,19 +38941,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -38907,19 +38973,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38939,19 +39005,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -38975,8 +39041,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -38984,9 +39050,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -38994,9 +39060,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -39011,9 +39077,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39028,9 +39094,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39045,9 +39111,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 670628088 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -39061,9 +39127,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39077,9 +39143,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -39093,9 +39159,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39109,9 +39175,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39129,8 +39195,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39138,9 +39204,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39148,9 +39214,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -39165,9 +39231,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39182,9 +39248,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39199,9 +39265,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 670628088 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -39215,9 +39281,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39231,9 +39297,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -39247,9 +39313,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39263,9 +39329,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39283,8 +39349,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39292,9 +39358,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39302,9 +39368,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -39319,21 +39385,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 - color: 669903835 + width: 5.4 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39348,21 +39414,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 - color: 669903835 + width: 7.6 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39377,21 +39443,21 @@ cont { element { scale: 16 lines { - width: 8.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 - color: 669903835 + width: 10.0 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.0 - color: 670628088 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -39405,21 +39471,21 @@ cont { element { scale: 17 lines { - width: 14.0 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.4 - color: 669903835 + width: 14.8 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39433,21 +39499,21 @@ cont { element { scale: 18 lines { - width: 20.0 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.0 - color: 669903835 + width: 20.8 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -39461,21 +39527,21 @@ cont { element { scale: 19 lines { - width: 24.0 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 669903835 + width: 25.2 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39489,21 +39555,21 @@ cont { element { scale: 20 lines { - width: 24.0 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 669903835 + width: 25.2 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -39521,8 +39587,8 @@ cont { scale: 11 lines { width: 0.8 - color: 670628088 - priority: 230 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39530,9 +39596,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.3 + color: 1308622847 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39540,9 +39606,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 670628088 - priority: 230 + width: 1.8 + color: 1308622847 + priority: 250 cap: BUTTCAP } path_text { @@ -39557,9 +39623,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 670628088 - priority: 230 + width: 2.7 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39574,9 +39640,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 670628088 - priority: 230 + width: 3.8 + color: 671088639 + priority: 250 cap: BUTTCAP } path_text { @@ -39591,19 +39657,19 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 4.0 - color: 671088639 - priority: 230 + width: 5.0 + color: 872415231 + priority: 250 } path_text { primary { @@ -39617,19 +39683,19 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 5.4 + width: 6.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -39643,19 +39709,19 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 8.0 + width: 9.4 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -39669,19 +39735,19 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -39695,19 +39761,19 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -45610,42 +45676,42 @@ cont { element { scale: 10 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 11 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 12 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 13 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 14 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 15 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -45659,7 +45725,7 @@ cont { element { scale: 16 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -45673,7 +45739,7 @@ cont { element { scale: 17 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -45687,7 +45753,7 @@ cont { element { scale: 18 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -45701,7 +45767,7 @@ cont { element { scale: 19 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -45715,7 +45781,7 @@ cont { element { scale: 20 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 40ae0f2981..e57da7e3b0 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 15bb7f9e3b..d0f53f2eed 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -20947,7 +20947,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -20956,7 +20956,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -20972,7 +20972,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -20988,7 +20988,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21004,7 +21004,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21020,7 +21020,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21039,7 +21039,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -21048,7 +21048,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21064,7 +21064,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21080,7 +21080,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21096,7 +21096,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21112,7 +21112,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21131,7 +21131,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -21140,7 +21140,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21156,7 +21156,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21172,7 +21172,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21188,7 +21188,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21204,7 +21204,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -23642,8 +23642,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 0.7 + color: 1296778819 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -23652,8 +23652,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.0 + color: 1296778819 priority: 230 cap: BUTTCAP } @@ -23661,7 +23661,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 priority: 230 cap: BUTTCAP @@ -23678,7 +23678,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 priority: 230 cap: BUTTCAP @@ -23695,7 +23695,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 659244611 priority: 230 } @@ -23711,7 +23711,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -23727,7 +23727,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -23743,7 +23743,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -23759,7 +23759,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -23778,8 +23778,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 0.7 + color: 1296778819 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -23788,8 +23788,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.0 + color: 1296778819 priority: 230 cap: BUTTCAP } @@ -23797,7 +23797,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 priority: 230 cap: BUTTCAP @@ -23814,7 +23814,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 priority: 230 cap: BUTTCAP @@ -23831,7 +23831,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 659244611 priority: 230 } @@ -23847,7 +23847,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -23863,7 +23863,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -23879,7 +23879,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -23895,7 +23895,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -23914,8 +23914,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 0.7 + color: 1296778819 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -23924,8 +23924,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.0 + color: 1296778819 priority: 230 cap: BUTTCAP } @@ -23933,7 +23933,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 priority: 230 cap: BUTTCAP @@ -23950,7 +23950,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 priority: 230 cap: BUTTCAP @@ -23967,7 +23967,7 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 @@ -23977,7 +23977,7 @@ cont { cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 657139751 priority: 230 } @@ -23993,7 +23993,7 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 @@ -24003,7 +24003,7 @@ cont { cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 2828327 priority: 230 } @@ -24019,7 +24019,7 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 @@ -24029,7 +24029,7 @@ cont { cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 2828327 priority: 230 } @@ -24045,7 +24045,7 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 @@ -24055,7 +24055,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 2828327 priority: 230 } @@ -24071,7 +24071,7 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 @@ -24081,7 +24081,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 2828327 priority: 230 } @@ -24206,7 +24206,7 @@ cont { scale: 13 lines { width: 2.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -24230,7 +24230,7 @@ cont { scale: 14 lines { width: 3.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -24277,7 +24277,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -24513,7 +24513,7 @@ cont { } lines { width: 2.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -24549,7 +24549,7 @@ cont { } lines { width: 3.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -24608,19 +24608,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -25003,7 +25003,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1291845632 dashdot { dd: 5.0 @@ -25013,7 +25013,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -25235,8 +25235,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25260,8 +25260,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25284,9 +25284,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1296640283 - priority: 300 + width: 1.3 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25310,8 +25310,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 cap: BUTTCAP } path_text { @@ -25333,9 +25333,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 1296640283 - priority: 300 + width: 2.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -25357,9 +25357,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 1296640283 - priority: 300 + width: 3.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -25381,9 +25381,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 1296640283 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -25404,9 +25404,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 1296640283 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -25427,9 +25427,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -25450,9 +25450,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -25473,9 +25473,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -25500,8 +25500,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25525,8 +25525,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25549,9 +25549,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1296640283 - priority: 300 + width: 1.3 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25575,8 +25575,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 cap: BUTTCAP } path_text { @@ -25598,21 +25598,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 1296640283 - priority: 300 + width: 2.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -25634,21 +25634,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1296640283 - priority: 300 + width: 3.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -25670,21 +25670,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 1296640283 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -25705,21 +25705,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 1296640283 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -25740,21 +25740,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -25775,21 +25775,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -25810,21 +25810,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -25849,8 +25849,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25874,8 +25874,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25898,15 +25898,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1291845632 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 1296640283 - priority: 300 + width: 1.3 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -25935,13 +25935,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 1295523604 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -25963,19 +25963,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 1295523604 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -25997,19 +25997,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -26031,19 +26031,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -26064,19 +26064,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -26097,19 +26097,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -26130,19 +26130,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -26163,19 +26163,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -28630,7 +28630,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1297691427 priority: 290 join: BEVELJOIN @@ -28725,8 +28725,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1297691427 + width: 2.3 + color: 660157219 priority: 290 cap: BUTTCAP } @@ -28750,7 +28750,7 @@ cont { scale: 14 lines { width: 3.2 - color: 1297691427 + color: 660157219 priority: 290 cap: BUTTCAP } @@ -28797,7 +28797,7 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 5.0 color: 5845795 priority: 290 } @@ -28915,7 +28915,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1297691427 priority: 290 join: BEVELJOIN @@ -29010,8 +29010,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1297691427 + width: 2.3 + color: 660157219 priority: 290 cap: BUTTCAP } @@ -29047,7 +29047,7 @@ cont { } lines { width: 3.2 - color: 1297691427 + color: 660157219 priority: 290 cap: BUTTCAP } @@ -29106,19 +29106,19 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 5845795 priority: 290 } @@ -29284,7 +29284,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 1297691427 priority: 290 join: BEVELJOIN @@ -29379,8 +29379,8 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1297691427 + width: 2.3 + color: 660157219 priority: 290 cap: BUTTCAP } @@ -29471,7 +29471,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 @@ -29481,7 +29481,7 @@ cont { cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 5845795 priority: 290 } @@ -29639,9 +29639,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 1297691427 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29664,9 +29664,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 1297691427 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29689,9 +29689,9 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1297691427 - priority: 280 + width: 1.3 + color: 660157219 + priority: 226 cap: BUTTCAP } path_text { @@ -29713,9 +29713,9 @@ cont { element { scale: 14 lines { - width: 3.2 - color: 1297691427 - priority: 280 + width: 1.8 + color: 660157219 + priority: 226 cap: BUTTCAP } path_text { @@ -29737,9 +29737,9 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 2.5 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -29761,9 +29761,9 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 3.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -29784,9 +29784,9 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 4.7 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -29807,9 +29807,9 @@ cont { element { scale: 18 lines { - width: 9.4 + width: 6.4 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -29830,9 +29830,9 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -29853,9 +29853,9 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -29879,9 +29879,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 1297691427 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29904,9 +29904,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 1297691427 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -29929,9 +29929,9 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1297691427 - priority: 280 + width: 1.3 + color: 660157219 + priority: 226 cap: BUTTCAP } path_text { @@ -29953,21 +29953,21 @@ cont { element { scale: 14 lines { - width: 7.2 + width: 4.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.4 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.2 - color: 1297691427 - priority: 280 + width: 1.8 + color: 660157219 + priority: 226 cap: BUTTCAP } path_text { @@ -29989,21 +29989,21 @@ cont { element { scale: 15 lines { - width: 8.4 + width: 5.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 7.6 + width: 5.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.8 + width: 2.5 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -30025,21 +30025,21 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 + width: 3.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30060,21 +30060,21 @@ cont { element { scale: 17 lines { - width: 16.4 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.6 + width: 4.7 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30095,21 +30095,21 @@ cont { element { scale: 18 lines { - width: 22.8 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.8 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30130,21 +30130,21 @@ cont { element { scale: 19 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30165,21 +30165,21 @@ cont { element { scale: 20 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30203,9 +30203,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 1297691427 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -30228,9 +30228,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 1297691427 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -30253,9 +30253,9 @@ cont { element { scale: 13 lines { - width: 2.4 - color: 1297691427 - priority: 280 + width: 1.3 + color: 660157219 + priority: 226 cap: BUTTCAP } path_text { @@ -30277,19 +30277,19 @@ cont { element { scale: 14 lines { - width: 5.2 + width: 3.8 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 3.2 + width: 1.8 color: 1296837147 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -30311,19 +30311,19 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 4.5 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 3.8 + width: 2.5 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -30345,19 +30345,19 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 4.4 + width: 3.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30378,19 +30378,19 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 6.6 + width: 4.7 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30411,19 +30411,19 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30444,19 +30444,19 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30477,19 +30477,19 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -30614,9 +30614,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 0.7 + color: 1296778819 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -30624,9 +30624,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 1.0 + color: 1296778819 + priority: 230 cap: BUTTCAP } path_text { @@ -30641,9 +30641,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30658,9 +30658,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30682,9 +30682,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 659244611 - priority: 250 + priority: 230 } path_text { primary { @@ -30705,9 +30705,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30728,9 +30728,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30751,9 +30751,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30774,9 +30774,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30800,9 +30800,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 0.7 + color: 1296778819 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -30810,9 +30810,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 1.0 + color: 1296778819 + priority: 230 cap: BUTTCAP } path_text { @@ -30827,9 +30827,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30844,9 +30844,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -30868,9 +30868,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 659244611 - priority: 250 + priority: 230 } path_text { primary { @@ -30891,9 +30891,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30914,9 +30914,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30937,9 +30937,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30960,9 +30960,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -30986,9 +30986,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 0.7 + color: 1296778819 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -30996,9 +30996,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 1.0 + color: 1296778819 + priority: 230 cap: BUTTCAP } path_text { @@ -31013,21 +31013,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 4.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 3.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 + width: 1.6 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -31042,21 +31042,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 5.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 4.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 + width: 2.4 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -31078,21 +31078,21 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 659244611 - priority: 250 + priority: 230 } path_text { primary { @@ -31113,21 +31113,21 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -31148,21 +31148,21 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -31183,21 +31183,21 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -31218,21 +31218,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -31256,9 +31256,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 0.7 + color: 1296778819 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -31266,9 +31266,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 250 + width: 1.0 + color: 1296778819 + priority: 230 cap: BUTTCAP } path_text { @@ -31283,9 +31283,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -31300,9 +31300,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -31324,19 +31324,19 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 657139751 - priority: 250 + priority: 230 } path_text { primary { @@ -31357,19 +31357,19 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -31390,19 +31390,19 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -31423,19 +31423,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -31456,19 +31456,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -31592,8 +31592,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 0.7 + color: 1296778819 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31602,8 +31602,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.0 + color: 1296778819 priority: 230 cap: BUTTCAP } @@ -31611,7 +31611,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 priority: 230 cap: BUTTCAP @@ -31628,7 +31628,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 priority: 230 cap: BUTTCAP @@ -31645,7 +31645,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 659244611 priority: 230 } @@ -31661,7 +31661,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -31677,7 +31677,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -31693,7 +31693,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -31709,7 +31709,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -31728,8 +31728,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 0.7 + color: 1296778819 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31738,8 +31738,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.0 + color: 1296778819 priority: 230 cap: BUTTCAP } @@ -31747,7 +31747,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 priority: 230 cap: BUTTCAP @@ -31764,7 +31764,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 priority: 230 cap: BUTTCAP @@ -31781,19 +31781,19 @@ cont { element { scale: 16 lines { - width: 8.4 + width: 6.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 659244611 priority: 230 } @@ -31809,19 +31809,19 @@ cont { element { scale: 17 lines { - width: 11.2 + width: 9.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.8 + width: 9.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -31837,19 +31837,19 @@ cont { element { scale: 18 lines { - width: 16.4 + width: 13.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 16.0 + width: 12.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -31865,19 +31865,19 @@ cont { element { scale: 19 lines { - width: 20.4 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -31893,19 +31893,19 @@ cont { element { scale: 20 lines { - width: 20.4 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -31924,8 +31924,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 0.7 + color: 1296778819 priority: 230 join: BEVELJOIN cap: BUTTCAP @@ -31934,8 +31934,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.0 + color: 1296778819 priority: 230 cap: BUTTCAP } @@ -31943,7 +31943,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 659244611 priority: 230 cap: BUTTCAP @@ -31960,7 +31960,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 659244611 priority: 230 cap: BUTTCAP @@ -31977,7 +31977,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 659244611 priority: 230 } @@ -31993,7 +31993,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -32009,7 +32009,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -32025,7 +32025,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -32041,7 +32041,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -32060,8 +32060,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 860571203 + width: 1.2 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32078,8 +32078,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 860571203 + width: 1.5 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32096,8 +32096,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 860571203 + width: 1.7 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32121,8 +32121,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 860571203 + width: 2.3 + color: 441925171 priority: 270 cap: BUTTCAP } @@ -32145,8 +32145,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 860571203 + width: 3.2 + color: 441925171 priority: 270 cap: BUTTCAP } @@ -32169,8 +32169,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 860571203 + width: 3.8 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -32193,8 +32193,8 @@ cont { element { scale: 16 lines { - width: 4.4 - color: 4933187 + width: 5.0 + color: 5717555 priority: 270 } path_text { @@ -32217,7 +32217,7 @@ cont { scale: 17 lines { width: 6.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32240,7 +32240,7 @@ cont { scale: 18 lines { width: 9.4 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32263,7 +32263,7 @@ cont { scale: 19 lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32286,7 +32286,7 @@ cont { scale: 20 lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32311,8 +32311,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 860571203 + width: 1.2 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32329,8 +32329,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 860571203 + width: 1.5 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32347,8 +32347,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 860571203 + width: 1.7 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32372,8 +32372,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 860571203 + width: 2.3 + color: 441925171 priority: 270 cap: BUTTCAP } @@ -32396,20 +32396,20 @@ cont { element { scale: 14 lines { - width: 6.8 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 860571203 + width: 3.2 + color: 441925171 priority: 270 cap: BUTTCAP } @@ -32432,20 +32432,20 @@ cont { element { scale: 15 lines { - width: 8.6 + width: 8.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 7.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 860571203 + width: 3.8 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -32468,20 +32468,20 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 + width: 5.0 + color: 5717555 priority: 270 } path_text { @@ -32516,7 +32516,7 @@ cont { } lines { width: 6.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32551,7 +32551,7 @@ cont { } lines { width: 9.4 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32586,7 +32586,7 @@ cont { } lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32621,7 +32621,7 @@ cont { } lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32646,8 +32646,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 860571203 + width: 1.2 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32664,8 +32664,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 860571203 + width: 1.5 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32682,8 +32682,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 860571203 + width: 1.7 + color: 861355571 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -32707,8 +32707,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 860571203 + width: 2.3 + color: 441925171 priority: 270 cap: BUTTCAP } @@ -32731,8 +32731,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 860571203 + width: 3.2 + color: 441925171 priority: 270 cap: BUTTCAP } @@ -32755,8 +32755,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 860571203 + width: 3.8 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -32779,7 +32779,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 @@ -32789,8 +32789,8 @@ cont { cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 + width: 5.0 + color: 5717555 priority: 270 } path_text { @@ -32823,7 +32823,7 @@ cont { } lines { width: 6.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -32944,30 +32944,39 @@ cont { } cont { name: "highway-secondary_link" + element { + scale: 13 + lines { + width: 1.3 + color: 441925171 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 860571203 - priority: 260 + width: 1.8 + color: 441925171 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 860571203 - priority: 260 + width: 2.5 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.4 - color: 4933187 - priority: 260 + width: 3.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -32981,9 +32990,9 @@ cont { element { scale: 17 lines { - width: 6.6 - color: 4933187 - priority: 260 + width: 4.7 + color: 5717555 + priority: 224 } path_text { primary { @@ -32997,9 +33006,9 @@ cont { element { scale: 18 lines { - width: 9.4 - color: 4933187 - priority: 260 + width: 6.4 + color: 5717555 + priority: 224 } path_text { primary { @@ -33013,9 +33022,9 @@ cont { element { scale: 19 lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -33029,9 +33038,9 @@ cont { element { scale: 20 lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -33045,66 +33054,75 @@ cont { } cont { name: "highway-secondary_link-bridge" + element { + scale: 13 + lines { + width: 1.3 + color: 441925171 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 6.8 + width: 4.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 860571203 - priority: 260 + width: 1.8 + color: 441925171 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 8.6 + width: 5.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 5.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 860571203 - priority: 260 + width: 2.5 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.6 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 - priority: 260 + width: 3.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -33118,21 +33136,21 @@ cont { element { scale: 17 lines { - width: 16.4 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 4933187 - priority: 260 + width: 4.7 + color: 5717555 + priority: 224 } path_text { primary { @@ -33146,21 +33164,21 @@ cont { element { scale: 18 lines { - width: 22.8 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.8 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 9.4 - color: 4933187 - priority: 260 + width: 6.4 + color: 5717555 + priority: 224 } path_text { primary { @@ -33174,21 +33192,21 @@ cont { element { scale: 19 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -33202,21 +33220,21 @@ cont { element { scale: 20 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -33230,40 +33248,49 @@ cont { } cont { name: "highway-secondary_link-tunnel" + element { + scale: 13 + lines { + width: 1.3 + color: 441925171 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 860571203 - priority: 260 + width: 1.8 + color: 441925171 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 860571203 - priority: 260 + width: 2.5 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.4 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 - priority: 260 + width: 3.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -33277,19 +33304,19 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 6.6 - color: 4933187 - priority: 260 + width: 4.7 + color: 5717555 + priority: 224 } path_text { primary { @@ -33303,19 +33330,19 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 2828327 - priority: 260 + priority: 224 } path_text { primary { @@ -33329,19 +33356,19 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 2828327 - priority: 260 + priority: 224 } path_text { primary { @@ -33355,19 +33382,19 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 2828327 - priority: 260 + priority: 224 } path_text { primary { @@ -33385,7 +33412,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -33394,7 +33421,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33410,7 +33437,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33426,7 +33453,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33442,7 +33469,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33458,7 +33485,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33477,7 +33504,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -33486,7 +33513,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33502,7 +33529,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33518,7 +33545,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33534,7 +33561,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33550,7 +33577,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33569,7 +33596,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -33590,7 +33617,7 @@ cont { } lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33618,7 +33645,7 @@ cont { } lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33646,7 +33673,7 @@ cont { } lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33674,7 +33701,7 @@ cont { } lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33702,7 +33729,7 @@ cont { } lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33721,7 +33748,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33737,7 +33764,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33753,7 +33780,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33769,7 +33796,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33785,7 +33812,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33804,7 +33831,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -33813,7 +33840,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33829,7 +33856,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33845,7 +33872,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33861,7 +33888,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33877,7 +33904,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33896,7 +33923,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -33905,7 +33932,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33921,7 +33948,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33937,7 +33964,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33953,7 +33980,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -33969,7 +33996,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -34577,7 +34604,7 @@ cont { scale: 11 lines { width: 0.8 - color: 659244611 + color: 1297041991 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34586,8 +34613,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 1.3 + color: 1297041991 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34604,8 +34631,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.8 + color: 1297041991 priority: 250 cap: BUTTCAP } @@ -34628,8 +34655,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 659244611 + width: 2.7 + color: 659507783 priority: 250 cap: BUTTCAP } @@ -34652,8 +34679,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 659244611 + width: 3.8 + color: 659507783 priority: 250 cap: BUTTCAP } @@ -34676,8 +34703,8 @@ cont { element { scale: 16 lines { - width: 4.2 - color: 659244611 + width: 5.0 + color: 5196359 priority: 250 } path_text { @@ -34699,8 +34726,8 @@ cont { element { scale: 17 lines { - width: 5.5 - color: 4933187 + width: 6.6 + color: 5196359 priority: 250 } path_text { @@ -34722,8 +34749,8 @@ cont { element { scale: 18 lines { - width: 8.2 - color: 4933187 + width: 9.4 + color: 5196359 priority: 250 } path_text { @@ -34745,8 +34772,8 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -34768,8 +34795,8 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -34795,7 +34822,7 @@ cont { scale: 11 lines { width: 0.8 - color: 659244611 + color: 1297041991 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34804,8 +34831,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 1.3 + color: 1297041991 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -34822,8 +34849,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.8 + color: 1297041991 priority: 250 cap: BUTTCAP } @@ -34846,20 +34873,20 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 5.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 659244611 + width: 2.7 + color: 659507783 priority: 250 cap: BUTTCAP } @@ -34882,20 +34909,20 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 7.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 659244611 + width: 3.8 + color: 659507783 priority: 250 cap: BUTTCAP } @@ -34918,20 +34945,20 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 659244611 + width: 5.0 + color: 5196359 priority: 250 } path_text { @@ -34953,20 +34980,20 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 4933187 + width: 6.6 + color: 5196359 priority: 250 } path_text { @@ -34988,20 +35015,20 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 20.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.2 - color: 4933187 + width: 9.4 + color: 5196359 priority: 250 } path_text { @@ -35023,20 +35050,20 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -35058,20 +35085,20 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -35097,7 +35124,7 @@ cont { scale: 11 lines { width: 0.8 - color: 659244611 + color: 1297041991 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -35106,8 +35133,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 + width: 1.3 + color: 1297041991 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -35124,8 +35151,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 + width: 1.8 + color: 1297041991 priority: 250 cap: BUTTCAP } @@ -35148,8 +35175,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 659244611 + width: 2.7 + color: 659507783 priority: 250 cap: BUTTCAP } @@ -35172,8 +35199,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 659244611 + width: 3.8 + color: 659507783 priority: 250 cap: BUTTCAP } @@ -35196,7 +35223,7 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 @@ -35206,8 +35233,8 @@ cont { cap: BUTTCAP } lines { - width: 4.2 - color: 657139751 + width: 5.0 + color: 858466343 priority: 250 } path_text { @@ -35229,7 +35256,7 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 @@ -35239,7 +35266,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.6 color: 2828327 priority: 250 } @@ -35262,7 +35289,7 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 @@ -35272,7 +35299,7 @@ cont { cap: BUTTCAP } lines { - width: 8.2 + width: 9.4 color: 2828327 priority: 250 } @@ -35295,7 +35322,7 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 @@ -35305,7 +35332,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 2828327 priority: 250 } @@ -35328,7 +35355,7 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 @@ -35338,7 +35365,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 2828327 priority: 250 } @@ -35361,37 +35388,46 @@ cont { } cont { name: "highway-tertiary_link" + element { + scale: 14 + lines { + width: 1.8 + color: 1297041991 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 659244611 - priority: 240 + width: 2.5 + color: 659507783 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.2 - color: 659244611 - priority: 240 + width: 3.2 + color: 659507783 + priority: 222 } } element { scale: 17 lines { - width: 5.5 - color: 4933187 - priority: 240 + width: 4.7 + color: 5196359 + priority: 222 } } element { scale: 18 lines { - width: 8.2 - color: 4933187 - priority: 240 + width: 6.4 + color: 5196359 + priority: 222 } path_text { primary { @@ -35405,9 +35441,9 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 4933187 - priority: 240 + width: 8.2 + color: 5196359 + priority: 222 } path_text { primary { @@ -35421,9 +35457,9 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 4933187 - priority: 240 + width: 8.2 + color: 5196359 + priority: 222 } path_text { primary { @@ -35438,68 +35474,117 @@ cont { cont { name: "highway-tertiary_link-bridge" element { - scale: 15 + scale: 14 lines { - width: 6.8 + width: 4.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 659244611 - priority: 240 + width: 1.8 + color: 1297041991 + priority: 222 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 5.8 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 5.0 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 + color: 659507783 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 659244611 - priority: 240 + width: 3.2 + color: 659507783 + priority: 222 } } element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 4933187 - priority: 240 + width: 4.7 + color: 5196359 + priority: 222 } } element { scale: 18 + lines { + width: 16.8 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 14.8 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 5196359 + priority: 222 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 1118464 + } + priority: 2950 + } + } + element { + scale: 19 lines { width: 20.4 color: 1297109072 @@ -35514,36 +35599,8 @@ cont { } lines { width: 8.2 - color: 4933187 - priority: 240 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 2950 - } - } - element { - scale: 19 - lines { - width: 24.8 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 22.8 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 10.4 - color: 4933187 - priority: 240 + color: 5196359 + priority: 222 } path_text { primary { @@ -35557,21 +35614,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 4933187 - priority: 240 + width: 8.2 + color: 5196359 + priority: 222 } path_text { primary { @@ -35585,67 +35642,76 @@ cont { } cont { name: "highway-tertiary_link-tunnel" + element { + scale: 14 + lines { + width: 1.8 + color: 1297041991 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 659244611 - priority: 240 + width: 2.5 + color: 659507783 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 4.2 - color: 657139751 - priority: 240 + width: 3.2 + color: 858466343 + priority: 222 } } element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 2828327 - priority: 240 + priority: 222 } } element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 2828327 - priority: 240 + priority: 222 } path_text { primary { @@ -35659,19 +35725,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 240 + priority: 222 } path_text { primary { @@ -35685,19 +35751,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 240 + priority: 222 } path_text { primary { @@ -37314,7 +37380,7 @@ cont { scale: 13 lines { width: 2.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -37338,7 +37404,7 @@ cont { scale: 14 lines { width: 3.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -37385,7 +37451,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -37621,7 +37687,7 @@ cont { } lines { width: 2.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -37657,7 +37723,7 @@ cont { } lines { width: 3.8 - color: 1296640283 + color: 659106075 priority: 310 cap: BUTTCAP } @@ -37716,19 +37782,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -38111,7 +38177,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1291845632 dashdot { dd: 5.0 @@ -38121,7 +38187,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -38280,8 +38346,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38305,8 +38371,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38329,9 +38395,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1296640283 - priority: 300 + width: 1.3 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38355,8 +38421,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 cap: BUTTCAP } path_text { @@ -38378,9 +38444,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 1296640283 - priority: 300 + width: 2.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -38402,9 +38468,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 1296640283 - priority: 300 + width: 3.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -38426,9 +38492,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 1296640283 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -38449,9 +38515,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 1296640283 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -38472,9 +38538,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -38495,9 +38561,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -38518,9 +38584,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -38545,8 +38611,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38570,8 +38636,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38594,9 +38660,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 1296640283 - priority: 300 + width: 1.3 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38620,8 +38686,8 @@ cont { scale: 13 lines { width: 1.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 cap: BUTTCAP } path_text { @@ -38643,21 +38709,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 1296640283 - priority: 300 + width: 2.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -38679,21 +38745,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1296640283 - priority: 300 + width: 3.6 + color: 660157219 + priority: 228 cap: BUTTCAP } path_text { @@ -38715,21 +38781,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 1296640283 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -38750,21 +38816,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 1296640283 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -38785,21 +38851,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -38820,21 +38886,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -38855,21 +38921,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -38894,8 +38960,8 @@ cont { scale: 10 lines { width: 0.8 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38919,8 +38985,8 @@ cont { scale: 11 lines { width: 1.0 - color: 1296640283 - priority: 300 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38943,15 +39009,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1291845632 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 1296640283 - priority: 300 + width: 1.3 + color: 1297691427 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -38980,13 +39046,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 1295523604 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -39008,19 +39074,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 1295523604 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -39042,19 +39108,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -39076,19 +39142,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -39109,19 +39175,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -39142,19 +39208,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -39175,19 +39241,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -39208,19 +39274,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -39245,8 +39311,8 @@ cont { scale: 11 lines { width: 0.8 - color: 659244611 - priority: 230 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39254,9 +39320,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.3 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39264,9 +39330,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.8 + color: 1297041991 + priority: 250 cap: BUTTCAP } path_text { @@ -39281,9 +39347,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 659244611 - priority: 230 + width: 2.7 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39298,9 +39364,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 659244611 - priority: 230 + width: 3.8 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39315,9 +39381,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 659244611 - priority: 230 + width: 5.0 + color: 5196359 + priority: 250 } path_text { primary { @@ -39331,9 +39397,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 4933187 - priority: 230 + width: 6.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39347,9 +39413,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 4933187 - priority: 230 + width: 9.4 + color: 5196359 + priority: 250 } path_text { primary { @@ -39363,9 +39429,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39379,9 +39445,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39399,8 +39465,8 @@ cont { scale: 11 lines { width: 0.8 - color: 659244611 - priority: 230 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39408,9 +39474,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.3 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39418,9 +39484,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.8 + color: 1297041991 + priority: 250 cap: BUTTCAP } path_text { @@ -39435,9 +39501,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 659244611 - priority: 230 + width: 2.7 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39452,9 +39518,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 659244611 - priority: 230 + width: 3.8 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39469,9 +39535,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 659244611 - priority: 230 + width: 5.0 + color: 5196359 + priority: 250 } path_text { primary { @@ -39485,9 +39551,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 4933187 - priority: 230 + width: 6.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39501,9 +39567,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 4933187 - priority: 230 + width: 9.4 + color: 5196359 + priority: 250 } path_text { primary { @@ -39517,9 +39583,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39533,9 +39599,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39553,8 +39619,8 @@ cont { scale: 11 lines { width: 0.8 - color: 659244611 - priority: 230 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39562,9 +39628,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.3 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39572,9 +39638,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.8 + color: 1297041991 + priority: 250 cap: BUTTCAP } path_text { @@ -39589,21 +39655,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 3.6 - color: 657206298 + width: 5.4 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 659244611 - priority: 230 + width: 2.7 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39618,21 +39684,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 - color: 657206298 + width: 7.6 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 659244611 - priority: 230 + width: 3.8 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39647,21 +39713,21 @@ cont { element { scale: 16 lines { - width: 8.8 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.0 - color: 657206298 + width: 10.0 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.0 - color: 659244611 - priority: 230 + width: 5.0 + color: 5196359 + priority: 250 } path_text { primary { @@ -39675,21 +39741,21 @@ cont { element { scale: 17 lines { - width: 14.0 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.4 - color: 657206298 + width: 14.8 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.4 - color: 4933187 - priority: 230 + width: 6.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39703,21 +39769,21 @@ cont { element { scale: 18 lines { - width: 20.0 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 18.0 - color: 657206298 + width: 20.8 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.0 - color: 4933187 - priority: 230 + width: 9.4 + color: 5196359 + priority: 250 } path_text { primary { @@ -39731,21 +39797,21 @@ cont { element { scale: 19 lines { - width: 24.0 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 657206298 + width: 25.2 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39759,21 +39825,21 @@ cont { element { scale: 20 lines { - width: 24.0 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 657206298 + width: 25.2 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -39791,8 +39857,8 @@ cont { scale: 11 lines { width: 0.8 - color: 659244611 - priority: 230 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39800,9 +39866,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.3 + color: 1297041991 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -39810,9 +39876,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 659244611 - priority: 230 + width: 1.8 + color: 1297041991 + priority: 250 cap: BUTTCAP } path_text { @@ -39827,9 +39893,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 659244611 - priority: 230 + width: 2.7 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39844,9 +39910,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 659244611 - priority: 230 + width: 3.8 + color: 659507783 + priority: 250 cap: BUTTCAP } path_text { @@ -39861,19 +39927,19 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 4.0 - color: 657139751 - priority: 230 + width: 5.0 + color: 858466343 + priority: 250 } path_text { primary { @@ -39887,19 +39953,19 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 5.4 + width: 6.6 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { @@ -39913,19 +39979,19 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 8.0 + width: 9.4 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { @@ -39939,19 +40005,19 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { @@ -39965,19 +40031,19 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 8a9fe6a796..784651fe0d 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 8925735658..9539060978 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 670628088 + color: 871954680 priority: 70 } } @@ -21546,7 +21546,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21555,7 +21555,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21571,7 +21571,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21587,7 +21587,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21603,7 +21603,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21619,7 +21619,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21638,7 +21638,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21647,7 +21647,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21663,7 +21663,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21679,7 +21679,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21695,7 +21695,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21711,7 +21711,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21730,7 +21730,7 @@ cont { scale: 15 lines { width: 1.2 - color: 670628088 + color: 871954680 priority: 190 cap: BUTTCAP } @@ -21739,7 +21739,7 @@ cont { scale: 16 lines { width: 1.6 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21755,7 +21755,7 @@ cont { scale: 17 lines { width: 2.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21771,7 +21771,7 @@ cont { scale: 18 lines { width: 3.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21787,7 +21787,7 @@ cont { scale: 19 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -21803,7 +21803,7 @@ cont { scale: 20 lines { width: 4.0 - color: 670628088 + color: 871954680 priority: 190 } path_text { @@ -25004,7 +25004,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 priority: 230 join: BEVELJOIN @@ -25014,7 +25014,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 priority: 230 cap: BUTTCAP @@ -25023,7 +25023,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 priority: 230 cap: BUTTCAP @@ -25040,7 +25040,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 priority: 230 cap: BUTTCAP @@ -25057,7 +25057,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 16316664 priority: 230 } @@ -25073,7 +25073,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -25089,7 +25089,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -25105,7 +25105,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -25121,7 +25121,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -25140,7 +25140,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 priority: 230 join: BEVELJOIN @@ -25150,7 +25150,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 priority: 230 cap: BUTTCAP @@ -25159,7 +25159,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 priority: 230 cap: BUTTCAP @@ -25176,7 +25176,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 priority: 230 cap: BUTTCAP @@ -25193,7 +25193,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 16316664 priority: 230 } @@ -25209,7 +25209,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -25225,7 +25225,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -25241,7 +25241,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -25257,7 +25257,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -25276,7 +25276,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 priority: 230 join: BEVELJOIN @@ -25286,7 +25286,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 priority: 230 cap: BUTTCAP @@ -25295,7 +25295,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 priority: 230 cap: BUTTCAP @@ -25312,7 +25312,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 priority: 230 cap: BUTTCAP @@ -25329,7 +25329,7 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 @@ -25339,7 +25339,7 @@ cont { cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 16777215 priority: 230 } @@ -25355,7 +25355,7 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 @@ -25365,7 +25365,7 @@ cont { cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 16777215 priority: 230 } @@ -25381,7 +25381,7 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 @@ -25391,7 +25391,7 @@ cont { cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 16777215 priority: 230 } @@ -25407,7 +25407,7 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 @@ -25417,7 +25417,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16777215 priority: 230 } @@ -25433,7 +25433,7 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 @@ -25443,7 +25443,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16777215 priority: 230 } @@ -25633,7 +25633,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -25953,19 +25953,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -26337,7 +26337,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1300267136 dashdot { dd: 5.0 @@ -26347,7 +26347,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -26564,8 +26564,8 @@ cont { scale: 10 lines { width: 0.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26588,8 +26588,8 @@ cont { scale: 11 lines { width: 1.0 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26611,9 +26611,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16742950 - priority: 300 + width: 1.3 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26636,8 +26636,8 @@ cont { scale: 13 lines { width: 1.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -26658,9 +26658,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 16742950 - priority: 300 + width: 2.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -26681,9 +26681,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -26704,9 +26704,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -26726,9 +26726,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26748,9 +26748,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -26770,9 +26770,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26792,9 +26792,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -26818,8 +26818,8 @@ cont { scale: 10 lines { width: 0.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26842,8 +26842,8 @@ cont { scale: 11 lines { width: 1.0 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26865,9 +26865,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16742950 - priority: 300 + width: 1.3 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26890,8 +26890,8 @@ cont { scale: 13 lines { width: 1.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -26912,21 +26912,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 16742950 - priority: 300 + width: 2.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -26947,21 +26947,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -26982,21 +26982,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -27016,21 +27016,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27050,21 +27050,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -27084,21 +27084,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27118,21 +27118,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27156,8 +27156,8 @@ cont { scale: 10 lines { width: 0.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27180,8 +27180,8 @@ cont { scale: 11 lines { width: 1.0 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27203,15 +27203,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1300267136 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 16742950 - priority: 300 + width: 1.3 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27239,13 +27239,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -27266,19 +27266,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 16557154 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -27299,19 +27299,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -27332,19 +27332,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -27364,19 +27364,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27396,19 +27396,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -27428,19 +27428,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -27460,19 +27460,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -30553,7 +30553,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 16746278 priority: 290 join: BEVELJOIN @@ -30645,7 +30645,7 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 2.3 color: 16749632 priority: 290 cap: BUTTCAP @@ -30714,7 +30714,7 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -30827,7 +30827,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 16746278 priority: 290 join: BEVELJOIN @@ -30919,7 +30919,7 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 2.3 color: 16749632 priority: 290 cap: BUTTCAP @@ -31012,19 +31012,19 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -31185,7 +31185,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 16746278 priority: 290 join: BEVELJOIN @@ -31277,7 +31277,7 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 2.3 color: 16749632 priority: 290 cap: BUTTCAP @@ -31366,7 +31366,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -31376,7 +31376,7 @@ cont { cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 16752972 priority: 290 } @@ -31529,9 +31529,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 16749632 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31553,9 +31553,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 16749632 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31577,9 +31577,9 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 1.3 color: 16749632 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31600,9 +31600,9 @@ cont { element { scale: 14 lines { - width: 3.2 + width: 1.8 color: 16749632 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31623,9 +31623,9 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 2.5 color: 16752972 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31646,9 +31646,9 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 3.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31668,9 +31668,9 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 4.7 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31690,9 +31690,9 @@ cont { element { scale: 18 lines { - width: 9.4 + width: 6.4 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31712,9 +31712,9 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31734,9 +31734,9 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -31759,9 +31759,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 16749632 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31783,9 +31783,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 16749632 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31807,9 +31807,9 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 1.3 color: 16749632 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31829,334 +31829,22 @@ cont { } element { scale: 14 - lines { - width: 7.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.2 - color: 16749632 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 175 - } - } - element { - scale: 15 - lines { - width: 8.4 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 7.6 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.8 - color: 16752972 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 11 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 250 - } - } - element { - scale: 16 - lines { - width: 9.6 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 8.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } lines { width: 4.4 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 872415231 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 17 - lines { - width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 872415231 - } - priority: 6100 - } - shield { - height: 10 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 18 - lines { - width: 22.8 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 20.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 9.4 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 10 - color: 16777215 - priority: 2970 - min_distance: 300 - } - } - element { - scale: 19 - lines { - width: 27.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 25.2 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 11.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 11 - color: 16777215 - priority: 2970 - min_distance: 350 - } - } - element { - scale: 20 - lines { - width: 27.2 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 25.2 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 11.6 - color: 16752972 - priority: 280 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 6100 - } - shield { - height: 11 - color: 16777215 - priority: 2970 - min_distance: 350 - } - } -} -cont { - name: "highway-primary_link-tunnel" - element { - scale: 11 - lines { - width: 1.5 + width: 1.8 color: 16749632 - priority: 280 - join: BEVELJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 871230427 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 90 - } - } - element { - scale: 12 - lines { - width: 1.7 - color: 16749632 - priority: 280 - join: BEVELJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 451800027 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 90 - } - } - element { - scale: 13 - lines { - width: 2.4 - color: 16749632 - priority: 280 - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 451800027 - } - priority: 6100 - } - shield { - height: 9 - color: 16777215 - priority: 2970 - min_distance: 120 - } - } - element { - scale: 14 - lines { - width: 5.2 - color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 - cap: BUTTCAP - } - lines { - width: 3.2 - color: 16557154 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -32179,17 +31867,19 @@ cont { lines { width: 5.8 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 3.8 + width: 5.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 color: 16752972 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -32210,19 +31900,21 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.2 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 4.4 + width: 6.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 3.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -32242,19 +31934,21 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 12.6 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 6.6 + width: 11.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 4.7 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -32274,19 +31968,21 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 16.8 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 14.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -32306,19 +32002,21 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 20.4 color: 1300267136 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 279 + priority: 140 cap: BUTTCAP } lines { - width: 11.6 + width: 18.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 8.2 color: 16752972 - priority: 280 + priority: 226 } path_text { primary { @@ -32338,19 +32036,321 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 20.4 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 18.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 11 + color: 16777215 + priority: 2970 + min_distance: 350 + } + } +} +cont { + name: "highway-primary_link-tunnel" + element { + scale: 11 + lines { + width: 0.8 + color: 16749632 + priority: 226 + join: BEVELJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 90 + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 16749632 + priority: 226 + join: BEVELJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 451800027 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 90 + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16749632 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 451800027 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 120 + } + } + element { + scale: 14 + lines { + width: 3.8 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 11.6 + width: 1.8 + color: 16557154 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 175 + } + } + element { + scale: 15 + lines { + width: 4.5 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 2.5 color: 16752972 - priority: 280 + priority: 226 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 3355443 + stroke_color: 871230427 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 250 + } + } + element { + scale: 16 + lines { + width: 5.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 3.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 6100 + } + shield { + height: 9 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 17 + lines { + width: 6.7 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 4.7 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 6100 + } + shield { + height: 10 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 18 + lines { + width: 8.4 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 10 + color: 16777215 + priority: 2970 + min_distance: 300 + } + } + element { + scale: 19 + lines { + width: 10.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 6100 + } + shield { + height: 11 + color: 16777215 + priority: 2970 + min_distance: 350 + } + } + element { + scale: 20 + lines { + width: 10.2 + color: 1300267136 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 225 + cap: BUTTCAP + } + lines { + width: 8.2 + color: 16752972 + priority: 226 } path_text { primary { @@ -32474,9 +32474,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32484,9 +32484,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32501,9 +32501,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32518,9 +32518,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32541,9 +32541,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32563,9 +32563,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32585,9 +32585,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32607,9 +32607,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32629,9 +32629,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32654,9 +32654,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32664,9 +32664,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32681,9 +32681,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32698,9 +32698,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32721,9 +32721,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32743,9 +32743,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32765,9 +32765,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32787,9 +32787,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32809,9 +32809,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32834,9 +32834,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32844,9 +32844,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32861,21 +32861,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 4.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 3.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 + width: 1.6 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32890,21 +32890,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 5.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 4.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 + width: 2.4 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32925,21 +32925,21 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32959,21 +32959,21 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -32993,21 +32993,21 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -33027,21 +33027,21 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -33061,21 +33061,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16316664 - priority: 250 + priority: 230 } path_text { primary { @@ -33098,9 +33098,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -33108,9 +33108,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33125,9 +33125,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33142,9 +33142,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33165,19 +33165,19 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -33197,19 +33197,19 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -33229,19 +33229,19 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -33261,19 +33261,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -33293,19 +33293,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 250 + priority: 230 } path_text { primary { @@ -33435,7 +33435,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 priority: 230 join: BEVELJOIN @@ -33445,7 +33445,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 priority: 230 cap: BUTTCAP @@ -33454,7 +33454,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 priority: 230 cap: BUTTCAP @@ -33471,7 +33471,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 priority: 230 cap: BUTTCAP @@ -33488,7 +33488,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 16316664 priority: 230 } @@ -33504,7 +33504,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -33520,7 +33520,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -33536,7 +33536,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33552,7 +33552,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33571,7 +33571,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 priority: 230 join: BEVELJOIN @@ -33581,7 +33581,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 priority: 230 cap: BUTTCAP @@ -33590,7 +33590,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 priority: 230 cap: BUTTCAP @@ -33607,7 +33607,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 priority: 230 cap: BUTTCAP @@ -33624,19 +33624,19 @@ cont { element { scale: 16 lines { - width: 8.4 + width: 6.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 16316664 priority: 230 } @@ -33652,19 +33652,19 @@ cont { element { scale: 17 lines { - width: 11.2 + width: 9.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.8 + width: 9.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -33680,19 +33680,19 @@ cont { element { scale: 18 lines { - width: 16.4 + width: 13.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 16.0 + width: 12.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -33708,19 +33708,19 @@ cont { element { scale: 19 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33736,19 +33736,19 @@ cont { element { scale: 20 lines { - width: 20.4 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33767,7 +33767,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 16316664 priority: 230 join: BEVELJOIN @@ -33777,7 +33777,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 16316664 priority: 230 cap: BUTTCAP @@ -33786,7 +33786,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 16316664 priority: 230 cap: BUTTCAP @@ -33803,7 +33803,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 16316664 priority: 230 cap: BUTTCAP @@ -33820,7 +33820,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 16316664 priority: 230 } @@ -33836,7 +33836,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 16316664 priority: 230 } @@ -33852,7 +33852,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 16316664 priority: 230 } @@ -33868,7 +33868,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33884,7 +33884,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 16316664 priority: 230 } @@ -33903,8 +33903,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 16777215 + width: 1.2 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33921,8 +33921,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 16777215 + width: 1.5 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33939,8 +33939,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 16777215 + width: 1.7 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -33963,8 +33963,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 16777215 + width: 2.3 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -33986,8 +33986,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 16777215 + width: 3.2 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34009,8 +34009,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 16777215 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34032,8 +34032,8 @@ cont { element { scale: 16 lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -34055,7 +34055,7 @@ cont { scale: 17 lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34077,7 +34077,7 @@ cont { scale: 18 lines { width: 9.4 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34099,7 +34099,7 @@ cont { scale: 19 lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34121,7 +34121,7 @@ cont { scale: 20 lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34145,8 +34145,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 16777215 + width: 1.2 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34163,8 +34163,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 16777215 + width: 1.5 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34181,8 +34181,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 16777215 + width: 1.7 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34205,8 +34205,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 16777215 + width: 2.3 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34228,20 +34228,20 @@ cont { element { scale: 14 lines { - width: 6.8 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 16777215 + width: 3.2 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34263,20 +34263,20 @@ cont { element { scale: 15 lines { - width: 8.6 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 7.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 16777215 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34298,20 +34298,20 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -34345,7 +34345,7 @@ cont { } lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34379,7 +34379,7 @@ cont { } lines { width: 9.4 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34413,7 +34413,7 @@ cont { } lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34447,7 +34447,7 @@ cont { } lines { width: 11.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34471,8 +34471,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 16777215 + width: 1.2 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34489,8 +34489,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 16777215 + width: 1.5 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34507,8 +34507,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 16777215 + width: 1.7 + color: 16757286 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34531,8 +34531,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 16777215 + width: 2.3 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34554,8 +34554,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 16777215 + width: 3.2 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34577,8 +34577,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 16777215 + width: 3.8 + color: 16760658 priority: 270 cap: BUTTCAP } @@ -34600,7 +34600,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -34610,8 +34610,8 @@ cont { cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 + width: 5.0 + color: 16760658 priority: 270 } path_text { @@ -34643,7 +34643,7 @@ cont { } lines { width: 6.6 - color: 16777215 + color: 16760658 priority: 270 } path_text { @@ -34760,30 +34760,39 @@ cont { } cont { name: "highway-secondary_link" + element { + scale: 13 + lines { + width: 1.3 + color: 16760658 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 16777215 - priority: 260 + width: 1.8 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 16777215 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34797,9 +34806,9 @@ cont { element { scale: 17 lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -34813,9 +34822,9 @@ cont { element { scale: 18 lines { - width: 9.4 - color: 16777215 - priority: 260 + width: 6.4 + color: 16760658 + priority: 224 } path_text { primary { @@ -34829,9 +34838,9 @@ cont { element { scale: 19 lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34845,9 +34854,9 @@ cont { element { scale: 20 lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34861,66 +34870,75 @@ cont { } cont { name: "highway-secondary_link-bridge" + element { + scale: 13 + lines { + width: 1.3 + color: 16760658 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 6.8 + width: 4.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 16777215 - priority: 260 + width: 1.8 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 8.6 + width: 5.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 5.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 16777215 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.6 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -34934,21 +34952,21 @@ cont { element { scale: 17 lines { - width: 16.4 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -34962,21 +34980,21 @@ cont { element { scale: 18 lines { - width: 22.8 + width: 16.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 20.8 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 9.4 - color: 16777215 - priority: 260 + width: 6.4 + color: 16760658 + priority: 224 } path_text { primary { @@ -34990,21 +35008,21 @@ cont { element { scale: 19 lines { - width: 27.2 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -35018,21 +35036,21 @@ cont { element { scale: 20 lines { - width: 27.2 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 16777215 - priority: 260 + width: 8.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -35046,40 +35064,49 @@ cont { } cont { name: "highway-secondary_link-tunnel" + element { + scale: 13 + lines { + width: 1.3 + color: 16760658 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 16777215 - priority: 260 + width: 1.8 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 16777215 - priority: 260 + width: 2.5 + color: 16760658 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.4 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 4.4 - color: 16777215 - priority: 260 + width: 3.2 + color: 16760658 + priority: 224 } path_text { primary { @@ -35093,19 +35120,19 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 6.6 - color: 16777215 - priority: 260 + width: 4.7 + color: 16760658 + priority: 224 } path_text { primary { @@ -35119,19 +35146,19 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -35145,19 +35172,19 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -35171,19 +35198,19 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 16777215 - priority: 260 + priority: 224 } path_text { primary { @@ -36657,7 +36684,7 @@ cont { scale: 11 lines { width: 0.8 - color: 16316664 + color: 16777215 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36666,8 +36693,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16316664 + width: 1.3 + color: 16777215 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36684,8 +36711,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 16316664 + width: 1.8 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -36707,8 +36734,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 16316664 + width: 2.7 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -36730,8 +36757,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 16316664 + width: 3.8 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -36753,8 +36780,8 @@ cont { element { scale: 16 lines { - width: 4.2 - color: 16316664 + width: 5.0 + color: 16777215 priority: 250 } path_text { @@ -36775,8 +36802,8 @@ cont { element { scale: 17 lines { - width: 5.5 - color: 16316664 + width: 6.6 + color: 16777215 priority: 250 } path_text { @@ -36797,8 +36824,8 @@ cont { element { scale: 18 lines { - width: 8.2 - color: 16316664 + width: 9.4 + color: 16777215 priority: 250 } path_text { @@ -36819,8 +36846,8 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -36841,8 +36868,8 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -36867,7 +36894,7 @@ cont { scale: 11 lines { width: 0.8 - color: 16316664 + color: 16777215 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36876,8 +36903,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16316664 + width: 1.3 + color: 16777215 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36894,8 +36921,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 16316664 + width: 1.8 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -36917,20 +36944,20 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 5.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 16316664 + width: 2.7 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -36952,20 +36979,20 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 7.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 16316664 + width: 3.8 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -36987,20 +37014,20 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 16316664 + width: 5.0 + color: 16777215 priority: 250 } path_text { @@ -37021,20 +37048,20 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 16316664 + width: 6.6 + color: 16777215 priority: 250 } path_text { @@ -37055,20 +37082,20 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.2 - color: 16316664 + width: 9.4 + color: 16777215 priority: 250 } path_text { @@ -37089,20 +37116,20 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -37123,20 +37150,20 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 + width: 11.6 + color: 16777215 priority: 250 } path_text { @@ -37161,7 +37188,7 @@ cont { scale: 11 lines { width: 0.8 - color: 16316664 + color: 16777215 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -37170,8 +37197,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16316664 + width: 1.3 + color: 16777215 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -37188,8 +37215,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 16316664 + width: 1.8 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -37211,8 +37238,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 16316664 + width: 2.7 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -37234,8 +37261,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 16316664 + width: 3.8 + color: 16777215 priority: 250 cap: BUTTCAP } @@ -37257,7 +37284,7 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 @@ -37267,7 +37294,7 @@ cont { cap: BUTTCAP } lines { - width: 4.2 + width: 5.0 color: 16777215 priority: 250 } @@ -37289,7 +37316,7 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 @@ -37299,7 +37326,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.6 color: 16777215 priority: 250 } @@ -37321,7 +37348,7 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 @@ -37331,7 +37358,7 @@ cont { cap: BUTTCAP } lines { - width: 8.2 + width: 9.4 color: 16777215 priority: 250 } @@ -37353,7 +37380,7 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 @@ -37363,7 +37390,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 16777215 priority: 250 } @@ -37385,7 +37412,7 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 @@ -37395,7 +37422,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 16777215 priority: 250 } @@ -37417,37 +37444,46 @@ cont { } cont { name: "highway-tertiary_link" + element { + scale: 14 + lines { + width: 1.8 + color: 16777215 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 16316664 - priority: 240 + width: 2.5 + color: 16777215 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.2 - color: 16316664 - priority: 240 + width: 3.2 + color: 16777215 + priority: 222 } } element { scale: 17 lines { - width: 5.5 - color: 16316664 - priority: 240 + width: 4.7 + color: 16777215 + priority: 222 } } element { scale: 18 lines { - width: 8.2 - color: 16316664 - priority: 240 + width: 6.4 + color: 16777215 + priority: 222 } path_text { primary { @@ -37461,9 +37497,9 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -37477,9 +37513,9 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -37494,68 +37530,117 @@ cont { cont { name: "highway-tertiary_link-bridge" element { - scale: 15 + scale: 14 lines { - width: 6.8 + width: 4.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 16316664 - priority: 240 + width: 1.8 + color: 16777215 + priority: 222 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 5.8 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 5.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 + color: 16777215 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 16316664 - priority: 240 + width: 3.2 + color: 16777215 + priority: 222 } } element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 16316664 - priority: 240 + width: 4.7 + color: 16777215 + priority: 222 } } element { scale: 18 + lines { + width: 16.8 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 14.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 16777215 + priority: 222 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 16777215 + } + priority: 2950 + } + } + element { + scale: 19 lines { width: 20.4 color: 1300267136 @@ -37570,36 +37655,8 @@ cont { } lines { width: 8.2 - color: 16316664 - priority: 240 - } - path_text { - primary { - height: 12 - color: 3355443 - stroke_color: 16777215 - } - priority: 2950 - } - } - element { - scale: 19 - lines { - width: 24.8 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 22.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 10.4 - color: 16316664 - priority: 240 + color: 16777215 + priority: 222 } path_text { primary { @@ -37613,21 +37670,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 16316664 - priority: 240 + width: 8.2 + color: 16777215 + priority: 222 } path_text { primary { @@ -37641,67 +37698,76 @@ cont { } cont { name: "highway-tertiary_link-tunnel" + element { + scale: 14 + lines { + width: 1.8 + color: 16777215 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 16316664 - priority: 240 + width: 2.5 + color: 16777215 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 16777215 - priority: 240 + priority: 222 } } element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 16777215 - priority: 240 + priority: 222 } } element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -37715,19 +37781,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -37741,19 +37807,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 16777215 - priority: 240 + priority: 222 } path_text { primary { @@ -40005,7 +40071,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -40325,19 +40391,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -40709,7 +40775,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1300267136 dashdot { dd: 5.0 @@ -40719,7 +40785,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 16742950 priority: 310 } @@ -40873,8 +40939,8 @@ cont { scale: 10 lines { width: 0.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40897,8 +40963,8 @@ cont { scale: 11 lines { width: 1.0 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40920,9 +40986,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16742950 - priority: 300 + width: 1.3 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -40945,8 +41011,8 @@ cont { scale: 13 lines { width: 1.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -40967,9 +41033,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 16742950 - priority: 300 + width: 2.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -40990,9 +41056,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -41013,9 +41079,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -41035,9 +41101,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41057,9 +41123,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -41079,9 +41145,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41101,9 +41167,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41127,8 +41193,8 @@ cont { scale: 10 lines { width: 0.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41151,8 +41217,8 @@ cont { scale: 11 lines { width: 1.0 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41174,9 +41240,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16742950 - priority: 300 + width: 1.3 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41199,8 +41265,8 @@ cont { scale: 13 lines { width: 1.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -41221,21 +41287,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 16742950 - priority: 300 + width: 2.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -41256,21 +41322,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -41291,21 +41357,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -41325,21 +41391,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41359,21 +41425,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -41393,21 +41459,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41427,21 +41493,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41465,8 +41531,8 @@ cont { scale: 10 lines { width: 0.8 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41489,8 +41555,8 @@ cont { scale: 11 lines { width: 1.0 - color: 16742950 - priority: 300 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41512,15 +41578,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1300267136 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 16742950 - priority: 300 + width: 1.3 + color: 16746278 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41548,13 +41614,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -41575,19 +41641,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 16557154 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -41608,19 +41674,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 16742950 - priority: 300 + width: 3.6 + color: 16746278 + priority: 228 cap: BUTTCAP } path_text { @@ -41641,19 +41707,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 16742950 - priority: 300 + width: 5.0 + color: 16746278 + priority: 228 } path_text { primary { @@ -41673,19 +41739,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 16742950 - priority: 300 + width: 6.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41705,19 +41771,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 16742950 - priority: 300 + width: 9.4 + color: 16746278 + priority: 228 } path_text { primary { @@ -41737,19 +41803,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41769,19 +41835,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 16742950 - priority: 300 + width: 11.6 + color: 16746278 + priority: 228 } path_text { primary { @@ -41805,8 +41871,8 @@ cont { scale: 11 lines { width: 0.8 - color: 16316664 - priority: 230 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41814,9 +41880,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.3 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41824,9 +41890,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -41841,9 +41907,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 16316664 - priority: 230 + width: 2.7 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -41858,9 +41924,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 16316664 - priority: 230 + width: 3.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -41875,9 +41941,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 16316664 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -41891,9 +41957,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41907,9 +41973,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -41923,9 +41989,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41939,9 +42005,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -41959,8 +42025,8 @@ cont { scale: 11 lines { width: 0.8 - color: 16316664 - priority: 230 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41968,9 +42034,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.3 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -41978,9 +42044,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -41995,9 +42061,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 16316664 - priority: 230 + width: 2.7 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42012,9 +42078,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 16316664 - priority: 230 + width: 3.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42029,9 +42095,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 16316664 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -42045,9 +42111,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -42061,9 +42127,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -42077,9 +42143,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -42093,9 +42159,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -42113,8 +42179,8 @@ cont { scale: 11 lines { width: 0.8 - color: 16316664 - priority: 230 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42122,9 +42188,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.3 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42132,9 +42198,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42149,21 +42215,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 3.6 - color: 669903835 + width: 5.4 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 16316664 - priority: 230 + width: 2.7 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42178,21 +42244,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.0 - color: 669903835 + width: 7.6 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 16316664 - priority: 230 + width: 3.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42207,21 +42273,21 @@ cont { element { scale: 16 lines { - width: 8.8 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 - color: 669903835 + width: 10.0 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.0 - color: 16316664 - priority: 230 + width: 5.0 + color: 16777215 + priority: 250 } path_text { primary { @@ -42235,21 +42301,21 @@ cont { element { scale: 17 lines { - width: 14.0 + width: 16.4 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 12.4 - color: 669903835 + width: 14.8 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 5.4 - color: 16316664 - priority: 230 + width: 6.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -42263,21 +42329,21 @@ cont { element { scale: 18 lines { - width: 20.0 + width: 22.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 18.0 - color: 669903835 + width: 20.8 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 8.0 - color: 16316664 - priority: 230 + width: 9.4 + color: 16777215 + priority: 250 } path_text { primary { @@ -42291,21 +42357,21 @@ cont { element { scale: 19 lines { - width: 24.0 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 669903835 + width: 25.2 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -42319,21 +42385,21 @@ cont { element { scale: 20 lines { - width: 24.0 + width: 27.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 669903835 + width: 25.2 + color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 16316664 - priority: 230 + width: 11.6 + color: 16777215 + priority: 250 } path_text { primary { @@ -42351,8 +42417,8 @@ cont { scale: 11 lines { width: 0.8 - color: 16316664 - priority: 230 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42360,9 +42426,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.3 + color: 16777215 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42370,9 +42436,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 16316664 - priority: 230 + width: 1.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42387,9 +42453,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 16316664 - priority: 230 + width: 2.7 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42404,9 +42470,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 16316664 - priority: 230 + width: 3.8 + color: 16777215 + priority: 250 cap: BUTTCAP } path_text { @@ -42421,19 +42487,19 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 7.0 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 4.0 + width: 5.0 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -42447,19 +42513,19 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 8.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 5.4 + width: 6.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -42473,19 +42539,19 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 11.4 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 8.0 + width: 9.4 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -42499,19 +42565,19 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -42525,19 +42591,19 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 13.6 color: 1300267136 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 16777215 - priority: 230 + priority: 250 } path_text { primary { @@ -48528,42 +48594,42 @@ cont { element { scale: 10 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 11 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 12 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 13 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 14 area { - color: 15459493 + color: 14999213 priority: -1920 } } element { scale: 15 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48577,7 +48643,7 @@ cont { element { scale: 16 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48591,7 +48657,7 @@ cont { element { scale: 17 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48605,7 +48671,7 @@ cont { element { scale: 18 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48619,7 +48685,7 @@ cont { element { scale: 19 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { @@ -48633,7 +48699,7 @@ cont { element { scale: 20 area { - color: 15459493 + color: 14999213 priority: -1920 } caption { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 676b69f981..de444d6716 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 8bdd6542b3..dd5006f1ee 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -2857,7 +2857,7 @@ cont { scale: 16 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2865,7 +2865,7 @@ cont { scale: 17 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2873,7 +2873,7 @@ cont { scale: 18 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2881,7 +2881,7 @@ cont { scale: 19 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -2889,7 +2889,7 @@ cont { scale: 20 lines { width: 3.5 - color: 659244611 + color: 860571203 priority: 70 } } @@ -21546,7 +21546,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -21555,7 +21555,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21571,7 +21571,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21587,7 +21587,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21603,7 +21603,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21619,7 +21619,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21638,7 +21638,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -21647,7 +21647,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21663,7 +21663,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21679,7 +21679,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21695,7 +21695,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21711,7 +21711,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21730,7 +21730,7 @@ cont { scale: 15 lines { width: 1.2 - color: 659244611 + color: 860571203 priority: 190 cap: BUTTCAP } @@ -21739,7 +21739,7 @@ cont { scale: 16 lines { width: 1.6 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21755,7 +21755,7 @@ cont { scale: 17 lines { width: 2.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21771,7 +21771,7 @@ cont { scale: 18 lines { width: 3.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21787,7 +21787,7 @@ cont { scale: 19 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -21803,7 +21803,7 @@ cont { scale: 20 lines { width: 4.0 - color: 659244611 + color: 860571203 priority: 190 } path_text { @@ -25004,7 +25004,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 priority: 230 join: BEVELJOIN @@ -25014,7 +25014,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 priority: 230 cap: BUTTCAP @@ -25023,7 +25023,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 priority: 230 cap: BUTTCAP @@ -25040,7 +25040,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 priority: 230 cap: BUTTCAP @@ -25057,7 +25057,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 4933187 priority: 230 } @@ -25073,7 +25073,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -25089,7 +25089,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -25105,7 +25105,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -25121,7 +25121,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -25140,7 +25140,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 priority: 230 join: BEVELJOIN @@ -25150,7 +25150,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 priority: 230 cap: BUTTCAP @@ -25159,7 +25159,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 priority: 230 cap: BUTTCAP @@ -25176,7 +25176,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 priority: 230 cap: BUTTCAP @@ -25193,7 +25193,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 4933187 priority: 230 } @@ -25209,7 +25209,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -25225,7 +25225,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -25241,7 +25241,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -25257,7 +25257,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -25276,7 +25276,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 priority: 230 join: BEVELJOIN @@ -25286,7 +25286,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 priority: 230 cap: BUTTCAP @@ -25295,7 +25295,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 priority: 230 cap: BUTTCAP @@ -25312,7 +25312,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 priority: 230 cap: BUTTCAP @@ -25329,7 +25329,7 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 @@ -25339,7 +25339,7 @@ cont { cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 2828327 priority: 230 } @@ -25355,7 +25355,7 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 @@ -25365,7 +25365,7 @@ cont { cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 2828327 priority: 230 } @@ -25381,7 +25381,7 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 @@ -25391,7 +25391,7 @@ cont { cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 2828327 priority: 230 } @@ -25407,7 +25407,7 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 @@ -25417,7 +25417,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 2828327 priority: 230 } @@ -25433,7 +25433,7 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 @@ -25443,7 +25443,7 @@ cont { cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 2828327 priority: 230 } @@ -25639,7 +25639,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -25970,19 +25970,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -26365,7 +26365,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1291845632 dashdot { dd: 5.0 @@ -26375,7 +26375,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -26597,8 +26597,8 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26622,8 +26622,8 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26646,9 +26646,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4794651 - priority: 300 + width: 1.3 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26672,8 +26672,8 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -26695,9 +26695,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 4794651 - priority: 300 + width: 2.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -26719,9 +26719,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -26743,9 +26743,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -26766,9 +26766,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -26789,9 +26789,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -26812,9 +26812,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -26835,9 +26835,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -26862,8 +26862,8 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26887,8 +26887,8 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26911,9 +26911,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4794651 - priority: 300 + width: 1.3 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -26937,8 +26937,8 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -26960,21 +26960,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 4794651 - priority: 300 + width: 2.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -26996,21 +26996,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -27032,21 +27032,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -27067,21 +27067,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -27102,21 +27102,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -27137,21 +27137,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -27172,21 +27172,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -27211,8 +27211,8 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27236,8 +27236,8 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27260,15 +27260,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1291845632 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 4794651 - priority: 300 + width: 1.3 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -27297,13 +27297,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 3677972 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -27325,19 +27325,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 3677972 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -27359,19 +27359,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -27393,19 +27393,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -27426,19 +27426,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -27459,19 +27459,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -27492,19 +27492,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -27525,19 +27525,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -30619,7 +30619,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 5845795 priority: 290 join: BEVELJOIN @@ -30714,7 +30714,7 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 2.3 color: 5845795 priority: 290 cap: BUTTCAP @@ -30786,7 +30786,7 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 5.0 color: 5845795 priority: 290 } @@ -30904,7 +30904,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 5845795 priority: 290 join: BEVELJOIN @@ -30999,7 +30999,7 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 2.3 color: 5845795 priority: 290 cap: BUTTCAP @@ -31095,19 +31095,19 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 5845795 priority: 290 } @@ -31273,7 +31273,7 @@ cont { element { scale: 8 lines { - width: 0.9 + width: 0.7 color: 5845795 priority: 290 join: BEVELJOIN @@ -31368,7 +31368,7 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 2.3 color: 5845795 priority: 290 cap: BUTTCAP @@ -31460,7 +31460,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 @@ -31470,7 +31470,7 @@ cont { cap: BUTTCAP } lines { - width: 4.4 + width: 5.0 color: 5845795 priority: 290 } @@ -31628,9 +31628,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 5845795 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31653,9 +31653,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 5845795 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31678,9 +31678,9 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 1.3 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31702,9 +31702,9 @@ cont { element { scale: 14 lines { - width: 3.2 + width: 1.8 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31726,9 +31726,9 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 2.5 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31750,9 +31750,9 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 3.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -31773,9 +31773,9 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 4.7 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -31796,9 +31796,9 @@ cont { element { scale: 18 lines { - width: 9.4 + width: 6.4 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -31819,9 +31819,9 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -31842,9 +31842,9 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -31868,9 +31868,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 5845795 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31893,9 +31893,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 5845795 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -31918,9 +31918,9 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 1.3 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31942,21 +31942,21 @@ cont { element { scale: 14 lines { - width: 7.2 + width: 4.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.4 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.2 + width: 1.8 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -31978,21 +31978,21 @@ cont { element { scale: 15 lines { - width: 8.4 + width: 5.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 7.6 + width: 5.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.8 + width: 2.5 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -32014,21 +32014,21 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 + width: 3.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32049,21 +32049,21 @@ cont { element { scale: 17 lines { - width: 16.4 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.6 + width: 4.7 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32084,21 +32084,21 @@ cont { element { scale: 18 lines { - width: 22.8 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.8 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32119,21 +32119,21 @@ cont { element { scale: 19 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32154,21 +32154,21 @@ cont { element { scale: 20 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32192,9 +32192,9 @@ cont { element { scale: 11 lines { - width: 1.5 + width: 0.8 color: 5845795 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -32217,9 +32217,9 @@ cont { element { scale: 12 lines { - width: 1.7 + width: 1.0 color: 5845795 - priority: 280 + priority: 226 join: BEVELJOIN cap: BUTTCAP } @@ -32242,9 +32242,9 @@ cont { element { scale: 13 lines { - width: 2.4 + width: 1.3 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -32266,19 +32266,19 @@ cont { element { scale: 14 lines { - width: 5.2 + width: 3.8 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 3.2 + width: 1.8 color: 4991515 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -32300,19 +32300,19 @@ cont { element { scale: 15 lines { - width: 5.8 + width: 4.5 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 3.8 + width: 2.5 color: 5845795 - priority: 280 + priority: 226 cap: BUTTCAP } path_text { @@ -32334,19 +32334,19 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 4.4 + width: 3.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32367,19 +32367,19 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 6.6 + width: 4.7 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32400,19 +32400,19 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32433,19 +32433,19 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32466,19 +32466,19 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 279 + priority: 225 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 5845795 - priority: 280 + priority: 226 } path_text { primary { @@ -32603,9 +32603,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32613,9 +32613,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32630,9 +32630,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32647,9 +32647,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32671,9 +32671,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32694,9 +32694,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32717,9 +32717,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32740,9 +32740,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32763,9 +32763,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32789,9 +32789,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32799,9 +32799,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32816,9 +32816,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32833,9 +32833,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -32857,9 +32857,9 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32880,9 +32880,9 @@ cont { element { scale: 17 lines { - width: 5.5 + width: 4.7 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32903,9 +32903,9 @@ cont { element { scale: 18 lines { - width: 8.2 + width: 6.4 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32926,9 +32926,9 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32949,9 +32949,9 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -32975,9 +32975,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -32985,9 +32985,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33002,21 +33002,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 4.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 3.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 + width: 1.6 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33031,21 +33031,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 5.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 4.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 + width: 2.4 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33067,21 +33067,21 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -33102,21 +33102,21 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -33137,21 +33137,21 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -33172,21 +33172,21 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -33207,21 +33207,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 4933187 - priority: 250 + priority: 230 } path_text { primary { @@ -33245,9 +33245,9 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 - priority: 250 + priority: 230 join: BEVELJOIN cap: BUTTCAP } @@ -33255,9 +33255,9 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33272,9 +33272,9 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33289,9 +33289,9 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 - priority: 250 + priority: 230 cap: BUTTCAP } path_text { @@ -33313,19 +33313,19 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -33346,19 +33346,19 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -33379,19 +33379,19 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -33412,19 +33412,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -33445,19 +33445,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 249 + priority: 229 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 250 + priority: 230 } path_text { primary { @@ -33588,7 +33588,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 priority: 230 join: BEVELJOIN @@ -33598,7 +33598,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 priority: 230 cap: BUTTCAP @@ -33607,7 +33607,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 priority: 230 cap: BUTTCAP @@ -33624,7 +33624,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 priority: 230 cap: BUTTCAP @@ -33641,7 +33641,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 4933187 priority: 230 } @@ -33657,7 +33657,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -33673,7 +33673,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -33689,7 +33689,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -33705,7 +33705,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -33724,7 +33724,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 priority: 230 join: BEVELJOIN @@ -33734,7 +33734,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 priority: 230 cap: BUTTCAP @@ -33743,7 +33743,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 priority: 230 cap: BUTTCAP @@ -33760,7 +33760,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 priority: 230 cap: BUTTCAP @@ -33777,19 +33777,19 @@ cont { element { scale: 16 lines { - width: 8.4 + width: 6.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.0 + width: 3.2 color: 4933187 priority: 230 } @@ -33805,19 +33805,19 @@ cont { element { scale: 17 lines { - width: 11.2 + width: 9.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.8 + width: 9.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -33833,19 +33833,19 @@ cont { element { scale: 18 lines { - width: 16.4 + width: 13.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 16.0 + width: 12.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -33861,19 +33861,19 @@ cont { element { scale: 19 lines { - width: 20.4 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -33889,19 +33889,19 @@ cont { element { scale: 20 lines { - width: 20.4 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.0 + width: 16.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -33920,7 +33920,7 @@ cont { element { scale: 12 lines { - width: 1.2 + width: 0.7 color: 4933187 priority: 230 join: BEVELJOIN @@ -33930,7 +33930,7 @@ cont { element { scale: 13 lines { - width: 1.2 + width: 1.0 color: 4933187 priority: 230 cap: BUTTCAP @@ -33939,7 +33939,7 @@ cont { element { scale: 14 lines { - width: 1.8 + width: 1.6 color: 4933187 priority: 230 cap: BUTTCAP @@ -33956,7 +33956,7 @@ cont { element { scale: 15 lines { - width: 3.0 + width: 2.4 color: 4933187 priority: 230 cap: BUTTCAP @@ -33973,7 +33973,7 @@ cont { element { scale: 16 lines { - width: 4.0 + width: 3.2 color: 4933187 priority: 230 } @@ -33989,7 +33989,7 @@ cont { element { scale: 17 lines { - width: 5.4 + width: 4.7 color: 4933187 priority: 230 } @@ -34005,7 +34005,7 @@ cont { element { scale: 18 lines { - width: 8.0 + width: 6.4 color: 4933187 priority: 230 } @@ -34021,7 +34021,7 @@ cont { element { scale: 19 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -34037,7 +34037,7 @@ cont { element { scale: 20 lines { - width: 10.0 + width: 8.2 color: 4933187 priority: 230 } @@ -34056,8 +34056,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 4933187 + width: 1.2 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34074,8 +34074,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 4933187 + width: 1.5 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34092,8 +34092,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 4933187 + width: 1.7 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34117,8 +34117,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 4933187 + width: 2.3 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34141,8 +34141,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 4933187 + width: 3.2 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34165,8 +34165,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 4933187 + width: 3.8 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34189,8 +34189,8 @@ cont { element { scale: 16 lines { - width: 4.4 - color: 4933187 + width: 5.0 + color: 5717555 priority: 270 } path_text { @@ -34213,7 +34213,7 @@ cont { scale: 17 lines { width: 6.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34236,7 +34236,7 @@ cont { scale: 18 lines { width: 9.4 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34259,7 +34259,7 @@ cont { scale: 19 lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34282,7 +34282,7 @@ cont { scale: 20 lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34307,8 +34307,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 4933187 + width: 1.2 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34325,8 +34325,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 4933187 + width: 1.5 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34343,8 +34343,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 4933187 + width: 1.7 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34368,8 +34368,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 4933187 + width: 2.3 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34392,20 +34392,20 @@ cont { element { scale: 14 lines { - width: 6.8 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 4933187 + width: 3.2 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34428,20 +34428,20 @@ cont { element { scale: 15 lines { - width: 8.6 + width: 8.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 7.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 4933187 + width: 3.8 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34464,20 +34464,20 @@ cont { element { scale: 16 lines { - width: 9.6 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 + width: 5.0 + color: 5717555 priority: 270 } path_text { @@ -34512,7 +34512,7 @@ cont { } lines { width: 6.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34547,7 +34547,7 @@ cont { } lines { width: 9.4 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34582,7 +34582,7 @@ cont { } lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34617,7 +34617,7 @@ cont { } lines { width: 11.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34642,8 +34642,8 @@ cont { element { scale: 10 lines { - width: 1.0 - color: 4933187 + width: 1.2 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34660,8 +34660,8 @@ cont { element { scale: 11 lines { - width: 1.3 - color: 4933187 + width: 1.5 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34678,8 +34678,8 @@ cont { element { scale: 12 lines { - width: 1.6 - color: 4933187 + width: 1.7 + color: 5717555 priority: 270 join: BEVELJOIN cap: BUTTCAP @@ -34703,8 +34703,8 @@ cont { element { scale: 13 lines { - width: 2.2 - color: 4933187 + width: 2.3 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34727,8 +34727,8 @@ cont { element { scale: 14 lines { - width: 3.0 - color: 4933187 + width: 3.2 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34751,8 +34751,8 @@ cont { element { scale: 15 lines { - width: 3.9 - color: 4933187 + width: 3.8 + color: 5717555 priority: 270 cap: BUTTCAP } @@ -34775,7 +34775,7 @@ cont { element { scale: 16 lines { - width: 6.4 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 @@ -34785,8 +34785,8 @@ cont { cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 + width: 5.0 + color: 5717555 priority: 270 } path_text { @@ -34819,7 +34819,7 @@ cont { } lines { width: 6.6 - color: 4933187 + color: 5717555 priority: 270 } path_text { @@ -34940,30 +34940,39 @@ cont { } cont { name: "highway-secondary_link" + element { + scale: 13 + lines { + width: 1.3 + color: 5717555 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 4933187 - priority: 260 + width: 1.8 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 4933187 - priority: 260 + width: 2.5 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.4 - color: 4933187 - priority: 260 + width: 3.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -34977,9 +34986,9 @@ cont { element { scale: 17 lines { - width: 6.6 - color: 4933187 - priority: 260 + width: 4.7 + color: 5717555 + priority: 224 } path_text { primary { @@ -34993,9 +35002,9 @@ cont { element { scale: 18 lines { - width: 9.4 - color: 4933187 - priority: 260 + width: 6.4 + color: 5717555 + priority: 224 } path_text { primary { @@ -35009,9 +35018,9 @@ cont { element { scale: 19 lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -35025,9 +35034,9 @@ cont { element { scale: 20 lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -35041,66 +35050,75 @@ cont { } cont { name: "highway-secondary_link-bridge" + element { + scale: 13 + lines { + width: 1.3 + color: 5717555 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 6.8 + width: 4.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 4933187 - priority: 260 + width: 1.8 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 8.6 + width: 5.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 7.8 + width: 5.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.9 - color: 4933187 - priority: 260 + width: 2.5 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.6 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 - priority: 260 + width: 3.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -35114,21 +35132,21 @@ cont { element { scale: 17 lines { - width: 16.4 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 14.8 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.6 - color: 4933187 - priority: 260 + width: 4.7 + color: 5717555 + priority: 224 } path_text { primary { @@ -35142,21 +35160,21 @@ cont { element { scale: 18 lines { - width: 22.8 + width: 16.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 20.8 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 9.4 - color: 4933187 - priority: 260 + width: 6.4 + color: 5717555 + priority: 224 } path_text { primary { @@ -35170,21 +35188,21 @@ cont { element { scale: 19 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -35198,21 +35216,21 @@ cont { element { scale: 20 lines { - width: 27.2 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 25.2 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 11.6 - color: 4933187 - priority: 260 + width: 8.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -35226,40 +35244,49 @@ cont { } cont { name: "highway-secondary_link-tunnel" + element { + scale: 13 + lines { + width: 1.3 + color: 5717555 + priority: 224 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 3.0 - color: 4933187 - priority: 260 + width: 1.8 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 15 lines { - width: 3.9 - color: 4933187 - priority: 260 + width: 2.5 + color: 5717555 + priority: 224 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.4 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 4.4 - color: 4933187 - priority: 260 + width: 3.2 + color: 5717555 + priority: 224 } path_text { primary { @@ -35273,19 +35300,19 @@ cont { element { scale: 17 lines { - width: 8.6 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 6.6 - color: 4933187 - priority: 260 + width: 4.7 + color: 5717555 + priority: 224 } path_text { primary { @@ -35299,19 +35326,19 @@ cont { element { scale: 18 lines { - width: 11.4 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 9.4 + width: 6.4 color: 2828327 - priority: 260 + priority: 224 } path_text { primary { @@ -35325,19 +35352,19 @@ cont { element { scale: 19 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 2828327 - priority: 260 + priority: 224 } path_text { primary { @@ -35351,19 +35378,19 @@ cont { element { scale: 20 lines { - width: 13.6 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 259 + priority: 223 cap: BUTTCAP } lines { - width: 11.6 + width: 8.2 color: 2828327 - priority: 260 + priority: 224 } path_text { primary { @@ -36837,7 +36864,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 5196359 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36846,8 +36873,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4933187 + width: 1.3 + color: 5196359 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -36864,8 +36891,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 4933187 + width: 1.8 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -36888,8 +36915,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 4933187 + width: 2.7 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -36912,8 +36939,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 4933187 + width: 3.8 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -36936,8 +36963,8 @@ cont { element { scale: 16 lines { - width: 4.2 - color: 4933187 + width: 5.0 + color: 5196359 priority: 250 } path_text { @@ -36959,8 +36986,8 @@ cont { element { scale: 17 lines { - width: 5.5 - color: 4933187 + width: 6.6 + color: 5196359 priority: 250 } path_text { @@ -36982,8 +37009,8 @@ cont { element { scale: 18 lines { - width: 8.2 - color: 4933187 + width: 9.4 + color: 5196359 priority: 250 } path_text { @@ -37005,8 +37032,8 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -37028,8 +37055,8 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -37055,7 +37082,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 5196359 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -37064,8 +37091,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4933187 + width: 1.3 + color: 5196359 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -37082,8 +37109,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 4933187 + width: 1.8 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -37106,20 +37133,20 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 3.6 + width: 5.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 4933187 + width: 2.7 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -37142,20 +37169,20 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 7.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 4933187 + width: 3.8 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -37178,20 +37205,20 @@ cont { element { scale: 16 lines { - width: 9.2 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 4933187 + width: 5.0 + color: 5196359 priority: 250 } path_text { @@ -37213,20 +37240,20 @@ cont { element { scale: 17 lines { - width: 14.2 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 4933187 + width: 6.6 + color: 5196359 priority: 250 } path_text { @@ -37248,20 +37275,20 @@ cont { element { scale: 18 lines { - width: 20.4 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 18.4 + width: 20.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.2 - color: 4933187 + width: 9.4 + color: 5196359 priority: 250 } path_text { @@ -37283,20 +37310,20 @@ cont { element { scale: 19 lines { - width: 24.8 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -37318,20 +37345,20 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 4933187 + width: 11.6 + color: 5196359 priority: 250 } path_text { @@ -37357,7 +37384,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 5196359 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -37366,8 +37393,8 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4933187 + width: 1.3 + color: 5196359 priority: 250 join: BEVELJOIN cap: BUTTCAP @@ -37384,8 +37411,8 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 4933187 + width: 1.8 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -37408,8 +37435,8 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 4933187 + width: 2.7 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -37432,8 +37459,8 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 4933187 + width: 3.8 + color: 5196359 priority: 250 cap: BUTTCAP } @@ -37456,7 +37483,7 @@ cont { element { scale: 16 lines { - width: 6.2 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 @@ -37466,7 +37493,7 @@ cont { cap: BUTTCAP } lines { - width: 4.2 + width: 5.0 color: 2828327 priority: 250 } @@ -37489,7 +37516,7 @@ cont { element { scale: 17 lines { - width: 7.5 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 @@ -37499,7 +37526,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.6 color: 2828327 priority: 250 } @@ -37522,7 +37549,7 @@ cont { element { scale: 18 lines { - width: 10.2 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 @@ -37532,7 +37559,7 @@ cont { cap: BUTTCAP } lines { - width: 8.2 + width: 9.4 color: 2828327 priority: 250 } @@ -37555,7 +37582,7 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 @@ -37565,7 +37592,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 2828327 priority: 250 } @@ -37588,7 +37615,7 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 @@ -37598,7 +37625,7 @@ cont { cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 2828327 priority: 250 } @@ -37621,37 +37648,46 @@ cont { } cont { name: "highway-tertiary_link" + element { + scale: 14 + lines { + width: 1.8 + color: 5196359 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 4933187 - priority: 240 + width: 2.5 + color: 5196359 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 4.2 - color: 4933187 - priority: 240 + width: 3.2 + color: 5196359 + priority: 222 } } element { scale: 17 lines { - width: 5.5 - color: 4933187 - priority: 240 + width: 4.7 + color: 5196359 + priority: 222 } } element { scale: 18 lines { - width: 8.2 - color: 4933187 - priority: 240 + width: 6.4 + color: 5196359 + priority: 222 } path_text { primary { @@ -37665,9 +37701,9 @@ cont { element { scale: 19 lines { - width: 10.4 - color: 4933187 - priority: 240 + width: 8.2 + color: 5196359 + priority: 222 } path_text { primary { @@ -37681,9 +37717,9 @@ cont { element { scale: 20 lines { - width: 10.4 - color: 4933187 - priority: 240 + width: 8.2 + color: 5196359 + priority: 222 } path_text { primary { @@ -37698,68 +37734,117 @@ cont { cont { name: "highway-tertiary_link-bridge" element { - scale: 15 + scale: 14 lines { - width: 6.8 + width: 4.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 4933187 - priority: 240 + width: 1.8 + color: 5196359 + priority: 222 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 5.8 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 5.0 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.5 + color: 5196359 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 9.2 + width: 7.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.4 + width: 6.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 - color: 4933187 - priority: 240 + width: 3.2 + color: 5196359 + priority: 222 } } element { scale: 17 lines { - width: 14.2 + width: 12.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.6 + width: 11.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 - color: 4933187 - priority: 240 + width: 4.7 + color: 5196359 + priority: 222 } } element { scale: 18 + lines { + width: 16.8 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 14.8 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 5196359 + priority: 222 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 1118464 + } + priority: 2950 + } + } + element { + scale: 19 lines { width: 20.4 color: 1297109072 @@ -37774,36 +37859,8 @@ cont { } lines { width: 8.2 - color: 4933187 - priority: 240 - } - path_text { - primary { - height: 12 - color: 7829367 - stroke_color: 1118464 - } - priority: 2950 - } - } - element { - scale: 19 - lines { - width: 24.8 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 22.8 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 10.4 - color: 4933187 - priority: 240 + color: 5196359 + priority: 222 } path_text { primary { @@ -37817,21 +37874,21 @@ cont { element { scale: 20 lines { - width: 24.8 + width: 20.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.8 + width: 18.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.4 - color: 4933187 - priority: 240 + width: 8.2 + color: 5196359 + priority: 222 } path_text { primary { @@ -37845,67 +37902,76 @@ cont { } cont { name: "highway-tertiary_link-tunnel" + element { + scale: 14 + lines { + width: 1.8 + color: 5196359 + priority: 222 + cap: BUTTCAP + } + } element { scale: 15 lines { - width: 3.0 - color: 4933187 - priority: 240 + width: 2.5 + color: 5196359 + priority: 222 cap: BUTTCAP } } element { scale: 16 lines { - width: 6.2 + width: 5.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 4.2 + width: 3.2 color: 2828327 - priority: 240 + priority: 222 } } element { scale: 17 lines { - width: 7.5 + width: 6.7 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 5.5 + width: 4.7 color: 2828327 - priority: 240 + priority: 222 } } element { scale: 18 lines { - width: 10.2 + width: 8.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 8.2 + width: 6.4 color: 2828327 - priority: 240 + priority: 222 } path_text { primary { @@ -37919,19 +37985,19 @@ cont { element { scale: 19 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 240 + priority: 222 } path_text { primary { @@ -37945,19 +38011,19 @@ cont { element { scale: 20 lines { - width: 12.4 + width: 10.2 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 221 cap: BUTTCAP } lines { - width: 10.4 + width: 8.2 color: 2828327 - priority: 240 + priority: 222 } path_text { primary { @@ -40215,7 +40281,7 @@ cont { element { scale: 16 lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -40546,19 +40612,19 @@ cont { element { scale: 16 lines { - width: 11.8 + width: 12.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 11.0 + width: 12.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -40941,7 +41007,7 @@ cont { element { scale: 16 lines { - width: 7.5 + width: 8.0 color: 1291845632 dashdot { dd: 5.0 @@ -40951,7 +41017,7 @@ cont { cap: BUTTCAP } lines { - width: 5.5 + width: 6.0 color: 4794651 priority: 310 } @@ -41110,8 +41176,8 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41135,8 +41201,8 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41159,9 +41225,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4794651 - priority: 300 + width: 1.3 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41185,8 +41251,8 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -41208,9 +41274,9 @@ cont { element { scale: 14 lines { - width: 2.0 - color: 4794651 - priority: 300 + width: 2.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -41232,9 +41298,9 @@ cont { element { scale: 15 lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -41256,9 +41322,9 @@ cont { element { scale: 16 lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -41279,9 +41345,9 @@ cont { element { scale: 17 lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -41302,9 +41368,9 @@ cont { element { scale: 18 lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -41325,9 +41391,9 @@ cont { element { scale: 19 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -41348,9 +41414,9 @@ cont { element { scale: 20 lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -41375,8 +41441,8 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41400,8 +41466,8 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41424,9 +41490,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4794651 - priority: 300 + width: 1.3 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41450,8 +41516,8 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -41473,21 +41539,21 @@ cont { element { scale: 14 lines { - width: 4.8 + width: 6.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.0 + width: 5.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 4794651 - priority: 300 + width: 2.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -41509,21 +41575,21 @@ cont { element { scale: 15 lines { - width: 5.6 + width: 8.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 4.8 + width: 7.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -41545,21 +41611,21 @@ cont { element { scale: 16 lines { - width: 6.8 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 10.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -41580,21 +41646,21 @@ cont { element { scale: 17 lines { - width: 12.2 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 14.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -41615,21 +41681,21 @@ cont { element { scale: 18 lines { - width: 15.2 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 13.2 + width: 20.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -41650,21 +41716,21 @@ cont { element { scale: 19 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -41685,21 +41751,21 @@ cont { element { scale: 20 lines { - width: 17.6 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 15.6 + width: 25.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -41724,8 +41790,8 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41749,8 +41815,8 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 - priority: 300 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41773,15 +41839,15 @@ cont { element { scale: 12 lines { - width: 3.2 + width: 3.3 color: 1291845632 - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 1.2 - color: 4794651 - priority: 300 + width: 1.3 + color: 5845795 + priority: 228 join: BEVELJOIN cap: BUTTCAP } @@ -41810,13 +41876,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { width: 1.8 color: 3677972 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -41838,19 +41904,19 @@ cont { element { scale: 14 lines { - width: 4.0 + width: 4.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 3677972 - priority: 300 + priority: 228 cap: BUTTCAP } path_text { @@ -41872,19 +41938,19 @@ cont { element { scale: 15 lines { - width: 4.4 + width: 5.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 2.4 - color: 4794651 - priority: 300 + width: 3.6 + color: 5845795 + priority: 228 cap: BUTTCAP } path_text { @@ -41906,19 +41972,19 @@ cont { element { scale: 16 lines { - width: 5.0 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 3.0 - color: 4794651 - priority: 300 + width: 5.0 + color: 5845795 + priority: 228 } path_text { primary { @@ -41939,19 +42005,19 @@ cont { element { scale: 17 lines { - width: 6.5 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 4.5 - color: 4794651 - priority: 300 + width: 6.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -41972,19 +42038,19 @@ cont { element { scale: 18 lines { - width: 7.6 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 5.6 - color: 4794651 - priority: 300 + width: 9.4 + color: 5845795 + priority: 228 } path_text { primary { @@ -42005,19 +42071,19 @@ cont { element { scale: 19 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -42038,19 +42104,19 @@ cont { element { scale: 20 lines { - width: 8.8 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 299 + priority: 227 cap: BUTTCAP } lines { - width: 6.8 - color: 4794651 - priority: 300 + width: 11.6 + color: 5845795 + priority: 228 } path_text { primary { @@ -42075,8 +42141,8 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 - priority: 230 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42084,9 +42150,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.3 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42094,9 +42160,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42111,9 +42177,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 4933187 - priority: 230 + width: 2.7 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42128,9 +42194,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 4933187 - priority: 230 + width: 3.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42145,9 +42211,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 4933187 - priority: 230 + width: 5.0 + color: 5196359 + priority: 250 } path_text { primary { @@ -42161,9 +42227,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 4933187 - priority: 230 + width: 6.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42177,9 +42243,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 4933187 - priority: 230 + width: 9.4 + color: 5196359 + priority: 250 } path_text { primary { @@ -42193,9 +42259,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42209,9 +42275,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42229,8 +42295,8 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 - priority: 230 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42238,9 +42304,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.3 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42248,9 +42314,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42265,9 +42331,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 4933187 - priority: 230 + width: 2.7 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42282,9 +42348,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 4933187 - priority: 230 + width: 3.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42299,9 +42365,9 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 4933187 - priority: 230 + width: 5.0 + color: 5196359 + priority: 250 } path_text { primary { @@ -42315,9 +42381,9 @@ cont { element { scale: 17 lines { - width: 5.4 - color: 4933187 - priority: 230 + width: 6.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42331,9 +42397,9 @@ cont { element { scale: 18 lines { - width: 8.0 - color: 4933187 - priority: 230 + width: 9.4 + color: 5196359 + priority: 250 } path_text { primary { @@ -42347,9 +42413,9 @@ cont { element { scale: 19 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42363,9 +42429,9 @@ cont { element { scale: 20 lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42383,8 +42449,8 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 - priority: 230 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42392,9 +42458,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.3 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42402,9 +42468,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42419,21 +42485,21 @@ cont { element { scale: 14 lines { - width: 4.4 + width: 6.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 3.6 - color: 657206298 + width: 5.4 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 4933187 - priority: 230 + width: 2.7 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42448,21 +42514,21 @@ cont { element { scale: 15 lines { - width: 6.8 + width: 8.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 - color: 657206298 + width: 7.6 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.0 - color: 4933187 - priority: 230 + width: 3.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42477,21 +42543,21 @@ cont { element { scale: 16 lines { - width: 8.8 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.0 - color: 657206298 + width: 10.0 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.0 - color: 4933187 - priority: 230 + width: 5.0 + color: 5196359 + priority: 250 } path_text { primary { @@ -42505,21 +42571,21 @@ cont { element { scale: 17 lines { - width: 14.0 + width: 16.4 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 12.4 - color: 657206298 + width: 14.8 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 5.4 - color: 4933187 - priority: 230 + width: 6.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42533,21 +42599,21 @@ cont { element { scale: 18 lines { - width: 20.0 + width: 22.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 18.0 - color: 657206298 + width: 20.8 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 8.0 - color: 4933187 - priority: 230 + width: 9.4 + color: 5196359 + priority: 250 } path_text { primary { @@ -42561,21 +42627,21 @@ cont { element { scale: 19 lines { - width: 24.0 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 657206298 + width: 25.2 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42589,21 +42655,21 @@ cont { element { scale: 20 lines { - width: 24.0 + width: 27.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 22.0 - color: 657206298 + width: 25.2 + color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 10.0 - color: 4933187 - priority: 230 + width: 11.6 + color: 5196359 + priority: 250 } path_text { primary { @@ -42621,8 +42687,8 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 - priority: 230 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42630,9 +42696,9 @@ cont { element { scale: 12 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.3 + color: 5196359 + priority: 250 join: BEVELJOIN cap: BUTTCAP } @@ -42640,9 +42706,9 @@ cont { element { scale: 13 lines { - width: 1.2 - color: 4933187 - priority: 230 + width: 1.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42657,9 +42723,9 @@ cont { element { scale: 14 lines { - width: 1.8 - color: 4933187 - priority: 230 + width: 2.7 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42674,9 +42740,9 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 4933187 - priority: 230 + width: 3.8 + color: 5196359 + priority: 250 cap: BUTTCAP } path_text { @@ -42691,19 +42757,19 @@ cont { element { scale: 16 lines { - width: 6.0 + width: 7.0 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 4.0 + width: 5.0 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { @@ -42717,19 +42783,19 @@ cont { element { scale: 17 lines { - width: 7.4 + width: 8.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 5.4 + width: 6.6 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { @@ -42743,19 +42809,19 @@ cont { element { scale: 18 lines { - width: 10.0 + width: 11.4 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 8.0 + width: 9.4 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { @@ -42769,19 +42835,19 @@ cont { element { scale: 19 lines { - width: 12.0 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { @@ -42795,19 +42861,19 @@ cont { element { scale: 20 lines { - width: 12.0 + width: 13.6 color: 1291845632 dashdot { dd: 5.0 dd: 5.0 } - priority: 229 + priority: 249 cap: BUTTCAP } lines { - width: 10.0 + width: 11.6 color: 2828327 - priority: 230 + priority: 250 } path_text { primary { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index d30cbcfda1..f6dbc07c94 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index c462755e1e..f69b27822b 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -11162,7 +11162,7 @@ cont { lines { width: 1.3 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11186,7 +11186,7 @@ cont { lines { width: 2.0 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11210,7 +11210,7 @@ cont { lines { width: 2.5 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11234,7 +11234,7 @@ cont { lines { width: 2.8 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11257,13 +11257,13 @@ cont { lines { width: 4.27 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11286,13 +11286,13 @@ cont { lines { width: 6.1 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 16748864 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11315,13 +11315,13 @@ cont { lines { width: 8.8 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11343,13 +11343,13 @@ cont { lines { width: 14.0 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11371,13 +11371,13 @@ cont { lines { width: 20.3 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11399,13 +11399,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11427,13 +11427,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11458,7 +11458,7 @@ cont { lines { width: 1.3 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11482,7 +11482,7 @@ cont { lines { width: 2.0 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11506,7 +11506,7 @@ cont { lines { width: 2.5 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11530,7 +11530,7 @@ cont { lines { width: 2.8 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11565,13 +11565,13 @@ cont { lines { width: 4.27 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11606,13 +11606,13 @@ cont { lines { width: 6.1 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 16748864 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11647,13 +11647,13 @@ cont { lines { width: 8.8 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11687,13 +11687,13 @@ cont { lines { width: 14.0 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11727,13 +11727,13 @@ cont { lines { width: 20.3 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11767,13 +11767,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11807,13 +11807,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -11838,7 +11838,7 @@ cont { lines { width: 1.3 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11862,7 +11862,7 @@ cont { lines { width: 2.0 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11886,13 +11886,13 @@ cont { lines { width: 4.5 color: 1300267136 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.5 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11920,13 +11920,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11953,13 +11953,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 16557154 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11986,13 +11986,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 16748864 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -12019,13 +12019,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -12051,13 +12051,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -12083,13 +12083,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -12115,13 +12115,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -12147,13 +12147,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -13865,7 +13865,7 @@ cont { lines { width: 1.7 color: 1308601687 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -13889,7 +13889,7 @@ cont { lines { width: 2.4 color: 1308601687 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -13913,7 +13913,7 @@ cont { lines { width: 3.0 color: 1308601687 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -13936,13 +13936,13 @@ cont { lines { width: 4.2 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 3.5 color: 1308601687 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -13965,13 +13965,13 @@ cont { lines { width: 5.3 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 4.2 color: 16756055 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -13994,13 +13994,13 @@ cont { lines { width: 8.1 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 6.5 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14022,13 +14022,13 @@ cont { lines { width: 14.8 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 13.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14050,13 +14050,13 @@ cont { lines { width: 24.2 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 22.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14078,13 +14078,13 @@ cont { lines { width: 29.6 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14106,13 +14106,13 @@ cont { lines { width: 29.6 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14137,7 +14137,7 @@ cont { lines { width: 1.7 color: 1308601687 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14161,7 +14161,7 @@ cont { lines { width: 2.4 color: 1308601687 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14185,7 +14185,7 @@ cont { lines { width: 3.0 color: 1308601687 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14220,13 +14220,13 @@ cont { lines { width: 4.2 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 3.5 color: 1308601687 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14261,13 +14261,13 @@ cont { lines { width: 5.3 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 4.2 color: 16756055 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14302,13 +14302,13 @@ cont { lines { width: 8.1 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 6.5 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14342,13 +14342,13 @@ cont { lines { width: 14.8 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 13.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14382,13 +14382,13 @@ cont { lines { width: 24.2 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 22.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14422,13 +14422,13 @@ cont { lines { width: 29.6 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14462,13 +14462,13 @@ cont { lines { width: 29.6 color: 1307964388 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14493,7 +14493,7 @@ cont { lines { width: 1.7 color: 1308601687 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14517,7 +14517,7 @@ cont { lines { width: 2.4 color: 1308601687 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14541,7 +14541,7 @@ cont { lines { width: 3.0 color: 1308601687 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14568,13 +14568,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 3.5 color: 1308402786 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14601,13 +14601,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 4.2 color: 16756055 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14634,13 +14634,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 6.5 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14666,13 +14666,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 13.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14698,13 +14698,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 22.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14730,13 +14730,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14762,13 +14762,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 16756055 - priority: 220 + priority: 166 } path_text { primary { @@ -14793,7 +14793,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -14811,7 +14811,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -14828,7 +14828,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -14845,13 +14845,13 @@ cont { lines { width: 4.4 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 16579836 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -14874,13 +14874,13 @@ cont { lines { width: 6.1 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -14902,13 +14902,13 @@ cont { lines { width: 9.4 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -14930,13 +14930,13 @@ cont { lines { width: 13.6 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -14958,13 +14958,13 @@ cont { lines { width: 19.0 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -14986,13 +14986,13 @@ cont { lines { width: 19.0 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15017,7 +15017,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -15035,7 +15035,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15052,7 +15052,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15069,13 +15069,13 @@ cont { lines { width: 4.4 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 16579836 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15098,13 +15098,13 @@ cont { lines { width: 6.1 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15126,13 +15126,13 @@ cont { lines { width: 9.4 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15154,13 +15154,13 @@ cont { lines { width: 13.6 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15182,13 +15182,13 @@ cont { lines { width: 19.0 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15210,13 +15210,13 @@ cont { lines { width: 19.0 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15241,7 +15241,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -15259,7 +15259,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15288,7 +15288,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15317,13 +15317,13 @@ cont { lines { width: 4.4 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 16579836 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15358,13 +15358,13 @@ cont { lines { width: 6.1 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15398,13 +15398,13 @@ cont { lines { width: 9.4 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15438,13 +15438,13 @@ cont { lines { width: 13.6 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15478,13 +15478,13 @@ cont { lines { width: 19.0 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15518,13 +15518,13 @@ cont { lines { width: 19.0 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16579836 - priority: 190 + priority: 170 } path_text { primary { @@ -15549,7 +15549,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -15567,7 +15567,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15584,7 +15584,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15601,13 +15601,13 @@ cont { lines { width: 4.4 color: 16118756 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 16579836 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15634,13 +15634,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 16777215 - priority: 190 + priority: 170 } path_text { primary { @@ -15666,13 +15666,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 16777215 - priority: 190 + priority: 170 } path_text { primary { @@ -15698,13 +15698,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 190 + priority: 170 } path_text { primary { @@ -15730,13 +15730,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16777215 - priority: 190 + priority: 170 } path_text { primary { @@ -15762,13 +15762,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 16777215 - priority: 190 + priority: 170 } path_text { primary { @@ -17268,18 +17268,27 @@ cont { } cont { name: "highway-secondary_link" + element { + scale: 13 + lines { + width: 2.9 + color: 872415231 + priority: 164 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 3.9 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 3.2 color: 872415231 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17288,13 +17297,13 @@ cont { lines { width: 5.3 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 4.2 color: 16777215 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17303,13 +17312,13 @@ cont { lines { width: 7.6 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17325,13 +17334,13 @@ cont { lines { width: 11.4 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 9.6 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17347,13 +17356,13 @@ cont { lines { width: 17.2 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 15.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17369,13 +17378,13 @@ cont { lines { width: 24.6 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17391,13 +17400,13 @@ cont { lines { width: 24.6 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17411,6 +17420,15 @@ cont { } cont { name: "highway-secondary_link-bridge" + element { + scale: 13 + lines { + width: 2.9 + color: 872415231 + priority: 164 + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -17428,13 +17446,13 @@ cont { lines { width: 3.9 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 3.2 color: 872415231 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17455,13 +17473,13 @@ cont { lines { width: 5.3 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 4.2 color: 16777215 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17482,13 +17500,13 @@ cont { lines { width: 7.6 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17516,13 +17534,13 @@ cont { lines { width: 11.4 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 9.6 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17550,13 +17568,13 @@ cont { lines { width: 17.2 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 15.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17584,13 +17602,13 @@ cont { lines { width: 24.6 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17618,13 +17636,13 @@ cont { lines { width: 24.6 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17638,18 +17656,27 @@ cont { } cont { name: "highway-secondary_link-tunnel" + element { + scale: 13 + lines { + width: 2.9 + color: 872415231 + priority: 164 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 3.9 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 3.2 color: 872415231 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17658,13 +17685,13 @@ cont { lines { width: 5.3 color: 16118756 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 4.2 color: 16777215 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17677,13 +17704,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17703,13 +17730,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 9.6 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17729,13 +17756,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 15.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17755,13 +17782,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -17781,13 +17808,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 16777215 - priority: 200 + priority: 164 } path_text { primary { @@ -19520,18 +19547,27 @@ cont { } cont { name: "highway-tertiary_link" + element { + scale: 14 + lines { + width: 3.2 + color: 1308425468 + priority: 162 + cap: BUTTCAP + } + } element { scale: 15 lines { width: 4.7 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 3.8 color: 16579836 - priority: 180 + priority: 162 cap: BUTTCAP } } @@ -19540,13 +19576,13 @@ cont { lines { width: 6.5 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 5.4 color: 16579836 - priority: 180 + priority: 162 } } element { @@ -19554,13 +19590,13 @@ cont { lines { width: 9.9 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 8.4 color: 16579836 - priority: 180 + priority: 162 } } element { @@ -19568,13 +19604,13 @@ cont { lines { width: 15.8 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 14.0 color: 16579836 - priority: 180 + priority: 162 } path_text { primary { @@ -19590,13 +19626,13 @@ cont { lines { width: 22.2 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 16579836 - priority: 180 + priority: 162 } path_text { primary { @@ -19612,13 +19648,13 @@ cont { lines { width: 22.2 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 16579836 - priority: 180 + priority: 162 } path_text { primary { @@ -19632,6 +19668,27 @@ cont { } cont { name: "highway-tertiary_link-bridge" + element { + scale: 14 + lines { + width: 7.2 + color: 8421504 + priority: 100 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 15066325 + priority: 110 + cap: BUTTCAP + } + lines { + width: 3.2 + color: 1308425468 + priority: 162 + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -19649,13 +19706,13 @@ cont { lines { width: 4.7 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 3.8 color: 16579836 - priority: 180 + priority: 162 cap: BUTTCAP } } @@ -19676,13 +19733,13 @@ cont { lines { width: 6.5 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 5.4 color: 16579836 - priority: 180 + priority: 162 } } element { @@ -19702,13 +19759,13 @@ cont { lines { width: 9.9 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 8.4 color: 16579836 - priority: 180 + priority: 162 } } element { @@ -19728,13 +19785,13 @@ cont { lines { width: 15.8 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 14.0 color: 16579836 - priority: 180 + priority: 162 } path_text { primary { @@ -19762,13 +19819,13 @@ cont { lines { width: 22.2 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 16579836 - priority: 180 + priority: 162 } path_text { primary { @@ -19796,13 +19853,13 @@ cont { lines { width: 22.2 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 16579836 - priority: 180 + priority: 162 } path_text { primary { @@ -19816,18 +19873,27 @@ cont { } cont { name: "highway-tertiary_link-tunnel" + element { + scale: 14 + lines { + width: 3.2 + color: 1308425468 + priority: 162 + cap: BUTTCAP + } + } element { scale: 15 lines { width: 4.7 color: 16118756 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 3.8 color: 16579836 - priority: 180 + priority: 162 cap: BUTTCAP } } @@ -19840,13 +19906,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 5.4 color: 16777215 - priority: 180 + priority: 162 } } element { @@ -19858,13 +19924,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 8.4 color: 16777215 - priority: 180 + priority: 162 } } element { @@ -19876,13 +19942,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 14.0 color: 16777215 - priority: 180 + priority: 162 } path_text { primary { @@ -19902,13 +19968,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 16777215 - priority: 180 + priority: 162 } path_text { primary { @@ -19928,13 +19994,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 16777215 - priority: 180 + priority: 162 } path_text { primary { @@ -21668,7 +21734,7 @@ cont { lines { width: 1.3 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -21692,7 +21758,7 @@ cont { lines { width: 2.0 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -21716,7 +21782,7 @@ cont { lines { width: 2.5 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -21740,7 +21806,7 @@ cont { lines { width: 2.8 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -21763,13 +21829,13 @@ cont { lines { width: 4.27 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -21792,13 +21858,13 @@ cont { lines { width: 6.1 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 16748864 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -21821,13 +21887,13 @@ cont { lines { width: 8.8 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -21849,13 +21915,13 @@ cont { lines { width: 14.0 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -21877,13 +21943,13 @@ cont { lines { width: 20.3 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -21905,13 +21971,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -21933,13 +21999,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -21964,7 +22030,7 @@ cont { lines { width: 1.3 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -21988,7 +22054,7 @@ cont { lines { width: 2.0 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22012,7 +22078,7 @@ cont { lines { width: 2.5 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22036,7 +22102,7 @@ cont { lines { width: 2.8 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22071,13 +22137,13 @@ cont { lines { width: 4.27 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1308594496 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22112,13 +22178,13 @@ cont { lines { width: 6.1 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 16748864 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22153,13 +22219,13 @@ cont { lines { width: 8.8 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -22193,13 +22259,13 @@ cont { lines { width: 14.0 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -22233,13 +22299,13 @@ cont { lines { width: 20.3 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -22273,13 +22339,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -22313,13 +22379,13 @@ cont { lines { width: 26.5 color: 1307964388 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1308594496 - priority: 240 + priority: 168 } path_text { primary { @@ -22344,7 +22410,7 @@ cont { lines { width: 1.3 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22368,7 +22434,7 @@ cont { lines { width: 2.0 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22392,13 +22458,13 @@ cont { lines { width: 4.5 color: 1300267136 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.5 color: 1308594496 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22426,13 +22492,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22459,13 +22525,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 16557154 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22492,13 +22558,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 16748864 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22525,13 +22591,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -22557,13 +22623,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -22589,13 +22655,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -22621,13 +22687,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -22653,13 +22719,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 16748864 - priority: 240 + priority: 168 } path_text { primary { @@ -22684,7 +22750,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -22694,7 +22760,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -22704,7 +22770,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -22713,7 +22779,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -22730,7 +22796,7 @@ cont { lines { width: 3.6 color: 16579836 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -22747,7 +22813,7 @@ cont { lines { width: 5.1 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22763,7 +22829,7 @@ cont { lines { width: 8.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22779,7 +22845,7 @@ cont { lines { width: 12.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22795,7 +22861,7 @@ cont { lines { width: 17.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22811,7 +22877,7 @@ cont { lines { width: 17.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22830,7 +22896,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -22840,7 +22906,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -22850,7 +22916,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -22859,7 +22925,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -22876,7 +22942,7 @@ cont { lines { width: 3.6 color: 16579836 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -22893,7 +22959,7 @@ cont { lines { width: 5.1 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22909,7 +22975,7 @@ cont { lines { width: 8.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22925,7 +22991,7 @@ cont { lines { width: 12.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22941,7 +23007,7 @@ cont { lines { width: 17.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22957,7 +23023,7 @@ cont { lines { width: 17.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -22976,7 +23042,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -22986,7 +23052,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -22996,7 +23062,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -23017,7 +23083,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23046,7 +23112,7 @@ cont { lines { width: 3.6 color: 16579836 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23075,7 +23141,7 @@ cont { lines { width: 5.1 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -23103,7 +23169,7 @@ cont { lines { width: 8.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -23131,7 +23197,7 @@ cont { lines { width: 12.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -23159,7 +23225,7 @@ cont { lines { width: 17.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -23187,7 +23253,7 @@ cont { lines { width: 17.0 color: 16579836 - priority: 170 + priority: 190 } path_text { primary { @@ -23206,7 +23272,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23216,7 +23282,7 @@ cont { lines { width: 0.8 color: 1308425468 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23226,7 +23292,7 @@ cont { lines { width: 1.6 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -23235,7 +23301,7 @@ cont { lines { width: 2.2 color: 1308425468 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23252,7 +23318,7 @@ cont { lines { width: 3.6 color: 16579836 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23273,13 +23339,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 5.1 color: 16777215 - priority: 170 + priority: 190 } path_text { primary { @@ -23299,13 +23365,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 8.0 color: 16777215 - priority: 170 + priority: 190 } path_text { primary { @@ -23325,13 +23391,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 170 + priority: 190 } path_text { primary { @@ -23351,13 +23417,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 17.0 color: 16777215 - priority: 170 + priority: 190 } path_text { primary { @@ -23377,13 +23443,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 17.0 color: 16777215 - priority: 170 + priority: 190 } path_text { primary { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index c0693109dc..cc88d3f135 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index f5a9474e6d..076976f008 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -11228,7 +11228,7 @@ cont { lines { width: 1.3 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11254,7 +11254,7 @@ cont { lines { width: 2.0 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11280,7 +11280,7 @@ cont { lines { width: 2.5 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11306,7 +11306,7 @@ cont { lines { width: 2.8 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11331,13 +11331,13 @@ cont { lines { width: 4.27 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11362,13 +11362,13 @@ cont { lines { width: 6.1 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 4991513 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11393,13 +11393,13 @@ cont { lines { width: 8.8 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11423,13 +11423,13 @@ cont { lines { width: 14.0 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11453,13 +11453,13 @@ cont { lines { width: 20.3 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11483,13 +11483,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11513,13 +11513,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11546,7 +11546,7 @@ cont { lines { width: 1.3 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11572,7 +11572,7 @@ cont { lines { width: 2.0 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11598,7 +11598,7 @@ cont { lines { width: 2.5 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11624,7 +11624,7 @@ cont { lines { width: 2.8 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11661,13 +11661,13 @@ cont { lines { width: 4.27 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11704,13 +11704,13 @@ cont { lines { width: 6.1 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 4991513 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -11747,13 +11747,13 @@ cont { lines { width: 8.8 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11789,13 +11789,13 @@ cont { lines { width: 14.0 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11831,13 +11831,13 @@ cont { lines { width: 20.3 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11873,13 +11873,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11915,13 +11915,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -11948,7 +11948,7 @@ cont { lines { width: 1.3 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -11974,7 +11974,7 @@ cont { lines { width: 2.0 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -12000,13 +12000,13 @@ cont { lines { width: 4.5 color: 1291845632 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.5 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -12036,13 +12036,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.8 color: 3677972 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -12071,13 +12071,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 3677972 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -12106,13 +12106,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 4991513 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -12141,13 +12141,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -12175,13 +12175,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -12209,13 +12209,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -12243,13 +12243,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -12277,13 +12277,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -14063,7 +14063,7 @@ cont { lines { width: 1.7 color: 1298019613 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14089,7 +14089,7 @@ cont { lines { width: 2.4 color: 1298019613 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14115,7 +14115,7 @@ cont { lines { width: 3.0 color: 1298019613 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14140,13 +14140,13 @@ cont { lines { width: 4.2 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 3.5 color: 1298019613 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14171,13 +14171,13 @@ cont { lines { width: 5.3 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 4.2 color: 6173981 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14202,13 +14202,13 @@ cont { lines { width: 8.1 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 6.5 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14232,13 +14232,13 @@ cont { lines { width: 14.8 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 13.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14262,13 +14262,13 @@ cont { lines { width: 24.2 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 22.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14292,13 +14292,13 @@ cont { lines { width: 29.6 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14322,13 +14322,13 @@ cont { lines { width: 29.6 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14355,7 +14355,7 @@ cont { lines { width: 1.7 color: 1298019613 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14381,7 +14381,7 @@ cont { lines { width: 2.4 color: 1298019613 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14407,7 +14407,7 @@ cont { lines { width: 3.0 color: 1298019613 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14444,13 +14444,13 @@ cont { lines { width: 4.2 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 3.5 color: 1298019613 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14487,13 +14487,13 @@ cont { lines { width: 5.3 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 4.2 color: 6173981 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14530,13 +14530,13 @@ cont { lines { width: 8.1 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 6.5 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14572,13 +14572,13 @@ cont { lines { width: 14.8 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 13.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14614,13 +14614,13 @@ cont { lines { width: 24.2 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 22.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14656,13 +14656,13 @@ cont { lines { width: 29.6 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14698,13 +14698,13 @@ cont { lines { width: 29.6 color: 1292700941 - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14731,7 +14731,7 @@ cont { lines { width: 1.7 color: 1298019613 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14757,7 +14757,7 @@ cont { lines { width: 2.4 color: 1298019613 - priority: 220 + priority: 166 join: BEVELJOIN cap: BUTTCAP } @@ -14783,7 +14783,7 @@ cont { lines { width: 3.0 color: 1298019613 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14812,13 +14812,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 3.5 color: 1296837147 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14847,13 +14847,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 4.2 color: 6173981 - priority: 220 + priority: 166 cap: BUTTCAP } path_text { @@ -14882,13 +14882,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 6.5 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14916,13 +14916,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 13.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14950,13 +14950,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 22.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -14984,13 +14984,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -15018,13 +15018,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 219 + priority: 165 cap: BUTTCAP } lines { width: 27.0 color: 6173981 - priority: 220 + priority: 166 } path_text { primary { @@ -15051,7 +15051,7 @@ cont { lines { width: 0.8 color: 1295397940 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -15069,7 +15069,7 @@ cont { lines { width: 1.6 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15086,7 +15086,7 @@ cont { lines { width: 2.2 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15103,13 +15103,13 @@ cont { lines { width: 4.4 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 3552308 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15134,13 +15134,13 @@ cont { lines { width: 6.1 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15164,13 +15164,13 @@ cont { lines { width: 9.4 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15194,13 +15194,13 @@ cont { lines { width: 13.6 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15224,13 +15224,13 @@ cont { lines { width: 19.0 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15254,13 +15254,13 @@ cont { lines { width: 19.0 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15287,7 +15287,7 @@ cont { lines { width: 0.8 color: 1295397940 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -15305,7 +15305,7 @@ cont { lines { width: 1.6 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15322,7 +15322,7 @@ cont { lines { width: 2.2 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15339,13 +15339,13 @@ cont { lines { width: 4.4 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 3552308 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15370,13 +15370,13 @@ cont { lines { width: 6.1 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15400,13 +15400,13 @@ cont { lines { width: 9.4 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15430,13 +15430,13 @@ cont { lines { width: 13.6 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15460,13 +15460,13 @@ cont { lines { width: 19.0 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15490,13 +15490,13 @@ cont { lines { width: 19.0 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15523,7 +15523,7 @@ cont { lines { width: 0.8 color: 1295397940 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -15541,7 +15541,7 @@ cont { lines { width: 1.6 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15570,7 +15570,7 @@ cont { lines { width: 2.2 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15599,13 +15599,13 @@ cont { lines { width: 4.4 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 3552308 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15642,13 +15642,13 @@ cont { lines { width: 6.1 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15684,13 +15684,13 @@ cont { lines { width: 9.4 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15726,13 +15726,13 @@ cont { lines { width: 13.6 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15768,13 +15768,13 @@ cont { lines { width: 19.0 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15810,13 +15810,13 @@ cont { lines { width: 19.0 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 3552308 - priority: 190 + priority: 170 } path_text { primary { @@ -15843,7 +15843,7 @@ cont { lines { width: 0.8 color: 1295397940 - priority: 190 + priority: 170 join: BEVELJOIN cap: BUTTCAP } @@ -15861,7 +15861,7 @@ cont { lines { width: 1.6 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15878,7 +15878,7 @@ cont { lines { width: 2.2 color: 1295397940 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15895,13 +15895,13 @@ cont { lines { width: 4.4 color: 855309 - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 3.6 color: 3552308 - priority: 190 + priority: 170 cap: BUTTCAP } path_text { @@ -15930,13 +15930,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 5.1 color: 2828327 - priority: 190 + priority: 170 } path_text { primary { @@ -15964,13 +15964,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 8.0 color: 2828327 - priority: 190 + priority: 170 } path_text { primary { @@ -15998,13 +15998,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 190 + priority: 170 } path_text { primary { @@ -16032,13 +16032,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 2828327 - priority: 190 + priority: 170 } path_text { primary { @@ -16066,13 +16066,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 189 + priority: 169 cap: BUTTCAP } lines { width: 17.0 color: 2828327 - priority: 190 + priority: 170 } path_text { primary { @@ -17628,18 +17628,27 @@ cont { } cont { name: "highway-secondary_link" + element { + scale: 13 + lines { + width: 2.9 + color: 859519289 + priority: 164 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 3.9 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 3.2 color: 859519289 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17648,13 +17657,13 @@ cont { lines { width: 5.3 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 4.2 color: 3881273 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17663,13 +17672,13 @@ cont { lines { width: 7.6 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 6.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17685,13 +17694,13 @@ cont { lines { width: 11.4 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 9.6 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17707,13 +17716,13 @@ cont { lines { width: 17.2 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 15.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17729,13 +17738,13 @@ cont { lines { width: 24.6 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17751,13 +17760,13 @@ cont { lines { width: 24.6 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17771,6 +17780,15 @@ cont { } cont { name: "highway-secondary_link-bridge" + element { + scale: 13 + lines { + width: 2.9 + color: 859519289 + priority: 164 + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -17788,13 +17806,13 @@ cont { lines { width: 3.9 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 3.2 color: 859519289 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17815,13 +17833,13 @@ cont { lines { width: 5.3 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 4.2 color: 3881273 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -17842,13 +17860,13 @@ cont { lines { width: 7.6 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 6.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17876,13 +17894,13 @@ cont { lines { width: 11.4 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 9.6 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17910,13 +17928,13 @@ cont { lines { width: 17.2 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 15.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17944,13 +17962,13 @@ cont { lines { width: 24.6 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17978,13 +17996,13 @@ cont { lines { width: 24.6 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -17998,18 +18016,27 @@ cont { } cont { name: "highway-secondary_link-tunnel" + element { + scale: 13 + lines { + width: 2.9 + color: 859519289 + priority: 164 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 3.9 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 3.2 color: 859519289 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -18018,13 +18045,13 @@ cont { lines { width: 5.3 color: 855309 - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 4.2 color: 3881273 - priority: 200 + priority: 164 cap: BUTTCAP } } @@ -18037,13 +18064,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 6.0 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -18063,13 +18090,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 9.6 color: 3881273 - priority: 200 + priority: 164 } path_text { primary { @@ -18089,13 +18116,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 15.0 color: 2828327 - priority: 200 + priority: 164 } path_text { primary { @@ -18115,13 +18142,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 2828327 - priority: 200 + priority: 164 } path_text { primary { @@ -18141,13 +18168,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 199 + priority: 163 cap: BUTTCAP } lines { width: 22.0 color: 2828327 - priority: 200 + priority: 164 } path_text { primary { @@ -19928,18 +19955,27 @@ cont { } cont { name: "highway-tertiary_link" + element { + scale: 14 + lines { + width: 3.2 + color: 1295397940 + priority: 162 + cap: BUTTCAP + } + } element { scale: 15 lines { width: 4.7 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 3.8 color: 3552308 - priority: 180 + priority: 162 cap: BUTTCAP } } @@ -19948,13 +19984,13 @@ cont { lines { width: 6.5 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 5.4 color: 3552308 - priority: 180 + priority: 162 } } element { @@ -19962,13 +19998,13 @@ cont { lines { width: 9.9 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 8.4 color: 3552308 - priority: 180 + priority: 162 } } element { @@ -19976,13 +20012,13 @@ cont { lines { width: 15.8 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 14.0 color: 3552308 - priority: 180 + priority: 162 } path_text { primary { @@ -19998,13 +20034,13 @@ cont { lines { width: 22.2 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 3552308 - priority: 180 + priority: 162 } path_text { primary { @@ -20020,13 +20056,13 @@ cont { lines { width: 22.2 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 3552308 - priority: 180 + priority: 162 } path_text { primary { @@ -20040,6 +20076,27 @@ cont { } cont { name: "highway-tertiary_link-bridge" + element { + scale: 14 + lines { + width: 7.2 + color: 855309 + priority: 100 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 1184274 + priority: 110 + cap: BUTTCAP + } + lines { + width: 3.2 + color: 1295397940 + priority: 162 + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -20057,13 +20114,13 @@ cont { lines { width: 4.7 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 3.8 color: 3552308 - priority: 180 + priority: 162 cap: BUTTCAP } } @@ -20084,13 +20141,13 @@ cont { lines { width: 6.5 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 5.4 color: 3552308 - priority: 180 + priority: 162 } } element { @@ -20110,13 +20167,13 @@ cont { lines { width: 9.9 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 8.4 color: 3552308 - priority: 180 + priority: 162 } } element { @@ -20136,13 +20193,13 @@ cont { lines { width: 15.8 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 14.0 color: 3552308 - priority: 180 + priority: 162 } path_text { primary { @@ -20170,13 +20227,13 @@ cont { lines { width: 22.2 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 3552308 - priority: 180 + priority: 162 } path_text { primary { @@ -20204,13 +20261,13 @@ cont { lines { width: 22.2 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 3552308 - priority: 180 + priority: 162 } path_text { primary { @@ -20224,18 +20281,27 @@ cont { } cont { name: "highway-tertiary_link-tunnel" + element { + scale: 14 + lines { + width: 3.2 + color: 1295397940 + priority: 162 + cap: BUTTCAP + } + } element { scale: 15 lines { width: 4.7 color: 855309 - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 3.8 color: 3552308 - priority: 180 + priority: 162 cap: BUTTCAP } } @@ -20248,13 +20314,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 5.4 color: 2828327 - priority: 180 + priority: 162 } } element { @@ -20266,13 +20332,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 8.4 color: 2828327 - priority: 180 + priority: 162 } } element { @@ -20284,13 +20350,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 14.0 color: 2828327 - priority: 180 + priority: 162 } path_text { primary { @@ -20310,13 +20376,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 2828327 - priority: 180 + priority: 162 } path_text { primary { @@ -20336,13 +20402,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 179 + priority: 161 cap: BUTTCAP } lines { width: 20.0 color: 2828327 - priority: 180 + priority: 162 } path_text { primary { @@ -22142,7 +22208,7 @@ cont { lines { width: 1.3 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22168,7 +22234,7 @@ cont { lines { width: 2.0 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22194,7 +22260,7 @@ cont { lines { width: 2.5 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22220,7 +22286,7 @@ cont { lines { width: 2.8 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22245,13 +22311,13 @@ cont { lines { width: 4.27 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22276,13 +22342,13 @@ cont { lines { width: 6.1 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 4991513 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22307,13 +22373,13 @@ cont { lines { width: 8.8 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22337,13 +22403,13 @@ cont { lines { width: 14.0 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22367,13 +22433,13 @@ cont { lines { width: 20.3 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22397,13 +22463,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22427,13 +22493,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22460,7 +22526,7 @@ cont { lines { width: 1.3 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22486,7 +22552,7 @@ cont { lines { width: 2.0 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22512,7 +22578,7 @@ cont { lines { width: 2.5 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22538,7 +22604,7 @@ cont { lines { width: 2.8 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22575,13 +22641,13 @@ cont { lines { width: 4.27 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 1296837145 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22618,13 +22684,13 @@ cont { lines { width: 6.1 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 4991513 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22661,13 +22727,13 @@ cont { lines { width: 8.8 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22703,13 +22769,13 @@ cont { lines { width: 14.0 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22745,13 +22811,13 @@ cont { lines { width: 20.3 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22787,13 +22853,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22829,13 +22895,13 @@ cont { lines { width: 26.5 color: 1292700941 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 1296837145 - priority: 240 + priority: 168 } path_text { primary { @@ -22862,7 +22928,7 @@ cont { lines { width: 1.3 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22888,7 +22954,7 @@ cont { lines { width: 2.0 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22914,13 +22980,13 @@ cont { lines { width: 4.5 color: 1291845632 - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.5 color: 1296837145 - priority: 240 + priority: 168 join: BEVELJOIN cap: BUTTCAP } @@ -22950,13 +23016,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 2.8 color: 3677972 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -22985,13 +23051,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 3.37 color: 3677972 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -23020,13 +23086,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 5.0 color: 4991513 - priority: 240 + priority: 168 cap: BUTTCAP } path_text { @@ -23055,13 +23121,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 7.2 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -23089,13 +23155,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 12.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -23123,13 +23189,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 18.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -23157,13 +23223,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -23191,13 +23257,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 239 + priority: 167 cap: BUTTCAP } lines { width: 24.0 color: 4991513 - priority: 240 + priority: 168 } path_text { primary { @@ -23224,7 +23290,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23234,7 +23300,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23244,7 +23310,7 @@ cont { lines { width: 1.6 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -23253,7 +23319,7 @@ cont { lines { width: 2.2 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23270,7 +23336,7 @@ cont { lines { width: 3.6 color: 3354929 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23287,7 +23353,7 @@ cont { lines { width: 5.1 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23303,7 +23369,7 @@ cont { lines { width: 8.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23319,7 +23385,7 @@ cont { lines { width: 12.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23335,7 +23401,7 @@ cont { lines { width: 17.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23351,7 +23417,7 @@ cont { lines { width: 17.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23370,7 +23436,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23380,7 +23446,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23390,7 +23456,7 @@ cont { lines { width: 1.6 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -23399,7 +23465,7 @@ cont { lines { width: 2.2 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23416,7 +23482,7 @@ cont { lines { width: 3.6 color: 3354929 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23433,7 +23499,7 @@ cont { lines { width: 5.1 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23449,7 +23515,7 @@ cont { lines { width: 8.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23465,7 +23531,7 @@ cont { lines { width: 12.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23481,7 +23547,7 @@ cont { lines { width: 17.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23497,7 +23563,7 @@ cont { lines { width: 17.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23516,7 +23582,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23526,7 +23592,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23536,7 +23602,7 @@ cont { lines { width: 1.6 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -23557,7 +23623,7 @@ cont { lines { width: 2.2 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23586,7 +23652,7 @@ cont { lines { width: 3.6 color: 3354929 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23615,7 +23681,7 @@ cont { lines { width: 5.1 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23643,7 +23709,7 @@ cont { lines { width: 8.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23671,7 +23737,7 @@ cont { lines { width: 12.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23699,7 +23765,7 @@ cont { lines { width: 17.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23727,7 +23793,7 @@ cont { lines { width: 17.0 color: 3354929 - priority: 170 + priority: 190 } path_text { primary { @@ -23746,7 +23812,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23756,7 +23822,7 @@ cont { lines { width: 0.8 color: 1295200561 - priority: 170 + priority: 190 join: BEVELJOIN cap: BUTTCAP } @@ -23766,7 +23832,7 @@ cont { lines { width: 1.6 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } } @@ -23775,7 +23841,7 @@ cont { lines { width: 2.2 color: 1295200561 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23792,7 +23858,7 @@ cont { lines { width: 3.6 color: 3354929 - priority: 170 + priority: 190 cap: BUTTCAP } path_text { @@ -23813,13 +23879,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 5.1 color: 2828327 - priority: 170 + priority: 190 } path_text { primary { @@ -23839,13 +23905,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 8.0 color: 2828327 - priority: 170 + priority: 190 } path_text { primary { @@ -23865,13 +23931,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 170 + priority: 190 } path_text { primary { @@ -23891,13 +23957,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 17.0 color: 2828327 - priority: 170 + priority: 190 } path_text { primary { @@ -23917,13 +23983,13 @@ cont { dd: 5.0 dd: 5.0 } - priority: 169 + priority: 189 cap: BUTTCAP } lines { width: 17.0 color: 2828327 - priority: 170 + priority: 190 } path_text { primary { diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index aff45a8431..5df6684509 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -122,7 +122,6 @@ railway-rail-tourism-bridge # line z10- (also has line:: railway-rail-tourism-tunnel # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-) === 280 -# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) # railway-rail-branch-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) # railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) # railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) @@ -146,8 +145,8 @@ highway-unclassified-bridge # line z11- (also has line:: highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z13-) === 250 -# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) # highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-) +# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-) # === 249 highway-living_street # line z12- (also has pathtext z14-) @@ -163,7 +162,7 @@ highway-road-tunnel # line z12- (also has pathte === 230 # highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-) -# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) # === 229 highway-motorway_link # line z10- (also has pathtext z10-, shield::shield z10-) @@ -176,28 +175,31 @@ highway-trunk_link-tunnel # line z10- (also has line(c # highway-motorway_link-tunnel # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-) # highway-trunk_link-tunnel # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-) -# === 299 +# === 227 highway-primary_link # line z11- (also has pathtext z11-, shield::shield z11-) highway-primary_link-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) highway-primary_link-tunnel # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-) === 226 -highway-secondary_link # line z14- (also has pathtext z16-) -highway-secondary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) -highway-secondary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z16-) +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) +# === 225 + +highway-secondary_link # line z13- (also has pathtext z16-) +highway-secondary_link-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-tunnel # line z13- (also has line(casing) z16-, pathtext z16-) === 224 -# highway-secondary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z16-) -# === 259 +# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-) +# === 223 -highway-tertiary_link # line z15- (also has pathtext z18-) -highway-tertiary_link-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z18-) -highway-tertiary_link-tunnel # line z15- (also has line(casing) z16-, pathtext z18-) +highway-tertiary_link # line z14- (also has pathtext z18-) +highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-) === 222 -# highway-tertiary_link-tunnel # line(casing) z16- (also has line z15-, pathtext z18-) -# === 239 +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) +# === 221 railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) @@ -324,11 +326,11 @@ highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (al highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z16-) +highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z15-, line::bridgeblack z16-, pathtext z16-) highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z18-) +highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) @@ -358,11 +360,11 @@ highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (al highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z16-, pathtext z16-) highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z18-) +highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 90c842655f..fa27f10d3c 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -622,9 +622,9 @@ highway-residential-tunnel # pathtext z13- (also has sh highway-road # pathtext z14- (also has line z12-) highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-) highway-road-tunnel # pathtext z14- (also has line z12-) -highway-secondary_link # pathtext z16- (also has line z14-) -highway-secondary_link-bridge # pathtext z16- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary_link-tunnel # pathtext z16- (also has line z14-, line(casing) z16-) +highway-secondary_link # pathtext z16- (also has line z13-) +highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z16-) === 3000 highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-) @@ -663,9 +663,9 @@ highway-footway # pathtext z15- (also has li highway-footway-area # pathtext z15- (also has line z15-, area z14-) highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) highway-footway-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-tertiary_link # pathtext z18- (also has line z15-) -highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-) +highway-tertiary_link # pathtext z18- (also has line z14-) +highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z16-) === 2950 natural-water-basin # caption z10- (also has area z1-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 7c74058479..c94696123b 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -122,7 +122,6 @@ railway-rail-tourism-bridge # line z10- (also has line:: railway-rail-tourism-tunnel # line z10- (also has line::dash z15-, line(casing) z14-, pathtext z14-) === 280 -# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) # railway-rail-branch-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) # railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) # railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) @@ -146,8 +145,8 @@ highway-unclassified-bridge # line z11- (also has line:: highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z13-) === 250 -# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) # highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-) +# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-) # === 249 highway-living_street # line z12- (also has pathtext z14-) @@ -163,7 +162,7 @@ highway-road-tunnel # line z12- (also has pathte === 230 # highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-) -# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) # === 229 highway-motorway_link # line z10- (also has pathtext z10-, shield::shield z10-) @@ -176,28 +175,31 @@ highway-trunk_link-tunnel # line z10- (also has line(c # highway-motorway_link-tunnel # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-) # highway-trunk_link-tunnel # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-) -# === 299 +# === 227 highway-primary_link # line z11- (also has pathtext z11-, shield::shield z11-) highway-primary_link-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) highway-primary_link-tunnel # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-) === 226 -highway-secondary_link # line z14- (also has pathtext z16-) -highway-secondary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) -highway-secondary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z16-) +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) +# === 225 + +highway-secondary_link # line z13- (also has pathtext z16-) +highway-secondary_link-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-tunnel # line z13- (also has line(casing) z16-, pathtext z16-) === 224 -# highway-secondary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z16-) -# === 259 +# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-) +# === 223 -highway-tertiary_link # line z15- (also has pathtext z18-) -highway-tertiary_link-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z18-) -highway-tertiary_link-tunnel # line z15- (also has line(casing) z16-, pathtext z18-) +highway-tertiary_link # line z14- (also has pathtext z18-) +highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-) === 222 -# highway-tertiary_link-tunnel # line(casing) z16- (also has line z15-, pathtext z18-) -# === 239 +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) +# === 221 railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) @@ -324,11 +326,11 @@ highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (al highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z16-) +highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-, pathtext z16-) highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z18-) +highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) @@ -358,11 +360,11 @@ highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (al highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-, pathtext z16-) highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z18-) +highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index ea586f644f..54653b8c17 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -622,9 +622,9 @@ highway-residential-tunnel # pathtext z13- (also has sh highway-road # pathtext z14- (also has line z12-) highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-) highway-road-tunnel # pathtext z14- (also has line z12-) -highway-secondary_link # pathtext z16- (also has line z14-) -highway-secondary_link-bridge # pathtext z16- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary_link-tunnel # pathtext z16- (also has line z14-, line(casing) z16-) +highway-secondary_link # pathtext z16- (also has line z13-) +highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z16-) === 3000 highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-) @@ -663,9 +663,9 @@ highway-footway # pathtext z13- (also has li highway-footway-area # pathtext z13- (also has line z11-, area z14-) highway-footway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) highway-footway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-tertiary_link # pathtext z18- (also has line z15-) -highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-) +highway-tertiary_link # pathtext z18- (also has line z14-) +highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z16-) === 2950 natural-water-basin # caption z10- (also has area z1-) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 3988e55c05..74f97eaadb 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -96,9 +96,6 @@ railway-rail-tourism-bridge # line z10- (also has line:: railway-rail-tourism-tunnel # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z16-) === 220 -# highway-primary_link # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) -# highway-primary_link-bridge # line(casing) z14- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) # railway-rail-branch-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) # railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) # railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) @@ -124,13 +121,10 @@ highway-unclassified-bridge # line z11- (also has line:: highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z14-) === 190 -# highway-residential # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) -# highway-residential-area # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) -# highway-residential-bridge # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-) -# highway-residential-tunnel # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) # highway-tertiary # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z13-) # highway-tertiary-bridge # line(casing) z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) # highway-tertiary-tunnel # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z13-) +# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z14-) # === 189 highway-living_street # line z12- (also has pathtext z14-) @@ -146,7 +140,10 @@ highway-road-tunnel # line z12- (also has pathte === 170 # highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-) -# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z14-) +# highway-residential # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) +# highway-residential-area # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) +# highway-residential-bridge # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-) +# highway-residential-tunnel # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-) # === 169 highway-motorway_link # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z10-) @@ -163,32 +160,37 @@ highway-trunk_link-tunnel # line z10- (also has line(c # highway-trunk_link # line(casing) z14- (also has line z10-, pathtext z10-, shield::shield z10-) # highway-trunk_link-bridge # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) # highway-trunk_link-tunnel # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-) -# === 239 +# === 167 highway-primary_link # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-) highway-primary_link-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z11-, shield::shield z11-) highway-primary_link-tunnel # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-) === 166 -highway-secondary_link # line z14- (also has line(casing) z14-, pathtext z16-) -highway-secondary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-) -highway-secondary_link-tunnel # line z14- (also has line(casing) z14-, pathtext z16-) +# highway-primary_link # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line(casing) z14- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) +# === 165 + +highway-secondary_link # line z13- (also has line(casing) z14-, pathtext z16-) +highway-secondary_link-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-) +highway-secondary_link-tunnel # line z13- (also has line(casing) z14-, pathtext z16-) === 164 -# highway-secondary_link # line(casing) z14- (also has line z14-, pathtext z16-) -# highway-secondary_link-bridge # line(casing) z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) -# highway-secondary_link-tunnel # line(casing) z14- (also has line z14-, pathtext z16-) -# === 199 +# highway-secondary_link # line(casing) z14- (also has line z13-, pathtext z16-) +# highway-secondary_link-bridge # line(casing) z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +# highway-secondary_link-tunnel # line(casing) z14- (also has line z13-, pathtext z16-) +# === 163 -highway-tertiary_link # line z15- (also has line(casing) z15-, pathtext z18-) -highway-tertiary_link-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, line(casing) z15-, pathtext z18-) -highway-tertiary_link-tunnel # line z15- (also has line(casing) z15-, pathtext z18-) +highway-tertiary_link # line z14- (also has line(casing) z15-, pathtext z18-) +highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z18-) +highway-tertiary_link-tunnel # line z14- (also has line(casing) z15-, pathtext z18-) === 162 -# highway-tertiary_link # line(casing) z15- (also has line z15-, pathtext z18-) -# highway-tertiary_link-bridge # line(casing) z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z18-) -# highway-tertiary_link-tunnel # line(casing) z15- (also has line z15-, pathtext z18-) -# === 179 +# highway-tertiary_link # line(casing) z15- (also has line z14-, pathtext z18-) +# highway-tertiary_link-bridge # line(casing) z15- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +# highway-tertiary_link-tunnel # line(casing) z15- (also has line z14-, pathtext z18-) +# === 161 railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z14-) @@ -295,9 +297,9 @@ highway-primary-bridge::bridgewhite # line::bridgewhite z14- (al highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z14-, pathtext z11-, shield::shield z11-) highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, line(casing) z14-, pathtext z16-) +highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, line(casing) z14-, pathtext z16-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, line(casing) z15-, pathtext z18-) +highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, line(casing) z15-, pathtext z18-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-) @@ -320,9 +322,9 @@ highway-primary-bridge::bridgeblack # line::bridgeblack z14- (al highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z14-, pathtext z11-, shield::shield z11-) highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-) +highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, line(casing) z15-, pathtext z18-) +highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z18-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 472884ecc0..2c5400961a 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -77,9 +77,9 @@ highway-tertiary-bridge # pathtext z12- (also has sh highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z15-) === 4100 -highway-secondary_link # pathtext z16- (also has line(casing) z14-, line z14-) -highway-secondary_link-bridge # pathtext z16- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-) -highway-secondary_link-tunnel # pathtext z16- (also has line(casing) z14-, line z14-) +highway-secondary_link # pathtext z16- (also has line z13-, line(casing) z14-) +highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-) +highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z14-) === 4050 highway-unclassified # pathtext z14- (also has line z11-) @@ -120,9 +120,9 @@ highway-road-bridge # pathtext z14- (also has li highway-road-tunnel # pathtext z14- (also has line z12-) === 3900 -highway-tertiary_link # pathtext z18- (also has line(casing) z15-, line z15-) -highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, line(casing) z15-) -highway-tertiary_link-tunnel # pathtext z18- (also has line(casing) z15-, line z15-) +highway-tertiary_link # pathtext z18- (also has line z14-, line(casing) z15-) +highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-) +highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z15-) === 3850 place-continent # caption z1-2 diff --git a/data/visibility.txt b/data/visibility.txt index 28fb52e635..6f103704a4 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -483,9 +483,9 @@ world 000000000000000000000 + bridge 000000000011111111111 - tunnel 000000000011111111111 - {} - secondary_link 000000000000001111111 + - bridge 000000000000001111111 - - tunnel 000000000000001111111 - + secondary_link 000000000000011111111 + + bridge 000000000000011111111 - + tunnel 000000000000011111111 - {} service 000000000000001111111 + area 000000000000001111111 - @@ -504,9 +504,9 @@ world 000000000000000000000 + bridge 000000000001111111111 - tunnel 000000000001111111111 - {} - tertiary_link 000000000000000111111 + - bridge 000000000000000111111 - - tunnel 000000000000000111111 - + tertiary_link 000000000000001111111 + + bridge 000000000000001111111 - + tunnel 000000000000001111111 - {} track 000000000000000011111 + area 000000000000000011111 -