From 38b44ce040a5b9d4b02f7713471ead69fa817f4b Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 11 Dec 2024 00:22:07 +0300
Subject: [PATCH] [styles] Regenerate for man_made=tower

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin                         | Bin 427713 -> 428063 bytes
 data/drules_proto.txt                         | 137 +++++++++++++++++-
 data/drules_proto_default_dark.bin            | Bin 412155 -> 412437 bytes
 data/drules_proto_default_dark.txt            | 109 +++++++++++++-
 data/drules_proto_default_light.bin           | Bin 413512 -> 413794 bytes
 data/drules_proto_default_light.txt           | 109 +++++++++++++-
 data/drules_proto_outdoors_dark.bin           | Bin 429068 -> 429418 bytes
 data/drules_proto_outdoors_dark.txt           | 137 +++++++++++++++++-
 data/drules_proto_outdoors_light.bin          | Bin 430536 -> 430886 bytes
 data/drules_proto_outdoors_light.txt          | 137 +++++++++++++++++-
 .../include/priorities_4_overlays.prio.txt    |   6 +-
 .../include/priorities_4_overlays.prio.txt    |   6 +-
 12 files changed, 612 insertions(+), 29 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 6d3cae6a4fe28690d9ddfa84f46a82fff7da2c07..2c7789e06dba42f7f9c46a6fc0ecf2748f9ba54a 100644
GIT binary patch
delta 293
zcmX@uD>Z+DR6`5n7AEW6Nmm)U_;M5T;&T&IQguu6%TtSl_&NBLxVhMJ6N^i9b0sdZ
z0R{Nc1q9Fq1W^SvIfP&W(;G~f<avZNIfPL}Ca+EAU;)_ymS^UA%sAa<H<P^oK-k_s
TYc~@RGXpWp_F21G)lUNe$J$Nm

delta 43
xcmbO~LF!<yR6`5n7AEW6jB(RN_b|y%58KS-(Ef7|6A&{4G0XO!dsx*@0|1Hi6HEXA

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index eb35b424cc..fd99f0d7fd 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -56022,34 +56022,161 @@ cont {
   }
 }
 cont {
-  name: "man_made-tower-communication"
+  name: "man_made-tower"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 44b929eac303634da00fa58d4ed3d8f5dd5df09d..36940196b13ae6b6290a1a1ffd35005ccc08949c 100644
GIT binary patch
delta 217
zcmex8S#s($$%YojElfVs9X2y^@#QAw#pfobr0SOBm!}p9@pA|$adWZdCKi|I=1N>*
z0}2SD3TSc&!2~8dEKuOq<Pb*YPp(U1X8~ykO3E{H9b}yDJDo{hm%8S*ub$2X#LPg<
LvVHY*)__d_<SRbR

delta 68
zcmbO_P4f3-$%YojElfVs<>R<yauf67a}!fibxZQgQ;T$y^K)}c^D>hYOEUBGrZ1hy
W<k)^}1``l712N0?V>4L&Hvs^lEgVAt

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index a9f8bd2241..34686d9207 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -53380,34 +53380,133 @@ cont {
   }
 }
 cont {
-  name: "man_made-tower-communication"
+  name: "man_made-tower"
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index e6f12c27dc01e4edb3ea4c7b87b5dcb7b9a9ebc6..830a7f03fd4ee1d2287c5e80b5e4e2183b69ced6 100644
GIT binary patch
delta 223
zcmX>xPx8?M$%YojElhW(I&5a-;>%6Ui_c9=N!2aMFHbEJ;^z=h;^tz@O)M_a&6T*s
z1{4rP70~1mf(cA63{~LP<Pb*Viy-mknYj)!PQN#mNnV%gMz`BcV*+AkAZFQaGmVvJ
FCjimiJDval

delta 43
xcmaE~K=Q;q$%YojElhW(GR94xI*mzwI@bgyhxYL4OhC*G#4Ovxr?YbJ1OSOJ5Yqqv

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 1ba8512f44..4ccaba5da7 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -53134,34 +53134,133 @@ cont {
   }
 }
 cont {
-  name: "man_made-tower-communication"
+  name: "man_made-tower"
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index a32bb86e3f679668cb8f317b440a18d5bfdcd1ef..8562ba6b0990e8b6589e96101b5abeac6368d349 100644
GIT binary patch
delta 174
zcmeB~A@ypOR6`5n7N(MILRT5N_;M5T;&T&IQguu6%TtS{KVQe>%B{&Eq{Pj|mYY~y
zGQD99lRS@*CWkPFhzPQX0@Gv0>80D4<fp$_$K*nm3GG+5F#$0%5VLH*vW?Z^Dgb6@
BHoO1;

delta 102
zcmaDgOR8svR6`5n7N(MIjB(Tbwlm4w^Kl3&adEMx<d^8?N?c+S;^PoP;|rtlMUeUJ
ThC7&mm>Gy!wj1tXwY&-dq)Hqy

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 9b417b1c99..ce6023a873 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -56051,34 +56051,161 @@ cont {
   }
 }
 cont {
-  name: "man_made-tower-communication"
+  name: "man_made-tower"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 4d34bb46a70e352a8833e478831e41a7ea9a56e1..3c33756bb594b217eb116180b3202fa90ae1d99b 100644
GIT binary patch
delta 165
zcmX@HSZdiasfHHDEliwSg|0Gk@#QAw#pfobr0SOBm!}p@_g~B8%B{&Eq{Pj|mYY~y
yGWoz{1t4D-jW2@4muKdB%s8EEE0g^6fVE66r0Q<Z*vbUN%s|YtJ!30t!W{sNZ!^OH

delta 127
zcmZ3sOzOm9sfHHDEliwS<Kwtwauf67a}!fibxZQgQ;T$y^K)}c^D>hYOEUBGg!niF
rmAJTAQ}Ro6b0sdZ0r^5`d|@=c2r|F@*fu60W(H!G?Z>vUCfor4`W`47

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 1958cedecd..bcf903b96a 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -55805,34 +55805,161 @@ cont {
   }
 }
 cont {
-  name: "man_made-tower-communication"
+  name: "man_made-tower"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
 }
 cont {
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index dab9b0975c..d9cb980cdc 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1079,8 +1079,8 @@ leisure-ice_rink                                    # icon z17- (also has captio
 leisure-pitch                                       # icon z17- (also has caption(optional) z17-, area z15-)
 man_made-chimney                                    # icon z16- (also has caption(optional) z18-)
 man_made-flagpole                                   # icon z15-
-man_made-tower
-man_made-tower-communication                        # icon z17-
+man_made-tower                                      # icon z16- (also has caption(optional) z18-)
+man_made-tower-communication                        # icon z16- (also has caption(optional) z18-)
 === 850
 
 junction                                            # caption z17-
@@ -2001,6 +2001,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
 # man_made-chimney                                  # caption(optional) z18- (also has icon z16-)
+# man_made-tower                                    # caption(optional) z18- (also has icon z16-)
+# man_made-tower-communication                      # caption(optional) z18- (also has icon z16-)
 # === -9150
 
 # man_made-works                                    # caption(optional) z17- (also has icon z16-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index e7b2d21a68..63a973fdb9 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1079,8 +1079,8 @@ leisure-ice_rink                                    # icon z17- (also has captio
 leisure-pitch                                       # icon z17- (also has caption(optional) z17-, area z15-)
 man_made-chimney                                    # icon z16- (also has caption(optional) z18-)
 man_made-flagpole                                   # icon z12-
-man_made-tower
-man_made-tower-communication                        # icon z17-
+man_made-tower                                      # icon z14- (also has caption(optional) z18-)
+man_made-tower-communication                        # icon z14- (also has caption(optional) z18-)
 === 850
 
 junction                                            # caption z17-
@@ -2001,6 +2001,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
 # man_made-chimney                                  # caption(optional) z18- (also has icon z16-)
+# man_made-tower                                    # caption(optional) z18- (also has icon z14-)
+# man_made-tower-communication                      # caption(optional) z18- (also has icon z14-)
 # === -9150
 
 # man_made-works                                    # caption(optional) z17- (also has icon z16-)