From c2b34234641a8f63fe23cbd00cf6df7b05d6eca2 Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Mon, 2 Oct 2023 11:00:17 +0100 Subject: [PATCH] [styles] regenerated Signed-off-by: Harry Bond --- data/colors.txt | 3 ++ data/drules_proto.bin | Bin 346294 -> 346213 bytes data/drules_proto.txt | 73 ++++++++++----------------- data/drules_proto_clear.bin | Bin 347267 -> 347186 bytes data/drules_proto_clear.txt | 73 ++++++++++----------------- data/drules_proto_dark.bin | Bin 345648 -> 345572 bytes data/drules_proto_dark.txt | 73 ++++++++++----------------- data/drules_proto_vehicle_clear.bin | Bin 247475 -> 247542 bytes data/drules_proto_vehicle_clear.txt | 75 ++++++++++++++++++---------- data/drules_proto_vehicle_dark.bin | Bin 247042 -> 247109 bytes data/drules_proto_vehicle_dark.txt | 75 ++++++++++++++++++---------- data/visibility.txt | 2 +- 12 files changed, 179 insertions(+), 195 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index 38e757eed6..4c75526a6e 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -56,6 +56,7 @@ 2004720 2038026 2038555 +2171142 2171163 2171169 2229797 @@ -260,10 +261,12 @@ 15014691 15022389 15037299 +15062700 15066325 15086900 15094016 15214341 +15260347 15263452 15459493 15590876 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index cd406c8a6eedf414d9ea9399e76f5e8f0b667722..86e23ec2285d77f45faa39e6289c337fe0900316 100644 GIT binary patch delta 330 zcmdlsQS|8q(S|LI7WeDdtews-(fIK{1TYGTaBxcraA1n^U=`)XD$0jNREdKhQ&fv* z`kQ-Kq;LP{J0aQW#E?=gx(1O>4P3ZV*4*L}dq$p&#USnKw{2aFp91B1Bua}x7X zN{dr<(-Vsl(^HFuxPh)<=XiZ|GP^_`kRyQ15k%$)A#;SGoc1N37=f4xh?%!9`NSd= F1^~Vxgh~Ja delta 135 zcmaDlL3GqDH#MDXPUY z{md;!uIapY7&+M>c1}Ndi&2!ngHK3_LlCY3Nl*xzpfIZ7_PKW$Hwp#@aq;IQ=B1Pt zr|PCB7A2;q77K9$UBS-r`sieKi98@j0GT6*%n?H72tzsTAKoznF%u9oZ~yR)WpXS4 Dzh#A2 delta 144 zcmdlqL$rCOXu}r9mfO>lZ!ro@kH5uOKAratBjT#MT}hhIf;2GrNybb>4`;&>8Zs+JRE#d92~nRE^p(I$OH2D nA-rvDK%NYTfRw~!MkVpdPTM2f7rkQyVkRJF-oEG^%Y;|}FHSMs diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 272cfc4c4c..3904eab022 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -38345,43 +38345,43 @@ cont { element { scale: 10 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } } element { scale: 11 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } } element { scale: 12 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } } element { scale: 13 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } } element { scale: 14 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } } element { scale: 15 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } caption { primary { @@ -38394,8 +38394,8 @@ cont { element { scale: 16 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } caption { primary { @@ -38408,8 +38408,8 @@ cont { element { scale: 17 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } caption { primary { @@ -38422,8 +38422,8 @@ cont { element { scale: 18 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } caption { primary { @@ -38436,8 +38436,8 @@ cont { element { scale: 19 area { - color: 15459493 - priority: -1920 + color: 15062700 + priority: -1919 } caption { primary { @@ -39704,61 +39704,38 @@ cont { } cont { name: "landuse-garages" - element { - scale: 14 - area { - color: 2160707771 - priority: 110 - } - } element { scale: 15 area { - color: 1724500155 + color: 15000299 priority: 110 } } element { scale: 16 area { - color: 868862139 - border { - width: 1.0 - color: 10592406 - } + color: 15000299 priority: 110 } } element { scale: 17 area { - color: 12763315 - border { - width: 1.0 - color: 10197647 - } + color: 15000299 priority: 110 } } element { scale: 18 area { - color: 12763315 - border { - width: 1.0 - color: 10197647 - } + color: 15000299 priority: 110 } } element { scale: 19 area { - color: 12763315 - border { - width: 1.0 - color: 10197647 - } + color: 15000299 priority: 110 } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 750640fc6555dc172a23c481eb41e5b0bf4f1c86..6f394d66b78c565fdb8450b3ad79e0d4c4116b47 100644 GIT binary patch delta 334 zcmdncBl@IUv|$V5qPz85n79OT67y0@i&J&e5{q&x6N^%WL^!yl1UT9bwJ=IFe*6ys zj6hLttfD+vMR~D`@}Y?e{Qu7=q{P7w7oJ{tk5Ph0i9-NGL=Zzn2tz~|MMQl2xqFP! zf!Vq@*=?{!R%ml>D+fRRB HNeu-6Qn`Bf delta 162 zcmaFTExMscv|$V5qPxPYn79OT67y0@i&J&e5{q&x6N{#I++ply>);bos1krUsdi%9|jIn~Iix|21VaB8<7A2;q77Ouk@JVrSth%zIkwYR6 p$m56bHnIVEG8_U@5|bH~#3wUtk8E%HzzD=lK+L?o=>tnrC;*k>Hmv{v diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 14c5b1d3b6..8bb9849f7e 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -38506,43 +38506,43 @@ cont { element { scale: 10 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } } element { scale: 11 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } } element { scale: 12 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } } element { scale: 13 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } } element { scale: 14 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } } element { scale: 15 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } caption { primary { @@ -38555,8 +38555,8 @@ cont { element { scale: 16 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } caption { primary { @@ -38569,8 +38569,8 @@ cont { element { scale: 17 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } caption { primary { @@ -38583,8 +38583,8 @@ cont { element { scale: 18 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } caption { primary { @@ -38597,8 +38597,8 @@ cont { element { scale: 19 area { - color: 1381632 - priority: -1920 + color: 2171142 + priority: -1919 } caption { primary { @@ -39865,61 +39865,38 @@ cont { } cont { name: "landuse-garages" - element { - scale: 14 - area { - color: 2150246954 - priority: 110 - } - } element { scale: 15 area { - color: 1714039338 + color: 1643545 priority: 110 } } element { scale: 16 area { - color: 858401322 - border { - width: 1.0 - color: 3158064 - } + color: 1643545 priority: 110 } } element { scale: 17 area { - color: 3881787 - border { - width: 1.0 - color: 4671303 - } + color: 1643545 priority: 110 } } element { scale: 18 area { - color: 3881787 - border { - width: 1.0 - color: 4671303 - } + color: 1643545 priority: 110 } } element { scale: 19 area { - color: 3881787 - border { - width: 1.0 - color: 4671303 - } + color: 1643545 priority: 110 } } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 45a9ff424552950251f181be70340038995c5c4e..f8845ef84febfad76538598b49f1795c9dafb5c9 100644 GIT binary patch delta 246 zcmdno%m1yHzhMhwyu|cl;*0|Im5D_uLLwY|QUV;iw=QOv`2OKP1TX?c`LT)$U=?Scn^FJ3GhYo$c%rQ9zCWGDi@Z XBZSNmhH~1OwHSezX*;tP^M*M913zDE delta 65 zcmey?%fGpozhMhwyu|h&5{!QZgqJgN@#iGwrIZ$@>ZT_aC8nnqPp%7)WsI7b%7 diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index b3164a416d..261ec24672 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -22651,6 +22651,51 @@ cont { } } } +cont { + name: "landuse-farmyard" + element { + scale: 14 + area { + color: 15260347 + priority: -1929 + } + } + element { + scale: 15 + area { + color: 15260347 + priority: -1929 + } + } + element { + scale: 16 + area { + color: 15260347 + priority: -1929 + } + } + element { + scale: 17 + area { + color: 15260347 + priority: -1929 + } + } + element { + scale: 18 + area { + color: 15260347 + priority: -1929 + } + } + element { + scale: 19 + area { + color: 15260347 + priority: -1929 + } + } +} cont { name: "landuse-field" element { @@ -23849,55 +23894,35 @@ cont { element { scale: 15 area { - color: 1523897290 - border { - width: 1.0 - color: 13947850 - } + color: 14802147 priority: 90 } } element { scale: 16 area { - color: 1943327690 - border { - width: 1.0 - color: 13947850 - } + color: 14802147 priority: 90 } } element { scale: 17 area { - color: 1943327690 - border { - width: 1.0 - color: 13947850 - } + color: 14802147 priority: 90 } } element { scale: 18 area { - color: 1943327690 - border { - width: 1.0 - color: 13947850 - } + color: 14802147 priority: 90 } } element { scale: 19 area { - color: 1943327690 - border { - width: 1.0 - color: 13947850 - } + color: 14802147 priority: 90 } } diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index f74b123d11cbe6d638c4d9c1cb6a6d6f739ff9d7..3faa845d36cdc2f4fe68c94095f9ebe01ac118d6 100644 GIT binary patch delta 253 zcmZqb;y>EO->`+zLau%qBbPuY_501{gei7kZ07KX6fJM|fXm}z^bK6B+%0A77w#sB~S delta 67 zcmX@w#oyG$->`+zLT>v-ImYz@!iyNW_;V8TQc8ob>41prt$8V3LX diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 9463ee413e..a5140eba40 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -23063,6 +23063,51 @@ cont { } } } +cont { + name: "landuse-farmyard" + element { + scale: 14 + area { + color: 2171142 + priority: -1929 + } + } + element { + scale: 15 + area { + color: 2171142 + priority: -1929 + } + } + element { + scale: 16 + area { + color: 2171142 + priority: -1929 + } + } + element { + scale: 17 + area { + color: 2171142 + priority: -1929 + } + } + element { + scale: 18 + area { + color: 2171142 + priority: -1929 + } + } + element { + scale: 19 + area { + color: 2171142 + priority: -1929 + } + } +} cont { name: "landuse-field" element { @@ -24261,55 +24306,35 @@ cont { element { scale: 15 area { - color: 1511594265 - border { - width: 1.0 - color: 1842204 - } + color: 854541 priority: 90 } } element { scale: 16 area { - color: 1931024665 - border { - width: 1.0 - color: 1842204 - } + color: 854541 priority: 90 } } element { scale: 17 area { - color: 1931024665 - border { - width: 1.0 - color: 1842204 - } + color: 854541 priority: 90 } } element { scale: 18 area { - color: 1931024665 - border { - width: 1.0 - color: 1842204 - } + color: 854541 priority: 90 } } element { scale: 19 area { - color: 1931024665 - border { - width: 1.0 - color: 1842204 - } + color: 854541 priority: 90 } } diff --git a/data/visibility.txt b/data/visibility.txt index c27d55cadc..eb394ef759 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -614,7 +614,7 @@ world 00000000000000000000 + education 00000000000000000000 - farm 00000000000000000000 - farmland 00000000000000111111 - - farmyard 00000000000000000000 - + farmyard 00000000000000111111 - field 00000000000000111111 - flowerbed 00000000000000000000 - forest 00000000001111111111 +