From 93dc7596fcc16dd168e12baef2bb9d137687ac96 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Mon, 7 Feb 2022 15:04:54 +0300
Subject: [PATCH] [styles] Regenerate for house numbers

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto_vehicle_clear.bin | Bin 138868 -> 138660 bytes
 data/drules_proto_vehicle_clear.txt |  93 +++++-----------------------
 data/drules_proto_vehicle_dark.bin  | Bin 138294 -> 138086 bytes
 data/drules_proto_vehicle_dark.txt  |  93 +++++-----------------------
 data/visibility.txt                 |   2 +-
 5 files changed, 29 insertions(+), 159 deletions(-)

diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index d70d741dd43d1f50db0a205c00f91d9868fe5bc0..0e7e81b55edb1a919973b4a27fda1729d442bcd0 100644
GIT binary patch
delta 286
zcmeyehhxcZjt%BkOivjnTUvQezHcuxx!#I(@?k4QM&8L4wz8A2*ec5M3EVo=%4{T%
zn37Utm62asoSIjfo0M84aiWYXVX~vOsDO}`A{RRcFIb(BFbB`%UTbl6VXz=XGf)sB
ztHEf*k(pN#pO=`M3ex|Eaq=hY0PGga;j{QX<77tLU@|oRWST5&w~kR~@&kM6$?NSz
dCJWi?13fzt==C^zBSyaFiT2wk+A}`B2LK~0VnYA`

delta 399
zcmZ3oo8!wKjt%BkOs!0lEv-BmZ6^!ZOHZ<8XXKyEVJkcNi?t%70FY%TCn#|1P%E>M
zKw?TtkyS>1X>n>^X>L+#k;I8Iu62x)6|6<;1+)~o*g1Fv?wy*-EF{dq1=gX#XvC43
zR}!C>n41bzE2PRH2v)`qmIW%~!=X$FtV{r=45A*>G-0qZkn3byLAFBNiKdRLhiP)N
zbpUz3>t~u=WD`uD-dW6(Q*75U`hr4ra*UlQFjx=T$xODlGXe%Hh}8#V2{s?J+kViF
H@$o$Xgb{eD

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 10d65435d3..f847d2be1c 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -4888,14 +4888,6 @@ cont {
       }
       priority: 1177
     }
-    caption {
-      primary {
-        height: 15
-        color: 6381914
-        text: "addr:housenumber"
-      }
-      priority: 15176
-    }
   }
   element {
     scale: 18
@@ -4909,7 +4901,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4928,7 +4920,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4938,47 +4930,15 @@ cont {
 }
 cont {
   name: "building-address"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 12
-        color: 6645086
-      }
-      secondary {
-        height: 10
-        color: 6381914
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15176
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 15
-        color: 6381914
-      }
-      secondary {
-        height: 14
-        color: 6381914
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15176
-    }
-  }
   element {
     scale: 18
     caption {
       primary {
-        height: 16
+        height: 13
         color: 6381914
       }
       secondary {
-        height: 15
+        height: 12
         color: 6381914
         offset_y: 1
         text: "int_name"
@@ -4990,11 +4950,11 @@ cont {
     scale: 19
     caption {
       primary {
-        height: 17
+        height: 14
         color: 6381914
       }
       secondary {
-        height: 17
+        height: 13
         color: 6381914
         offset_y: 1
         text: "int_name"
@@ -5037,14 +4997,6 @@ cont {
       }
       priority: 1177
     }
-    caption {
-      primary {
-        height: 15
-        color: 6381914
-        text: "addr:housenumber"
-      }
-      priority: 15176
-    }
   }
   element {
     scale: 18
@@ -5058,7 +5010,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 6381914
         text: "addr:housenumber"
       }
@@ -5077,7 +5029,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 6381914
         text: "addr:housenumber"
       }
@@ -5119,14 +5071,6 @@ cont {
       }
       priority: 1177
     }
-    caption {
-      primary {
-        height: 15
-        color: 6381914
-        text: "addr:housenumber"
-      }
-      priority: 15176
-    }
   }
   element {
     scale: 18
@@ -5140,7 +5084,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 6381914
         text: "addr:housenumber"
       }
@@ -5159,7 +5103,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 6381914
         text: "addr:housenumber"
       }
@@ -5228,20 +5172,11 @@ cont {
         width: 1.0
         color: 13947850
       }
-      priority: 1177
+      priority: 1953
     }
     symbol {
       name: "train-m"
-      priority: 16176
-    }
-    caption {
-      primary {
-        height: 15
-        color: 6381914
-        offset_y: 1
-        text: "addr:housenumber"
-      }
-      priority: 15176
+      priority: 16952
     }
   }
   element {
@@ -5260,7 +5195,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 6381914
         offset_y: 1
         text: "addr:housenumber"
@@ -5284,7 +5219,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 6381914
         offset_y: 1
         text: "addr:housenumber"
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index dace29e169a7b1639d33cb8b35c18e55bbded8d6..a186438e27a426d7d7e8e9c31b8b208d8a64b1ac 100644
GIT binary patch
delta 246
zcmdnCgX7sYjtv(r`5rKGaU_*y=A>lir3=YS{%9*T`KP5KvkZse<U}A_-d35BcXA_;
z6=0*x$OmLet0iy=z;x&)rlb_578eVtatLWDa<Oyp3VeQcmRU%cgJ*JqwaDaHYfdgc
zm=G^eNR;V0<K%X0KYSK2y<(g^(IybDk}ph?=h?1d)&@IMVlua#5TnmzMO&H4>2|_E
b2Upw4Pkv#i2Xt_?olLW_{dQw}M&`Q!Cdx=d

delta 327
zcmaF1jbqymjtv(rc^a6wIFd>;b5b(%(kJV`k(nG|!#eq&r3|wThv4KwTZzf@t=Sp*
zCr4Y!PA;}lU=#qdY#9ZCq?88NIz}!5m|oq)l$4^>;$k6H4goDiE_MzcfzQv*G7AZF
za7|{k77+%D3xdV@Vd8u+aUrm{08E@8BtH3_6(^S<Oh^zYB+AszG+DyhkFdj-xw@Dp
zGuZ?ZqjD<q<o7mfn0=t0eQYZV^z2Vtc}5|y=Rte{Am5h*;ua0Y$q81X&B=D#lkFIp
G?*ag~DO-&I

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index a3b9b09025..f2820918c2 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -4888,14 +4888,6 @@ cont {
       }
       priority: 1177
     }
-    caption {
-      primary {
-        height: 15
-        color: 7566195
-        text: "addr:housenumber"
-      }
-      priority: 15176
-    }
   }
   element {
     scale: 18
@@ -4909,7 +4901,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4928,7 +4920,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4938,47 +4930,15 @@ cont {
 }
 cont {
   name: "building-address"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 12
-        color: 7566195
-      }
-      secondary {
-        height: 10
-        color: 7566195
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15176
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 15
-        color: 7566195
-      }
-      secondary {
-        height: 14
-        color: 7566195
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15176
-    }
-  }
   element {
     scale: 18
     caption {
       primary {
-        height: 16
+        height: 13
         color: 7566195
       }
       secondary {
-        height: 15
+        height: 12
         color: 7566195
         offset_y: 1
         text: "int_name"
@@ -4990,11 +4950,11 @@ cont {
     scale: 19
     caption {
       primary {
-        height: 17
+        height: 14
         color: 7566195
       }
       secondary {
-        height: 17
+        height: 13
         color: 7566195
         offset_y: 1
         text: "int_name"
@@ -5037,14 +4997,6 @@ cont {
       }
       priority: 1177
     }
-    caption {
-      primary {
-        height: 15
-        color: 7566195
-        text: "addr:housenumber"
-      }
-      priority: 15176
-    }
   }
   element {
     scale: 18
@@ -5058,7 +5010,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 7566195
         text: "addr:housenumber"
       }
@@ -5077,7 +5029,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 7566195
         text: "addr:housenumber"
       }
@@ -5119,14 +5071,6 @@ cont {
       }
       priority: 1177
     }
-    caption {
-      primary {
-        height: 15
-        color: 7566195
-        text: "addr:housenumber"
-      }
-      priority: 15176
-    }
   }
   element {
     scale: 18
@@ -5140,7 +5084,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 7566195
         text: "addr:housenumber"
       }
@@ -5159,7 +5103,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 7566195
         text: "addr:housenumber"
       }
@@ -5228,20 +5172,11 @@ cont {
         width: 1.0
         color: 1842204
       }
-      priority: 1177
+      priority: 1953
     }
     symbol {
       name: "train-m"
-      priority: 16176
-    }
-    caption {
-      primary {
-        height: 15
-        color: 7566195
-        offset_y: 1
-        text: "addr:housenumber"
-      }
-      priority: 15176
+      priority: 16952
     }
   }
   element {
@@ -5260,7 +5195,7 @@ cont {
     }
     caption {
       primary {
-        height: 16
+        height: 13
         color: 7566195
         offset_y: 1
         text: "addr:housenumber"
@@ -5284,7 +5219,7 @@ cont {
     }
     caption {
       primary {
-        height: 17
+        height: 14
         color: 7566195
         offset_y: 1
         text: "addr:housenumber"
diff --git a/data/visibility.txt b/data/visibility.txt
index 411d9191a2..c6c54ac998 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -188,7 +188,7 @@ world  00000000000000000000  +
         national_park  00000000000011111111  -
         {}
     building  00000000000000011111  +
-        address  00000000000000001111  -
+        address  00000000000000000011  -
         garage  00000000000000011111  -
         has_parts  00000000000000011111  -
         train_station  00000000000011111111  -