From be73bb0415ada0631dedd07b38dd811a5ec2c343 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 10 Mar 2022 23:44:25 +0300 Subject: [PATCH] [styles] Regenerate for subways Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 210727 -> 210750 bytes data/drules_proto.txt | 80 ++++++++++++++++++++---------------- data/drules_proto_clear.bin | Bin 211455 -> 211478 bytes data/drules_proto_clear.txt | 80 ++++++++++++++++++++---------------- data/drules_proto_dark.bin | Bin 210162 -> 210173 bytes data/drules_proto_dark.txt | 80 ++++++++++++++++++++---------------- 6 files changed, 135 insertions(+), 105 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 5811f68b013569ece47f4be9f837cb0e708c2069..464dc009eabb4a160759f48df4dd51e808c461c7 100644 GIT binary patch delta 383 zcmZ4fj%VLHo`x32Ele>BnVv9Do6RISy?i0lIpzQkzUhq%nWV+E47mh2xCIs+>0p%j z|NlR`2BQU|kks@>HztYcu`8IkroUeV)N^hJlhX8c;!NC}7K{={YlK8O1g1OAViMkN zu$U=MlxYL=^a(qdlzsV?#JTv3OOwhID|K`8i<9%qb&CZUCDyhuVz-8a6UkypBaY0x zlK8yD+*Gh7(>Ls3l44vt{qzndV>Y0jejI|+-z{R20y#!Z0olpuI)O@sz)HB8K+PGKZ{9fdig@8bId^;eA62jGD%P8U&O>Z{r_?%!|Acp znfRvP*}=p=y=pp>DWl8u^E;SirmL=I%G>U|m`OsE@!9kPTbX27^NW-7%cq~+!6e1l zHhtqFCe`V@JApd&HZci;v~vSR>klzWO`FEV%P2WLdK;7c^t(HlxTa6r%%lMnSc@XS aFKNV)nO72@mzbMs!6-3rJI^jAqgnuFC_}3N 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 08adebc1ee52c9d76f04b7d729ed8d5eb48920bd..1eeec9cab2d72d32c89b750223b5290db39db00c 100644 GIT binary patch delta 383 zcmezWnP=J;o`x32Ele?Un4U0Co5mzLy?hSSIpzQkzUhr~n54zD47mh2xCIs+>0p%j z|NlR`2BQU|kks^vwoDS!V;3`VO@BWZsOQ{fCZ*|q0!-YT7K{={YlK8O1g1MqWfIH8pl44vt{q$xgV>Y0jejI|+-_2!`0y#!Z0olpuI)O@sz)H?zVqi delta 184 zcmbRCh3Efgo`x32Ele?U7^hGFKb1*pdifltbId^;eA64}FiB76pUcEL{r@5+!|Ab; znE0mO+04X0y=oGZDWl8u^P8DurmHSv%G>Tdk4Zw5@!9kP8<=ER^NW-7%cq~+%p}Fw zHhtq-REAO`FKX%P2WLdLxtk^t+pxxTa5A$D{!iSc@XS aFKNV)nO72@mzbMs!6-3rJI_`ou2ukDL_w`spV-SJIo)ms(>X@J>AW+UR-2QzgQzS0NC(UFMo_=-)6T6`nHfuOI5%x+Nab)I|#OEdE zrh+Y)p1+<+igE4quJufYEMRBsU(Y0A2DAfg6c0it*u}_RKsO5L1;GtW5*9GMyd>%6 f5T1T;J(HLvIl8$nGI7aIFI>(fvHijZCZ!et!I^WY delta 184 zcmezSlIPP)o`x32ElkQY7^hF4(90w>-EIccImV#ryfc~PrqAhQGMyeZiHUD|)=Vb; z=`W`-nKHX@2uzQk2~=n`ok?)|&xK5}+u3F@35YU2nO?nyNrp4OI61#u$OocIjInL{ z!u3ps(_gLtDh3+D4HPig3DmuypNW@Ia=PA1pfw=z>7mP*G=KsPC<6SFMjV-WCGmNQ Rxv3V667#n2-N59~0sytFKQRCR 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 } } }