diff --git a/coding/string_utf8_multilang.cpp b/coding/string_utf8_multilang.cpp index bb3829d2cd..13c0c9e1b0 100644 --- a/coding/string_utf8_multilang.cpp +++ b/coding/string_utf8_multilang.cpp @@ -70,7 +70,7 @@ array co {"lt", "Lietuvių", {}}, {"old_name", "Old/Previous name", {"Any-Latin"}}, // Was "la" before December 2018. {"kk", "Қазақ", {"Kazakh-Latin/BGN"}}, - {StringUtf8Multilang::kReservedLang /* gsw */, "", {}}, + {"mr", "मराठी", {"Any-Latin"}}, // Was kReservedLang "gsw" before March 2022 {"et", "Eesti", {}}, {"ku", "Kurdish", {"Any-Latin"}}, {"mn", "Mongolian", {"Mongolian-Latin/BGN"}}, diff --git a/data/08_NotoSerifDevanagari-Regular.ttf b/data/08_NotoSerifDevanagari-Regular.ttf new file mode 100644 index 0000000000..b9c96b9115 Binary files /dev/null and b/data/08_NotoSerifDevanagari-Regular.ttf differ diff --git a/data/colors.txt b/data/colors.txt index 4537723866..7a9cc3f1da 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -56,6 +56,7 @@ 2171163 2171169 2229797 +2236945 2236962 2301728 2302755 @@ -71,7 +72,6 @@ 2827062 2828327 2836760 -2894874 3155515 3156522 3158064 @@ -89,6 +89,7 @@ 3552308 3584191 3629602 +3677969 3677972 3681605 3684408 @@ -100,9 +101,9 @@ 4016230 4065802 4073251 -4143671 4285507 4311295 +4334872 4340748 4473924 4495803 @@ -110,10 +111,8 @@ 4612472 4666933 4671303 -4794651 4809033 4854924 -4933187 4985359 4991511 4991513 @@ -123,13 +122,11 @@ 5064516 5072410 5131837 -5263440 5286655 5378955 5395026 5592405 5666134 -5845795 5862272 5918280 5991734 @@ -313,9 +310,9 @@ 857282841 857551774 857874978 +858466343 860111940 860447049 -860571203 860638284 861230421 861304150 @@ -355,8 +352,8 @@ 1712264192 1712394496 1713512994 +1714104359 1716085065 -1716209219 1716942166 1717328977 1719302778 @@ -368,9 +365,9 @@ 2147483648 2149128473 2149720610 +2150311975 2151957572 2152292681 -2152416835 2153149782 2157549977 2159483932 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 464dc009ea..5811f68b01 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index fb12eddaad..daa5238b7f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -56106,14 +56106,14 @@ cont { primary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 1308622847 offset_y: 1 is_optional: true } secondary { height: 9 color: 2236962 - stroke_color: 16777215 + stroke_color: 1308622847 offset_y: 1 text: "int_name" is_optional: true @@ -56132,14 +56132,14 @@ cont { primary { height: 12 color: 2236962 - stroke_color: 16777215 + stroke_color: 872415231 offset_y: 1 is_optional: true } secondary { height: 10 color: 2236962 - stroke_color: 16777215 + stroke_color: 872415231 offset_y: 1 text: "int_name" is_optional: true @@ -56150,10 +56150,26 @@ cont { element { scale: 16 symbol { - name: "zero-icon" + name: "subway-moscow-m" apply_for_type: 1 priority: 16941 } + caption { + primary { + height: 10 + color: 8355711 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8355711 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15941 + } } element { scale: 17 @@ -57832,38 +57848,12 @@ cont { } cont { name: "railway-subway_entrance-moscow" - element { - scale: 15 - symbol { - name: "subway-moscow-s" - apply_for_type: 1 - priority: 16941 - } - caption { - primary { - height: 11 - color: 2236962 - stroke_color: 16777215 - offset_y: 1 - is_optional: true - } - secondary { - height: 9 - color: 2236962 - stroke_color: 16777215 - offset_y: 25 - text: "int_name" - is_optional: true - } - priority: 15941 - } - } element { scale: 16 symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { @@ -57881,7 +57871,7 @@ cont { text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57889,25 +57879,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 12 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57915,25 +57905,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 13 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57941,25 +57931,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 13 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 1eeec9cab2..08adebc1ee 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 6775e7ac6e..0b5686f57a 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -55632,14 +55632,14 @@ cont { primary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 1308622847 offset_y: 1 is_optional: true } secondary { height: 9 color: 2236962 - stroke_color: 16777215 + stroke_color: 1308622847 offset_y: 1 text: "int_name" is_optional: true @@ -55658,14 +55658,14 @@ cont { primary { height: 12 color: 2236962 - stroke_color: 16777215 + stroke_color: 872415231 offset_y: 1 is_optional: true } secondary { height: 10 color: 2236962 - stroke_color: 16777215 + stroke_color: 872415231 offset_y: 1 text: "int_name" is_optional: true @@ -55676,10 +55676,26 @@ cont { element { scale: 16 symbol { - name: "zero-icon" + name: "subway-moscow-m" apply_for_type: 1 priority: 16941 } + caption { + primary { + height: 10 + color: 8355711 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8355711 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15941 + } } element { scale: 17 @@ -57358,38 +57374,12 @@ cont { } cont { name: "railway-subway_entrance-moscow" - element { - scale: 15 - symbol { - name: "subway-moscow-s" - apply_for_type: 1 - priority: 16941 - } - caption { - primary { - height: 11 - color: 2236962 - stroke_color: 16777215 - offset_y: 1 - is_optional: true - } - secondary { - height: 9 - color: 2236962 - stroke_color: 16777215 - offset_y: 25 - text: "int_name" - is_optional: true - } - priority: 15941 - } - } element { scale: 16 symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { @@ -57407,7 +57397,7 @@ cont { text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57415,25 +57405,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 12 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57441,25 +57431,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 13 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57467,25 +57457,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 13 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 16777215 + stroke_color: 452984831 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 00ab0a3c99..e14718b520 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 23ab007301..60f718ae2d 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -1960,7 +1960,7 @@ cont { scale: 12 lines { width: 1.0 - color: 2152416835 + color: 2150311975 priority: 1155 join: BEVELJOIN cap: BUTTCAP @@ -1970,7 +1970,7 @@ cont { scale: 13 lines { width: 1.5 - color: 860571203 + color: 858466343 priority: 1155 cap: BUTTCAP } @@ -1979,7 +1979,7 @@ cont { scale: 14 lines { width: 2.4 - color: 4933187 + color: 2828327 priority: 1155 cap: BUTTCAP } @@ -1988,7 +1988,7 @@ cont { scale: 15 lines { width: 2.4 - color: 4933187 + color: 2828327 priority: 1155 cap: BUTTCAP } @@ -1997,7 +1997,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1155 } } @@ -2005,7 +2005,7 @@ cont { scale: 17 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1155 } } @@ -2013,7 +2013,7 @@ cont { scale: 18 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1155 } } @@ -2021,7 +2021,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1155 } } @@ -2032,7 +2032,7 @@ cont { scale: 14 lines { width: 0.6 - color: 1716209219 + color: 1714104359 priority: 1155 cap: BUTTCAP } @@ -2041,7 +2041,7 @@ cont { scale: 15 lines { width: 1.2 - color: 1716209219 + color: 1714104359 priority: 1155 cap: BUTTCAP } @@ -2050,7 +2050,7 @@ cont { scale: 16 lines { width: 1.2 - color: 1716209219 + color: 1714104359 priority: 1155 } } @@ -2058,7 +2058,7 @@ cont { scale: 17 lines { width: 1.2 - color: 1716209219 + color: 1714104359 priority: 1155 } } @@ -2066,7 +2066,7 @@ cont { scale: 18 lines { width: 1.2 - color: 1716209219 + color: 1714104359 priority: 1155 } } @@ -2074,7 +2074,7 @@ cont { scale: 19 lines { width: 1.2 - color: 1716209219 + color: 1714104359 priority: 1155 } } @@ -12826,7 +12826,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -12847,7 +12847,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -12867,7 +12867,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -12887,7 +12887,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -12907,7 +12907,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -12930,7 +12930,7 @@ cont { scale: 14 lines { width: 1.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -12943,7 +12943,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -12964,7 +12964,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -12984,7 +12984,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13004,7 +13004,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13024,7 +13024,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13054,7 +13054,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13079,7 +13079,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13103,7 +13103,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13127,7 +13127,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13151,7 +13151,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13178,7 +13178,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13199,7 +13199,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13219,7 +13219,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13239,7 +13239,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13259,7 +13259,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13282,7 +13282,7 @@ cont { scale: 14 lines { width: 1.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13295,7 +13295,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13316,7 +13316,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13336,7 +13336,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13356,7 +13356,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13376,7 +13376,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13399,7 +13399,7 @@ cont { scale: 14 lines { width: 1.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13412,7 +13412,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13433,7 +13433,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13453,7 +13453,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13473,7 +13473,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13493,7 +13493,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13516,7 +13516,7 @@ cont { scale: 14 lines { width: 1.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13529,7 +13529,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13550,7 +13550,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13570,7 +13570,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13590,7 +13590,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13610,7 +13610,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13633,7 +13633,7 @@ cont { scale: 14 lines { width: 1.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13646,7 +13646,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13667,7 +13667,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13687,7 +13687,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13707,7 +13707,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13727,7 +13727,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13750,7 +13750,7 @@ cont { scale: 14 lines { width: 1.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13763,7 +13763,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13784,7 +13784,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13804,7 +13804,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13824,7 +13824,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13844,7 +13844,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13867,7 +13867,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13888,7 +13888,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -13908,7 +13908,7 @@ cont { scale: 17 lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -13928,7 +13928,7 @@ cont { scale: 18 lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -13948,7 +13948,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -13971,7 +13971,7 @@ cont { scale: 15 lines { width: 1.5 - color: 4143671 + color: 2828327 dashdot { dd: 2.7 dd: 1.26 @@ -13992,7 +13992,7 @@ cont { scale: 16 lines { width: 2.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.6 dd: 1.8 @@ -14012,7 +14012,7 @@ cont { scale: 17 lines { width: 5.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -14020,7 +14020,7 @@ cont { } lines { width: 6.8 - color: 5263440 + color: 4473924 dashdot { dd: 2.0 dd: 2.0 @@ -14030,7 +14030,7 @@ cont { } lines { width: 2.4 - color: 4143671 + color: 2828327 dashdot { dd: 4.5 dd: 1.8 @@ -14050,7 +14050,7 @@ cont { scale: 18 lines { width: 7.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -14058,7 +14058,7 @@ cont { } lines { width: 8.8 - color: 5263440 + color: 4473924 dashdot { dd: 2.0 dd: 2.0 @@ -14068,7 +14068,7 @@ cont { } lines { width: 3.4 - color: 4143671 + color: 2828327 dashdot { dd: 7.2 dd: 2.7 @@ -14088,7 +14088,7 @@ cont { scale: 19 lines { width: 9.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -14096,7 +14096,7 @@ cont { } lines { width: 10.0 - color: 5263440 + color: 4473924 dashdot { dd: 2.0 dd: 2.0 @@ -14106,7 +14106,7 @@ cont { } lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 9.0 dd: 3.6 @@ -14271,7 +14271,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -14281,7 +14281,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14290,7 +14290,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14307,7 +14307,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14324,7 +14324,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14340,7 +14340,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14356,7 +14356,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14372,7 +14372,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14391,7 +14391,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -14401,7 +14401,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14410,7 +14410,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14427,7 +14427,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14444,7 +14444,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14460,7 +14460,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14476,7 +14476,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14492,7 +14492,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -14511,7 +14511,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -14521,7 +14521,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14530,7 +14530,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14547,7 +14547,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -14667,7 +14667,7 @@ cont { scale: 7 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14677,7 +14677,7 @@ cont { scale: 8 lines { width: 1.1 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14687,7 +14687,7 @@ cont { scale: 9 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14697,7 +14697,7 @@ cont { scale: 10 lines { width: 1.5 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14722,7 +14722,7 @@ cont { scale: 11 lines { width: 1.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14747,7 +14747,7 @@ cont { scale: 12 lines { width: 1.9 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14772,7 +14772,7 @@ cont { scale: 13 lines { width: 2.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -14796,7 +14796,7 @@ cont { scale: 14 lines { width: 3.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -14820,7 +14820,7 @@ cont { scale: 15 lines { width: 4.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -14844,7 +14844,7 @@ cont { scale: 16 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -14867,7 +14867,7 @@ cont { scale: 17 lines { width: 9.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -14890,7 +14890,7 @@ cont { scale: 18 lines { width: 12.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -14913,7 +14913,7 @@ cont { scale: 19 lines { width: 15.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -14939,7 +14939,7 @@ cont { scale: 7 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14949,7 +14949,7 @@ cont { scale: 8 lines { width: 1.1 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14959,7 +14959,7 @@ cont { scale: 9 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14969,7 +14969,7 @@ cont { scale: 10 lines { width: 1.5 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -14994,7 +14994,7 @@ cont { scale: 11 lines { width: 1.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -15019,7 +15019,7 @@ cont { scale: 12 lines { width: 1.9 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -15044,13 +15044,13 @@ cont { scale: 13 lines { width: 2.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -15058,7 +15058,7 @@ cont { } lines { width: 6.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -15084,13 +15084,13 @@ cont { scale: 14 lines { width: 3.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } lines { width: 7.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -15098,7 +15098,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -15124,13 +15124,13 @@ cont { scale: 15 lines { width: 4.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } lines { width: 9.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -15138,7 +15138,7 @@ cont { } lines { width: 10.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -15164,12 +15164,12 @@ cont { scale: 16 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 12.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -15177,7 +15177,7 @@ cont { } lines { width: 12.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -15203,12 +15203,12 @@ cont { scale: 17 lines { width: 9.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 19.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -15216,7 +15216,7 @@ cont { } lines { width: 21.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -15242,12 +15242,12 @@ cont { scale: 18 lines { width: 12.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 26.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -15255,7 +15255,7 @@ cont { } lines { width: 28.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -15281,12 +15281,12 @@ cont { scale: 19 lines { width: 15.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 32.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -15294,7 +15294,7 @@ cont { } lines { width: 34.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -15323,7 +15323,7 @@ cont { scale: 7 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -15333,7 +15333,7 @@ cont { scale: 8 lines { width: 1.1 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -15343,7 +15343,7 @@ cont { scale: 9 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -15353,7 +15353,7 @@ cont { scale: 10 lines { width: 1.5 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -15378,7 +15378,7 @@ cont { scale: 11 lines { width: 1.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -15512,7 +15512,7 @@ cont { } lines { width: 4.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -15545,7 +15545,7 @@ cont { } lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -15577,7 +15577,7 @@ cont { } lines { width: 9.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -15609,7 +15609,7 @@ cont { } lines { width: 12.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -15641,7 +15641,7 @@ cont { } lines { width: 15.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -15720,7 +15720,7 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -15745,7 +15745,7 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -15770,7 +15770,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -15795,7 +15795,7 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -15819,7 +15819,7 @@ cont { scale: 14 lines { width: 2.0 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -15843,7 +15843,7 @@ cont { scale: 15 lines { width: 2.4 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -15867,7 +15867,7 @@ cont { scale: 16 lines { width: 3.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -15890,7 +15890,7 @@ cont { scale: 17 lines { width: 4.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -15913,7 +15913,7 @@ cont { scale: 18 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -15936,7 +15936,7 @@ cont { scale: 19 lines { width: 7.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -15962,7 +15962,7 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -15987,7 +15987,7 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -16012,7 +16012,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -16037,7 +16037,7 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -16061,13 +16061,13 @@ cont { scale: 14 lines { width: 2.0 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -16075,7 +16075,7 @@ cont { } lines { width: 4.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -16101,13 +16101,13 @@ cont { scale: 15 lines { width: 2.4 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } lines { width: 4.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -16115,7 +16115,7 @@ cont { } lines { width: 5.6 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -16141,12 +16141,12 @@ cont { scale: 16 lines { width: 3.0 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -16154,7 +16154,7 @@ cont { } lines { width: 6.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -16180,12 +16180,12 @@ cont { scale: 17 lines { width: 4.5 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 10.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -16193,7 +16193,7 @@ cont { } lines { width: 12.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -16219,12 +16219,12 @@ cont { scale: 18 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 14.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -16232,7 +16232,7 @@ cont { } lines { width: 16.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -16258,12 +16258,12 @@ cont { scale: 19 lines { width: 7.5 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 17.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -16271,7 +16271,7 @@ cont { } lines { width: 19.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -16300,7 +16300,7 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -16325,7 +16325,7 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -16357,7 +16357,7 @@ cont { } lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -16457,7 +16457,7 @@ cont { } lines { width: 2.4 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -16490,7 +16490,7 @@ cont { } lines { width: 3.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -16522,7 +16522,7 @@ cont { } lines { width: 4.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -16554,7 +16554,7 @@ cont { } lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -16586,7 +16586,7 @@ cont { } lines { width: 7.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -17953,7 +17953,7 @@ cont { scale: 17 lines { width: 5.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -17961,7 +17961,7 @@ cont { } lines { width: 6.0 - color: 5263440 + color: 4473924 dashdot { dd: 2.0 dd: 2.0 @@ -17991,7 +17991,7 @@ cont { scale: 18 lines { width: 7.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -17999,7 +17999,7 @@ cont { } lines { width: 8.0 - color: 5263440 + color: 4473924 dashdot { dd: 2.0 dd: 2.0 @@ -18029,7 +18029,7 @@ cont { scale: 19 lines { width: 9.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -18037,7 +18037,7 @@ cont { } lines { width: 10.0 - color: 5263440 + color: 4473924 dashdot { dd: 2.0 dd: 2.0 @@ -18380,7 +18380,7 @@ cont { } lines { width: 1.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -18401,7 +18401,7 @@ cont { } lines { width: 3.2 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -18409,7 +18409,7 @@ cont { } lines { width: 3.6 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -18438,7 +18438,7 @@ cont { } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -18446,7 +18446,7 @@ cont { } lines { width: 4.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -18474,7 +18474,7 @@ cont { } lines { width: 5.2 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -18482,7 +18482,7 @@ cont { } lines { width: 6.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -18510,7 +18510,7 @@ cont { } lines { width: 6.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -18518,7 +18518,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -18546,7 +18546,7 @@ cont { } lines { width: 8.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -18554,7 +18554,7 @@ cont { } lines { width: 9.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -18582,7 +18582,7 @@ cont { } lines { width: 10.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -18590,7 +18590,7 @@ cont { } lines { width: 11.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -18786,7 +18786,7 @@ cont { scale: 8 lines { width: 0.9 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -18796,7 +18796,7 @@ cont { scale: 9 lines { width: 0.8 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -18806,7 +18806,7 @@ cont { scale: 10 lines { width: 1.2 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -18831,7 +18831,7 @@ cont { scale: 11 lines { width: 1.5 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -18856,7 +18856,7 @@ cont { scale: 12 lines { width: 1.7 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -18881,7 +18881,7 @@ cont { scale: 13 lines { width: 2.4 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } @@ -18905,7 +18905,7 @@ cont { scale: 14 lines { width: 3.2 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } @@ -18929,7 +18929,7 @@ cont { scale: 15 lines { width: 4.2 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } @@ -18953,7 +18953,7 @@ cont { scale: 16 lines { width: 4.8 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -18976,7 +18976,7 @@ cont { scale: 17 lines { width: 7.0 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -18999,7 +18999,7 @@ cont { scale: 18 lines { width: 10.0 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -19022,7 +19022,7 @@ cont { scale: 19 lines { width: 13.0 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -19048,7 +19048,7 @@ cont { scale: 8 lines { width: 0.9 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19058,7 +19058,7 @@ cont { scale: 9 lines { width: 0.8 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19068,7 +19068,7 @@ cont { scale: 10 lines { width: 1.2 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19093,7 +19093,7 @@ cont { scale: 11 lines { width: 1.5 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19118,7 +19118,7 @@ cont { scale: 12 lines { width: 1.7 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19143,7 +19143,7 @@ cont { scale: 13 lines { width: 2.4 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } @@ -19167,13 +19167,13 @@ cont { scale: 14 lines { width: 3.2 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } lines { width: 6.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -19181,7 +19181,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -19207,13 +19207,13 @@ cont { scale: 15 lines { width: 4.2 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } lines { width: 8.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -19221,7 +19221,7 @@ cont { } lines { width: 9.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -19247,12 +19247,12 @@ cont { scale: 16 lines { width: 4.8 - color: 5845795 + color: 4334872 priority: 1427 } lines { width: 9.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -19260,7 +19260,7 @@ cont { } lines { width: 10.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -19286,12 +19286,12 @@ cont { scale: 17 lines { width: 7.0 - color: 5845795 + color: 4334872 priority: 1427 } lines { width: 15.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -19299,7 +19299,7 @@ cont { } lines { width: 17.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -19325,12 +19325,12 @@ cont { scale: 18 lines { width: 10.0 - color: 5845795 + color: 4334872 priority: 1427 } lines { width: 22.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -19338,7 +19338,7 @@ cont { } lines { width: 24.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -19364,12 +19364,12 @@ cont { scale: 19 lines { width: 13.0 - color: 5845795 + color: 4334872 priority: 1427 } lines { width: 28.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -19377,7 +19377,7 @@ cont { } lines { width: 30.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -19406,7 +19406,7 @@ cont { scale: 8 lines { width: 0.9 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19416,7 +19416,7 @@ cont { scale: 9 lines { width: 0.8 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19426,7 +19426,7 @@ cont { scale: 10 lines { width: 1.2 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19451,7 +19451,7 @@ cont { scale: 11 lines { width: 1.5 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19476,7 +19476,7 @@ cont { scale: 12 lines { width: 1.7 - color: 5845795 + color: 4334872 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -19501,7 +19501,7 @@ cont { scale: 13 lines { width: 2.4 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } @@ -19567,7 +19567,7 @@ cont { } lines { width: 4.2 - color: 5845795 + color: 4334872 priority: 1427 cap: BUTTCAP } @@ -19600,7 +19600,7 @@ cont { } lines { width: 4.8 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -19632,7 +19632,7 @@ cont { } lines { width: 7.0 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -19664,7 +19664,7 @@ cont { } lines { width: 10.0 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -19696,7 +19696,7 @@ cont { } lines { width: 13.0 - color: 5845795 + color: 4334872 priority: 1427 } path_text { @@ -19733,7 +19733,7 @@ cont { scale: 11 lines { width: 1.5 - color: 5845795 + color: 4334872 priority: 1417 join: BEVELJOIN cap: BUTTCAP @@ -19758,7 +19758,7 @@ cont { scale: 12 lines { width: 1.7 - color: 5845795 + color: 4334872 priority: 1417 join: BEVELJOIN cap: BUTTCAP @@ -19783,7 +19783,7 @@ cont { scale: 13 lines { width: 2.4 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } @@ -19807,7 +19807,7 @@ cont { scale: 14 lines { width: 3.2 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } @@ -19831,7 +19831,7 @@ cont { scale: 15 lines { width: 4.2 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } @@ -19855,7 +19855,7 @@ cont { scale: 16 lines { width: 4.8 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -19878,7 +19878,7 @@ cont { scale: 17 lines { width: 7.0 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -19901,7 +19901,7 @@ cont { scale: 18 lines { width: 10.0 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -19924,7 +19924,7 @@ cont { scale: 19 lines { width: 13.0 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -19961,7 +19961,7 @@ cont { scale: 11 lines { width: 1.5 - color: 5845795 + color: 4334872 priority: 1417 join: BEVELJOIN cap: BUTTCAP @@ -19986,7 +19986,7 @@ cont { scale: 12 lines { width: 1.7 - color: 5845795 + color: 4334872 priority: 1417 join: BEVELJOIN cap: BUTTCAP @@ -20011,7 +20011,7 @@ cont { scale: 13 lines { width: 2.4 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } @@ -20035,13 +20035,13 @@ cont { scale: 14 lines { width: 3.2 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } lines { width: 6.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -20049,7 +20049,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -20075,13 +20075,13 @@ cont { scale: 15 lines { width: 4.2 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } lines { width: 8.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -20089,7 +20089,7 @@ cont { } lines { width: 9.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -20115,12 +20115,12 @@ cont { scale: 16 lines { width: 4.8 - color: 5845795 + color: 4334872 priority: 1417 } lines { width: 9.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -20128,7 +20128,7 @@ cont { } lines { width: 10.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -20154,12 +20154,12 @@ cont { scale: 17 lines { width: 7.0 - color: 5845795 + color: 4334872 priority: 1417 } lines { width: 15.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -20167,7 +20167,7 @@ cont { } lines { width: 17.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -20193,12 +20193,12 @@ cont { scale: 18 lines { width: 10.0 - color: 5845795 + color: 4334872 priority: 1417 } lines { width: 22.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -20206,7 +20206,7 @@ cont { } lines { width: 24.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -20232,12 +20232,12 @@ cont { scale: 19 lines { width: 13.0 - color: 5845795 + color: 4334872 priority: 1417 } lines { width: 28.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -20245,7 +20245,7 @@ cont { } lines { width: 30.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -20285,7 +20285,7 @@ cont { scale: 11 lines { width: 1.5 - color: 5845795 + color: 4334872 priority: 1417 join: BEVELJOIN cap: BUTTCAP @@ -20310,7 +20310,7 @@ cont { scale: 12 lines { width: 1.7 - color: 5845795 + color: 4334872 priority: 1417 join: BEVELJOIN cap: BUTTCAP @@ -20335,7 +20335,7 @@ cont { scale: 13 lines { width: 2.4 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } @@ -20401,7 +20401,7 @@ cont { } lines { width: 4.2 - color: 5845795 + color: 4334872 priority: 1417 cap: BUTTCAP } @@ -20434,7 +20434,7 @@ cont { } lines { width: 4.8 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -20466,7 +20466,7 @@ cont { } lines { width: 7.0 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -20498,7 +20498,7 @@ cont { } lines { width: 10.0 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -20530,7 +20530,7 @@ cont { } lines { width: 13.0 - color: 5845795 + color: 4334872 priority: 1417 } path_text { @@ -20641,7 +20641,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -20658,7 +20658,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -20682,7 +20682,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -20706,7 +20706,7 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -20730,7 +20730,7 @@ cont { scale: 16 lines { width: 4.4 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -20753,7 +20753,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -20776,7 +20776,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -20799,7 +20799,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -20825,7 +20825,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -20842,7 +20842,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -20866,7 +20866,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -20890,7 +20890,7 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -20914,7 +20914,7 @@ cont { scale: 16 lines { width: 4.4 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -20937,7 +20937,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -20960,7 +20960,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -20983,7 +20983,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -21009,7 +21009,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -21026,7 +21026,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -21050,13 +21050,13 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } lines { width: 3.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21064,7 +21064,7 @@ cont { } lines { width: 4.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21090,13 +21090,13 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } lines { width: 6.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21104,7 +21104,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21130,12 +21130,12 @@ cont { scale: 16 lines { width: 4.4 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 8.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21143,7 +21143,7 @@ cont { } lines { width: 9.6 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21169,12 +21169,12 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 13.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21182,7 +21182,7 @@ cont { } lines { width: 15.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21208,12 +21208,12 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 20.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21221,7 +21221,7 @@ cont { } lines { width: 22.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21247,12 +21247,12 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 26.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21260,7 +21260,7 @@ cont { } lines { width: 28.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21289,7 +21289,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -21306,7 +21306,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -21330,7 +21330,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -21354,7 +21354,7 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -21576,7 +21576,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -21586,7 +21586,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21595,7 +21595,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21612,7 +21612,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21629,7 +21629,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -21645,7 +21645,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -21661,7 +21661,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -21677,7 +21677,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -21696,7 +21696,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -21706,7 +21706,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21715,7 +21715,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21732,7 +21732,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21749,12 +21749,12 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21762,7 +21762,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21781,12 +21781,12 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 12.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21794,7 +21794,7 @@ cont { } lines { width: 12.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21813,12 +21813,12 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 18.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21826,7 +21826,7 @@ cont { } lines { width: 18.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21845,12 +21845,12 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 24.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -21858,7 +21858,7 @@ cont { } lines { width: 24.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -21880,7 +21880,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -21890,7 +21890,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21899,7 +21899,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21916,7 +21916,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -21933,7 +21933,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -21949,7 +21949,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -21965,7 +21965,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -21981,7 +21981,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -22000,7 +22000,7 @@ cont { scale: 10 lines { width: 1.0 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22018,7 +22018,7 @@ cont { scale: 11 lines { width: 1.3 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22036,7 +22036,7 @@ cont { scale: 12 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22061,7 +22061,7 @@ cont { scale: 13 lines { width: 2.2 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } @@ -22085,7 +22085,7 @@ cont { scale: 14 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } @@ -22109,7 +22109,7 @@ cont { scale: 15 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } @@ -22133,7 +22133,7 @@ cont { scale: 16 lines { width: 4.8 - color: 4933187 + color: 2828327 priority: 1398 } path_text { @@ -22156,7 +22156,7 @@ cont { scale: 17 lines { width: 7.0 - color: 4933187 + color: 2828327 priority: 1398 } path_text { @@ -22179,7 +22179,7 @@ cont { scale: 18 lines { width: 10.0 - color: 4933187 + color: 2828327 priority: 1398 } path_text { @@ -22202,7 +22202,7 @@ cont { scale: 19 lines { width: 13.0 - color: 4933187 + color: 2828327 priority: 1398 } path_text { @@ -22228,7 +22228,7 @@ cont { scale: 10 lines { width: 1.0 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22246,7 +22246,7 @@ cont { scale: 11 lines { width: 1.3 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22264,7 +22264,7 @@ cont { scale: 12 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22289,7 +22289,7 @@ cont { scale: 13 lines { width: 2.2 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } @@ -22313,13 +22313,13 @@ cont { scale: 14 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22327,7 +22327,7 @@ cont { } lines { width: 6.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22353,13 +22353,13 @@ cont { scale: 15 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22367,7 +22367,7 @@ cont { } lines { width: 8.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22393,12 +22393,12 @@ cont { scale: 16 lines { width: 4.8 - color: 4933187 + color: 2828327 priority: 1398 } lines { width: 9.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22406,7 +22406,7 @@ cont { } lines { width: 10.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22432,12 +22432,12 @@ cont { scale: 17 lines { width: 7.0 - color: 4933187 + color: 2828327 priority: 1398 } lines { width: 15.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22445,7 +22445,7 @@ cont { } lines { width: 17.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22471,12 +22471,12 @@ cont { scale: 18 lines { width: 10.0 - color: 4933187 + color: 2828327 priority: 1398 } lines { width: 22.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22484,7 +22484,7 @@ cont { } lines { width: 24.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22510,12 +22510,12 @@ cont { scale: 19 lines { width: 13.0 - color: 4933187 + color: 2828327 priority: 1398 } lines { width: 28.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22523,7 +22523,7 @@ cont { } lines { width: 30.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22552,7 +22552,7 @@ cont { scale: 10 lines { width: 1.0 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22570,7 +22570,7 @@ cont { scale: 11 lines { width: 1.3 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22588,7 +22588,7 @@ cont { scale: 12 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1398 join: BEVELJOIN cap: BUTTCAP @@ -22613,7 +22613,7 @@ cont { scale: 13 lines { width: 2.2 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } @@ -22637,7 +22637,7 @@ cont { scale: 14 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } @@ -22661,7 +22661,7 @@ cont { scale: 15 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1398 cap: BUTTCAP } @@ -22694,7 +22694,7 @@ cont { } lines { width: 4.8 - color: 4933187 + color: 2828327 priority: 1398 } path_text { @@ -22726,7 +22726,7 @@ cont { } lines { width: 7.0 - color: 4933187 + color: 2828327 priority: 1398 } path_text { @@ -22816,7 +22816,7 @@ cont { scale: 14 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1388 cap: BUTTCAP } @@ -22825,7 +22825,7 @@ cont { scale: 15 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1388 cap: BUTTCAP } @@ -22834,7 +22834,7 @@ cont { scale: 16 lines { width: 4.8 - color: 4933187 + color: 2828327 priority: 1388 } path_text { @@ -22850,7 +22850,7 @@ cont { scale: 17 lines { width: 7.0 - color: 4933187 + color: 2828327 priority: 1388 } path_text { @@ -22866,7 +22866,7 @@ cont { scale: 18 lines { width: 10.0 - color: 4933187 + color: 2828327 priority: 1388 } path_text { @@ -22882,7 +22882,7 @@ cont { scale: 19 lines { width: 13.0 - color: 4933187 + color: 2828327 priority: 1388 } path_text { @@ -22901,13 +22901,13 @@ cont { scale: 14 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1388 cap: BUTTCAP } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22915,7 +22915,7 @@ cont { } lines { width: 6.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22926,13 +22926,13 @@ cont { scale: 15 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1388 cap: BUTTCAP } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22940,7 +22940,7 @@ cont { } lines { width: 8.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22951,12 +22951,12 @@ cont { scale: 16 lines { width: 4.8 - color: 4933187 + color: 2828327 priority: 1388 } lines { width: 9.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22964,7 +22964,7 @@ cont { } lines { width: 10.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -22983,12 +22983,12 @@ cont { scale: 17 lines { width: 7.0 - color: 4933187 + color: 2828327 priority: 1388 } lines { width: 15.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -22996,7 +22996,7 @@ cont { } lines { width: 17.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -23015,12 +23015,12 @@ cont { scale: 18 lines { width: 10.0 - color: 4933187 + color: 2828327 priority: 1388 } lines { width: 22.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -23028,7 +23028,7 @@ cont { } lines { width: 24.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -23047,12 +23047,12 @@ cont { scale: 19 lines { width: 13.0 - color: 4933187 + color: 2828327 priority: 1388 } lines { width: 28.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -23060,7 +23060,7 @@ cont { } lines { width: 30.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -23082,7 +23082,7 @@ cont { scale: 14 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1388 cap: BUTTCAP } @@ -23091,7 +23091,7 @@ cont { scale: 15 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1388 cap: BUTTCAP } @@ -23109,7 +23109,7 @@ cont { } lines { width: 4.8 - color: 4933187 + color: 2828327 priority: 1388 } path_text { @@ -23134,7 +23134,7 @@ cont { } lines { width: 7.0 - color: 4933187 + color: 2828327 priority: 1388 } path_text { @@ -23203,7 +23203,7 @@ cont { scale: 15 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1320 cap: BUTTCAP } @@ -23212,7 +23212,7 @@ cont { scale: 16 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23228,7 +23228,7 @@ cont { scale: 17 lines { width: 2.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23244,7 +23244,7 @@ cont { scale: 18 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23260,7 +23260,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23279,7 +23279,7 @@ cont { scale: 15 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1320 cap: BUTTCAP } @@ -23288,7 +23288,7 @@ cont { scale: 16 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23304,7 +23304,7 @@ cont { scale: 17 lines { width: 2.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23320,7 +23320,7 @@ cont { scale: 18 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23336,7 +23336,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23355,7 +23355,7 @@ cont { scale: 15 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1320 cap: BUTTCAP } @@ -23364,12 +23364,12 @@ cont { scale: 16 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1320 } lines { width: 3.2 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -23377,7 +23377,7 @@ cont { } lines { width: 3.6 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -23396,12 +23396,12 @@ cont { scale: 17 lines { width: 2.0 - color: 4933187 + color: 2828327 priority: 1320 } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -23409,7 +23409,7 @@ cont { } lines { width: 4.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -23428,12 +23428,12 @@ cont { scale: 18 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1320 } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -23441,7 +23441,7 @@ cont { } lines { width: 6.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -23460,12 +23460,12 @@ cont { scale: 19 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1320 } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -23473,7 +23473,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -23495,7 +23495,7 @@ cont { scale: 16 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23511,7 +23511,7 @@ cont { scale: 17 lines { width: 2.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23527,7 +23527,7 @@ cont { scale: 18 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23543,7 +23543,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23562,7 +23562,7 @@ cont { scale: 15 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1320 cap: BUTTCAP } @@ -23571,7 +23571,7 @@ cont { scale: 16 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23587,7 +23587,7 @@ cont { scale: 17 lines { width: 2.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23603,7 +23603,7 @@ cont { scale: 18 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23619,7 +23619,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23638,7 +23638,7 @@ cont { scale: 15 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1320 cap: BUTTCAP } @@ -23647,7 +23647,7 @@ cont { scale: 16 lines { width: 1.6 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23663,7 +23663,7 @@ cont { scale: 17 lines { width: 2.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23679,7 +23679,7 @@ cont { scale: 18 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23695,7 +23695,7 @@ cont { scale: 19 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1320 } path_text { @@ -23793,7 +23793,7 @@ cont { scale: 15 lines { width: 2.2 - color: 4143671 + color: 2828327 dashdot { dd: 1.5 dd: 1.5 @@ -23806,7 +23806,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 1.8 dd: 1.8 @@ -23826,7 +23826,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.5 dd: 2.5 @@ -23846,7 +23846,7 @@ cont { scale: 18 lines { width: 8.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.2 dd: 3.2 @@ -23866,7 +23866,7 @@ cont { scale: 19 lines { width: 10.0 - color: 4143671 + color: 2828327 dashdot { dd: 4.0 dd: 4.0 @@ -23889,7 +23889,7 @@ cont { scale: 15 lines { width: 2.2 - color: 4143671 + color: 2828327 dashdot { dd: 1.5 dd: 1.5 @@ -23902,7 +23902,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 1.8 dd: 1.8 @@ -23922,7 +23922,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.5 dd: 2.5 @@ -23942,7 +23942,7 @@ cont { scale: 18 lines { width: 8.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.2 dd: 3.2 @@ -23962,7 +23962,7 @@ cont { scale: 19 lines { width: 10.0 - color: 4143671 + color: 2828327 dashdot { dd: 4.0 dd: 4.0 @@ -23985,7 +23985,7 @@ cont { scale: 15 lines { width: 2.2 - color: 4143671 + color: 2828327 dashdot { dd: 1.5 dd: 1.5 @@ -23998,7 +23998,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4143671 + color: 2828327 dashdot { dd: 1.8 dd: 1.8 @@ -24018,7 +24018,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4143671 + color: 2828327 dashdot { dd: 2.5 dd: 2.5 @@ -24038,7 +24038,7 @@ cont { scale: 18 lines { width: 8.0 - color: 4143671 + color: 2828327 dashdot { dd: 3.2 dd: 3.2 @@ -24058,7 +24058,7 @@ cont { scale: 19 lines { width: 10.0 - color: 4143671 + color: 2828327 dashdot { dd: 4.0 dd: 4.0 @@ -24081,7 +24081,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -24091,7 +24091,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -24116,7 +24116,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -24140,7 +24140,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -24164,7 +24164,7 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -24188,7 +24188,7 @@ cont { scale: 16 lines { width: 4.4 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -24211,7 +24211,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -24234,7 +24234,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -24257,7 +24257,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1378 } path_text { @@ -24283,7 +24283,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -24293,7 +24293,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -24318,7 +24318,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -24342,13 +24342,13 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } lines { width: 3.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24356,7 +24356,7 @@ cont { } lines { width: 4.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24382,13 +24382,13 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } lines { width: 6.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24396,7 +24396,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24422,12 +24422,12 @@ cont { scale: 16 lines { width: 4.4 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 8.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24435,7 +24435,7 @@ cont { } lines { width: 9.6 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24461,12 +24461,12 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 13.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24474,7 +24474,7 @@ cont { } lines { width: 15.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24500,12 +24500,12 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 20.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24513,7 +24513,7 @@ cont { } lines { width: 22.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24539,12 +24539,12 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1378 } lines { width: 26.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24552,7 +24552,7 @@ cont { } lines { width: 28.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24581,7 +24581,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -24591,7 +24591,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 join: BEVELJOIN cap: BUTTCAP @@ -24616,7 +24616,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -24640,7 +24640,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -24664,7 +24664,7 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1378 cap: BUTTCAP } @@ -24819,7 +24819,7 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1368 cap: BUTTCAP } @@ -24828,7 +24828,7 @@ cont { scale: 16 lines { width: 4.4 - color: 4933187 + color: 2828327 priority: 1368 } } @@ -24836,7 +24836,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1368 } } @@ -24844,7 +24844,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1368 } path_text { @@ -24860,7 +24860,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1368 } path_text { @@ -24879,13 +24879,13 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1368 cap: BUTTCAP } lines { width: 6.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24893,7 +24893,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24904,12 +24904,12 @@ cont { scale: 16 lines { width: 4.4 - color: 4933187 + color: 2828327 priority: 1368 } lines { width: 8.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24917,7 +24917,7 @@ cont { } lines { width: 9.6 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24928,12 +24928,12 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1368 } lines { width: 13.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24941,7 +24941,7 @@ cont { } lines { width: 15.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24952,12 +24952,12 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1368 } lines { width: 20.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24965,7 +24965,7 @@ cont { } lines { width: 22.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -24984,12 +24984,12 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1368 } lines { width: 26.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -24997,7 +24997,7 @@ cont { } lines { width: 28.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -25019,7 +25019,7 @@ cont { scale: 15 lines { width: 3.2 - color: 4933187 + color: 2828327 priority: 1368 cap: BUTTCAP } @@ -26402,7 +26402,7 @@ cont { scale: 7 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26412,7 +26412,7 @@ cont { scale: 8 lines { width: 1.1 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26422,7 +26422,7 @@ cont { scale: 9 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26432,7 +26432,7 @@ cont { scale: 10 lines { width: 1.5 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26457,7 +26457,7 @@ cont { scale: 11 lines { width: 1.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26482,7 +26482,7 @@ cont { scale: 12 lines { width: 1.9 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26507,7 +26507,7 @@ cont { scale: 13 lines { width: 2.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -26531,7 +26531,7 @@ cont { scale: 14 lines { width: 3.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -26555,7 +26555,7 @@ cont { scale: 15 lines { width: 4.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -26579,7 +26579,7 @@ cont { scale: 16 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -26602,7 +26602,7 @@ cont { scale: 17 lines { width: 9.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -26625,7 +26625,7 @@ cont { scale: 18 lines { width: 12.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -26648,7 +26648,7 @@ cont { scale: 19 lines { width: 15.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -26674,7 +26674,7 @@ cont { scale: 7 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26684,7 +26684,7 @@ cont { scale: 8 lines { width: 1.1 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26694,7 +26694,7 @@ cont { scale: 9 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26704,7 +26704,7 @@ cont { scale: 10 lines { width: 1.5 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26729,7 +26729,7 @@ cont { scale: 11 lines { width: 1.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26754,7 +26754,7 @@ cont { scale: 12 lines { width: 1.9 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -26779,13 +26779,13 @@ cont { scale: 13 lines { width: 2.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -26793,7 +26793,7 @@ cont { } lines { width: 6.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -26819,13 +26819,13 @@ cont { scale: 14 lines { width: 3.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } lines { width: 7.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -26833,7 +26833,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -26859,13 +26859,13 @@ cont { scale: 15 lines { width: 4.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } lines { width: 9.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -26873,7 +26873,7 @@ cont { } lines { width: 10.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -26899,12 +26899,12 @@ cont { scale: 16 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 12.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -26912,7 +26912,7 @@ cont { } lines { width: 12.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -26938,12 +26938,12 @@ cont { scale: 17 lines { width: 9.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 19.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -26951,7 +26951,7 @@ cont { } lines { width: 21.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -26977,12 +26977,12 @@ cont { scale: 18 lines { width: 12.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 26.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -26990,7 +26990,7 @@ cont { } lines { width: 28.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27016,12 +27016,12 @@ cont { scale: 19 lines { width: 15.0 - color: 4794651 + color: 3677969 priority: 1446 } lines { width: 32.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -27029,7 +27029,7 @@ cont { } lines { width: 34.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27058,7 +27058,7 @@ cont { scale: 7 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -27068,7 +27068,7 @@ cont { scale: 8 lines { width: 1.1 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -27078,7 +27078,7 @@ cont { scale: 9 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -27088,7 +27088,7 @@ cont { scale: 10 lines { width: 1.5 - color: 4794651 + color: 3677972 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -27113,7 +27113,7 @@ cont { scale: 11 lines { width: 1.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -27247,7 +27247,7 @@ cont { } lines { width: 4.8 - color: 4794651 + color: 3677969 priority: 1446 cap: BUTTCAP } @@ -27280,7 +27280,7 @@ cont { } lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -27312,7 +27312,7 @@ cont { } lines { width: 9.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -27344,7 +27344,7 @@ cont { } lines { width: 12.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -27376,7 +27376,7 @@ cont { } lines { width: 15.0 - color: 4794651 + color: 3677969 priority: 1446 } path_text { @@ -27402,7 +27402,7 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -27427,7 +27427,7 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -27452,7 +27452,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -27477,7 +27477,7 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -27501,7 +27501,7 @@ cont { scale: 14 lines { width: 2.0 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -27525,7 +27525,7 @@ cont { scale: 15 lines { width: 2.4 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -27549,7 +27549,7 @@ cont { scale: 16 lines { width: 3.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -27572,7 +27572,7 @@ cont { scale: 17 lines { width: 4.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -27595,7 +27595,7 @@ cont { scale: 18 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -27618,7 +27618,7 @@ cont { scale: 19 lines { width: 7.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -27644,7 +27644,7 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -27669,7 +27669,7 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -27694,7 +27694,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -27719,7 +27719,7 @@ cont { scale: 13 lines { width: 1.8 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -27743,13 +27743,13 @@ cont { scale: 14 lines { width: 2.0 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -27757,7 +27757,7 @@ cont { } lines { width: 4.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27783,13 +27783,13 @@ cont { scale: 15 lines { width: 2.4 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } lines { width: 4.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -27797,7 +27797,7 @@ cont { } lines { width: 5.6 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27823,12 +27823,12 @@ cont { scale: 16 lines { width: 3.0 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -27836,7 +27836,7 @@ cont { } lines { width: 6.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27862,12 +27862,12 @@ cont { scale: 17 lines { width: 4.5 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 10.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -27875,7 +27875,7 @@ cont { } lines { width: 12.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27901,12 +27901,12 @@ cont { scale: 18 lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 14.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -27914,7 +27914,7 @@ cont { } lines { width: 16.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27940,12 +27940,12 @@ cont { scale: 19 lines { width: 7.5 - color: 4794651 + color: 3677969 priority: 1436 } lines { width: 17.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -27953,7 +27953,7 @@ cont { } lines { width: 19.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -27982,7 +27982,7 @@ cont { scale: 10 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -28007,7 +28007,7 @@ cont { scale: 11 lines { width: 1.0 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -28039,7 +28039,7 @@ cont { } lines { width: 1.2 - color: 4794651 + color: 3677969 priority: 1436 join: BEVELJOIN cap: BUTTCAP @@ -28139,7 +28139,7 @@ cont { } lines { width: 2.4 - color: 4794651 + color: 3677969 priority: 1436 cap: BUTTCAP } @@ -28172,7 +28172,7 @@ cont { } lines { width: 3.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -28204,7 +28204,7 @@ cont { } lines { width: 4.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -28236,7 +28236,7 @@ cont { } lines { width: 6.0 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -28268,7 +28268,7 @@ cont { } lines { width: 7.5 - color: 4794651 + color: 3677969 priority: 1436 } path_text { @@ -28294,7 +28294,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28304,7 +28304,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28314,7 +28314,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28331,7 +28331,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28348,7 +28348,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28365,7 +28365,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28381,7 +28381,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28397,7 +28397,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28413,7 +28413,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28432,7 +28432,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28442,7 +28442,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28452,7 +28452,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28469,7 +28469,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28486,7 +28486,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28503,7 +28503,7 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28519,7 +28519,7 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28535,7 +28535,7 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28551,7 +28551,7 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } path_text { @@ -28570,7 +28570,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28580,7 +28580,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28590,7 +28590,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28607,13 +28607,13 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } lines { width: 3.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -28621,7 +28621,7 @@ cont { } lines { width: 4.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -28640,13 +28640,13 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } lines { width: 6.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -28654,7 +28654,7 @@ cont { } lines { width: 6.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -28673,12 +28673,12 @@ cont { scale: 16 lines { width: 4.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -28686,7 +28686,7 @@ cont { } lines { width: 8.8 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -28705,12 +28705,12 @@ cont { scale: 17 lines { width: 6.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 13.6 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -28718,7 +28718,7 @@ cont { } lines { width: 15.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -28737,12 +28737,12 @@ cont { scale: 18 lines { width: 9.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 20.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -28750,7 +28750,7 @@ cont { } lines { width: 22.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -28769,12 +28769,12 @@ cont { scale: 19 lines { width: 12.0 - color: 4933187 + color: 2828327 priority: 1359 } lines { width: 26.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -28782,7 +28782,7 @@ cont { } lines { width: 28.0 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -28804,7 +28804,7 @@ cont { scale: 11 lines { width: 0.8 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28814,7 +28814,7 @@ cont { scale: 12 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 join: BEVELJOIN cap: BUTTCAP @@ -28824,7 +28824,7 @@ cont { scale: 13 lines { width: 1.2 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28841,7 +28841,7 @@ cont { scale: 14 lines { width: 1.8 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28858,7 +28858,7 @@ cont { scale: 15 lines { width: 3.0 - color: 4933187 + color: 2828327 priority: 1359 cap: BUTTCAP } @@ -28978,7 +28978,7 @@ cont { scale: 4 lines { width: 0.5 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -28988,7 +28988,7 @@ cont { scale: 5 lines { width: 0.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -28998,7 +28998,7 @@ cont { scale: 6 lines { width: 0.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -29008,7 +29008,7 @@ cont { scale: 7 lines { width: 0.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -29018,7 +29018,7 @@ cont { scale: 8 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -29028,7 +29028,7 @@ cont { scale: 9 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -29041,7 +29041,7 @@ cont { scale: 6 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -29051,7 +29051,7 @@ cont { scale: 7 lines { width: 0.7 - color: 4794651 + color: 3677969 priority: 1446 join: BEVELJOIN cap: BUTTCAP @@ -29061,7 +29061,7 @@ cont { scale: 8 lines { width: 0.9 - color: 4794651 + color: 3677969 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -29071,7 +29071,7 @@ cont { scale: 9 lines { width: 0.8 - color: 4794651 + color: 3677969 priority: 1427 join: BEVELJOIN cap: BUTTCAP @@ -52551,7 +52551,7 @@ cont { } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -52568,7 +52568,7 @@ cont { } lines { width: 4.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -52584,7 +52584,7 @@ cont { } lines { width: 5.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -52592,7 +52592,7 @@ cont { } lines { width: 5.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 @@ -52617,7 +52617,7 @@ cont { } lines { width: 6.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -52625,7 +52625,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 @@ -52650,7 +52650,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -52658,7 +52658,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 @@ -52683,7 +52683,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -52691,7 +52691,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 @@ -53398,7 +53398,7 @@ cont { } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -53415,7 +53415,7 @@ cont { } lines { width: 4.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -53431,7 +53431,7 @@ cont { } lines { width: 5.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -53439,7 +53439,7 @@ cont { } lines { width: 5.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -53464,7 +53464,7 @@ cont { } lines { width: 6.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -53472,7 +53472,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -53497,7 +53497,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -53505,7 +53505,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -53530,7 +53530,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -53538,7 +53538,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -55750,14 +55750,14 @@ cont { primary { height: 11 color: 8947848 - stroke_color: 1118464 + stroke_color: 1292964096 offset_y: 1 is_optional: true } secondary { height: 9 color: 8947848 - stroke_color: 1118464 + stroke_color: 1292964096 offset_y: 1 text: "int_name" is_optional: true @@ -55776,14 +55776,14 @@ cont { primary { height: 12 color: 8947848 - stroke_color: 1118464 + stroke_color: 856756480 offset_y: 1 is_optional: true } secondary { height: 10 color: 8947848 - stroke_color: 1118464 + stroke_color: 856756480 offset_y: 1 text: "int_name" is_optional: true @@ -55794,10 +55794,26 @@ cont { element { scale: 16 symbol { - name: "zero-icon" + name: "subway-moscow-m" apply_for_type: 1 priority: 16941 } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 5592405 + offset_y: 1 + text: "int_name" + is_optional: true + } + priority: 15941 + } } element { scale: 17 @@ -56610,7 +56626,7 @@ cont { } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -56627,7 +56643,7 @@ cont { } lines { width: 4.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -56643,7 +56659,7 @@ cont { } lines { width: 5.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -56651,7 +56667,7 @@ cont { } lines { width: 5.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -56676,7 +56692,7 @@ cont { } lines { width: 6.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -56684,7 +56700,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -56709,7 +56725,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -56717,7 +56733,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -56742,7 +56758,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1280 @@ -56750,7 +56766,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1270 @@ -57476,38 +57492,12 @@ cont { } cont { name: "railway-subway_entrance-moscow" - element { - scale: 15 - symbol { - name: "subway-moscow-s" - apply_for_type: 1 - priority: 16941 - } - caption { - primary { - height: 11 - color: 8947848 - stroke_color: 1118464 - offset_y: 1 - is_optional: true - } - secondary { - height: 9 - color: 8947848 - stroke_color: 1118464 - offset_y: 25 - text: "int_name" - is_optional: true - } - priority: 15941 - } - } element { scale: 16 symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { @@ -57525,7 +57515,7 @@ cont { text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57533,25 +57523,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 12 color: 8947848 - stroke_color: 1118464 + stroke_color: 437326080 offset_y: 1 is_optional: true } secondary { height: 11 color: 8947848 - stroke_color: 1118464 + stroke_color: 437326080 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57559,25 +57549,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 13 color: 8947848 - stroke_color: 1118464 + stroke_color: 437326080 offset_y: 1 is_optional: true } secondary { height: 11 color: 8947848 - stroke_color: 1118464 + stroke_color: 437326080 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } element { @@ -57585,25 +57575,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16941 + priority: 16902 } caption { primary { height: 13 color: 8947848 - stroke_color: 1118464 + stroke_color: 437326080 offset_y: 1 is_optional: true } secondary { height: 11 color: 8947848 - stroke_color: 1118464 + stroke_color: 437326080 offset_y: 25 text: "int_name" is_optional: true } - priority: 15941 + priority: 15902 } } } @@ -58462,7 +58452,7 @@ cont { } lines { width: 4.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -58479,7 +58469,7 @@ cont { } lines { width: 4.4 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -58495,7 +58485,7 @@ cont { } lines { width: 5.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -58503,7 +58493,7 @@ cont { } lines { width: 5.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 @@ -58528,7 +58518,7 @@ cont { } lines { width: 6.8 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -58536,7 +58526,7 @@ cont { } lines { width: 7.2 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 @@ -58561,7 +58551,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -58569,7 +58559,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 @@ -58594,7 +58584,7 @@ cont { } lines { width: 8.0 - color: 2894874 + color: 2236945 dashdot { } priority: 1076 @@ -58602,7 +58592,7 @@ cont { } lines { width: 8.4 - color: 5263440 + color: 4473924 dashdot { } priority: 1066 diff --git a/data/fonts_whitelist.txt b/data/fonts_whitelist.txt index f09a4813e2..d8792e493b 100644 --- a/data/fonts_whitelist.txt +++ b/data/fonts_whitelist.txt @@ -15,3 +15,4 @@ Latin_Extended-B 01_dejavusans.ttf Latin_Extended-B /system/fonts/Roboto-Medium.ttf Latin_Extended-B 07_roboto_medium.ttf CJK_Compatibility 02_droidsans-fallback.ttf +Devanagari 08_NotoSerifDevanagari-Regular.ttf diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 6f881daf32..7688b23177 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -462,7 +462,6 @@ area[public_transport=station] node[railway=station], node[amenity=ferry_terminal], -node[railway=subway_entrance][city=moscow], node[railway=station][transport=subway] {z-index: 2990;} @@ -665,9 +664,15 @@ node|z14-[railway=station][transport=subway]::int_name, node|z16-[railway=subway_entrance]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;text-optional: true;} +node|z12-[railway=station][transport=subway][city=moscow], +node|z12-[railway=station][transport=subway][city=spb], +node|z16-[railway=subway_entrance][city=moscow], node|z17-[railway=tram_stop], area|z17-[railway=tram_stop] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;} +node|z12-[railway=station][transport=subway][city=moscow]::int_name, +node|z12-[railway=station][transport=subway][city=spb]::int_name, +node|z16-[railway=subway_entrance][city=moscow]::int_name, node|z17-[railway=tram_stop]::int_name, area|z17-[railway=tram_stop]::int_name {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;} diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss index 73fce52332..4bcd23bb8b 100644 --- a/data/styles/clear/include/Subways.mapcss +++ b/data/styles/clear/include/Subways.mapcss @@ -529,14 +529,6 @@ node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;t node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;text-optional: true;} /* Moscow Subway Station */ - -node|z12-[railway=station][transport=subway][city=moscow], -node|z15-[railway=subway_entrance][city=moscow], -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;} -node|z12-[railway=station][transport=subway][city=moscow]::int_name, -node|z15-[railway=subway_entrance][city=moscow]::int_name, -{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;} - node|z11[railway=station][transport=subway][city=moscow] {icon-image: subway-moscow-s.svg;icon-min-distance: 1;text-optional: true;} node|z12-13[railway=station][transport=subway][city=moscow] @@ -551,20 +543,18 @@ node|z15[railway=station][transport=subway][city=moscow] {icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;text-optional: true;} node|z15[railway=station][transport=subway][city=moscow]::int_name {text-offset: 1;font-size: 10;text-optional: true;} +node|z16[railway=station][transport=subway][city=moscow]check +{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 10;text-color: @district_label;text-halo-radius: 0;} +node|z16[railway=station][transport=subway][city=moscow]::int_name +{text-offset: 1;font-size: 9;text-color: @district_label;text-halo-radius: 0;} check /* Do not draw main metro icon, because entrances will be visible now */ -node|z16-[railway=station][transport=subway][city=moscow] +node|z17-[railway=station][transport=subway][city=moscow] {icon-image: zero-icon.svg;text: none;} -node|z16-[railway=station][transport=subway][city=moscow]::int_name +node|z17-[railway=station][transport=subway][city=moscow]::int_name {text: none;} /* Moscow Subway Station entrance */ - -node|z15[railway=subway_entrance][city=moscow] -{icon-image: subway-moscow-s.svg;text-offset: 1;font-size: 11;text-optional: true;} -node|z15[railway=subway_entrance][city=moscow]::int_name -{text-offset: 25;font-size: 9;text-optional: true;} - node|z16[railway=subway_entrance][city=moscow] {icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;text-optional: true;} node|z16[railway=subway_entrance][city=moscow]::int_name @@ -751,11 +741,6 @@ node|z15-[railway=station][transport=subway][city=sofia] {icon-image: subway-sof node|z17-[railway=subway_entrance][city=sofia] {icon-image: subway-sofia-s.svg;text-optional: true;} /* Saint Petersburg Subway Station */ -node|z12-[railway=station][transport=subway][city=spb], -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;} -node|z12-[railway=station][transport=subway][city=spb]::int_name, -{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;} - node|z11[railway=station][transport=subway][city=spb] {icon-image: subway-spb-s.svg;icon-min-distance: 1;} node|z12[railway=station][transport=subway][city=spb] diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index cca308f7f5..ea2fe8dd4f 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -91,17 +91,17 @@ /* 5.1 All roads */ @trunk: #372400; -@trunk_orange: #49291B; -@trunk_orange_medium: #49291B; -@trunk_orange_light: #49291B; -@primary_orange: #593323; -@primary_orange_medium: #593323; -@primary_orange_light: #593323; -@secondary: #4B4643; -@residential: #4B4643; -@unclassified: #4B4643; +@trunk_orange: #381F14; +@trunk_orange_medium: #381F14; +@trunk_orange_light: #381F11; +@primary_orange: #422518; +@primary_orange_medium: #422518; +@primary_orange_light: #422518; +@secondary: #2B2827; +@residential: #2B2827; +@unclassified: #2B2827; @pedestrian: #4D4744; -@footway: #3F3A37; +@footway: #2B2827; @cycleway: #6E3D47; @construction: #332F2D; @track: #2B2827; @@ -110,8 +110,8 @@ /* 5.2 Bridges */ -@bridge_background: #2C2C1A; -@bridge_casing: #505050; +@bridge_background: #222211; +@bridge_casing: #444444; /* 5.3 Tunnels */ diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 70ce708fbd..795977a44e 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -81,7 +81,6 @@ The OM community abides by the [CNCF code of conduct](CODE_OF_CONDUCT.md). ## Developer's Guidelines -- [Directories structure](STRUCTURE.md) - [C++ Style Guide](CPP_STYLE.md). - [Objective-C Style Guide](OBJC_STYLE.md). - [Pull Request Guide](PR_GUIDE.md). diff --git a/docs/INSTALL.md b/docs/INSTALL.md index b7bdb251c1..af5da41b00 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -224,13 +224,11 @@ Install Android SDK and NDK: - Run the Android Studio. - Open "SDK Manager" (under "More Actions" in a welcome screen or a three-dot menu in a list of recent projects screen or "Tools" top menu item in an open project). - Select "Android 12.0 (S) / API Level 31" SDK. -- Switch to "SDK Tools" tab. +- Switch to "SDK Tools" tab - Check "Show Package Details" checkbox. - Select "NDK (Side by side)" version **23.1.7779620**. - Select "CMake" version **3.18.1**. -- Click "Apply" and wait for downloads and installation to finish. -- In the left pane menu select "Appearance & Behavior > System Settings > Memory Settings". -- Set "IDE max heap size" to 2048Mb or more (otherwise the Studio might get stuck on "Updating indexes" when opening the project). +- Click "OK" and wait for downloads and installation to finish. Configure the repo with Android SDK and NDK paths: @@ -246,6 +244,8 @@ _macOS:_ _Windows 10:_ no action needed, should work out of the box. +Make sure the Studio has at least 1920Mb max heap size in "File > Settings... > Appearance & Behavior > System Settings > Memory Settings" _before_ opening the project, otherwise it might get stuck on "Updating indexes". + In Android Studio open the project in `android/` directory. Setup a virtual device to use [emulator](https://developer.android.com/studio/run/emulator) ("Tools > Device Manager") or [use a hardware device for debugging](https://developer.android.com/studio/run/device). If using an emulator, make sure to choose a system image with API Level 31 and ABI _x86_64_. diff --git a/docs/STRUCTURE.md b/docs/STRUCTURE.md index 1f841ada45..2369ed37f3 100644 --- a/docs/STRUCTURE.md +++ b/docs/STRUCTURE.md @@ -1,120 +1,43 @@ # Directories Structure -## Platforms -- `android/` - Android UI. - -- `iphone/` - iOS UI. -- `xcode/` - XCode workspace. - -- `qt/` - desktop application. - -## Data - -`data/` folder contains data files for the application: maps, styles, country borders, etc.: - -- `benchmarks/` - -- `borders/` - polygons describing countries' borders. -- `conf/isolines/` - per-country isoline profiles. -- `metainfo/` - languages used in countries / regions. -- `vulkan_shaders/` - - -- `countries.txt` - map files hierarchy and checksums. -- `countries_meta.txt` - country languages and driving sides. -- `hierarchy.txt` - countries / map regions hierarchy, languages used and Wikidata IDs. - -- `faq.html` - FAQ text displayed in the "?"/Help screen. -- `copyright.html` - attributions to 3rd-party libraries, map data, icons, fonts. - -- `hardcoded_categories.txt` - search categories displayed in UI (duplicated in search/displayed_categories.cpp, see #1795). -- `minsk-pass.mwm`,`minsk-pass.osm.bz2` - a small map used for tests. - -There are some other files not mentioned here. - -### Map features / classificator - -- `mapcss-mapping.csv` - mapping between OSM tags and OM types. -- `replaced_tags.txt` - similar OSM tags merged. -- `mixed_tags.txt` - pedestrian streets of high popularity. - -- `editor.config` - built-in OSM data editor configuration (editable POIs, their attributes, etc.). -- `config.xsd` - xml schema for `editor.config`. - -Automatically generated: -- `classificator.txt` - hierarchical list of all OM types. -- `types.txt` - -### Styles and icons - -- `resources-default/` - -- `resources-svg/` - social networks icons -- `search-icons/svg/` - source svg files for search categories icons -- `styles/` - map [style files](STYLES.md#files) - -Automatically [generated](STYLES.md#technical-details): -- `resources-*/` - icons skin files in various resolutions for `dark` and `clear` (light) themes. -- `drules_proto*` - binary drawing rules files. -- `colors.txt`,`patterns.txt`,`visibility.txt` - -### Strings and translations - -[Translation files](TRANSLATIONS.md#translation-files): -- `strings/` -- `categories.txt`,`categories_cuisines.txt`,`categories_brands.txt`,`countries_names.txt` - -Misc strings: -- `mwm_names_en.txt` - english names for map regions. -- `countries_synonyms.csv` - alternative country names. -- `synonyms.txt` - country and region names abbreviations and short names. -- `languages.txt` - native language names. - -Automatically [generated](TRANSLATIONS.md#technical-details): -- `countries-strings/` - country and map region names JSON localization files. -- `sound-strings/` - Text-To-Speech JSON localization files. - -## Tools -- `tools/` - various scripts for building packages and maps, testing, managing translations etc. - -- `generator/` - map building tool. -- `poly_borders/` - borders post-processing tool. -- `skin_generator/` - a console app for building skin files with icons and symbols. -- `topography_generator/` - isolines from SRTM data. -- `track_generator/` - generate smooth tracks based on waypoints from KML. - -## C++ Core - -- `3party/` - external libraries, sometimes modified. -- `base/` - some base things, like macros, logging, caches etc. -- `cmake/` - CMake helper files. -- `coding/` - I/O classes and data processing. -- `descriptions/` - -- `drape_frontend/` - scene and resource manager for the Drape library. -- `drape/` - the new graphics library core. -- `editor/` - built-in OSM data editor. -- `feature_list/` - -- `ge0/` - external API of the application. -- `geometry/` - geometry primitives we use. -- `indexer/` - processor for map files, classificator, styles. -- `kml/` - manipulation of KML files. -- `map/` - app business logic, including a scene manager. -- `mapshot/` - generate screenshots of maps, specified by coordinates and zoom level. -- `openlr/` - -- `packaging/` - packaging specs for various distributions. -- `platform/` - platform abstraction classes: file paths, http requests, location services. -- `pyhelpers/` - -- `qt_tstfrm/` - widgets for visual testing. -- `routing_common/` - -- `routing/` - in-app routing engine. -- `search/` - ranking and searching classes. -- `shaders/` - shaders for rendering. -- `software_renderer/` - -- `std/` - standard headers wrappers, for Boost, STL, C-rt. -- `storage/` - map reading function. -- `testing/` - common interfaces for tests. -- `track_analyzing/` - -- `tracking/` - -- `traffic/` - real-time traffic information. -- `transit/` - experimental GTFS-based public transport support. - -## Documentation - -The main docs are in the `docs/` directory, however some tools have their own readmes, etc. +- `3party` - external libraries, sometimes modified. +- `android` - Android UI. +- `api` - external API of the application. +- `base` - some base things, like macros, logging, caches etc. +- `cmake` - CMake helper files. +- `coding` - I/O classes and data processing. +- `data` - data files for the application: maps, styles, country borders. +- `descriptions` - +- `drape_frontend` - scene and resource manager for the Drape library. +- `drape` - the new graphics library core. +- `editor` - +- `feature_list` - +- `generator` - map building tool. +- `geocoder` - +- `geometry` - geometry primitives we use. +- `indexer` - processor for map files, classificator, styles. +- `iphone` - iOS UI. +- `kml` - manipulation of KML files. +- `map` - app business logic, including a scene manager. +- `mapshot` - generate screenshots of maps, specified by coordinates and zoom level. +- `openlr` - +- `platform` - platform abstraction classes: file paths, http requests, location services. +- `pyhelpers` - +- `qt_tstfrm` - widgets for visual testing. +- `qt` - desktop application. +- `routing_common` - +- `routing` - in-app routing engine. +- `search` - ranking and searching classes. +- `shaders` - shaders for rendering. +- `skin_generator` - a console app for building skin files with icons and symbols. +- `software_renderer` - +- `std` - standard headers wrappers, for Boost, STL, C-rt. +- `storage` - map reading function. +- `testing` - common interfaces for tests. +- `tools` - tools for building packages and maps, for testing etc. +- `track_analyzing` - +- `track_generator` - Generate smooth tracks based on waypoints from KML. +- `tracking` - +- `traffic` - real-time traffic information. +- `transit` - +- `xcode` - XCode workspace. diff --git a/docs/TRANSLATIONS.md b/docs/TRANSLATIONS.md index 6920d159fa..6d1ededb98 100644 --- a/docs/TRANSLATIONS.md +++ b/docs/TRANSLATIONS.md @@ -12,25 +12,30 @@ But if you can't run it - don't worry, its not mandatory! ## Translation files -Main: - Application UI strings: [`data/strings/strings.txt`](../data/strings/strings.txt) -- A few iOS specific strings: [`iphone/plist.txt`](../iphone/plist.txt) -- Names of map features/types: [`data/strings/types_strings.txt`](../data/strings/types_strings.txt) -- Search keywords/aliases/synonyms for map features: [`data/categories.txt`](../data/categories.txt) -Additional: -- Text-to-speech strings for navigation: [`data/strings/sound.txt`](../data/strings/sound.txt) +- A few iOS specific strings: [`iphone/plist.txt`](../iphone/plist.txt) + - Android stores description: [`android/src/google/play/listings/`](../android/src/google/play/listings/) + - Apple AppStore description: [`iphone/metadata/`](../iphone/metadata/) -- Popular brands of map features: [`data/strings/brands_strings.txt`](../data/strings/brands_strings.txt) -- Search keywords for popular brands: [`data/categories_brands.txt`](../data/categories_brands.txt) + +- Names of map features/types: [`data/strings/types_strings.txt`](../data/strings/types_strings.txt) + +- Search keywords/aliases/synonyms for map features: [`data/categories.txt`](../data/categories.txt) + - Search keywords for cuisine types: [`data/categories_cuisines.txt`](../data/categories_cuisines.txt) -- Country / map region names: [`data/countries_names.txt`](../data/countries_names.txt) -- [other strings](STRUCTURE.md#strings-and-translations) files +- Text-to-speech strings for navigation: [`data/strings/sound.txt`](../data/strings/sound.txt) + + +- Popular brands of map features: [`data/strings/brands_strings.txt`](../data/strings/brands_strings.txt) + +- Search keywords for popular brands: [`data/categories_brands.txt`](../data/categories_brands.txt) + Language codes used are from [ISO 639-1 standard](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). If a string is not translated into a particular language then it falls back to English or a "parent" language (e.g. `es-MX` falls back to `es`). diff --git a/tools/python/strings/google_translate.py b/tools/python/strings/google_translate.py new file mode 100755 index 0000000000..a505bcaf74 --- /dev/null +++ b/tools/python/strings/google_translate.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python3 + +import sys +from googletrans import Translator + +LANGUAGES = [ + "ar", + "be", + "bg", + "cs", + "da", + "de", + "el", + "en", + "es", + "fa", + "fi", + "fr", + "he", + "hu", + "id", + "it", + "ja", + "ko", + "nl", + "no", + "pl", + "pt", + "ro", + "ru", + "sk", + "sv", + "sw", + "th", + "tr", + "uk", + "vi", + "zh-cn", + "zh-tw" +] + +STRINGS_OVERRIDE = { + "no": "nb", + "zh-cn": "zh-Hans", + "zh-tw": "zh-Hant", +} + +if len(sys.argv) < 2: + print("Usage:", sys.argv[0], "STRING", file=sys.stderr) + sys.exit(1) + +text = sys.argv[1] +src = 'en' + +translator = Translator() +for dest in LANGUAGES: + trans = translator.translate(text, src=src, dest=dest).text + # Correct language codes to ours. + dest = STRINGS_OVERRIDE.get(dest, dest) + print(dest, '=', trans) diff --git a/tools/python/strings/requirements.txt b/tools/python/strings/requirements.txt new file mode 100644 index 0000000000..c5d01e86d9 --- /dev/null +++ b/tools/python/strings/requirements.txt @@ -0,0 +1 @@ +googletrans==4.0.0rc1