From b4ff239fc7ef7eb23b36054f4c9f38e0c7051fd8 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Mon, 11 Sep 2023 15:54:00 +0300
Subject: [PATCH] [styles] Regenerate for housenumbers

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin               | Bin 344114 -> 343975 bytes
 data/drules_proto.txt               |  72 +++---------
 data/drules_proto_clear.bin         | Bin 345087 -> 344948 bytes
 data/drules_proto_clear.txt         |  72 +++---------
 data/drules_proto_dark.bin          | Bin 343384 -> 343245 bytes
 data/drules_proto_dark.txt          |  72 +++---------
 data/drules_proto_vehicle_clear.bin | Bin 245359 -> 245683 bytes
 data/drules_proto_vehicle_clear.txt | 164 ++++++++++++++++++++++++++--
 data/drules_proto_vehicle_dark.bin  | Bin 244746 -> 245070 bytes
 data/drules_proto_vehicle_dark.txt  | 164 ++++++++++++++++++++++++++--
 data/visibility.txt                 |   8 +-
 11 files changed, 360 insertions(+), 192 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 3e11fc5d558f953d15b66d1b139bda8f548b77e9..0cb92e705e27cbd03ff95ec1ffec2ed9bdbf693b 100644
GIT binary patch
delta 420
zcmdngAiDg&$Ob(hM&HQ>KH|)#9Kw^me559KHA!vW<5QO*wTzKVAgMGnCnYm4T{kf$
zr6{$ySV);eKudmd;Z{+BzD@rjfDtGt2oVfM5fsvr=VIsJ61aD2DzgwL2M3s;!6<>E
zNSKhK%?Gzm5a9LU;z-RaDN4*sP8D*P9Cu8{T$zg-X!fl`t;`yX7K~u?K^zN4i4PlL
zF5~j$;)Q9`O|8f*5we;5_n3qQQF?nBku>KfX66amPEI&38HQW)nawbZg={&5l|;Ds
kLE7TsE-03`!>ENrd-I*+?RSnd0x=U1GjG3hoF%LR0LlQNZ~y=R

delta 608
zcmZ4fUu08*=mtF>rf$Z``aa^RRvbb~;#^#*c_l@OdC94|#S$Mj{)YfYEm<xB4laRP
zhgz8x7>$^VQqwFLk)(ypIfQZRmEz(B>OImikx7AZbFNQcMo1eYmq1c!W==|GUb=2#
zN=i{`aj}pzhk%wi7dr=sz`avbnT0r^3=Kw!6O2GfL41-zTH=%Aw~BIrRSH8mj3+iP
z+B!jiH=c_F<|m=x$@a%&>di1cBP0&>o(7i@7sy3cX*r1{#VEeyn!(7$3o}YLwIZ`b
z$P5@}!dz@1Hu2$A|DRFF9~fX*HInPLS;%h7P0Y*##)*)U2p2zy9S?VPvBVulMXa%T
lW-~0Zg#sok9+%W2-X+a}$J+ysGXgOa5HoKNJkAnU0RYJF+T;KL

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 7ea4745955..604b8a403b 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5936,23 +5936,6 @@ cont {
 }
 cont {
   name: "amenity-loading_dock"
-  element {
-    scale: 18
-    symbol {
-      name: "entrance-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -5963,7 +5946,6 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_x: 1
         offset_y: 1
         is_optional: true
       }
@@ -13882,7 +13864,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13897,7 +13879,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13912,7 +13894,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13927,7 +13909,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
 }
@@ -15293,15 +15275,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15310,23 +15289,6 @@ cont {
 }
 cont {
   name: "entrance-exit"
-  element {
-    scale: 18
-    symbol {
-      name: "exit-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -15337,15 +15299,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15364,8 +15323,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
         is_optional: true
       }
       priority: -9780
@@ -15381,15 +15344,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -9780
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 081f0a51143d9acc85d50f894bdc44f66a0df352..09021dd09fbca864445250c1989d840f0916dcc6 100644
GIT binary patch
delta 525
zcmez0F8ZZSbi);IX<sgp#N5=p%#upooczR;%)IpYl>FpuAyW?F$sfF>CP#NjZBFtL
zOs`+Y$R&_enwbMqqMMkKQj}U;ETqgKpe4`6&cPvY@6=RgAx<bmgHfVy(|-tH1S%3F
zMv)L$5f=`VG=Qdoj1tDH3aDuFugwz#l6<&0Qu9iR67!N%g&a79mBhKYV0_(Ti5YOm
zX(@AYb8rdVI@HRn!Dzt<_5p}v!6@-zBg_X}zFfR;-KiCsB|<hF!jq1Q)f1(;mk~*K
zZenJhkS&Lhk_Z<+h#e0%w^-s1BOceB*$i_HP`fZhyDmxkC!anh*=&5Q-S`+I5HkTW
L^LFE7EN5x~1QWq@

delta 605
zcmey;Ci=f!bi);InQlfdk;L58yv&kH-JJZyl+3*J_>}zQY#}QSp~>&Pr4(ej1UR?^
zZXIf6R$w$@E=o<aV3hc<@jnDG3YkxS>n+10#l;I$bfjY<lLF&rVIRfx`Zh)`fuz#R
z9FT#!i76>Xsl~-Y(i{R>;#}+;90K=FO=TA1gfcW3B~CB`B?a+G3V|iLu<H~?m*fCh
z05W&;?adPec;mS^Qu9iR67!N%g@Pwn9FeIv!}OMrIMkyWTt-|VCtIcEB$gDT_?K%2
zBNs2sDBaYG%n~6p4k0CBE;bNbw-_mCwD5&o`hP|te-2^n8p(CrEM&LkCT8XVV@LX^
xq!KoVoY@SI!T=88$+Abq^+~e!%;w1s$0VCq9Bp55lo5!TfS7svilZ!NY5@)p(u@EA

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 1d02bd0649..37e04028d8 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5902,23 +5902,6 @@ cont {
 }
 cont {
   name: "amenity-loading_dock"
-  element {
-    scale: 18
-    symbol {
-      name: "entrance-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -5929,7 +5912,6 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_x: 1
         offset_y: 1
         is_optional: true
       }
@@ -13740,7 +13722,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13755,7 +13737,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13770,7 +13752,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13785,7 +13767,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
 }
@@ -15151,15 +15133,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15168,23 +15147,6 @@ cont {
 }
 cont {
   name: "entrance-exit"
-  element {
-    scale: 18
-    symbol {
-      name: "exit-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -15195,15 +15157,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15222,8 +15181,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
         is_optional: true
       }
       priority: -9780
@@ -15239,15 +15202,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -9780
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 8f679355230e9c3e2252ba7b5564a0c6f8b0bf88..827c83d60f34f83c6a73de27f2358c710a564c63 100644
GIT binary patch
delta 526
zcmccdOXTcNkqw8urG2?X5_41YGD|9TbMg~YGV{{oQ}UCug-khwC*Sjyn!K|?YIA_k
z<Fxu^j9daqrI|S(CAx_zDMhKp#X`y)0$TE1>>L~d7Zx0365@n1G#DlNHvNYHMxY`=
zViXC16>;G(Ndssa$S7gFs(^|%@7g>;AjyY|BQ>w2C^0WNRmg!uSV^3V3&z(imY4x|
zoR%^dHwTx%)m2xSG#D)y!9D<SEEpv|Y=rrM%a@B6t~<3NvqZ=S7&-@zh}9FNyO$A3
zdv0Q8o{%kvkdg=&KZqR<H@H~h4kI4toY@R>4p6%=M7u6Y`X_fElWhKcwEgo@Mj&Pa
NV&?6ikFune0{|y%$FTqa

delta 604
zcmX^6Q{=`kkqw8uWx5%;L=tmT^D;{+b#w9)Q!?|?<5TjJvxTfUgeKqhmQs-A65!wx
zxVq{plLDg=b5UxV1*61=jsGElQOJDqZEqPKDK1{PqRosxpVR8w7`X(JN;7jn2I?lJ
zq!gtV7Yj*q2xy6Ov2$<;Tv%|BNr)55&|s7}!3dNT#3v~PmgK^&Qy5*617rcn+|9E$
zPY~dZ=i*4sD=A9MOHLIEo@{YMrrr$GTSDScKWK0nae<s{m6nrOQjFqXt{IG6yfCA5
zQ!6q{gv>aEl!Uq1Ky2M&q@dBl7jo(U8HM~ggt2QR*KM<q-Ikk}nForUBa%wk9CBte
pJPHFigeTuUBCb!8wP!X@IwskiakM?-C?gOv0WtITjH4{6<p4Ka)QkWC

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 657a410471..e0ddd9a26a 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5902,23 +5902,6 @@ cont {
 }
 cont {
   name: "amenity-loading_dock"
-  element {
-    scale: 18
-    symbol {
-      name: "entrance-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -5929,7 +5912,6 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
         offset_y: 1
         is_optional: true
       }
@@ -13740,7 +13722,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13755,7 +13737,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13770,7 +13752,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13785,7 +13767,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
 }
@@ -15151,15 +15133,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 5592405
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15168,23 +15147,6 @@ cont {
 }
 cont {
   name: "entrance-exit"
-  element {
-    scale: 18
-    symbol {
-      name: "exit-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -15195,15 +15157,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 5592405
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15222,8 +15181,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 5592405
         is_optional: true
       }
       priority: -9780
@@ -15239,15 +15202,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 5592405
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -9780
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 55f0739e25e8b5f8c857f628f48d55b20fd05e4f..a2a2dfe3595be842cb55da752952d6ed9f0ac8cd 100644
GIT binary patch
delta 772
zcmaF=hi~(Lz70j9ZoXV1iMgqHnI)CFIr)hxnR)5)Df!9SLZ%$TO5$8xsd*(uiFwJX
zy2TP7HvWeIMlA_0ZVq07TZdYiH5e@zfijyjMR!^8TwvtlNGi?D0hu!WgBqjk<c2^y
zMw7|=17#(}xY(gugg7~Ppn4^YgiIzkhDc``X@TVVz`{UznAs9WTs~X^Fe7ynQ&Ngj
zi;IP%IfS&t!RFmNHI*4`9*CjAC^3x@C@Bn<<P*S@<hnjNFfbRdi{v0KlE&pCIj&oi
zErSa1ngR6{PBV<S9!ypVE@3nUg^U!$C!oMY4w+>vLZ+ag5jTSR2C4uSG?N8F`s#hS
zIA9SZ<bW^2lu;rKXb%TCsKIdui&ZXPE?$^vx~UbJB|<hpBZaxxKy1|bhZ<K8O#nE|
z>t;kUFgGzX4``qe&_I3=J05OTv4n^gZuhlpg1Has93<U3kc3H`_U5@E?Q=sIftYFg
J+z{qVnE*TH_>2Gm

delta 449
zcmdn|pYQ!2z70j9n-7X^v|_wBxi}z=(R%WMU|9uOE=dkvfm?@KnT-SzQ&NhoGV)7{
zQ}ar5lTwQ$jD)Nw3k1s6gB0=MRK(@QC6H8_nUj*4m#zykBel3#NQy&9ON@&hX!gBR
zQ<;T0Ie5Sf4Mqt$pqwyRjt^6g>nS4_KishN#G=IXRH4bs1EYv>t{lX<U_aq>t{m5k
z$$3Eq#Fz*5K7R9zxZX|n4lZG|0R^X`9KPUO#v)_`3Qrl3DqIentQpeR{3x{jQ79u2
MGi`qq%6u^s0Fd#JQ2+n{

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 495d92ffc7..9ff7eba0bf 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -1689,6 +1689,25 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-loading_dock"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
 cont {
   name: "amenity-motorcycle_parking"
   element {
@@ -6010,7 +6029,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6029,7 +6052,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6049,7 +6076,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
   element {
@@ -6064,7 +6091,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
 }
@@ -6117,7 +6144,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 30
     }
@@ -6136,7 +6167,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 30
     }
@@ -6191,7 +6226,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6210,7 +6249,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6265,7 +6308,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 550
     }
@@ -6284,7 +6331,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 550
     }
@@ -6337,6 +6388,99 @@ cont {
     }
   }
 }
+cont {
+  name: "entrance"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-exit"
+  element {
+    scale: 19
+    symbol {
+      name: "exit-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-main"
+  element {
+    scale: 18
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+}
 cont {
   name: "highway-bridleway"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index a81564af54b8a899f9353479a3dc0ff74c847854..1555fb741af61ac1a0c1b9d7ea9642862b6aaf3c 100644
GIT binary patch
delta 772
zcmeDB!FTQ#-v$p+H(xH1#N5=p%#upooczR;%)IpYl>FpuAyW=vC2=mU)Vz|S#JuEG
z-C~Ik8~;N9qm~30HwUl4=Vxb`H5e@zfij!zMeD2>Pfy<GpUh}HIWSO0QjCioszivB
zg9oZs!br$?a$JB+JxG=hEC`f^nIvJv<-;YARGOIsa)xeVN=i{`aj}pzhme*y*t9n{
zHZp@v12HrhC8jX~C56F~d;*w~T$dQR_~FK-Cl)29rvf$bONmeZ7Z8NkopKO&f_;JM
zPC2ftlTQZb;xz&4QyeB3aowK0KB$n<1Qb?M5Z{4<6FIDwu?U%f0!tJmjp2yN(}KI|
zeYiMa5hUb*FT#{jA`EB?2RQJ-aR-Z4E?+KQm}$DH6`3VMHb5hVx!6E#)cA)QR}W19
zILzy2L^3cpF*6Tnpb*eNeh@nzZdI{_h!$@5wQPd959%Bw-8ztjNu2g(`H*(`5Jn(o
L+Abf${5l-~c2fhS

delta 414
zcmX^2i?8bk-v$rS&C^9otr%}k<_$<@w3=KPAfq75CCR}n@cG$UW+Q>bl$0W?jQrB#
z)V$K%q|_n_BO$BF3xi}rK#KTqD&q3u5=bh|%t^`2OV<UNky>0VB*h`5CC0@LH2cks
zjm$!v96Vr#2BU-=P)=A&Y_dS0D6<^bgUOnKS;V+S4&oNDgK@e=j_dK{e}TEgm<RP6
ze)EjDUQWIiRLE!z3M)l9d||bWMaUWySTZ10xEwfneQ;NEN@#mZC?gOvZBGehew7XY
D>!FES

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index c9d113e1aa..9308856d1a 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1689,6 +1689,25 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-loading_dock"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
 cont {
   name: "amenity-motorcycle_parking"
   element {
@@ -6010,7 +6029,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6029,7 +6052,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6049,7 +6076,7 @@ cont {
         color: 7105644
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
   element {
@@ -6064,7 +6091,7 @@ cont {
         color: 7105644
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
 }
@@ -6117,7 +6144,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 30
     }
@@ -6136,7 +6167,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 30
     }
@@ -6191,7 +6226,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6210,7 +6249,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6265,7 +6308,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 550
     }
@@ -6284,7 +6331,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 550
     }
@@ -6337,6 +6388,99 @@ cont {
     }
   }
 }
+cont {
+  name: "entrance"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-exit"
+  element {
+    scale: 19
+    symbol {
+      name: "exit-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-main"
+  element {
+    scale: 18
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+}
 cont {
   name: "highway-bridleway"
   element {
diff --git a/data/visibility.txt b/data/visibility.txt
index 9590bc1d44..782698947b 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -80,7 +80,7 @@ world  00000000000000000000  +
         kindergarten  00000000000000000000  -
         language_school  00000000000000000000  -
         library  00000000000000000000  -
-        loading_dock  00000000000000000000  -
+        loading_dock  00000000000000000001  -
         marketplace  00000000000000000000  -
         money_transfer  00000000000000000000  -
         motorcycle_parking  00000000000000000111  -
@@ -368,9 +368,9 @@ world  00000000000000000000  +
         fire_hydrant  00000000000000000000  -
         phone  00000000000000000000  -
         {}
-    entrance  00000000000000000000  +
-        exit  00000000000000000000  -
-        main  00000000000000000000  -
+    entrance  00000000000000000001  +
+        exit  00000000000000000001  -
+        main  00000000000000000011  -
         {}
     healthcare  00000000000000000000  +
         alternative  00000000000000000000  -