From 17e1096220e25dace1f4c3ac8775f3707c830f0a Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Wed, 20 Oct 2021 22:46:21 +0100
Subject: [PATCH] [styles] Regenerated styles.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/classificator.txt      |   4 +
 data/colors.txt             |   1 +
 data/drules_proto.bin       | Bin 213993 -> 215033 bytes
 data/drules_proto.txt       | 389 +++++++++++++++++++++++++++++++++++-
 data/drules_proto_clear.bin | Bin 214790 -> 215830 bytes
 data/drules_proto_clear.txt | 389 +++++++++++++++++++++++++++++++++++-
 data/drules_proto_dark.bin  | Bin 213330 -> 214370 bytes
 data/drules_proto_dark.txt  | 389 +++++++++++++++++++++++++++++++++++-
 data/types.txt              |   8 +-
 data/visibility.txt         |   4 +
 10 files changed, 1147 insertions(+), 37 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 91de903ab3..f8987b6a8e 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -569,6 +569,8 @@ world  +
         pipeline  +
             overground  -
             {}
+        silo  -
+        storage_tank  -
         surveillance  -
         tower  -
         wastewater_plant  -
@@ -584,6 +586,7 @@ world  +
     military  +
         bunker  -
         {}
+    mountain_pass  -
     natural  +
         bare_rock  -
         bay  -
@@ -603,6 +606,7 @@ world  +
         land  -
         peak  -
         rock  -
+        saddle  -
         scrub  -
         spring  -
         strait  -
diff --git a/data/colors.txt b/data/colors.txt
index 6c11e2d2f7..5973c99bf9 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -245,6 +245,7 @@
 15094016
 15214341
 15263452
+15590876
 15591638
 15592411
 15592899
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a7748eea1d33901a60685c867bc768639fc172a4..87a288a3a2eb45b25590b15fe61bd6ac09f1a5c1 100644
GIT binary patch
delta 863
zcmaFa&ik{Uw_yvT>-PF?MlRmm#Ju?2#FSLs;>?_UAyEziB|$Ep;*$KL#Pn3%lEl1h
ziH2IBupl;JRSqF6!diS>oE+Q&M>-}lX)sF6C>2uW5XP#k9#tLJWJWGggmWNHhzB`=
zM$W?JE>vf2ciGPPmQi&g6ELjuOY=$+GxOpL5{rw4G&%T`gb{+eK*8zv_c2NcYjW`8
zk`TZpA&5&t2$zH~HVN?nuJue@f_aH0rA3K3x=D#esqsbm$=O0896VA29CuD{XO}qD
z{2u}sfug)vMAbO>5Ter)_A*KcJSr7Z<KV|CDu7i~5UZ#VR#9OzQKm<w+vo3Ov=LOB
e#Kgr1^Gk7JN=i=Z;0*QlTc;Se-#W#_UkL!h#unuO

delta 55
zcmV-70LcIOj}7UE4S=)(MYp$UxB=_|5N!$(ZeetFa$#&OVqtP+Uzc~y0bjS9ya78A
NhwIJ(x9iRV4tbL!7mok{

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 125c7cbece..a34fd3e67e 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -37473,6 +37473,100 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-silo"
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "man_made-storage_tank"
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -37634,40 +37728,214 @@ cont {
   }
 }
 cont {
-  name: "natural-bare_rock"
+  name: "mountain_pass"
+  element {
+    scale: 14
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "natural-bare_rock"
+  element {
+    scale: 12
+    area {
+      color: 15590876
+      priority: -15926
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15590876
+      priority: -15926
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
     }
   }
 }
@@ -39244,6 +39512,105 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-saddle"
+  element {
+    scale: 14
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "natural-scrub"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 9c779ead4da3db6d8a0cd5e93efb62a8aed0d8d5..2c409a73039a3236ddb3410c73bc692721a3d459 100644
GIT binary patch
delta 807
zcmZqc<DE8*w_yw8%Pqm(j9k3AiFxt4i7BbN#hE$zLZTc3N`hQG#U=SgiRr1jC5d_2
z5)HLLVL@!dsvJV-!qX3KV-yw<QsofFCL<C(nUPBrVI{<xc#t(Tw|e`_EsSp%RVOk5
z{hVK#SCW{S7hjNATr8x?!KWmQ5Yz<<PXB1lEFrAP!H-Kq0GEUyE(sxA62jOd!~?k2
zGjR##C6<&HCFbZRB^IT|7v(2s3yE;>NC|M<IlY}-;#Bj02w((?@?sHH<KRPxPA}NO
zC?W8uR7j13AFHSUR#8E$qC!|jh0#Qr9+hr)-p*(vs5Xg-ix1|P;>47coYcV?>g{zW
M7`NA*VCtv?0Ax7_Q~&?~

delta 55
zcmV-70LcHAmJNoE4S=)(>9n^EwgKz`5N!$(ZeetFa$#&OVqtP+UzZ!p0bjR2x&b>8
NhmXtww~x#Mhkj_w79aos

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 8735cda4a9..69bd5f033b 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -37257,6 +37257,100 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-silo"
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "man_made-storage_tank"
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -37418,40 +37512,214 @@ cont {
   }
 }
 cont {
-  name: "natural-bare_rock"
+  name: "mountain_pass"
+  element {
+    scale: 14
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "natural-bare_rock"
+  element {
+    scale: 12
+    area {
+      color: 15590876
+      priority: -15926
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15590876
+      priority: -15926
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
     }
   }
 }
@@ -39028,6 +39296,105 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-saddle"
+  element {
+    scale: 14
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "natural-scrub"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index a9cb1139ac2c77b924d5153664f88646799d03ce..02745a11af6bd6d3a42ee6e545fb7cc99665d043 100644
GIT binary patch
delta 811
zcmccA#QUg=w_yw8r!B$Vj9k3AiFxt4i7BbN#hE$zLZTc3N`hQG#U=SgiRr1jC5d_2
z5)HLLVL@!dsvJV-!jly<MTAv3gfYY$Gex2&GjfR{?1R`553+-{_HO^Qh4Bre>O>}>
zZ}Us@N)j{k;tLXsi-j~f_>_bZg1SJ#=@XAJii-ec_;Jbz;FJ->DI<haMi{G10M~jZ
zF2TISlG38Y9NnbEqSW}J{N!vQ5e^<H0ggMTx3f!}YW@!aj6hLdETU>0d<fC$`nwq=
z1Rj+Nsd4aQ6&1iLDu`872&<?tnkdtw((OLm8QTQZCNXjG!TeI3n39r{I*5b5{o--P
L?H7+THC6%uIh_X3

delta 55
zcmV-70LcI1iVf0&4S=)(^0c=WwgKz`5N!$(ZeetFa$#&OVqtP+Uzcvm0bjRBx&eg{
NhvLftx8lnJfO(aS7w!N6

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 38275e0935..c99eb149ad 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -37374,6 +37374,100 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-silo"
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "man_made-storage_tank"
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "storage-tank"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -37535,40 +37629,214 @@ cont {
   }
 }
 cont {
-  name: "natural-bare_rock"
+  name: "mountain_pass"
+  element {
+    scale: 14
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
-      priority: 16000
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "natural-bare_rock"
+  element {
+    scale: 12
+    area {
+      color: 15590876
+      priority: -15926
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15590876
+      priority: -15926
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15590876
+      priority: -15926
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15074
     }
   }
 }
@@ -39125,6 +39393,105 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-saddle"
+  element {
+    scale: 14
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mountain-pass"
+      priority: 16455
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "natural-scrub"
   element {
diff --git a/data/types.txt b/data/types.txt
index d8eb1c90bd..ab5867b15e 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -298,13 +298,13 @@ mapswithme
 *railway|abandoned|bridge
 *man_made|lighthouse
 *highway|path|demanding_mountain_hiking
-mapswithme
-mapswithme
+*man_made|storage_tank
+*man_made|silo
 *power|generator
 *highway|pedestrian|bridge
 *man_made|pipeline|overground
-mapswithme
-mapswithme
+*natural|saddle
+*mountain_pass
 *highway|raceway
 *highway|primary|tunnel
 *highway|primary_link|bridge
diff --git a/data/visibility.txt b/data/visibility.txt
index fb58f6cc03..64b194da59 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -569,6 +569,8 @@ world  00000000000000000000  +
         pipeline  00000000000000000000  +
             overground  00000000000000000000  -
             {}
+        silo  00000000000000000000  -
+        storage_tank  00000000000000000000  -
         surveillance  00000000000000000000  -
         tower  00000000000000000000  -
         wastewater_plant  00000000000000000000  -
@@ -584,6 +586,7 @@ world  00000000000000000000  +
     military  00000000000000000000  +
         bunker  00000000000000000000  -
         {}
+    mountain_pass  00000000000000000000  -
     natural  00000000000000000000  +
         bare_rock  00000000000000000000  -
         bay  00000000000000111111  -
@@ -603,6 +606,7 @@ world  00000000000000000000  +
         land  11111111111111111111  -
         peak  00000000000000000000  -
         rock  00000000000000000000  -
+        saddle  00000000000000000000  -
         scrub  00000000000000111111  -
         spring  00000000000000000000  -
         strait  00000000000001111111  -