From a65625334864e711b49fdd5b66cb31a60da05d1e Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 31 Mar 2024 22:19:21 +0300
Subject: [PATCH] [styles] Regenerate for scree, shingle, bare_rock

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/classificator.txt                        |   2 +
 data/colors.txt                               |   4 +-
 data/drules_proto.bin                         | Bin 427306 -> 427806 bytes
 data/drules_proto.txt                         | 171 +++++++++++++++-
 data/drules_proto_clear.bin                   | Bin 414507 -> 415007 bytes
 data/drules_proto_clear.txt                   | 171 +++++++++++++++-
 data/drules_proto_dark.bin                    | Bin 413106 -> 413604 bytes
 data/drules_proto_dark.txt                    | 153 ++++++++++++++
 data/drules_proto_outdoors_clear.bin          | Bin 432507 -> 433007 bytes
 data/drules_proto_outdoors_clear.txt          | 187 ++++++++++++++++--
 data/drules_proto_outdoors_dark.bin           | Bin 430987 -> 431485 bytes
 data/drules_proto_outdoors_dark.txt           | 153 ++++++++++++++
 data/drules_proto_vehicle_clear.bin           | Bin 279007 -> 279007 bytes
 data/drules_proto_vehicle_clear.txt           |  18 +-
 .../include/priorities_1_BG-by-size.prio.txt  |   6 +-
 .../include/priorities_1_BG-by-size.prio.txt  |   6 +-
 data/types.txt                                |   4 +-
 data/visibility.txt                           |   2 +
 18 files changed, 824 insertions(+), 53 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index f35facf8a7..f38402066e 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -755,7 +755,9 @@ world  +
         peak  -
         rock  -
         saddle  -
+        scree  -
         scrub  -
+        shingle  -
         spring  -
         strait  -
         tree_row  -
diff --git a/data/colors.txt b/data/colors.txt
index 0f81ce0dc7..552a00367d 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -59,6 +59,7 @@
 2236962
 2301728
 2302755
+2367520
 2374579
 2399474
 2496790
@@ -232,6 +233,7 @@
 13224123
 13229526
 13407549
+13420474
 13484259
 13538264
 13615592
@@ -241,6 +243,7 @@
 13942770
 13947850
 14209512
+14275263
 14802147
 14934482
 14951168
@@ -256,7 +259,6 @@
 15214341
 15260347
 15263452
-15590876
 15591638
 15592411
 15592899
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 46c39bc38a26031eb49ca64e03374854508e4c2f..f4666ea5e6f05cca4886ca9c51e7df19f1a12309 100644
GIT binary patch
delta 666
zcmZ40B{i>4s-cB(3)6<v2K$#jXOn37_#Xlog+w@br35(8MO8TXprX?soMuvD0m*|{
zavTCk;&L2<$h_$VXP8)!lnNtDa)==Dq_^Kc!^AA>{+f}CH!rcIv?wu0w>Y^dH5KR_
zZlJnd{hQGo$%9oC<aD6g>5V~5!u6P%__1mN`2bTb$S0VhLRdvX9>Y*OeSItwt3H}A
zS0fXO4@;APKI8&wU$J^Wo5ZG%(+lP@iHL7Pjt-DdA+pm2OPNHci@su7YJ8oMiyt0P
i8JT(MIiR2#B7wpN36%B?ub6<C8Hic7Z+OL8H46YUf-@@s

delta 195
zcmbQ&C$*|es-cB(3)6<v26s+xXP0RB_#Xlog+w@br35(8MO8TXprX?soMuvD0m*|{
zavTCk;&L2<$h_$VXP8)!lnNtDa)==Dq_^Kc!^A8rc$JZhH!rcIv?wu0w>Y_|G-*2T
XYo_Dv>)tQ{F*6XeY+v_=wO|$i4;NM<

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index d61df1f584..1f42c2cde8 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -57220,21 +57220,21 @@ cont {
   element {
     scale: 12
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
   }
   element {
     scale: 13
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
   }
   element {
     scale: 14
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57249,7 +57249,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57264,7 +57264,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57279,7 +57279,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57294,7 +57294,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57309,7 +57309,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57324,7 +57324,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -59757,8 +59757,95 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-scree"
+  element {
+    scale: 11
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-scrub"
+  element {
+    scale: 10
+    area {
+      color: 13620648
+      priority: -1870
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 13620648
+      priority: -1870
+    }
+  }
   element {
     scale: 12
     area {
@@ -59823,6 +59910,72 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-shingle"
+  element {
+    scale: 12
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-spring"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d6921240ca667d4b1af6caf17b12cdb63093729d..99f7538ca0ffde21bd90945db944c0ee02a478ba 100644
GIT binary patch
delta 626
zcmZ3zOmhAz$%YojEldI{nD;MzKK)=aldu$!!6wo0@jnDG3aN1LNeOU(M5jBfU{Yd%
zvE(=eki_LU1d(~uFRWl<K~gG=EXg5)#FO4`zmn;)q~U8uF5bMvlG38Y9NpsNqSRC&
z5e{ykx?TO7QJf>f!2=NmyH+1l8su6`QGTeV!cZpRdQ54M<1s~ru!@5Gf~gkdCp1y6
zMkW+Ll_mlG#06Bxv10XpHi=Cir%$Y95)t2o2y2MvAhOd1i<m^GyB=m*Dtn!giys~~
m8JT(MIiS#?I2_{8+zT|5n&Hs?;4l*qGXpWp_6LVqz54<DnH35E

delta 188
zcmbQgN^<ow$%YojEldI{4DOuX&MwjL@jnDG3W;#=N(peFi>h$&K}DxKtYA`N0m*|{
zavTCk;&L2<$h_$nRxq(3DHTSR<PbsPNpH7b$#hwA`i)&oJgmjZMWsp8ZI3V=Z@+hx
Q35c12m}UFDqpXho0NnaclmGw#

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 7b3146f436..b97009e19e 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -54499,21 +54499,21 @@ cont {
   element {
     scale: 12
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
   }
   element {
     scale: 13
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
   }
   element {
     scale: 14
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -54528,7 +54528,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -54543,7 +54543,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -54558,7 +54558,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -54573,7 +54573,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -54588,7 +54588,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -54603,7 +54603,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -56765,8 +56765,95 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-scree"
+  element {
+    scale: 11
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-scrub"
+  element {
+    scale: 10
+    area {
+      color: 13620648
+      priority: -1870
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 13620648
+      priority: -1870
+    }
+  }
   element {
     scale: 12
     area {
@@ -56831,6 +56918,72 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-shingle"
+  element {
+    scale: 12
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-spring"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 1bfd6522ab6a5202012c5b8d75e852b84b82de94..c15726398b2d4d07ba3510bb4e1b2bf96b40c802 100644
GIT binary patch
delta 520
zcmdlqTXM;K$%YojElj%)*S}`u;>}AeDJ@FO(Jf9cN=+3K;oz1M;8<{A0;5F3$Nvz(
z2o&YPD$0vhln<*YKc;9s&|m>fVW6lWR#73WqQY23MKDFVzM*=zlr>36n1gHjg~LoD
zjND*q`uW35yX&tra`D51B_lI0JqHvpGzkK1ArSZ<6ynqjg7$_ZOhC*G#4Otzj<6ba
F0sywx@+<%V

delta 71
zcmZ27UvkrI$%YojElj%)%bsE6;>}AeDJ@FO(Jf9cDoqj+=HQXy=V(}ABe7|^V=$A*
Zbe5w`^V(~UF#$0%5VLHrImW8d2>_(68Y}<+

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 56d9e146e6..92bba4511c 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -56991,8 +56991,95 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-scree"
+  element {
+    scale: 11
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-scrub"
+  element {
+    scale: 10
+    area {
+      color: 988160
+      priority: -1870
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 988160
+      priority: -1870
+    }
+  }
   element {
     scale: 12
     area {
@@ -57057,6 +57144,72 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-shingle"
+  element {
+    scale: 12
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-spring"
   element {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 2720de6c61433a30da3cc1f21928ea02c17087d8..b287f3a2bbd2579220ea17b9152c79bca9d93a55 100644
GIT binary patch
delta 730
zcmeypN$UMJsfHHDEldgLrS>m<&L+|D@jnDG3TbihN(pd)M5h~EWKu!!8ZR)3a`2(Z
z!Fgageq_1n1{auESir`BB?XWrIp92?oFqgQ*fK$wDzF|Q7!NE5=Yi#fk>oUx>=8i{
zSK)y1wlBTNG*i~_H6s^qUSdgUQDTm6adJ^=s*nf=H&DZ_{>><1Ai}`|5uIMx#w4td
zDGl;CrYI-?fTGhCE0~1qF{MGC!xRO13sV&2Jxo!MchE$+8ktc1RGI|z6PJ{L8pn#&
z``IKmAtDyyRW#A*{_mNN%U);X;)jPzMrK}m4k%<O4ud!}w*t+iW*D^dd|(1%W*}zS
K&hvpae<c9(6FP1H

delta 304
zcmaFAP3re1sfHHDEldgLrS6>G&MwjL@jnDG3TbihN(pd)M5h~EWKu!!8ZR)3a`2(Z
z!Fgageq_1n1{auESir`BB?XWrIp92?oFqgQ*fK$wDzF|Q7!NE5=Yi#fk>oUx>=8i{
zSK)y1wlBTNG*edeDkB$fUSdgUQDTm6adJ^<l8^`o&veHROrq1zPGRDl-u;1TX*<^^
RCLm@8VwUY(pIB2@0su8waJK*e

diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 14fb5c4dbc..8b2eb200e7 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -57862,14 +57862,14 @@ cont {
   element {
     scale: 12
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
   }
   element {
     scale: 13
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57885,7 +57885,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -57893,7 +57893,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57909,7 +57909,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -57917,7 +57917,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57933,7 +57933,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -57941,7 +57941,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57957,7 +57957,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -57965,7 +57965,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -57981,7 +57981,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -57989,7 +57989,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -58005,7 +58005,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -58013,7 +58013,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -58029,7 +58029,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -58037,7 +58037,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     caption {
@@ -58053,7 +58053,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 15590876
+      color: 14275263
       priority: -1920
     }
     apply_if: "!name"
@@ -60528,8 +60528,95 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-scree"
+  element {
+    scale: 11
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-scrub"
+  element {
+    scale: 10
+    area {
+      color: 13620648
+      priority: -1870
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 13620648
+      priority: -1870
+    }
+  }
   element {
     scale: 12
     area {
@@ -60594,6 +60681,72 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-shingle"
+  element {
+    scale: 12
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13420474
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-spring"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 3019573411575eaf3c5a34d82f7f1c6e0e3ddc46..e2bbb49a416692442f19257a7897d13fdc36d5ef 100644
GIT binary patch
delta 550
zcmeBPF7<bnR6`5n7N*DV>t8c+@#ZC#loloC=oTjzrKSpraBxcra4a}5fl;F2<9`TX
z1d8%t73IY$%7;~yA5*j*Xs`gLFi=zwtEdoGQDLm2BAB9F-%!0<s+=Sw%)uqa&(W~L
zMq(4fyTZUgfC)~YxQa=bantmP;Y=daMLsaitG~|3#Sag(jLf|B98j>)B!IAmPvC!0
Yd{8rh+E;vF0%B$$X4$^t1MA~O0CJoG+yDRo

delta 47
zcmeynN~(LgR6`5n7N*DVr>}U%#KT&gTvVDgo#!LdzV;=bn1GlWh*`ET`NVp25da>h
B7jpmr

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index ccd9020a5f..8232045949 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -60754,8 +60754,95 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-scree"
+  element {
+    scale: 11
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-scrub"
+  element {
+    scale: 10
+    area {
+      color: 988160
+      priority: -1870
+    }
+  }
+  element {
+    scale: 11
+    area {
+      color: 988160
+      priority: -1870
+    }
+  }
   element {
     scale: 12
     area {
@@ -60820,6 +60907,72 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-shingle"
+  element {
+    scale: 12
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 2367520
+      priority: -1920
+    }
+  }
+}
 cont {
   name: "natural-spring"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index fb660787a03206dd5af57d934d6e1ca831b4cd7d..6bfffe9bdfbdd3d4cda8fcef5e8c8af3d1de46c8 100644
GIT binary patch
delta 194
zcmccLEO@_Juwe`1p(*wImp*5c`1avH1TYGTaPUeAaA1n^VHM@aDk^|gR1lk}9ET7#
eVGd!4==8#DMqw6^Yud}EG6FHv_OhwWnQH*Rzhp)L

delta 207
zcmccLEO@_Juwe`1p(*uuPH$(I`1avH1TYGTaPUeAaA1n^VHM@aDk^|gR1ll!^!Q*#
dRs&4ygs~~+5P^!emrZ2^Vy5k7Q<*c@008TKZT0{F

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index d5f5cc6f90..1fe7a13c95 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -32154,63 +32154,63 @@ cont {
   element {
     scale: 12
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 13
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 14
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 15
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 16
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 17
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 18
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 19
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
   element {
     scale: 20
     area {
-      color: 15590876
+      color: 14275263
       priority: -1930
     }
   }
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index 0a907ccdbb..fac25c830e 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -67,7 +67,7 @@ leisure-golf_course                                 # area z12- (also has icon z
 === 140
 
 landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z12-
+natural-scrub                                       # area z10-
 === 130
 
 landuse-grass                                       # area z12-
@@ -116,8 +116,8 @@ landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z12- (also has caption z14-)
-natural-shingle
-natural-scree
+natural-scree                                       # area z11-
+natural-shingle                                     # area z12-
 === 80
 
 leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 474d6fc84a..029f9c6b0d 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -67,7 +67,7 @@ leisure-golf_course                                 # area z12- (also has icon z
 === 140
 
 landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z12-
+natural-scrub                                       # area z10-
 === 130
 
 landuse-grass                                       # area z12-
@@ -116,8 +116,8 @@ landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z12- (also has caption z13-)
-natural-shingle
-natural-scree
+natural-scree                                       # area z11-
+natural-shingle                                     # area z12-
 === 80
 
 leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
diff --git a/data/types.txt b/data/types.txt
index b206339d10..cdf8686797 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -436,8 +436,8 @@ mapswithme
 *sport|australian_football
 *leisure|bowling_alley
 *healthcare|speech_therapist
-mapswithme
-mapswithme
+*natural|scree
+*natural|shingle
 *aerialway|t-bar
 *amenity|parking|lane|fee
 *amenity|parking|street_side|fee
diff --git a/data/visibility.txt b/data/visibility.txt
index 39d9b80148..07a9794fa1 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -755,7 +755,9 @@ world  000000000000000000000  +
         peak  000000000000000000000  -
         rock  000000000000000000000  -
         saddle  000000000000000000000  -
+        scree  000000000000000000000  -
         scrub  000000000000001111111  -
+        shingle  000000000000000000000  -
         spring  000000000000000000000  -
         strait  000000000000000000000  -
         tree_row  000000000000000000000  -