From 3d592bf99af3fe16eaa82274a491f8e798a53b25 Mon Sep 17 00:00:00 2001 From: Anton Makouski Date: Thu, 1 Sep 2022 15:16:32 +0300 Subject: [PATCH] [styles] Regenerated Signed-off-by: Anton Makouski --- data/classificator.txt | 4 +- data/drules_proto.bin | Bin 225003 -> 225191 bytes data/drules_proto.txt | 89 ++++++++++++++++++++++++++++++------ data/drules_proto_clear.bin | Bin 225643 -> 225831 bytes data/drules_proto_clear.txt | 89 ++++++++++++++++++++++++++++++------ data/drules_proto_dark.bin | Bin 224006 -> 224194 bytes data/drules_proto_dark.txt | 89 ++++++++++++++++++++++++++++++------ data/types.txt | 2 +- data/visibility.txt | 4 +- 9 files changed, 232 insertions(+), 45 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 54b0bffc9b..4b8fb1aa37 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -586,7 +586,9 @@ world + swimming_pool + private - {} - track - + track + + area - + {} water_park - {} man_made + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 95ed193b42f4411ae1af26f7baf92cf9ff312885..d3cac2842f8cc0e0c836cb12348f093fde43a93c 100644 GIT binary patch delta 328 zcmaETmv{Mn-i9rV#m7}|F>>+dq-GYE7NzQz6eT8S3yE{^3kh>FfWZ%Yf#tK0vrXT4 zoKcho%sO?PQ60kaKfx$Do$myr020?4nJZO)iIGbP#cg@pt;8NfimK>(&evR&mQ<93ykOwG#xSM?z{ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 8348a925e4..110c2b84b0 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -38580,20 +38580,11 @@ cont { } cont { name: "leisure-track" - element { - scale: 14 - lines { - width: 1.0 - color: 6510384 - priority: 1320 - cap: BUTTCAP - } - } element { scale: 15 lines { width: 1.5 - color: 6510384 + color: 13749671 priority: 1320 cap: BUTTCAP } @@ -38602,7 +38593,7 @@ cont { scale: 16 lines { width: 1.8 - color: 6510384 + color: 13749671 priority: 1320 } caption { @@ -38618,7 +38609,7 @@ cont { scale: 17 lines { width: 3.0 - color: 6510384 + color: 13749671 priority: 1047 } caption { @@ -38635,7 +38626,7 @@ cont { scale: 18 lines { width: 3.0 - color: 6510384 + color: 13749671 priority: 1047 } caption { @@ -38652,7 +38643,7 @@ cont { scale: 19 lines { width: 4.0 - color: 6510384 + color: 13749671 priority: 1047 } caption { @@ -38666,6 +38657,76 @@ cont { } } } +cont { + name: "leisure-track-area" + element { + scale: 15 + area { + color: 13749671 + priority: -15680 + } + } + element { + scale: 16 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } + element { + scale: 17 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } + element { + scale: 18 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } + element { + scale: 19 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } +} cont { name: "leisure-water_park" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 74713d271157fefc2b7e986d8216aff85709de33..ebae892c0768aed4954fceeadea13bfa285b0729 100644 GIT binary patch delta 326 zcmaF;hB75LqJH7^XwTA z_yduco_>T;odu+1`u-z~GSk-`VdRB#HQ_ADdag^1TtYdinZ>0=sk$XaiOJcziAAZ2 zLLwaeQUV+x10)W#{)YfYAq@@zOi?W%E?y2!fz8j(FiHRw&S#dmQ4UloNQ}xbuu>r$ XO1Ur$6(&w)JL^%#?W{+c($)X~S<8t< delta 99 zcmZ4fg!lC$-i9rV0!J7>PZvDGC_LHfpWF1nBaA968`kwQPp>?}s5$xkKi270M;N8G zgoOk-8NfimK>#GLFr7n7go~epOW;VyL?(&<|NqZt)?k!4UfO=}DC72nN14*r002u| BBzXV; diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 78270bfc9e..9b62715a34 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -38221,20 +38221,11 @@ cont { } cont { name: "leisure-track" - element { - scale: 14 - lines { - width: 1.0 - color: 6510384 - priority: 1320 - cap: BUTTCAP - } - } element { scale: 15 lines { width: 1.5 - color: 6510384 + color: 13749671 priority: 1320 cap: BUTTCAP } @@ -38243,7 +38234,7 @@ cont { scale: 16 lines { width: 1.8 - color: 6510384 + color: 13749671 priority: 1320 } caption { @@ -38259,7 +38250,7 @@ cont { scale: 17 lines { width: 3.0 - color: 6510384 + color: 13749671 priority: 1047 } caption { @@ -38276,7 +38267,7 @@ cont { scale: 18 lines { width: 3.0 - color: 6510384 + color: 13749671 priority: 1047 } caption { @@ -38293,7 +38284,7 @@ cont { scale: 19 lines { width: 4.0 - color: 6510384 + color: 13749671 priority: 1047 } caption { @@ -38307,6 +38298,76 @@ cont { } } } +cont { + name: "leisure-track-area" + element { + scale: 15 + area { + color: 13749671 + priority: -15680 + } + } + element { + scale: 16 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } + element { + scale: 17 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } + element { + scale: 18 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } + element { + scale: 19 + area { + color: 13749671 + priority: -15680 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 15320 + } + } +} cont { name: "leisure-water_park" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 4ba761f95abea8c0fdcb572998db10a258f17bee..28977e1cbe367c07d7a9ed2714b175a0eeb51e71 100644 GIT binary patch delta 343 zcmZp>#(U^GZ^IVGDM##XF>>+dq-GYE7NzQz6eT8S3yE{^3kh>FfWZ%Yf!T*z7!_7< zSuhG|atH_sa-KZ{0)HS9(_bH9RA&JxnO<;|QF6NeQAPnIZVWP4s{Rrqmk^3wx`{=p zi9#YA{89oOAVVY$wEl+xMj;Ij0ZdUXAue7HPJ!?5?lMa>EIKlSS>i@HP^BPIDnmg^ Zg>We4!Z1{rIF;?4M;W(w9%ZUs3IGwkilP7j delta 91 zcmX?foww~8Z^IVGDMti9Gjj3fq-GYE7NzQz6eT8SPtN}DIsNJpMirK|%lyJ2LYG@$#&OcjN4t0G1V>w0L~#K9{>OV diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 9f390fb8a5..8dc5a07dee 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -38364,20 +38364,11 @@ cont { } cont { name: "leisure-track" - element { - scale: 14 - lines { - width: 1.0 - color: 6247213 - priority: 1320 - cap: BUTTCAP - } - } element { scale: 15 lines { width: 1.5 - color: 6247213 + color: 2171163 priority: 1320 cap: BUTTCAP } @@ -38386,7 +38377,7 @@ cont { scale: 16 lines { width: 1.8 - color: 6247213 + color: 2171163 priority: 1320 } caption { @@ -38402,7 +38393,7 @@ cont { scale: 17 lines { width: 3.0 - color: 6247213 + color: 2171163 priority: 1047 } caption { @@ -38419,7 +38410,7 @@ cont { scale: 18 lines { width: 3.0 - color: 6247213 + color: 2171163 priority: 1047 } caption { @@ -38436,7 +38427,7 @@ cont { scale: 19 lines { width: 4.0 - color: 6247213 + color: 2171163 priority: 1047 } caption { @@ -38450,6 +38441,76 @@ cont { } } } +cont { + name: "leisure-track-area" + element { + scale: 15 + area { + color: 2171163 + priority: -15680 + } + } + element { + scale: 16 + area { + color: 2171163 + priority: -15680 + } + caption { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 15320 + } + } + element { + scale: 17 + area { + color: 2171163 + priority: -15680 + } + caption { + primary { + height: 9 + color: 7829367 + stroke_color: 856756480 + } + priority: 15320 + } + } + element { + scale: 18 + area { + color: 2171163 + priority: -15680 + } + caption { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 15320 + } + } + element { + scale: 19 + area { + color: 2171163 + priority: -15680 + } + caption { + primary { + height: 10 + color: 7829367 + stroke_color: 856756480 + } + priority: 15320 + } + } +} cont { name: "leisure-water_park" element { diff --git a/data/types.txt b/data/types.txt index 89344855ee..cc746ef5bc 100644 --- a/data/types.txt +++ b/data/types.txt @@ -405,7 +405,7 @@ mapswithme *aerialway|gondola tourism|museum *highway|living_street|bridge -mapswithme +*leisure|track|area *railway|monorail mapswithme mapswithme diff --git a/data/visibility.txt b/data/visibility.txt index d431407a3a..67724cec23 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -586,7 +586,9 @@ world 00000000000000000000 + swimming_pool 00000000000001111111 + private 00000000000001111111 - {} - track 00000000000000000000 - + track 00000000000000000000 + + area 00000000000000000000 - + {} water_park 00000000000000000000 - {} man_made 00000000000000000000 +