From c589aaa3cf6164ae7ebf415e56ea7ea20c811586 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 10 Jul 2025 20:13:07 +0700
Subject: [PATCH] [styles] Regenerate

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/classificator.txt                        |   3 +-
 data/drules_proto.bin                         | Bin 441200 -> 441049 bytes
 data/drules_proto.txt                         | 171 ++++++------------
 data/drules_proto_default_dark.bin            | Bin 421357 -> 421197 bytes
 data/drules_proto_default_dark.txt            | 157 ++++++----------
 data/drules_proto_default_light.bin           | Bin 423877 -> 423726 bytes
 data/drules_proto_default_light.txt           | 171 ++++++------------
 data/drules_proto_outdoors_dark.bin           | Bin 441929 -> 441769 bytes
 data/drules_proto_outdoors_dark.txt           | 157 ++++++----------
 data/drules_proto_outdoors_light.bin          | Bin 444560 -> 444409 bytes
 data/drules_proto_outdoors_light.txt          | 171 ++++++------------
 data/drules_proto_vehicle_dark.bin            | Bin 281771 -> 281622 bytes
 data/drules_proto_vehicle_dark.txt            |  45 -----
 data/drules_proto_vehicle_light.bin           | Bin 281655 -> 281500 bytes
 data/drules_proto_vehicle_light.txt           |  45 -----
 .../include/priorities_1_BG-by-size.prio.txt  |   2 +-
 .../include/priorities_1_BG-by-size.prio.txt  |   2 +-
 data/types.txt                                |   4 +-
 data/visibility.txt                           |   3 +-
 19 files changed, 285 insertions(+), 646 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 4c357b529..5314be138 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -621,7 +621,6 @@ world  +
         cemetery  +
             christian  -
             {}
-        churchyard  -
         commercial  -
         construction  -
         education  -
@@ -650,6 +649,7 @@ world  +
         quarry  -
         railway  -
         recreation_ground  -
+        religious  -
         reservoir  -
         residential  -
         retail  -
@@ -891,7 +891,6 @@ world  +
             wind  -
             {}
         pole  -
-        station  -
         substation  -
         tower  -
         {}
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 549e36471789023b3791544afb545f7cdd4eae77..cec8cadb8d300d8958da8f30287268f4296c8e4c 100644
GIT binary patch
delta 163
zcmezHP3q=XsfHHDElfWWwoguE>QWay%*Z8}lbDxMTAZp|l$w*7o|#`-Jb8b=IHSm9
z#&!`VA(6=!d%@I&P7ysJ5e`8q0gi|FU$aXr`1BtF7=fZf*hD99=n)YEN{V1gw##%f
YZI|g}_AzeP+RF^YEZepAvby~P00=8bM*si-

delta 311
zcmcclRqDexsfHHDElfWW6lO4T3FRc_rIZ$@>LzED7A0p?CKja#iE!{s32<DyczycB
z9n8Y<x2|4imw5EyKLjuWr3Hb~n4&^hMTN17iXcR{zfWMAtlsX?$+X?0liAx?b3Y>&
zZ$W-}YLRYnNn%N6ex8sPhoBM<7du2SSK=9?mIN0!2lw=YyO~ABwK#<ENebhW6u~7a
S(mrVqGZ3?EpR|Y7{T~2!DtE5{

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 552c9b042..21c9ed0cd 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -48792,51 +48792,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 16115926
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -51966,6 +51921,65 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -76804,73 +76818,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 32a4163ef40059db0cae69d83e42ef78b204ffa4..5f686ab45c9f0bd67bb3742fe51483b7787822ef 100644
GIT binary patch
delta 202
zcmaERTk`BJ$%YojEldy1x5rvAEmNzX&B!H~lbDxMTAZp|l$w*7o|#`-EX2>jE5$9b
z;M0EyU<3;Ap$qV%3kaYK2%-xJp$iDhp^J#12(&ZBGi_&zXMQH!zN(lRh*`F;DrR;5
F1pwVUVnzS}

delta 346
zcmX?mOY-e)$%YojEldy1>#MkgauV}WN{dr<lQT+-k~1n3i&BL6IrycxB_4hF4*`ro
z0ReOYL39BjbOB*>0TC1dt_Uun?N7{^7OS<Z#xreKjc0x;T)&@@i?<-ZJhe!-xFoS8
zGe1vAi$hR}hl?E|m@Dy&QA>i0n}b`RXXYjr4Mqz_iEEqT&eY-%B0;S%rdmCm28&=S
U=HPDsTEq;*EZe^pu}1s?0F|_k$p8QV

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index b25a6baee..0d730e5ef 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -45619,45 +45619,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -48779,6 +48740,57 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -71549,73 +71561,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 3d369f0aabc6513c4a994b651a89d41364cf233c..9d79ce371731616d41b6f8c23a7f595c8857a4ac 100644
GIT binary patch
delta 137
zcmX^5UUJ<#$%YojEli!}+f^)>y3|DvGja*$B<7`*7N_bKrRHR&XXcj{PY!GqpT24y
z6Zhob6S<g#L?#<f5Sh&3#xr?lCpV+WWX2W|kl@8G5f&j44&liYJB39>I7FlbI3C`A
k%`UOv(|-tHY+oDCw0&(n^E>JG*cxUaX4xKF!<z9M0GahP)&Kwi

delta 294
zcmZ4YPV(q`$%YojEli!}3NskFgmMz|Qc8<cb(1qni;^=c6N^%WL^$}R1URl;yguEr
zlv&v5*469m5|2LohX6*Pv>;F#Q&b2pI{p0xCQ(!^B5=tM+Z)W8CabsKjAz<@GoJaa
zwB~+BF5ZIt^3)>T;*!LY%=|ndEe=5?9xir>V6Mb7MlA_0ZVvA08>^W`B!IF)cx8q0
V%8Fo<Z3mhR#4Ou4R<qXr1^_GdYaIXp

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index a6d8e5ad4..37483c290 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -45513,51 +45513,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 16115926
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -48687,6 +48642,65 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -71534,73 +71548,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 826b054e170bd688e0af35eee0a8b72dc1a1be6d..beb2ecc2a876f347e2eb2282735e28b5c5107292 100644
GIT binary patch
delta 206
zcmX^4M{4D7sfHHDElerl+aH88acR`gX5<pgNz6+rEl$-fO3lek&&)3^7UJjNmEx9I
z@aaDUFaibm&;|I>1q9Fq1knYA&;^9$&_zU01lnKLGi`ra&#YqHett7E5VHU=>-O`T
H*{ZkzT!m%c

delta 369
zcmZ4aTk7N=sfHHDElerl^;KL#If;2GrNybb$r+_Z$r+W2MJYo39Q;z;5|2LohX6*P
zfB?FHAi97Mx_~gcfC!2JR|J>P_VjQjc8zwP2Bz&i4a~~M_4^sQcnk8&Q;T$qOA<>m
z^YetXI0Th=xY!|rxf0J9wIsN>Ik*LSW^Q89V6<SAxV9PYOf3!}64VM~s&&L^un4AN
WtZLhJH!}k<3lOtz*WJuk!vz2c43^~p

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index a271cc71e..e2ad8f5de 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -48299,45 +48299,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -51551,6 +51512,57 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -76934,73 +76946,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 8f71318e1559dade61a911f92af9784d117ca1bf..272c35ef60fe2b29ae187255c47dfa66ea91bd4c 100644
GIT binary patch
delta 126
zcmbO*QTk`UbVCc{7ABtX?aRZNK52*?X5<pgNz6+rEl$-fO3lek&&)5K9MCN>J?a1x
z_vDq6xfw+!7qp8^pW(yI1L97;6$ld+XcL*9QNYAA`Be`WlaR<{hklXv84XO^XEZRI
VShx4>VFqFrAZFd(w}*|12LQZpF9`qu

delta 375
zcmey_FFj$RbVCc{7ABr>g&B-oLOF?fDW%1!y2%-(MadbJiA5<wA{_iu0vy*aUY~w&
z2eWYet*h7BB_4hF4*`roX+fYgrl=5BQDLm2A_&p#%;8MGHQJ9fFl|55z-(+?zn_td
zw;;bfwMe(PB(WqjKTk-DLr{r_iyb1EEAfm`OM;7=gInN8$3!L#MhixXYn$P&)8Y^!
iL9H;RT1T7)i(o3os<!>>Ze}260b<teUw5;y@BjdO37h2r

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 6b9ae9c2b..06156e711 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -48193,51 +48193,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 16115926
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -51459,6 +51414,65 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -76919,73 +76933,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index ff0724db151755e7d75f765f278ed30058cf4c7e..6c3e3e7dede05255672c44a249c2d1f473962216 100644
GIT binary patch
delta 25
fcmZ2IQ*hc0!G<l20>SM|gBgLCY5US(X11RIg1HIb

delta 137
zcmbO>LvZy>!G<l20>S2!7`cRU67y0@i&J%zGfIn+Gb$5{QiOy#_@($cTDwFfZhZI;
v0gOOF0hr+QgM3UP+9+~DFgaum!Z5*U{7fQDH$Jqp2QvaO({}b?X8xZ5&pkH;

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index fc7ac6484..2cb01f3e7 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -27260,51 +27260,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-}
 cont {
   name: "landuse-construction"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index d44f0c902fd5ce9241ca0b3595c56584e10ebd02..26066f2325bffa2382eef11fffbd8fb051356106 100644
GIT binary patch
delta 29
icmdl!LvYS?!G<l2lfByYycvO*35c1u>v^+qG6Ddh;t2Zy

delta 113
zcmbO;U2yvh!G<l2lf4vXFmegyB<7`*7N_baXOtEtXH+H@r3i^|@Jk7BTsqu8JyC{9
zc>4JTjI7gzWtjw-K|&9`7=@=R@G`MZFP4T1HA*lEvjgSWC2o9Z@A6^<VkRJF-rnWK
HBE$#)w0I_~

diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 5e70f3a75..6d40adc15 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -26720,51 +26720,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-}
 cont {
   name: "landuse-construction"
   element {
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index 578822bcc..f4e991a9d 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -27,7 +27,7 @@ amenity-place_of_worship-jewish                     # area z13- (also has icon z
 amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious
+landuse-religious                                   # area z13-
 === 240
 
 amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
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 e8604dbb5..cca075827 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
@@ -27,7 +27,7 @@ amenity-place_of_worship-jewish                     # area z13- (also has icon z
 amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious
+landuse-religious                                   # area z13-
 === 240
 
 amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
diff --git a/data/types.txt b/data/types.txt
index d537dc37f..3f51ad324 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -216,7 +216,7 @@ mapswithme
 *sport|table_tennis
 *sport|beachvolleyball
 *sport|volleyball
-*power|station
+mapswithme
 *sport|swimming
 *leisure|track
 *sport|skateboard
@@ -1327,7 +1327,7 @@ tourism|attraction
 *amenity|parking_space|underground
 *amenity|parking_space|private
 *amenity|parking_space|permissive
-*landuse|churchyard
+*landuse|religious
 *isoline|step_1000
 *isoline|step_500
 *isoline|step_100
diff --git a/data/visibility.txt b/data/visibility.txt
index 86f0303fc..c22e0f5ec 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -621,7 +621,6 @@ world  000000000000000000000  +
         cemetery  000000000000001111111  +
             christian  000000000000001111111  -
             {}
-        churchyard  000000000000000111111  -
         commercial  000000000000000000000  -
         construction  000000000000000111111  -
         education  000000000000000000000  -
@@ -650,6 +649,7 @@ world  000000000000000000000  +
         quarry  000000000000000111111  -
         railway  000000000000000111111  -
         recreation_ground  000000000000111111111  -
+        religious  000000000000000000000  -
         reservoir  000000000011111111111  -
         residential  000000000000000000000  -
         retail  000000000000000000000  -
@@ -891,7 +891,6 @@ world  000000000000000000000  +
             wind  000000000000000111111  -
             {}
         pole  000000000000000000000  -
-        station  000000000000000000000  -
         substation  000000000000000111111  -
         tower  000000000000000000000  -
         {}