diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 5811f68b01..464dc009ea 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 daa5238b7f..fb12eddaad 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -56106,14 +56106,14 @@ cont { primary { height: 11 color: 2236962 - stroke_color: 1308622847 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 9 color: 2236962 - stroke_color: 1308622847 + stroke_color: 16777215 offset_y: 1 text: "int_name" is_optional: true @@ -56132,14 +56132,14 @@ cont { primary { height: 12 color: 2236962 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 10 color: 2236962 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 text: "int_name" is_optional: true @@ -56150,26 +56150,10 @@ cont { element { scale: 16 symbol { - name: "subway-moscow-m" + name: "zero-icon" 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 @@ -57848,12 +57832,38 @@ 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: 16902 + priority: 16941 } caption { primary { @@ -57871,7 +57881,7 @@ cont { text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57879,25 +57889,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 12 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57905,25 +57915,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 13 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57931,25 +57941,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 13 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 08adebc1ee..1eeec9cab2 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 0b5686f57a..6775e7ac6e 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: 1308622847 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 9 color: 2236962 - stroke_color: 1308622847 + stroke_color: 16777215 offset_y: 1 text: "int_name" is_optional: true @@ -55658,14 +55658,14 @@ cont { primary { height: 12 color: 2236962 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 10 color: 2236962 - stroke_color: 872415231 + stroke_color: 16777215 offset_y: 1 text: "int_name" is_optional: true @@ -55676,26 +55676,10 @@ cont { element { scale: 16 symbol { - name: "subway-moscow-m" + name: "zero-icon" 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 @@ -57374,12 +57358,38 @@ 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: 16902 + priority: 16941 } caption { primary { @@ -57397,7 +57407,7 @@ cont { text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57405,25 +57415,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 12 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57431,25 +57441,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 13 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57457,25 +57467,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 13 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 1 is_optional: true } secondary { height: 11 color: 2236962 - stroke_color: 452984831 + stroke_color: 16777215 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index c0940356ac..00ab0a3c99 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 8d71c83b15..23ab007301 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -55750,14 +55750,14 @@ cont { primary { height: 11 color: 8947848 - stroke_color: 1292964096 + stroke_color: 1118464 offset_y: 1 is_optional: true } secondary { height: 9 color: 8947848 - stroke_color: 1292964096 + stroke_color: 1118464 offset_y: 1 text: "int_name" is_optional: true @@ -55776,14 +55776,14 @@ cont { primary { height: 12 color: 8947848 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 is_optional: true } secondary { height: 10 color: 8947848 - stroke_color: 856756480 + stroke_color: 1118464 offset_y: 1 text: "int_name" is_optional: true @@ -55794,26 +55794,10 @@ cont { element { scale: 16 symbol { - name: "subway-moscow-m" + name: "zero-icon" 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 @@ -57492,12 +57476,38 @@ 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: 16902 + priority: 16941 } caption { primary { @@ -57515,7 +57525,7 @@ cont { text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57523,25 +57533,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 12 color: 8947848 - stroke_color: 437326080 + stroke_color: 1118464 offset_y: 1 is_optional: true } secondary { height: 11 color: 8947848 - stroke_color: 437326080 + stroke_color: 1118464 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57549,25 +57559,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 13 color: 8947848 - stroke_color: 437326080 + stroke_color: 1118464 offset_y: 1 is_optional: true } secondary { height: 11 color: 8947848 - stroke_color: 437326080 + stroke_color: 1118464 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } element { @@ -57575,25 +57585,25 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16902 + priority: 16941 } caption { primary { height: 13 color: 8947848 - stroke_color: 437326080 + stroke_color: 1118464 offset_y: 1 is_optional: true } secondary { height: 11 color: 8947848 - stroke_color: 437326080 + stroke_color: 1118464 offset_y: 25 text: "int_name" is_optional: true } - priority: 15902 + priority: 15941 } } }