From 86a684029f2b364826e7b7236fcaaf96cead86fa Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 10 Dec 2024 23:32:19 +0300 Subject: [PATCH] [styles] Regenerate for shop-pasta Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 427759 -> 427809 bytes data/drules_proto.txt | 16 ++++++++++++++-- data/drules_proto_default_dark.bin | Bin 412201 -> 412251 bytes data/drules_proto_default_dark.txt | 16 ++++++++++++++-- data/drules_proto_default_light.bin | Bin 413558 -> 413608 bytes data/drules_proto_default_light.txt | 16 ++++++++++++++-- data/drules_proto_outdoors_dark.bin | Bin 429114 -> 429164 bytes data/drules_proto_outdoors_dark.txt | 16 ++++++++++++++-- data/drules_proto_outdoors_light.bin | Bin 430582 -> 430632 bytes data/drules_proto_outdoors_light.txt | 16 ++++++++++++++-- .../include/priorities_4_overlays.prio.txt | 4 ++-- .../include/priorities_4_overlays.prio.txt | 4 ++-- 12 files changed, 74 insertions(+), 14 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index a3234ee337acf6f28c7c5b3db22ce84a2ad32c9b..5d4c11c9edca19f04e214879294bee4409ce37d1 100644 GIT binary patch delta 71 zcmaFgE48pss-cCkg{g(Pg{6gc3)>oAp|^}&T*Vpr1-b=^#U+VC+8hGY9r)NZr<=ZH X<)7}&$0o-D6cYlAZRh7>dr$!YEhH3i delta 96 zcmZ43C-uHps-cCkg{g(Pg{6gc3)>oAtKE!TT*Vpr1-b=^#U+VCLL35Gd|aFyTmnZr kCNgO-N_-OriV0$fX>$lo-^a_QGhO;HE6?@-KDLV$05WG8`Tzg` diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 14cf0e64f5..658a3492f9 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -121368,24 +121368,36 @@ cont { name: "shop-pasta" element { scale: 16 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 33d7aa0da1202990b5504da9f4f791cae02d5dac..49e48da823dbfb6a24b4f332d3d6f2077325f583 100644 GIT binary patch delta 69 zcmZ2EMe_C($%Yoj7N!>F7M3lnYt9P2W#r;2&d4v&El4abNfgrN5SZ?8j#YEI=}K1q V>E7p97N7tC delta 94 zcmcaTMRMg7$%Yoj7N!>F7M3lnYtCBjX5`{3&d4v&El4abNfZ*|5YXb|;^g2G=$W~R jMT1e|n=nvJ5JOCxLumTGv#dJP&pc=4*&c9?mAeK2M^+oS diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index 4cebf3e8d4..ad4b3d12b2 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -116896,24 +116896,36 @@ cont { name: "shop-pasta" element { scale: 16 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 9211020 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 9211020 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index 3f73d2f4daaf633235388c6a34d6afe8d1fb68f4..0a8d0ce045a58355e467fb0977a74dab2dc107c2 100644 GIT binary patch delta 64 zcmex1Pjbb4$%Yoj7N!>F7M3lnOD+k$W#r;2&d4v&El4abNfgrN5SV`N606SioTIEf T(_daF7M3lnOD>u1X5`{3&d4v&El4abNfZ*|5YXb|;^g2GIMOkZ VNrO@1n=nvJ5M69L&t=v*H30Z@7c~F? diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 8d08b06dc2..607ea116b4 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -116681,24 +116681,36 @@ cont { name: "shop-pasta" element { scale: 16 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index f6337a59ac19b0cd7f9501d2d82a2e30ac6aebd4..09a68a5018ea00e2bf4edccf3e8cb6c80585c7b1 100644 GIT binary patch delta 66 zcmdlrL+Z^8sfHHD7N!>F7M2#)Eo?_Pgx)f8aTRCe7w8rw7MCOnX>$ln|Hr|mGri|G UE6;RJPBz8qJAth2K$c-M00Nd3$^ZZW delta 82 zcmaDeLu%IysfHHD7N!>F7M2#)Eo?_P%yu(!aTRCe7w8rw7MCOn32_K$@o{l-a0&Fx X+{B{6DDh1gC?<$5wq1vl&7m0p`ScbH diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index c3782d56b9..4ecc6ec380 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -121876,24 +121876,36 @@ cont { name: "shop-pasta" element { scale: 16 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 9211020 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 9211020 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index d9330ec5e513104ff6e11e186dddc6515de2294b..d8095194ce45839d9c4a8cc1ab1284b59f38db7e 100644 GIT binary patch delta 66 zcmeyiSZc)*sfHHD7N!>F7M2#)Eo={Xh2Ao9aTRCe7w8rw7MCOnX>$lnm*Qj7nV$2K Vm1nvtADiOz-zsc8+kvc$%>eRE6*vF@ delta 111 zcmZ3nMC#jOsfHHD7N!>F7M2#)Eo={Xt#&hVaTRCe7w8rw7MCOn32_K$@o{l-a0wjg wn8>8TDDh1gC?<#@rp+NVU7n9kXL`+RR-Wlvd~Ax-YYszLa@)`Iu|+lm0QCPJH2?qr diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 7f49790148..6907b7a31f 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -121661,24 +121661,36 @@ cont { name: "shop-pasta" element { scale: 16 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { scale: 17 + symbol { + name: "shop-m" + priority: 2550 + min_distance: 10 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 2550 + priority: -7450 } } element { diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 23f9159655..cf9ca56b06 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -780,7 +780,7 @@ shop-butcher # icon z16- (also has captio shop-cheese # icon z16- (also has caption(optional) z16-) shop-chocolate # icon z16- (also has caption(optional) z16-) shop-confectionery # icon z16- (also has caption(optional) z16-) -shop-pasta # icon z18- and caption z16-17 (also has caption(optional) z18-) +shop-pasta # icon z16- (also has caption(optional) z16-) shop-pastry # icon z16- (also has caption(optional) z16-) shop-seafood # icon z16- (also has caption(optional) z16-) === 2550 @@ -1733,7 +1733,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-cheese # caption(optional) z16- (also has icon z16-) # shop-chocolate # caption(optional) z16- (also has icon z16-) # shop-confectionery # caption(optional) z16- (also has icon z16-) -# shop-pasta # caption(optional) z18- (also has icon z18-, caption z16-17) +# shop-pasta # caption(optional) z16- (also has icon z16-) # shop-pastry # caption(optional) z16- (also has icon z16-) # shop-seafood # caption(optional) z16- (also has icon z16-) # === -7450 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 7981c4dd40..3ed9f27184 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -780,7 +780,7 @@ shop-butcher # icon z16- (also has captio shop-cheese # icon z16- (also has caption(optional) z16-) shop-chocolate # icon z16- (also has caption(optional) z16-) shop-confectionery # icon z16- (also has caption(optional) z16-) -shop-pasta # icon z18- and caption z16-17 (also has caption(optional) z18-) +shop-pasta # icon z16- (also has caption(optional) z16-) shop-pastry # icon z16- (also has caption(optional) z16-) shop-seafood # icon z16- (also has caption(optional) z16-) === 2550 @@ -1733,7 +1733,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-cheese # caption(optional) z16- (also has icon z16-) # shop-chocolate # caption(optional) z16- (also has icon z16-) # shop-confectionery # caption(optional) z16- (also has icon z16-) -# shop-pasta # caption(optional) z18- (also has icon z18-, caption z16-17) +# shop-pasta # caption(optional) z16- (also has icon z16-) # shop-pastry # caption(optional) z16- (also has icon z16-) # shop-seafood # caption(optional) z16- (also has icon z16-) # === -7450