From 54e83a5aea74700c5eb870f5885f3aec3472ba14 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sun, 10 Apr 2022 01:17:41 +0200 Subject: [PATCH] [styles] Regenerated Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- data/classificator.txt | 1 + data/drules_proto.bin | Bin 211727 -> 212021 bytes data/drules_proto.txt | 151 +++++++++++++++++++++++++++--------- data/drules_proto_clear.bin | Bin 212455 -> 212749 bytes data/drules_proto_clear.txt | 151 +++++++++++++++++++++++++++--------- data/drules_proto_dark.bin | Bin 211150 -> 211444 bytes data/drules_proto_dark.txt | 151 +++++++++++++++++++++++++++--------- data/types.txt | 2 +- data/visibility.txt | 1 + 9 files changed, 348 insertions(+), 109 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 829ac9dae1..894e88e9ae 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -508,6 +508,7 @@ world + churchyard - commercial - construction - + education - farm - farmland - farmyard - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 61530861b4bc0438b6eb91e44d88c4557b385108..43e6227fed409b1d3c34586328726dad160d309d 100644 GIT binary patch delta 826 zcmeDG#4`-psd++{NUmxA4*`ry!d!gFs&sQDuz188$&m!KPUbV0 zFoOgO0hJiO+$?KpqENq?k&6%J{^I0}{QMjtW2`Rc<>G+IV|TMDRyU(*!f=C-nJH3G zBYZ$e-{#AakC_=KPfmyvWiAG$i1V?kV4gUTJRd8?qs_sOh`{^t3cNx#$O$MRPMl?O ztpfLCfjCJnq=W@jIeA|k56r0Pf{Pf1Co9BpPW~Uq2^0iLYsQ15fhiD3`o)86g&L2V zV!*O8TnNGD`|;cF$1`3M7YpSQ%t_2kDJ@RbO-(6HPAtjH&l3`vd>~FlM@R$_ikwG zivz-&ez2EOoL2>CI$UV-LKTVW3LH!vY!D?tzU1b`QID7zJ16VMi!v8WbWWZZrwZnY z1Ic-DQasum{89oOyG}l4m*|{6VKbxnQ6IriNO4sotc-CT9lqxRFaw}WQo<;!d!gFs<8Xm8mrT>YMp$@ zOu`I3M6s&GbpJ(*k8(Mi8M*ji?k`Tx$j{FaGREq1UM>!ZJa#vmVs$gBCQxXbnPLrX zRE1aq+a=;LGvnmR7h^=3izOycc8F00^TdIqLyQ!UHU~dE4kri1Dewx}ASE`SHgT58 zwF=ym8)GE75Qz|^an4C@m0MgA{@Bjb+ delta 391 zcmeDE$MgI*&jusS$v3rm#FF!Ka#GV%g_Jo2mH4?hq1?&qg2nk%IfRgfK59q;g@jRs zBsME*)$=jVn7q(JV)8uorp`Iudzb9%x`M)AoBaXefCa511pahA?n1@6fKv64vQ2(^M3YPmpaC)>wyGQy1% zoxZx1k!$j+I6k1geQ~N_?)1!+jC^4Ggb`*ui~~8XFHVLFAqcaKv)Mj=yL~*PnOOUo NQpW9PN|_u_0sse-e*ORe diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 77b59e6de0..94a6922539 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -3427,10 +3427,14 @@ cont { cont { name: "amenity-college" element { - scale: 17 + scale: 16 + area { + color: 16311482 + priority: -15981 + } symbol { name: "college-m" - priority: 16650 + priority: 16019 } caption { primary { @@ -3438,14 +3442,37 @@ cont { color: 4473924 offset_y: 1 } - priority: 15650 + priority: 16000 + } + } + element { + scale: 17 + area { + color: 16311482 + priority: -15981 + } + symbol { + name: "college-m" + priority: 16019 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 16000 } } element { scale: 18 + area { + color: 16311482 + priority: -15981 + } symbol { name: "college-m" - priority: 16650 + priority: 16019 } caption { primary { @@ -3454,14 +3481,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15650 + priority: 16000 } } element { scale: 19 + area { + color: 16311482 + priority: -15981 + } symbol { name: "college-m" - priority: 16650 + priority: 16019 } caption { primary { @@ -3470,7 +3501,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15650 + priority: 16000 } } } @@ -4756,9 +4787,13 @@ cont { name: "amenity-kindergarten" element { scale: 17 + area { + color: 16311482 + priority: -15981 + } symbol { name: "kindergarten-m" - priority: 16601 + priority: 16019 } caption { primary { @@ -4766,14 +4801,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15601 + priority: 16000 } } element { scale: 18 + area { + color: 16311482 + priority: -15981 + } symbol { name: "kindergarten-m" - priority: 16601 + priority: 16019 } caption { primary { @@ -4782,14 +4821,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15601 + priority: 16000 } } element { scale: 19 + area { + color: 16311482 + priority: -15981 + } symbol { name: "kindergarten-m" - priority: 16601 + priority: 16019 } caption { primary { @@ -4798,7 +4841,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15601 + priority: 16000 } } } @@ -7451,9 +7494,13 @@ cont { name: "amenity-school" element { scale: 17 + area { + color: 16311482 + priority: -15981 + } symbol { name: "school-m" - priority: 16631 + priority: 16019 } caption { primary { @@ -7461,14 +7508,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15631 + priority: 16000 } } element { scale: 18 + area { + color: 16311482 + priority: -15981 + } symbol { name: "school-m" - priority: 16631 + priority: 16019 } caption { primary { @@ -7477,14 +7528,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15631 + priority: 16000 } } element { scale: 19 + area { + color: 16311482 + priority: -15981 + } symbol { name: "school-m" - priority: 16631 + priority: 16019 } caption { primary { @@ -7493,7 +7548,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15631 + priority: 16000 } } } @@ -7875,11 +7930,11 @@ cont { scale: 14 area { color: 16311482 - priority: -15991 + priority: -15981 } symbol { name: "college-s" - priority: 16009 + priority: 16019 min_distance: 12 } caption { @@ -7896,11 +7951,11 @@ cont { scale: 15 area { color: 16311482 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 min_distance: 12 } caption { @@ -7917,7 +7972,7 @@ cont { scale: 15 area { color: 16311482 - priority: -15991 + priority: -15981 } caption { primary { @@ -7933,11 +7988,11 @@ cont { scale: 16 area { color: 16311482 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 min_distance: 11 } caption { @@ -7954,7 +8009,7 @@ cont { scale: 16 area { color: 16311482 - priority: -15991 + priority: -15981 } caption { primary { @@ -7970,11 +8025,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 min_distance: 10 } caption { @@ -7991,7 +8046,7 @@ cont { scale: 17 area { color: 16311482 - priority: -15991 + priority: -15981 } caption { primary { @@ -8007,11 +8062,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 } caption { primary { @@ -8028,7 +8083,7 @@ cont { scale: 18 area { color: 16311482 - priority: -15991 + priority: -15981 } caption { primary { @@ -8044,11 +8099,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 } caption { primary { @@ -8065,7 +8120,7 @@ cont { scale: 19 area { color: 16311482 - priority: -15991 + priority: -15981 } caption { primary { @@ -31846,6 +31901,30 @@ cont { } } } +cont { + name: "landuse-education" + element { + scale: 17 + area { + color: 16311482 + priority: -15991 + } + } + element { + scale: 18 + area { + color: 16311482 + priority: -15991 + } + } + element { + scale: 19 + area { + color: 16311482 + priority: -15991 + } + } +} cont { name: "landuse-farmland" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 61215f40d20314211dcb8cb507675d23aa71340f..fd4356050d9cf3011e0c0e5068dac639fa90bb07 100644 GIT binary patch delta 854 zcmX^2k>|^2o()Et3U3*?_!Dze^D;{+b(8aRa#GV%g-kdEqy#u7@0-CWF?n)sthoH- zS}i^#WxA%vnv5onG87dHnt)Eo=2NoE|vD5^xTsoK0l zGncRaG$WS?%(2;-c`2zy>4`-psd++{NUmxA4*`ry!d!gFs&sQDuz188$&m!KPTpW9 zVFn2n0xB_lxp}|ENxAyXj9h#$_ZKH;}Fogoi53w>_NXZRk>A6^t z^)P9O6$;H}aof$}7l&x5zvsQs;a$~IcW83*t_ONh4Xs Y*~}Whoi(13N3uPmf^mCB1yj#K07NZ;yZ`_I diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 60c84a57b5..db87b55f5f 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -3427,10 +3427,14 @@ cont { cont { name: "amenity-college" element { - scale: 17 + scale: 16 + area { + color: 2498323 + priority: -15981 + } symbol { name: "college-m" - priority: 16650 + priority: 16019 } caption { primary { @@ -3438,14 +3442,37 @@ cont { color: 5592405 offset_y: 1 } - priority: 15650 + priority: 16000 + } + } + element { + scale: 17 + area { + color: 2498323 + priority: -15981 + } + symbol { + name: "college-m" + priority: 16019 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 16000 } } element { scale: 18 + area { + color: 2498323 + priority: -15981 + } symbol { name: "college-m" - priority: 16650 + priority: 16019 } caption { primary { @@ -3454,14 +3481,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15650 + priority: 16000 } } element { scale: 19 + area { + color: 2498323 + priority: -15981 + } symbol { name: "college-m" - priority: 16650 + priority: 16019 } caption { primary { @@ -3470,7 +3501,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15650 + priority: 16000 } } } @@ -4756,9 +4787,13 @@ cont { name: "amenity-kindergarten" element { scale: 17 + area { + color: 2498323 + priority: -15981 + } symbol { name: "kindergarten-m" - priority: 16601 + priority: 16019 } caption { primary { @@ -4766,14 +4801,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15601 + priority: 16000 } } element { scale: 18 + area { + color: 2498323 + priority: -15981 + } symbol { name: "kindergarten-m" - priority: 16601 + priority: 16019 } caption { primary { @@ -4782,14 +4821,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15601 + priority: 16000 } } element { scale: 19 + area { + color: 2498323 + priority: -15981 + } symbol { name: "kindergarten-m" - priority: 16601 + priority: 16019 } caption { primary { @@ -4798,7 +4841,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15601 + priority: 16000 } } } @@ -7451,9 +7494,13 @@ cont { name: "amenity-school" element { scale: 17 + area { + color: 2498323 + priority: -15981 + } symbol { name: "school-m" - priority: 16631 + priority: 16019 } caption { primary { @@ -7461,14 +7508,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15631 + priority: 16000 } } element { scale: 18 + area { + color: 2498323 + priority: -15981 + } symbol { name: "school-m" - priority: 16631 + priority: 16019 } caption { primary { @@ -7477,14 +7528,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15631 + priority: 16000 } } element { scale: 19 + area { + color: 2498323 + priority: -15981 + } symbol { name: "school-m" - priority: 16631 + priority: 16019 } caption { primary { @@ -7493,7 +7548,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15631 + priority: 16000 } } } @@ -7875,11 +7930,11 @@ cont { scale: 14 area { color: 2498323 - priority: -15991 + priority: -15981 } symbol { name: "college-s" - priority: 16009 + priority: 16019 min_distance: 12 } caption { @@ -7896,11 +7951,11 @@ cont { scale: 15 area { color: 2498323 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 min_distance: 12 } caption { @@ -7917,7 +7972,7 @@ cont { scale: 15 area { color: 2498323 - priority: -15991 + priority: -15981 } caption { primary { @@ -7933,11 +7988,11 @@ cont { scale: 16 area { color: 2498323 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 min_distance: 11 } caption { @@ -7954,7 +8009,7 @@ cont { scale: 16 area { color: 2498323 - priority: -15991 + priority: -15981 } caption { primary { @@ -7970,11 +8025,11 @@ cont { scale: 17 area { color: 2498323 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 min_distance: 10 } caption { @@ -7991,7 +8046,7 @@ cont { scale: 17 area { color: 2498323 - priority: -15991 + priority: -15981 } caption { primary { @@ -8007,11 +8062,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 } caption { primary { @@ -8028,7 +8083,7 @@ cont { scale: 18 area { color: 2498323 - priority: -15991 + priority: -15981 } caption { primary { @@ -8044,11 +8099,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15991 + priority: -15981 } symbol { name: "college-m" - priority: 16009 + priority: 16019 } caption { primary { @@ -8065,7 +8120,7 @@ cont { scale: 19 area { color: 2498323 - priority: -15991 + priority: -15981 } caption { primary { @@ -32022,6 +32077,30 @@ cont { } } } +cont { + name: "landuse-education" + element { + scale: 17 + area { + color: 2498323 + priority: -15991 + } + } + element { + scale: 18 + area { + color: 2498323 + priority: -15991 + } + } + element { + scale: 19 + area { + color: 2498323 + priority: -15991 + } + } +} cont { name: "landuse-farmland" element { diff --git a/data/types.txt b/data/types.txt index ae1bce830e..b28f3cf6bd 100644 --- a/data/types.txt +++ b/data/types.txt @@ -389,7 +389,7 @@ mapswithme *aerialway|cable_car *piste:type|downhill *sport|american_football -mapswithme +*landuse|education *man_made|cairn *railway|preserved|bridge *highway|path|demanding_alpine_hiking diff --git a/data/visibility.txt b/data/visibility.txt index e5a742f016..267ab5ca4c 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -508,6 +508,7 @@ world 00000000000000000000 + churchyard 00000000000000011111 - commercial 00000000000000000000 - construction 00000000000000011111 - + education 00000000000000000000 - farm 00000000000000000000 - farmland 00000000000000111111 - farmyard 00000000000000000000 -