From 6f2df3c1c1eb087103372a935f31a15263cb743c Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Mon, 8 Jan 2024 16:24:01 +0200 Subject: [PATCH] [styles] Regenerate for highways adjustments Signed-off-by: Konstantin Pastbin --- data/colors.txt | 21 +- data/drules_proto.bin | Bin 427320 -> 427501 bytes data/drules_proto.txt | 2820 +++++++++-------- data/drules_proto_clear.bin | Bin 414797 -> 414978 bytes data/drules_proto_clear.txt | 2800 ++++++++-------- data/drules_proto_dark.bin | Bin 413539 -> 413720 bytes data/drules_proto_dark.txt | 2188 ++++++------- data/drules_proto_outdoors_clear.bin | Bin 431928 -> 432122 bytes data/drules_proto_outdoors_clear.txt | 2650 ++++++++-------- data/drules_proto_outdoors_dark.bin | Bin 430555 -> 430749 bytes data/drules_proto_outdoors_dark.txt | 2036 ++++++------ data/drules_proto_vehicle_clear.bin | Bin 278973 -> 279169 bytes data/drules_proto_vehicle_clear.txt | 758 +++-- data/drules_proto_vehicle_dark.bin | Bin 279181 -> 279375 bytes data/drules_proto_vehicle_dark.txt | 758 +++-- .../clear/include/priorities_3_FG.prio.txt | 38 +- .../include/priorities_4_overlays.prio.txt | 12 +- .../outdoors/include/priorities_3_FG.prio.txt | 38 +- .../include/priorities_4_overlays.prio.txt | 12 +- .../vehicle/include/priorities_3_FG.prio.txt | 56 +- .../include/priorities_4_overlays.prio.txt | 12 +- data/visibility.txt | 12 +- 22 files changed, 7347 insertions(+), 6864 deletions(-) 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 9edfb3872a8168068ad96a11681fd1fc1b2b163b..a6bf2c8fad1aeede54fbe7446419df3f39a8f60a 100644 GIT binary patch delta 10584 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 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 8a9fe6a796d13f2d8570042adb628599cd3926e3..784651fe0d8f693ddbd9c7aa85084500f0928c90 100644 GIT binary patch delta 9464 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 S=c2y?`g3O+7kPej`M&@l+ZoaT delta 9541 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 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 676b69f9817cdcab935e41ed0e120a20e4819a28..de444d6716a94ed03e75ea84ad09554d05c52da4 100644 GIT binary patch delta 9103 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 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 -