From 29cf6abd7d9be30b61b20af4118b8d84a0be51f5 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 12 Feb 2025 15:52:19 +0700
Subject: [PATCH] [styles] Regenerate for new POIs

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/classificator.txt                        |   6 +
 data/drules_proto.bin                         | Bin 429164 -> 431024 bytes
 data/drules_proto.txt                         | 641 ++++++++++++++++-
 data/drules_proto_default_dark.bin            | Bin 412941 -> 414326 bytes
 data/drules_proto_default_dark.txt            | 468 ++++++++++++-
 data/drules_proto_default_light.bin           | Bin 414298 -> 415683 bytes
 data/drules_proto_default_light.txt           | 468 ++++++++++++-
 data/drules_proto_outdoors_dark.bin           | Bin 431303 -> 433212 bytes
 data/drules_proto_outdoors_dark.txt           | 663 +++++++++++++++++-
 data/drules_proto_outdoors_light.bin          | Bin 432771 -> 434680 bytes
 data/drules_proto_outdoors_light.txt          | 663 +++++++++++++++++-
 data/drules_proto_vehicle_dark.bin            | Bin 278473 -> 278739 bytes
 data/drules_proto_vehicle_dark.txt            |  90 +++
 data/drules_proto_vehicle_light.bin           | Bin 278288 -> 278554 bytes
 data/drules_proto_vehicle_light.txt           |  90 +++
 .../include/priorities_4_overlays.prio.txt    |  18 +-
 .../include/priorities_4_overlays.prio.txt    |  18 +-
 .../include/priorities_4_overlays.prio.txt    |   3 +-
 data/types.txt                                |  12 +-
 data/visibility.txt                           |   6 +
 20 files changed, 3055 insertions(+), 91 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index dc9942e37c..c60bc3caae 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -388,6 +388,8 @@ world  +
         defibrillator  -
         emergency_ward_entrance  -
         fire_hydrant  -
+        lifeguard  -
+        mountain_rescue  -
         phone  -
         {}
     entrance  +
@@ -698,11 +700,15 @@ world  +
         bridge  -
         cairn  -
         chimney  -
+        communications_tower  -
+        cross  -
         cutline  -
         embankment  -
         flagpole  -
+        flare  -
         lighthouse  -
         mast  -
+        petroleum_well  -
         pier  -
         pipeline  -
         silo  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 43a38f3c9449951a62613a128de3a6574a777353..8ccedf1ea95ef7ebfb68f56a042161157e423ee4 100644
GIT binary patch
delta 1195
zcmaKrPixdb6u`+;YnW{FXOh&qQnRcGy9=poPlEUn{0t#vXS;z+QuBwkCj}2Zmlji`
z7we%{5oIf=h<Nf`=*5d5g5be^0Kw<B?q-K<4s&?F-@KVOZ)Se&*IyphAHNp5=A%CX
z)+wX$1`WL}JMjB-BXi>(F+{nkVrc?ww(?a1s+3Z-lxih(O(aFS*c&gLKR877WwIvf
zMaem%++Dx(X#roGo`FSKn7V%G#5D0TN^G&#R4^Vy$)=yW0qpngMrQ>}qO|+_g;}@7
zrD`o#Yo%JN)mp38q+09M+L)(59-7--Q#k6H=+^B6gqH_?l18!b*+X|L@q5(q;wVYT
zx~Mh{tjxgOZ#Nspx~R<)WS-FH38PF{qwZbwZ0MXIyvp3rVQ!DwUc^`y`ktHmQJ6Ss
zG^8<6;C>~%$lN4_yWQ^qSmJ>^3)=9E&r|Yy-%&#%Z8&HF)BtGzQ}UfNn9_!Kd$G$H
z<UijdIo~@&tDuacvKsg^!t%7}aVtCUpKAEZxUc_OSnEIy98h_n@qq9^=YdfK*67PC
z^cImHLZP01;Knp}KA_XllQ-x9^-l$SbyDpnP2(t_8FPj-2#5@2<4JQLLacDH%Ej7D
q+=8~9=RX~w25!LzpN3KkI(M;p{yaj~wsnkPEWo%lvW_p`Kluv||5acB

delta 149
zcmdn6T<XmXsfI0#hNA7?#2J@=6K7IY|HsHBmXTRpl3$dWtXrN~S)7@Y8lPO0UtBDt
z!y%x=$HfljOuuNyq{O4cA&4q6{g57$(DdteOfu6yz*%zo5HacPB6du(%D4OMVA{d7
Z{q1h1IZW-z`$3o)h*`EL?`QSB0ss?pG_e2x

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 9a8e330297..4767c80ba2 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -21450,6 +21450,232 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-lifeguard"
+  element {
+    scale: 14
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
+cont {
+  name: "emergency-mountain_rescue"
+  element {
+    scale: 12
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+}
 cont {
   name: "emergency-phone"
   element {
@@ -45550,9 +45776,8 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45567,9 +45792,8 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45584,9 +45808,8 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45601,9 +45824,8 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45618,9 +45840,8 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -55324,6 +55545,241 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-communications_tower"
+  element {
+    scale: 12
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+}
+cont {
+  name: "man_made-cross"
+  element {
+    scale: 14
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -55533,6 +55989,92 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-flare"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  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 {
   name: "man_made-lighthouse"
   element {
@@ -55759,6 +56301,85 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-petroleum_well"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index c0d8e65364fd8ab67eb01093eb1aa85ce8846c24..98fe36991b9179dc93ff51e8b1c016661a0daac0 100644
GIT binary patch
delta 846
zcmZ|NJxjwt7zc22Rt=ZZmrJbHx7G?`i>ct^<Rtht!jYaD$mL32sGW4usS0*D5upx(
zy9z-Z1V4hai<66kAUJzUtu>~@4f*|Z_dIznt<(I+MSkx_>Lk|hB&ZTf+%4jmP2ILO
z$yR{f8q(x!DFc-r=yc*qK~)+3SAM?>rpBtWIylneqsc1V2QdFzpR&O5vE>*p@yviA
zUCxx!5N<QCZu!{e^`((QMrbxxQLL)5sztSU&`C&PCjq3~@)>}+ZOikSYngfjH$AIH
z4AW(vhgL*K8chGe_VavETM<nS2+*KF9TaGBK_NV!0<yn$1>g+DjzMva=q95ya4Zx1
z7IQqqXAR<_w45p_aD-yd7x#8jL1j7J1>OolQ4x^ohope)&ldjnAYLhptL~oh1L_~(
zqbDH6-ygtq5xz<=_1n_-pemw55{`aP?Q1~Eil`6)6a_U3T0a!R%Ok)5y6&&GX=9i0
zLk=#&+%b5RRxc$u-s`1Ke3#iIphkn(HcE*eU~e!xXi<D*_nFUafP%6p{^AH|{V;p*
Q(gtD;iIoUn+QSRCpV6=UC;$Ke

delta 158
zcmeyiM6!35WWyH5`7G^eY>eB}*q9i_)c-MZiDhIKm*f{^ChL|bRu*Tbq{b%~<rfzV
z>2L@r@o}+(InyUfGb!=ta0sG`OgH9Z5}H0;nn?yICyXZ750#VN-YUz)QL=sGWTrf(
a?N_HUU1DqxoXG^l%s|YtJ#Z$g>P`Ry`Y_)B

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index d6ea170955..2283017337 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -20196,6 +20196,147 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-lifeguard"
+  element {
+    scale: 17
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
+cont {
+  name: "emergency-mountain_rescue"
+  element {
+    scale: 16
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+}
 cont {
   name: "emergency-phone"
   element {
@@ -43108,9 +43249,8 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -43125,9 +43265,8 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -43142,9 +43281,8 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -43159,9 +43297,8 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -43176,9 +43313,8 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -52743,6 +52879,195 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-communications_tower"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+}
+cont {
+  name: "man_made-cross"
+  element {
+    scale: 16
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -52922,6 +53247,71 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-flare"
+  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 {
   name: "man_made-lighthouse"
   element {
@@ -53076,6 +53466,64 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-petroleum_well"
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 80b82eadacdd1f9f2b3572409926661d000812f2..db945275e6ca2d456604a01a86d7622dbf83b36c 100644
GIT binary patch
delta 842
zcmZ{iKTq307{=uzfb|;1$=NNWP{j&ElSmGNp<@^5#&@tz&Ot2se8_*AQmGOhS~f&M
z;utz2b*u!HJg`*d8!#dkhAxP2kcA_Z5R5b2@cy3n^gi!%cX3oX`&HTct@H}ZrwSO9
z(Qusx?xyW~Yjiy!VH=xjxmE&g0BkmMso|E2pHuPuGn#$TQjO7)nJ>L+!8Zhz$N7vW
zK}@{B32Ede6x(X4rUP_%wBg0X7oEk4YDv;^F2%Xj$fahMTHC#XlJ*Mdy1eiM!OM;p
z#XR&}yGu4BuT32{<WYo|q$3mbCvg92-ZGb@sSyGmB^aXwGf$|d|EAHK5ATi<yk;bD
z7->`6<%}hP=aSgtLFB}|OGB)y#hL~aj6|_~x5FlGsQLpCi+_=&HRKxqJNf_`(*8XV
zUsBm1uiz{&hJg?VNEcsIG-tt$0>wv1{hXR|z!XgOL%YjoswoF#0L}s<3(R3qO|>1w
z5k487w&s(Nis}J6N<ZzQbLH(%1*QjHHfS7jpC-)dQs2i#=>Z10e8hFR<9#i*R*(gC
c`G=p@=0m;v9$DL~dq|!!c?#+3-gxoPEl(QwL;wH)

delta 131
zcmX@SUh>uw$%ZYAzggN3u`zBx#K!bWkm(=e^mP(Uk~}&b0!n;b?8!y>#l_PT*_o7p
zB7&$Q(<```gr=vnGs#R}24`J?vZS}4l4MdZ+b%kZDUWHp<y59ijO|;eGXXI(5VLIG
JI-Qm8004CHDUARC

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 8e9c0d2b37..e0f1237d93 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -20196,6 +20196,147 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-lifeguard"
+  element {
+    scale: 17
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
+cont {
+  name: "emergency-mountain_rescue"
+  element {
+    scale: 16
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+}
 cont {
   name: "emergency-phone"
   element {
@@ -42838,9 +42979,8 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -42855,9 +42995,8 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -42872,9 +43011,8 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -42889,9 +43027,8 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -42906,9 +43043,8 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -52488,6 +52624,195 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-communications_tower"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+}
+cont {
+  name: "man_made-cross"
+  element {
+    scale: 16
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -52667,6 +52992,71 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-flare"
+  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 {
   name: "man_made-lighthouse"
   element {
@@ -52821,6 +53211,64 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-petroleum_well"
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 8194e0c048176a049a1d51716172501aac74bfe4..7b36766f78169e36539eb2aa28d60fc350a0fde5 100644
GIT binary patch
delta 1428
zcmaKs&ui0Q7{|%m*@d@1lDtV=w>ev<U{}Z(f}$6}g9q6`{R5<iHl2l}sYyy54(4qa
z9fKTR1yN6e2j{vKs<4w6#hYF{_;ZJe*Bv|zl=-w<x-?67c;R_J-|w3|@AEvo?_P|o
zzaF{QWL_oa|1nt949%L+Dur1^FPF5Lnran^#3sji9P0wbNPUd~<w7YRN`(+Q$r3+h
zimvb^!%woJpL$RV!t@3FHiC!u6E@6R#Zk+ZyrtQNnnn~hKF(o$%e1RyN7WTOwSGL8
z!Z8+8!HP;U7!n5zbfp>{l@z$K|EK{+J%tNbIECf?ipxC9024wO31MOglL9Qgu$*98
z%L$}p(PKovokhda8ThM&xw<-Qmy24yV41e<Zk)`3AoLSRKSAs#NMS;{_2nEoRloQq
zg2xQCk~h?%rW8!Ws8z}Z)hU}5JMWlv%_1ChB8H=eYCAAH4|8M!D!&Kl(iX}vQ*`4&
zM568%8Y5FMSOh1k?W0QP1D;1%1W$7l9TUMM1Wk=iltyHVUh=!dey-b|>ndJCIJtj;
zb_EF!0}#i9opM6Ti*X=afaIX`J)X{R#p%|ys63Q|{0<SxVWN1LD20j}*Q0W4=Owy<
z+|go+Ix9%*1W&!-gBSeS4aVqX6AijjF-@l%9kZ<CUyQF1C0(^NXkE8cP=`-Z07<WP
z9^it24+5bVOt6HWXrNpx(?FMzTiQNK@2(-a6Fm2V_bVt#f2={0ZT+u@PdE3BR~n$-
zY+s_ZEzjf63?Aw>v8p+iscSVOU)OY<Bq3+qoxeM<=K^~^uorsvS$L>?=Xd+e-+#0^
tkY&y@so$$R^m_rZau%Mh13vn(fMk%Qa7kL2Ya&<?SOcxO=8@^2{{b?bo8|xj

delta 253
zcmdn9L+bcSsfI0#>v`Kt1Q@rM2r%hrsQ+W+63fUeF3B&-Ox7(=tSrt<NsUh~$}cV!
z(%}$L;^SfmbEXGcFe&lqa0sG`OwZ9`5}F=v!6Y+%7Myhg%97r`&yq={eEY`DOtDPU
z&uwRtm@cu4iD&wp?M(911Gg~=L&R#}teHUB?LgTSrpcK)V$;QTF^Pg1jxa_Jj4>U?
k*twmFZ~BE@OzdEVZy~~>?H_kD0WmWWvuyvko7MXP0DR6_cK`qY

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index fdad23393b..8622aa09a5 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -20914,6 +20914,232 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-lifeguard"
+  element {
+    scale: 14
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
+cont {
+  name: "emergency-mountain_rescue"
+  element {
+    scale: 12
+    symbol {
+      name: "hospital-s"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hospital-s"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+}
 cont {
   name: "emergency-phone"
   element {
@@ -45468,9 +45694,8 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45485,9 +45710,8 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45502,9 +45726,8 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45519,9 +45742,8 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45536,9 +45758,8 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -55352,6 +55573,241 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-communications_tower"
+  element {
+    scale: 12
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+}
+cont {
+  name: "man_made-cross"
+  element {
+    scale: 14
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -55519,7 +55975,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55535,7 +55991,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55551,7 +56007,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55567,7 +56023,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55575,6 +56031,92 @@ cont {
       priority: -9150
     }
   }
+  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 {
+  name: "man_made-flare"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  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 {
@@ -55780,7 +56322,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55796,7 +56338,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55812,7 +56354,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55828,7 +56370,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55844,7 +56386,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55860,7 +56402,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55876,7 +56418,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55885,6 +56427,85 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-petroleum_well"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 1b75d34b476e1db806a78d6b93f7bac30ef84873..65723bc2d51d64d123c5cb05e15247cb8e23df7d 100644
GIT binary patch
delta 1479
zcmaKsy>HV%7>DHxO|466J7+r$MI}+`5F)vhvQQy)Wn*LEL#dTq8%uE<Y=@AkASBAf
zhdh`8(SHCD6oDc>Bt+paU_nAGNENVVqXQ~$Or6HA-QlG7p6AYb?ce$CzMlE>Y3BAT
zCdF<1Ww1zfYOd2prK8lfHM-tX%_@;tZcf0d5m5Bp_Y_b*k_wSD6G0bPGESMQlX+GU
z7Fcnd`cMkP{4(B7;Nu4k>qe_#t6HOMQmfLUL}Al&JjOM{YHGGxSFGIolcgL^vDmq>
zB})oBbx6B=t>g(XT)^nC(Kmdw;T2XGH}2qOvH&m>1xXYXqo5Rq`Ay6*eaxZk{F$c+
zXKR{e8>UuK+G@wrs<d1&4a*`+(2a!o0CawwDo9JvQH&sQLW~nql*soB=g`H@%9{k9
z)zwB>SF2R17`onSXcg7gjD}UVjW#t25Ba2UQdcb-PSleUISq;I1NY8LR3M8G1i@3y
z;c~^><a0iT3t>JOpu7kV%ESp0C&V}*MTo+sM+kEV@9U)?K>KMt=|uu>_#jOL_-BHo
z1W5&mcS6(7$7}L*3A&DV<OnAo;iM?%s`E(huRllEk#pg4*8TPZ$zCzh-7gmX;;LWV
z^NY7V#JL~3XcBhFHT;tq`x0w))ua&hC|URrUy=YgKWZQFVIYJ-CII?Zy2wJ#_O910
z=e*mUb-5mNJ0#0~QT2<5egWMM*T@_AD}$#;ku|Ap8g<&z%WYb(6Al{0qr-U%=6q-_
zgyxyRya;#O*#7^i3ZL&kMn&d4ll$G<b5~XoD;MFmJG9O{yNYB`QnZpbcX|j$0>-ia
JPH$rC*FWQDu+snl

delta 256
zcmexySgLueRKpfVZoc*l0*u=)2r!ANsQ+W+63fUeF3B&-Ox7(=tSrt<NsUh~$}cV!
z(%}$L;^SfmbEZ$^WK!bM;Sj_S5keK2eqW7AX!>+cCYkBH>JXOnc4jjs_sZ>(o0wvm
zrgLv&l9=ANg-IB~TD^mbXL{5&pz?=Xn8YAr{9BoXw*%G1GEM$9O>BDI4kl4BV<n7n
h1;+RfV`%M!stJWKMB5{GF#$0%5VLHL+{HToIRIeDT0{T<

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index e3418a83f2..578c058333 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -20914,6 +20914,232 @@ cont {
     }
   }
 }
+cont {
+  name: "emergency-lifeguard"
+  element {
+    scale: 14
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "lifeguard-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
+cont {
+  name: "emergency-mountain_rescue"
+  element {
+    scale: 12
+    symbol {
+      name: "hospital-s"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hospital-s"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hospital-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
+}
 cont {
   name: "emergency-phone"
   element {
@@ -45198,9 +45424,8 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45215,9 +45440,8 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45232,9 +45456,8 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45249,9 +45472,8 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -45266,9 +45488,8 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "cross-m"
+      name: "wayside_cross-m"
       priority: 1550
-      min_distance: 8
     }
     caption {
       primary {
@@ -55097,6 +55318,241 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-communications_tower"
+  element {
+    scale: 12
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "power-tower-m"
+      priority: 5400
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
+    }
+  }
+}
+cont {
+  name: "man_made-cross"
+  element {
+    scale: 14
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "cross-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -55264,7 +55720,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55280,7 +55736,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55296,7 +55752,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55312,7 +55768,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55320,6 +55776,92 @@ cont {
       priority: -9150
     }
   }
+  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 {
+  name: "man_made-flare"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
+  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 {
@@ -55525,7 +56067,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55541,7 +56083,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55557,7 +56099,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55573,7 +56115,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55589,7 +56131,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55605,7 +56147,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55621,7 +56163,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55630,6 +56172,85 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-petroleum_well"
+  element {
+    scale: 14
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 120
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9880
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index c74564bfd931fcfdf990173d18ddb006921244d6..5ca7fcbacdcfd0e8962cfab0a162acdf416af2c9 100644
GIT binary patch
delta 156
zcmX^4U*K}1V8a$h@kw^=OkA?LiFxt4i7BbN$@#gtrFogji6xo&dByQ1`Q@oaLi`;3
zO59v*xrxOky15eb_=Pk%1YiP_=lUpcYjOyp@rBU%!f1REB))vR*d#_EX4)<`iFxx{
E0Meu_-~a#s

delta 25
fcmccID0uR}K*JVB@k#B9lNo`SX}jWN=1pq>j$;a9

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 603de1a800..f703d3d5bc 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -32139,6 +32139,96 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-communications_tower"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 43153582884dfd7821bcd52da0df8f8c1629d8a2..75dd50bdae29bf800cae471591f26c8ae9a3bd6e 100644
GIT binary patch
delta 156
zcmbR6PheJqV8a$h=We@pCNA0B#Ju?2#FSLs<ow*+(!9*%#FEVXyyEzh{PNTyA$|^i
zC2lUZ+{EG%-CT)z{6d->0x*HeioOcmnjC^?d?7TxFdAP3i7(&o)XfOQOxvBhna^zo
E05E1Nx&QzG

delta 25
fcmbQ$AUNTlK*JVB=k9jj9!4N$+V0!Ke0DPcicSin

diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 850cdf08a9..40ca123bc5 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -31599,6 +31599,96 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-communications_tower"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 6a907af361..3f93c67fc1 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -303,7 +303,7 @@ highway-secondary-bridge                            # pathtext z10- (also has sh
 highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600
 
-man_made-communications_tower
+man_made-communications_tower                       # icon z14- (also has caption(optional) z15-)
 man_made-lighthouse                                 # icon z14- (also has caption(optional) z14-)
 natural-peak                                        # icon z13- (also has caption(optional) z13-)
 natural-volcano                                     # icon z12- (also has caption(optional) z13-)
@@ -408,7 +408,7 @@ amenity-pub                                         # icon z15- (also has captio
 
 amenity-shelter-basic_hut                           # icon z16- (also has caption(optional) z16-)
 amenity-shelter-lean_to                             # icon z16- (also has caption(optional) z16-)
-emergency-mountain_rescue
+emergency-mountain_rescue                           # icon z16- (also has caption(optional) z16-)
 tourism-wilderness_hut                              # icon z16- (also has caption(optional) z16-)
 === 3900
 
@@ -987,7 +987,7 @@ historic-pillory                                    # icon z16- (also has captio
 historic-tomb                                       # icon z16- (also has caption(optional) z16-)
 historic-wayside_cross                              # icon z16- (also has caption(optional) z16-)
 historic-wayside_shrine                             # icon z16- (also has caption(optional) z17-)
-man_made-cross
+man_made-cross                                      # icon z16- (also has caption(optional) z16-)
 tourism-artwork                                     # icon z15- (also has caption(optional) z15-)
 tourism-artwork-architecture                        # icon z15- (also has caption(optional) z15-)
 tourism-artwork-painting                            # icon z15- (also has caption(optional) z15-)
@@ -995,7 +995,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 
 amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
 amenity-shelter-public_transport                    # icon z17- (also has caption(optional) z17-)
-emergency-lifeguard
+emergency-lifeguard                                 # icon z17- (also has caption(optional) z18-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
@@ -1084,7 +1084,7 @@ 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-flare
+man_made-flare                                      # icon z16- (also has caption(optional) z18-)
 man_made-tower                                      # icon z16- (also has caption(optional) z18-)
 man_made-tower-communication                        # icon z16- (also has caption(optional) z18-)
 === 850
@@ -1238,11 +1238,11 @@ leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
+man_made-petroleum_well                             # icon z17- (also has caption(optional) z18-)
 power-generator                                     # icon z17-
 power-generator-gas                                 # icon z17-
 power-generator-hydro                               # icon z17-
 power-generator-wind                                # icon z15- (also has caption(optional) z18-)
-man_made-petroleum_well
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
@@ -1436,6 +1436,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # waterway-waterfall                                # caption(optional) z14- (also has icon z13-)
 # === -4200
 
+# man_made-communications_tower                     # caption(optional) z15- (also has icon z14-)
 # man_made-lighthouse                               # caption(optional) z14- (also has icon z14-)
 # natural-peak                                      # caption(optional) z13- (also has icon z13-)
 # natural-volcano                                   # caption(optional) z13- (also has icon z12-)
@@ -1538,6 +1539,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter-basic_hut                         # caption(optional) z16- (also has icon z16-)
 # amenity-shelter-lean_to                           # caption(optional) z16- (also has icon z16-)
+# emergency-mountain_rescue                         # caption(optional) z16- (also has icon z16-)
 # tourism-wilderness_hut                            # caption(optional) z16- (also has icon z16-)
 # === -6100
 
@@ -1926,6 +1928,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-tomb                                     # caption(optional) z16- (also has icon z16-)
 # historic-wayside_cross                            # caption(optional) z16- (also has icon z16-)
 # historic-wayside_shrine                           # caption(optional) z17- (also has icon z16-)
+# man_made-cross                                    # caption(optional) z16- (also has icon z16-)
 # tourism-artwork                                   # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-architecture                      # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-painting                          # caption(optional) z15- (also has icon z15-)
@@ -1933,6 +1936,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter                                   # caption(optional) z17- (also has icon z17-)
 # amenity-shelter-public_transport                  # caption(optional) z17- (also has icon z17-)
+# emergency-lifeguard                               # caption(optional) z18- (also has icon z17-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
 # === -8500
@@ -2009,6 +2013,7 @@ 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-flare                                    # 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
@@ -2131,6 +2136,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z15-)
 # landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z15-)
 # landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z15-)
+# man_made-petroleum_well                           # caption(optional) z18- (also has icon z17-)
 # power-generator-wind                              # caption(optional) z18- (also has icon z15-)
 # === -9880
 
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index fecfcb332f..1386c98d93 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -303,7 +303,7 @@ highway-secondary-bridge                            # pathtext z10- (also has sh
 highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600
 
-man_made-communications_tower
+man_made-communications_tower                       # icon z12- (also has caption(optional) z13-)
 man_made-lighthouse                                 # icon z11- (also has caption(optional) z14-)
 natural-peak                                        # icon z10- (also has caption(optional) z11-)
 natural-volcano                                     # icon z10- (also has caption(optional) z13-)
@@ -408,7 +408,7 @@ amenity-pub                                         # icon z15- (also has captio
 
 amenity-shelter-basic_hut                           # icon z12- (also has caption(optional) z13-)
 amenity-shelter-lean_to                             # icon z12- (also has caption(optional) z13-)
-emergency-mountain_rescue
+emergency-mountain_rescue                           # icon z12- (also has caption(optional) z12-)
 tourism-wilderness_hut                              # icon z12- (also has caption(optional) z13-)
 === 3900
 
@@ -987,7 +987,7 @@ historic-pillory                                    # icon z16- (also has captio
 historic-tomb                                       # icon z16- (also has caption(optional) z16-)
 historic-wayside_cross                              # icon z16- (also has caption(optional) z16-)
 historic-wayside_shrine                             # icon z16- (also has caption(optional) z17-)
-man_made-cross
+man_made-cross                                      # icon z14- (also has caption(optional) z16-)
 tourism-artwork                                     # icon z15- (also has caption(optional) z15-)
 tourism-artwork-architecture                        # icon z15- (also has caption(optional) z15-)
 tourism-artwork-painting                            # icon z15- (also has caption(optional) z15-)
@@ -995,7 +995,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 
 amenity-shelter                                     # icon z12- (also has caption(optional) z13-)
 amenity-shelter-public_transport                    # icon z14- (also has caption(optional) z14-)
-emergency-lifeguard
+emergency-lifeguard                                 # icon z14- (also has caption(optional) z18-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
@@ -1084,7 +1084,7 @@ 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- (also has caption(optional) z14-)
-man_made-flare
+man_made-flare                                      # icon z13- (also has caption(optional) z18-)
 man_made-tower                                      # icon z13- (also has caption(optional) z14-)
 man_made-tower-communication                        # icon z13- (also has caption(optional) z14-)
 === 850
@@ -1238,11 +1238,11 @@ leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
+man_made-petroleum_well                             # icon z14- (also has caption(optional) z18-)
 power-generator                                     # icon z17-
 power-generator-gas                                 # icon z17-
 power-generator-hydro                               # icon z17-
 power-generator-wind                                # icon z13- (also has caption(optional) z16-)
-man_made-petroleum_well
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
@@ -1436,6 +1436,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # waterway-waterfall                                # caption(optional) z11- (also has icon z10-)
 # === -4200
 
+# man_made-communications_tower                     # caption(optional) z13- (also has icon z12-)
 # man_made-lighthouse                               # caption(optional) z14- (also has icon z11-)
 # natural-peak                                      # caption(optional) z11- (also has icon z10-)
 # natural-volcano                                   # caption(optional) z13- (also has icon z10-)
@@ -1538,6 +1539,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter-basic_hut                         # caption(optional) z13- (also has icon z12-)
 # amenity-shelter-lean_to                           # caption(optional) z13- (also has icon z12-)
+# emergency-mountain_rescue                         # caption(optional) z12- (also has icon z12-)
 # tourism-wilderness_hut                            # caption(optional) z13- (also has icon z12-)
 # === -6100
 
@@ -1926,6 +1928,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-tomb                                     # caption(optional) z16- (also has icon z16-)
 # historic-wayside_cross                            # caption(optional) z16- (also has icon z16-)
 # historic-wayside_shrine                           # caption(optional) z17- (also has icon z16-)
+# man_made-cross                                    # caption(optional) z16- (also has icon z14-)
 # tourism-artwork                                   # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-architecture                      # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-painting                          # caption(optional) z15- (also has icon z15-)
@@ -1933,6 +1936,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter                                   # caption(optional) z13- (also has icon z12-)
 # amenity-shelter-public_transport                  # caption(optional) z14- (also has icon z14-)
+# emergency-lifeguard                               # caption(optional) z18- (also has icon z14-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
 # === -8500
@@ -2010,6 +2014,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
 # man_made-chimney                                  # caption(optional) z18- (also has icon z16-)
 # man_made-flagpole                                 # caption(optional) z14- (also has icon z12-)
+# man_made-flare                                    # caption(optional) z18- (also has icon z13-)
 # man_made-tower                                    # caption(optional) z14- (also has icon z13-)
 # man_made-tower-communication                      # caption(optional) z14- (also has icon z13-)
 # === -9150
@@ -2133,6 +2138,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z15-)
 # landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z15-)
 # landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z15-)
+# man_made-petroleum_well                           # caption(optional) z18- (also has icon z14-)
 # power-generator-wind                              # caption(optional) z16- (also has icon z13-)
 # === -9880
 
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index c3b200aa62..36bfa648fb 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -429,7 +429,7 @@ railway-station-subway-yokohama                     # icon z13- (also has captio
 barrier-border_control                              # icon z14- (also has caption(optional) z14-)
 historic-city_gate                                  # icon z13- (also has caption(optional) z15-)
 historic-monument                                   # icon z13- (also has caption(optional) z15-)
-man_made-communications_tower
+man_made-communications_tower                       # icon z15- (also has caption(optional) z16-)
 === 1950
 
 place-hamlet                                        # caption z13-
@@ -960,6 +960,7 @@ entrance-main                                       # icon z18- (also has captio
 # barrier-border_control                            # caption(optional) z14- (also has icon z14-)
 # historic-city_gate                                # caption(optional) z15- (also has icon z13-)
 # historic-monument                                 # caption(optional) z15- (also has icon z13-)
+# man_made-communications_tower                     # caption(optional) z16- (also has icon z15-)
 # === -8050
 
 # tourism-viewpoint                                 # caption(optional) z15- (also has icon z14-)
diff --git a/data/types.txt b/data/types.txt
index 53ec847281..fa0f076c4a 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -469,13 +469,13 @@ mapswithme
 *railway|monorail|bridge
 *area:highway|steps
 *amenity|telephone
-mapswithme
-mapswithme
+*man_made|communications_tower
+*man_made|petroleum_well
 *natural|grassland
-mapswithme
-mapswithme
+*emergency|lifeguard
+*emergency|mountain_rescue
 *aerialway|platter
-mapswithme
+*man_made|flare
 mapswithme
 *railway|preserved|tunnel
 *boundary|protected_area|1
@@ -689,7 +689,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-mapswithme
+*man_made|cross
 landuse|orchard
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index f5f13a96ae..896e9b5287 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -388,6 +388,8 @@ world  000000000000000000000  +
         defibrillator  000000000000000000000  -
         emergency_ward_entrance  000000000000000000111  -
         fire_hydrant  000000000000000000000  -
+        lifeguard  000000000000000000000  -
+        mountain_rescue  000000000000000000000  -
         phone  000000000000000000000  -
         {}
     entrance  000000000000000000011  +
@@ -698,11 +700,15 @@ world  000000000000000000000  +
         bridge  000000000000000011111  -
         cairn  000000000000000000000  -
         chimney  000000000000000000000  -
+        communications_tower  000000000000000111111  -
+        cross  000000000000000000000  -
         cutline  000000000000000111111  -
         embankment  000000000000000001111  -
         flagpole  000000000000000000000  -
+        flare  000000000000000000000  -
         lighthouse  000000000000000000000  -
         mast  000000000000000000000  -
+        petroleum_well  000000000000000000000  -
         pier  000000000000011111111  -
         pipeline  000000000000000000000  -
         silo  000000000000000000000  -