From 778b74a5e1d37a585111feab13d5e30377325089 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Fri, 11 Aug 2017 17:53:13 +0300 Subject: [PATCH] [styles] Rebuilt styles after upgrading kothic --- data/drules_proto.bin | Bin 200502 -> 203522 bytes data/drules_proto.txt | 648 ++++++++++++++++++++++++++++ data/drules_proto_clear.bin | Bin 200043 -> 203063 bytes data/drules_proto_clear.txt | 648 ++++++++++++++++++++++++++++ data/drules_proto_dark.bin | Bin 198894 -> 201890 bytes data/drules_proto_dark.txt | 648 ++++++++++++++++++++++++++++ data/drules_proto_vehicle_clear.bin | Bin 123669 -> 126485 bytes data/drules_proto_vehicle_clear.txt | 624 +++++++++++++++++++++++++++ data/drules_proto_vehicle_dark.bin | Bin 123545 -> 126337 bytes data/drules_proto_vehicle_dark.txt | 624 +++++++++++++++++++++++++++ 10 files changed, 3192 insertions(+) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 5428288b32d1f8c12d565e65e72dd96df0ca6d43..f8e8e27894b589b0522deb142ce5656ec2342f62 100644 GIT binary patch delta 2569 zcmdlskEdxHPs0|*J=sjBd8Y5nW>jZ%pT4n(QN&bv^D-lzBT1u3D0UY{O zh|xd&V-aH&WAyY5WsD;3O1voU*An64=inAt_~|91#Q*>Q=QC?CN)Tn{{2Z{E3v(F7 zd0+vO3k;CS0i`0u`6_ChJI712w8QYnoIfSMkEN2vjdyh0TCgd@;u?R(T2xB)yotRMOy2dkIGM~|C zH1VNisOh7L4}Xa>ohpg%D$n%#B1Xf}#5bDwNGd(4lK3w2On*|!s5_eYMiU=36CY9a Pf4fs9<94S?rY}lZP{t=_o^pEw7mD3fLGjdNqo6DFtU28Rv^``{L zs#^kNd6zNrPXAELC^-E?DPsU*)bxb~jH1)yn;8qHH3_+xc3VzDxxGhJ}15 diff --git a/data/drules_proto.txt b/data/drules_proto.txt index e299bc073b..ecc8be951f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -30447,6 +30447,12 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -30454,6 +30460,21 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -30461,6 +30482,21 @@ cont { color: 11781233 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -30499,6 +30535,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 11453035 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -30536,6 +30593,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 11584112 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -30573,6 +30651,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -30610,6 +30709,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -30651,6 +30771,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -30692,6 +30833,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-coniferous" @@ -30708,6 +30870,12 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -30715,6 +30883,21 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -30722,6 +30905,21 @@ cont { color: 11781233 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -30760,6 +30958,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 11453035 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -30797,6 +31016,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 11584112 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -30834,6 +31074,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -30871,6 +31132,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -30912,6 +31194,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -30953,6 +31256,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-deciduous" @@ -30969,6 +31293,12 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -30976,6 +31306,21 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -30983,6 +31328,21 @@ cont { color: 11781233 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -31021,6 +31381,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 11453035 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -31058,6 +31439,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 11584112 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -31095,6 +31497,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -31132,6 +31555,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -31173,6 +31617,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -31214,6 +31679,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-mixed" @@ -31230,6 +31716,12 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -31237,6 +31729,21 @@ cont { color: 12372094 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -31244,6 +31751,21 @@ cont { color: 11781233 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -31282,6 +31804,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 11453035 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 3832097 + stroke_color: 872415231 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -31319,6 +31862,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 11584112 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -31356,6 +31920,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -31393,6 +31978,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -31434,6 +32040,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -31475,6 +32102,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 11190117 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 3832097 + stroke_color: 452984831 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-garages" diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index d26f87367b32fb3371ddb70595d70ba167adae66..2773c3c031288f4e9aae40de255d8beaa69bc4ba 100644 GIT binary patch delta 2697 zcmaDoi)Z^Lo`x-qH5p8&d8XH8Fsd`UPcO`86scF@=icl2}w}o0nLUnV*-K6Aw};6wARQCBX4-!e>^Av(5h@fDzpw9xV|r zehw~yg`ZwBN&wZ&XVzepcv^~PyeL-lr*FK%DB?+;iC7GrzA>M%iZOb6K{2BUzY;Hs zhbK=c5mCW#7B)lTGr@)=W-^NNz=A9n7-W+hN=4L&F+nJ5I%6TD$n*zUjGWW!G8rAF z&&_3&2D%F*itH|!sl>S}FbnLi`Vu5}Y7+gkm25E)_WHYw02t{)U zPj4(?6orQn%n)^ALWt`c&-9zwj7Fo06OtQ86KD4H!IL-O zq_vC^4U3M92V2oVK)BL$3x6qs;{Z9027qX7jboMW5r VS<9$Hwh8Sm&5YYynwjJ#0s!#CV$%Qs diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 3206d0199d..ad243f99ae 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -30309,6 +30309,12 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -30316,6 +30322,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -30323,6 +30344,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -30361,6 +30397,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -30398,6 +30455,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -30435,6 +30513,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -30472,6 +30571,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -30513,6 +30633,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -30554,6 +30695,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-coniferous" @@ -30570,6 +30732,12 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -30577,6 +30745,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -30584,6 +30767,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -30622,6 +30820,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -30659,6 +30878,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -30696,6 +30936,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -30733,6 +30994,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -30774,6 +31056,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -30815,6 +31118,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-deciduous" @@ -30831,6 +31155,12 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -30838,6 +31168,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -30845,6 +31190,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -30883,6 +31243,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -30920,6 +31301,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -30957,6 +31359,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -30994,6 +31417,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -31035,6 +31479,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -31076,6 +31541,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-mixed" @@ -31092,6 +31578,12 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 20 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 12 @@ -31099,6 +31591,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -31106,6 +31613,21 @@ cont { color: 1317888 priority: -15923 } + symbol { + name: "nparkf-s" + priority: 16077 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -31144,6 +31666,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-s" + priority: 16077 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 856756480 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -31181,6 +31724,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -31218,6 +31782,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-m" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -31255,6 +31840,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -31296,6 +31902,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -31337,6 +31964,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 1317888 + priority: -15923 + } + symbol { + name: "nparkf-l" + priority: 16077 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15077 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-garages" diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index debf83e71361637a3c269a8a505049cdba672c1f..8d599c04852ffa3eab71a7c8637e6c4a90599879 100644 GIT binary patch delta 2626 zcmbPwjD6}I_6?IyG5zA2JoS_g_&K-* z7JhokDDnUQ|8^D)Mv2BUFNM^KlA^@;lEie|r2Nvnl*FP++q}e*%>2B>oOqCaq1eeA z&x&|b&AiF}m*W|uCkI{@=Ycse7wEvr1*RfuM7hU)@`uYJlP-D!4FNLTm3ZME1(^f( zCJ)@3`dxEsu;IWQOU!d-Zskw_N`IZSRmFFN_& zm2jY;K$aWAL&@MOpH!k*MIldF|`a?n|i(X>h^_K8B2HpsbJ!Y delta 353 zcmbPwhkfcX_6?IyG3{cVJoS|A^aZkvI+K;|#7z$P$UXVzY2L{j?rKj~xGOz*-AC@} zzvURYCdXaYn|vE6!1IZF@|m;2ll8xHPmaFNJ^9^zy~zj8X)-!Y7Q8A79$GvrFkidMU}RBi6xo&d5JmkAmu_a9K2He99{ENBwjZEhX6(_hN%%{ znBDY;;*7$R9WHw?MuC~`O1yA)lU)7wS3vq5uORg2fb4&0DneYy*iSD6M$_aC zSHgiI17h+cg$&Fn;=EFDE1O9uYVyQOB7BIzg&CnvOlWYu=bF6dlG|w7Auhm2(+*OB y!S#-7a>-TK(X=y~c0iR4Y30r^X*&PZ{K3v#|{A2%yMY} delta 293 zcmZp?%|7!e`v%?%OsiNY^Ix!@K2M2JYqHc2uE{4Z3QuOcV?X)+U#`ik?*vVj{RR@V zm^}Ng)MUM%T$82m1x#P70byy_cbO@xSz$$wUu>p*;O|R4cWpv`Nb_)3Jux7 VIyv%zBSnTZAAY+1@KeTp>;UTvjkW*) diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 5477998719..28fb009247 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -17410,6 +17410,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -17417,6 +17432,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -17448,6 +17478,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -17478,6 +17529,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -17508,6 +17580,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -17538,6 +17631,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -17572,6 +17686,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -17606,6 +17741,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-coniferous" @@ -17629,6 +17785,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -17636,6 +17807,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -17667,6 +17853,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -17697,6 +17904,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -17727,6 +17955,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -17757,6 +18006,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -17791,6 +18061,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -17825,6 +18116,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-deciduous" @@ -17848,6 +18160,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -17855,6 +18182,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -17886,6 +18228,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -17916,6 +18279,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -17946,6 +18330,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -17976,6 +18381,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -18010,6 +18436,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -18044,6 +18491,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-forest-mixed" @@ -18067,6 +18535,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 13 @@ -18074,6 +18557,21 @@ cont { color: 593674 priority: -15895 } + symbol { + name: "nparkf-s" + priority: 16105 + min_distance: 12 + } + caption { + primary { + height: 11 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" } element { scale: 14 @@ -18105,6 +18603,27 @@ cont { } apply_if: "!name" } + element { + scale: 14 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 1074860288 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 15 area { @@ -18135,6 +18654,27 @@ cont { } apply_if: "!name" } + element { + scale: 15 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 16 area { @@ -18165,6 +18705,27 @@ cont { } apply_if: "!name" } + element { + scale: 16 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-m" + priority: 16105 + } + caption { + primary { + height: 12 + color: 2836760 + stroke_color: 655429888 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 17 area { @@ -18195,6 +18756,27 @@ cont { } apply_if: "!name" } + element { + scale: 17 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 18 area { @@ -18229,6 +18811,27 @@ cont { } apply_if: "!name" } + element { + scale: 18 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } element { scale: 19 area { @@ -18263,6 +18866,27 @@ cont { } apply_if: "!name" } + element { + scale: 19 + area { + color: 593674 + priority: -15895 + } + symbol { + name: "nparkf-l" + priority: 16105 + } + caption { + primary { + height: 13 + color: 2836760 + stroke_color: 437326080 + offset_y: 1 + } + priority: 15105 + } + apply_if: "extra_tag=boundary=national_park" + } } cont { name: "landuse-garages"