From a9b1693beb6d613cbc1bb50c534a2e28ceea6c3d Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 14 Feb 2024 10:21:12 +0200 Subject: [PATCH] [styles] Regenerate for outdoors-specific POIs Signed-off-by: Konstantin Pastbin --- data/drules_proto.bin | Bin 427966 -> 427306 bytes data/drules_proto.txt | 872 +++++++----------- data/drules_proto_clear.bin | Bin 415356 -> 414507 bytes data/drules_proto_clear.txt | 817 ++++++---------- data/drules_proto_dark.bin | Bin 413951 -> 413106 bytes data/drules_proto_dark.txt | 817 ++++++---------- data/drules_proto_outdoors_clear.bin | Bin 432581 -> 432507 bytes data/drules_proto_outdoors_clear.txt | 209 ++--- data/drules_proto_outdoors_dark.bin | Bin 431061 -> 430987 bytes data/drules_proto_outdoors_dark.txt | 209 ++--- .../include/priorities_1_BG-by-size.prio.txt | 8 +- .../include/priorities_4_overlays.prio.txt | 77 +- .../include/priorities_4_overlays.prio.txt | 13 +- 13 files changed, 1078 insertions(+), 1944 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index ba8d7686d0e17d3db88747f58d32a8736355baea..46c39bc38a26031eb49ca64e03374854508e4c2f 100644 GIT binary patch delta 4525 zcmc(jYitx%6o4~l+hLe}&u+KNmeNu|2xX~l12GsS0#afOFKdhmp$uiDEBj)1TO=9_ z5rJre;utPABn2c5f$)$LN0O>M3}9`f$U}J+q)=L+wE9bah-YRxZFhE-gcL)QoqO(g z&YpYb-gEA~+wVX1?f%$z;GbF4Me)I`CaRPyJ_Xt0sM#YMTgxuLF>Z~Cweuk%97wG4 z$E$>3LWpq_8Eb)!9p2aVhrCzJB(f25ToV~vI)y!*!jVqlOsC+|DO~9k?i58EhTAx; z{$MtBLHz5R!|H2~ATuXJj(Dcb+jvdt%BIZXPp3!Y^H1ezZAH1UsI@$kIwGz;f7SE~ zV-v4mDiEWW$B@-qU>sUfS7s{DT*7|Y2Xe{Weo?%4MYYN$7ZpgTI>@2!im&{B+Vldt zb6%b*F20$EKAbnED$iW;!L{5zX>yw^6}M}eJ#t@laa=rj>H3q4s9UVLdS+-5b&I#! zhU}vJk0HA_-acd(B^^U^@!_^kX?k{Bt1Mh$;J@OBd=BfOYVfA3Rix97}l!I6k>_M9F%(n z5V7Hxz!VbN1jEUsD3q&UG5p4m<4a)nQyTpOL*82kWlw4JUl~#ogc(m~bm?Xk-hGxj zLKYHug8N2@!-2|*1ivIGVBXpbT&!&{6N^8{bECqMPT@?a;L<5v=@f1QMZR=z z5A5?%=gHO+@U4DB7q3YRs0*awB&6*1vPwE|3c4uQeiLgAMXJLIJ`k>m^6@z5C3~B} z3)tSkHiPprRAWOC$ zMwzAh7C1mdH<0;f!CP);*a9<4SMoK2KknT@`~CeNIMT&h%DQ7>f?{ebL5Q<0vn2qUG#?a)lQn=@I9 zHfU7fmvhfCEV*?XiZKb4#-cP*`)#mM$d3L1ZZfR{h7sExC`tlv>A_AtxPJ#m)E`_kO+@Di?NR!t;W$%i8xht-Rh@V+iC_Ld3A%m&P&XJlayoWYmD1k55cdcmv7 zD+bB+{jz&~OE2KZgr5wlr8kqAJN{oRutcOf7Kn%Zd@vda3l&w>39bkOaI%&GB6c_B zJBt{LA+;J(TPk%GVXh|m^@qfsrcuZpX}Hsfdy4R=)cNu5@{?bt)4psB-t{P@+dwJd zH#b_weqv&s+H6$vp=d=skPtXO{!Fs7tPJEnIod$w+x=Lf2GDK<9Y)Y;1i2*Gtq$Ze zf^I#`%VYPMSoc8qF}{Wmt8akU(*hS6y?}O+zZ(WERy6n)fE;)!i zk?32O78=$igpBi~l5%>cV?ryiE-muDOOlcjg&01bi7LVy+6J4LzcmL>V&$mRVY0q~ za)4?=4h_g?t{jeo%*i5wmfa{PqyblsNgek|7X*5BM)5Wi>(OFe83-;FVqqa3?<;3r ziDJl2qsaYt=o~C1-AW|sbjy*X)2&I8PPZ^gI^F81y6)xaN*4pwl)9BtzA2&d3vX=` zZe%NY{IAAJewAMl-sXcr&W*dPgEjX9++TP3k(v#u#gJMJ=p>xA!G1~TBf5^9ola+w Wk?ZIjReG&odcRNdNPE}OPU=6HQpBkM delta 5795 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 diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index e2af96d6fb..7b3146f436 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -5542,6 +5542,15 @@ cont { name: "drinking-water-s" priority: 3500 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6500 + } } element { scale: 19 @@ -11885,29 +11894,11 @@ cont { } cont { name: "amenity-shelter" - element { - scale: 16 - symbol { - name: "shelter-m" - priority: 1500 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -8500 - } - } element { scale: 17 symbol { name: "shelter-m" priority: 1500 - min_distance: 10 } caption { primary { @@ -11924,7 +11915,6 @@ cont { symbol { name: "shelter-m" priority: 1500 - min_distance: 10 } caption { primary { @@ -11941,7 +11931,6 @@ cont { symbol { name: "shelter-m" priority: 1500 - min_distance: 10 } caption { primary { @@ -11958,7 +11947,6 @@ cont { symbol { name: "shelter-m" priority: 1500 - min_distance: 10 } caption { primary { @@ -13662,6 +13650,15 @@ cont { name: "drinking-water-s" priority: 3050 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6950 + } } element { scale: 19 @@ -15574,7 +15571,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -15589,7 +15586,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -15604,7 +15601,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -15619,7 +15616,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -16112,10 +16109,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -16136,7 +16134,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16157,7 +16155,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16178,7 +16176,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16199,7 +16197,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16220,7 +16218,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16241,7 +16239,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16302,10 +16300,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -16322,7 +16321,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16339,7 +16338,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16356,7 +16355,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16373,7 +16372,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16390,7 +16389,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16407,7 +16406,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16491,10 +16490,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -16515,7 +16515,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16536,7 +16536,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16557,7 +16557,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16578,7 +16578,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16599,7 +16599,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16620,7 +16620,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16681,10 +16681,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -16701,7 +16702,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16718,7 +16719,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16735,7 +16736,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16752,7 +16753,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16769,7 +16770,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16786,7 +16787,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16847,10 +16848,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -16867,7 +16869,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16884,7 +16886,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16901,7 +16903,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16918,7 +16920,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16935,7 +16937,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -16952,7 +16954,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17013,10 +17015,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -17033,7 +17036,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17050,7 +17053,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17067,7 +17070,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17084,7 +17087,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17101,7 +17104,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17118,7 +17121,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17179,10 +17182,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -17199,7 +17203,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17216,7 +17220,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17233,7 +17237,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17250,7 +17254,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17267,7 +17271,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17284,7 +17288,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17345,10 +17349,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -17365,7 +17370,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17382,7 +17387,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17399,7 +17404,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17416,7 +17421,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17433,7 +17438,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -17450,7 +17455,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46197,20 +46202,6 @@ cont { color: 12372094 priority: -1940 } - symbol { - name: "nparkf-outline-s" - priority: 4800 - min_distance: 12 - } - apply_if: "name" - } - element { - scale: 12 - area { - color: 12372094 - priority: -1940 - } - apply_if: "!name" } element { scale: 13 @@ -46221,17 +46212,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 - } - caption { - primary { - height: 10 - color: 3832097 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - priority: -5200 } apply_if: "name" } @@ -46256,7 +46236,7 @@ cont { } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -46287,7 +46267,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46318,7 +46298,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46356,7 +46336,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46394,7 +46374,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46436,7 +46416,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46478,7 +46458,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46530,20 +46510,6 @@ cont { color: 12372094 priority: -1940 } - symbol { - name: "nparkf-outline-s" - priority: 4800 - min_distance: 12 - } - apply_if: "name" - } - element { - scale: 12 - area { - color: 12372094 - priority: -1940 - } - apply_if: "!name" } element { scale: 13 @@ -46554,17 +46520,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 - } - caption { - primary { - height: 10 - color: 3832097 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - priority: -5200 } apply_if: "name" } @@ -46589,7 +46544,7 @@ cont { } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -46620,7 +46575,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46651,7 +46606,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46689,7 +46644,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46727,7 +46682,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46769,7 +46724,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46811,7 +46766,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46863,20 +46818,6 @@ cont { color: 12372094 priority: -1940 } - symbol { - name: "nparkf-outline-s" - priority: 4800 - min_distance: 12 - } - apply_if: "name" - } - element { - scale: 12 - area { - color: 12372094 - priority: -1940 - } - apply_if: "!name" } element { scale: 13 @@ -46887,17 +46828,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 - } - caption { - primary { - height: 10 - color: 3832097 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - priority: -5200 } apply_if: "name" } @@ -46922,7 +46852,7 @@ cont { } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -46953,7 +46883,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -46984,7 +46914,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47022,7 +46952,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47060,7 +46990,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47102,7 +47032,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47144,7 +47074,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47196,20 +47126,6 @@ cont { color: 12372094 priority: -1940 } - symbol { - name: "nparkf-outline-s" - priority: 4800 - min_distance: 12 - } - apply_if: "name" - } - element { - scale: 12 - area { - color: 12372094 - priority: -1940 - } - apply_if: "!name" } element { scale: 13 @@ -47220,17 +47136,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 - } - caption { - primary { - height: 10 - color: 3832097 - stroke_color: 872415231 - offset_y: 1 - is_optional: true - } - priority: -5200 } apply_if: "name" } @@ -47255,7 +47160,7 @@ cont { } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -47286,7 +47191,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47317,7 +47222,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47355,7 +47260,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47393,7 +47298,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47435,7 +47340,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -47477,7 +47382,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50724,10 +50629,11 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 + min_distance: 12 } caption { primary { - height: 11 + height: 10 color: 3832097 stroke_color: 872415231 offset_y: 1 @@ -50748,7 +50654,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50769,7 +50675,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50790,7 +50696,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50811,7 +50717,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50832,7 +50738,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50853,7 +50759,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50870,7 +50776,6 @@ cont { symbol { name: "outdoor_seating-m" priority: 450 - min_distance: 10 } } element { @@ -50878,7 +50783,6 @@ cont { symbol { name: "outdoor_seating-m" priority: 450 - min_distance: 10 } } element { @@ -50886,7 +50790,6 @@ cont { symbol { name: "outdoor_seating-m" priority: 450 - min_distance: 10 } } } @@ -52072,29 +51975,11 @@ cont { } cont { name: "leisure-picnic_table" - element { - scale: 16 - symbol { - name: "picnic_table-m" - priority: 1200 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -8800 - } - } element { scale: 17 symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -52111,7 +51996,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -52128,7 +52012,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -52145,7 +52028,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -54236,6 +54118,15 @@ cont { name: "drinking-water-s" priority: 3050 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6950 + } } element { scale: 19 @@ -54243,6 +54134,15 @@ cont { name: "drinking-water-m" priority: 3050 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6950 + } } element { scale: 20 @@ -54250,6 +54150,15 @@ cont { name: "drinking-water-m" priority: 3050 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6950 + } } } cont { @@ -54274,6 +54183,15 @@ cont { name: "drinking-water-s" priority: 3050 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6950 + } } element { scale: 19 @@ -54281,6 +54199,15 @@ cont { name: "drinking-water-m" priority: 3050 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6950 + } } element { scale: 20 @@ -54288,6 +54215,15 @@ cont { name: "drinking-water-m" priority: 3050 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -6950 + } } } cont { @@ -54460,15 +54396,6 @@ cont { name: "mountain-pass-s" priority: 5050 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4950 - } } element { scale: 15 @@ -54510,7 +54437,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -54526,7 +54453,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -54542,7 +54469,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -54558,7 +54485,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -55218,53 +55145,12 @@ cont { } cont { name: "natural-cave_entrance" - element { - scale: 12 - symbol { - name: "cave-s" - priority: 4650 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -5350 - } - } - element { - scale: 13 - symbol { - name: "cave-s" - priority: 4650 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -5350 - } - } element { scale: 14 symbol { name: "cave-s" priority: 4650 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -5350 - } } element { scale: 15 @@ -55903,13 +55789,12 @@ cont { symbol { name: "geyser-s" priority: 4650 - min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 1 is_optional: true } priority: -5350 @@ -55920,13 +55805,12 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -55937,13 +55821,12 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -55954,13 +55837,12 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -55971,13 +55853,12 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -55988,13 +55869,12 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -56005,13 +55885,12 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -56300,16 +56179,6 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 6 - is_optional: true - } - priority: -5350 } } element { @@ -56317,13 +56186,12 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 1 is_optional: true } priority: -5350 @@ -56334,13 +56202,12 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 1 is_optional: true } priority: -5350 @@ -56349,15 +56216,14 @@ cont { element { scale: 17 symbol { - name: "drinking-water-s" + name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 6 + offset_y: 1 is_optional: true } priority: -5350 @@ -56368,13 +56234,12 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -56385,13 +56250,12 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -56402,13 +56266,12 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -56560,15 +56423,6 @@ cont { } cont { name: "natural-peak" - element { - scale: 12 - symbol { - name: "peakt-s" - priority: 5400 - min_distance: 10 - } - apply_if: "name" - } element { scale: 13 symbol { @@ -56661,7 +56515,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56686,7 +56540,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56711,7 +56565,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56736,7 +56590,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56756,19 +56610,21 @@ cont { } cont { name: "natural-rock" - element { - scale: 16 - symbol { - name: "peakt-s" - priority: 2850 - } - } element { scale: 17 symbol { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } element { scale: 18 @@ -56776,6 +56632,15 @@ cont { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } element { scale: 19 @@ -56783,6 +56648,15 @@ cont { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } element { scale: 20 @@ -56790,6 +56664,15 @@ cont { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } } cont { @@ -56825,7 +56708,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56841,7 +56724,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56857,7 +56740,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56873,7 +56756,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -56955,16 +56838,6 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 6 - is_optional: true - } - priority: -5350 } } element { @@ -56972,13 +56845,12 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 1 is_optional: true } priority: -5350 @@ -56989,13 +56861,12 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 } caption { primary { height: 10 color: 4473924 - offset_y: 6 + offset_y: 1 is_optional: true } priority: -5350 @@ -57004,15 +56875,14 @@ cont { element { scale: 17 symbol { - name: "drinking-water-s" + name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 6 + offset_y: 1 is_optional: true } priority: -5350 @@ -57023,13 +56893,12 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -57040,13 +56909,12 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -57057,13 +56925,12 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { - height: 10 + height: 11 color: 4473924 - offset_y: 8 + offset_y: 1 is_optional: true } priority: -5350 @@ -57198,53 +57065,12 @@ cont { } cont { name: "natural-volcano" - element { - scale: 10 - symbol { - name: "volcano-s" - priority: 5400 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4600 - } - } - element { - scale: 11 - symbol { - name: "volcano-s" - priority: 5400 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4600 - } - } element { scale: 12 symbol { name: "volcano-s" priority: 5400 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4600 - } } element { scale: 13 @@ -57318,7 +57144,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -57334,7 +57160,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -57350,7 +57176,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -57366,7 +57192,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -69575,27 +69401,6 @@ cont { } cont { name: "power-tower" - element { - scale: 16 - symbol { - name: "dot-m" - priority: 450 - } - } - element { - scale: 17 - symbol { - name: "dot-m" - priority: 450 - } - } - element { - scale: 18 - symbol { - name: "dot-m" - priority: 450 - } - } element { scale: 19 symbol { @@ -121586,7 +121391,6 @@ cont { symbol { name: "alpine_hut-s" priority: 5800 - min_distance: 8 } caption { primary { @@ -121603,7 +121407,6 @@ cont { symbol { name: "alpine_hut-s" priority: 5800 - min_distance: 8 } caption { primary { @@ -121620,7 +121423,6 @@ cont { symbol { name: "alpine_hut-m" priority: 5800 - min_distance: 24 } caption { primary { @@ -121637,7 +121439,6 @@ cont { symbol { name: "alpine_hut-m" priority: 5800 - min_distance: 24 } caption { primary { @@ -121654,7 +121455,6 @@ cont { symbol { name: "alpine_hut-m" priority: 5800 - min_distance: 16 } caption { primary { @@ -121671,7 +121471,6 @@ cont { symbol { name: "alpine_hut-m" priority: 5800 - min_distance: 16 } caption { primary { @@ -121688,7 +121487,6 @@ cont { symbol { name: "alpine_hut-m" priority: 5800 - min_distance: 16 } caption { primary { @@ -121705,7 +121503,6 @@ cont { symbol { name: "alpine_hut-m" priority: 5800 - min_distance: 16 } caption { primary { @@ -122786,29 +122583,11 @@ cont { } cont { name: "tourism-camp_site" - element { - scale: 15 - symbol { - name: "campsite-m" - priority: 3800 - min_distance: 12 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -6200 - } - } element { scale: 16 symbol { name: "campsite-m" priority: 3800 - min_distance: 12 } caption { primary { @@ -122825,7 +122604,6 @@ cont { symbol { name: "campsite-m" priority: 3800 - min_distance: 12 } caption { primary { @@ -122842,7 +122620,6 @@ cont { symbol { name: "campsite-m" priority: 3800 - min_distance: 12 } caption { primary { @@ -122859,7 +122636,6 @@ cont { symbol { name: "campsite-m" priority: 3800 - min_distance: 12 } caption { primary { @@ -122876,7 +122652,6 @@ cont { symbol { name: "campsite-m" priority: 3800 - min_distance: 12 } caption { primary { @@ -122896,7 +122671,6 @@ cont { symbol { name: "caravan_site-m" priority: 3800 - min_distance: 30 } caption { primary { @@ -122913,7 +122687,6 @@ cont { symbol { name: "caravan_site-m" priority: 3800 - min_distance: 20 } caption { primary { @@ -122930,7 +122703,6 @@ cont { symbol { name: "caravan_site-m" priority: 3800 - min_distance: 20 } caption { primary { @@ -122947,7 +122719,6 @@ cont { symbol { name: "caravan_site-m" priority: 3800 - min_distance: 20 } caption { primary { @@ -122964,7 +122735,6 @@ cont { symbol { name: "caravan_site-m" priority: 3800 - min_distance: 20 } caption { primary { @@ -122984,7 +122754,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3800 - min_distance: 24 } caption { primary { @@ -123001,7 +122770,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3800 - min_distance: 16 } caption { primary { @@ -123018,7 +122786,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3800 - min_distance: 16 } caption { primary { @@ -123035,7 +122802,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3800 - min_distance: 16 } caption { primary { @@ -123052,7 +122818,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3800 - min_distance: 16 } caption { primary { @@ -124229,7 +123994,6 @@ cont { symbol { name: "picnic-m" priority: 1800 - min_distance: 10 } caption { primary { @@ -124246,7 +124010,6 @@ cont { symbol { name: "picnic-m" priority: 1800 - min_distance: 10 } caption { primary { @@ -124263,7 +124026,6 @@ cont { symbol { name: "picnic-m" priority: 1800 - min_distance: 10 } caption { primary { @@ -124280,7 +124042,6 @@ cont { symbol { name: "picnic-m" priority: 1800 - min_distance: 10 } caption { primary { @@ -124297,7 +124058,6 @@ cont { symbol { name: "picnic-m" priority: 1800 - min_distance: 10 } caption { primary { @@ -124649,7 +124409,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3900 - min_distance: 24 } caption { primary { @@ -124666,7 +124425,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3900 - min_distance: 16 } caption { primary { @@ -124683,7 +124441,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3900 - min_distance: 16 } caption { primary { @@ -124700,7 +124457,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3900 - min_distance: 16 } caption { primary { @@ -124717,7 +124473,6 @@ cont { symbol { name: "alpine_hut-m" priority: 3900 - min_distance: 16 } caption { primary { @@ -126621,54 +126376,12 @@ cont { } cont { name: "waterway-waterfall" - element { - scale: 11 - symbol { - name: "waterfall-s" - priority: 5800 - min_distance: 15 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4200 - } - } - element { - scale: 12 - symbol { - name: "waterfall-s" - priority: 5800 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4200 - } - } element { scale: 13 symbol { name: "waterfall-s" priority: 5800 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4200 - } } element { scale: 14 @@ -126726,7 +126439,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -126742,7 +126455,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -126758,7 +126471,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -126774,7 +126487,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 8f10909dd5e6639ed5f890f05b2d1fd6328cc58a..1bfd6522ab6a5202012c5b8d75e852b84b82de94 100644 GIT binary patch delta 3645 zcmchaeN0nV6u|RN;qi70{dg^HDOA8nP~Z(2iTiMgAJLK-P!`=^Mw@3>rLnZo77fm? zxGd95H}&eS%>6Mme!#LQ#q7DwC<F#@vR|+j=iOeQ_ z@7&)x_uSKS&pj6&wdTb3<{UlXW(M&=cdf3H<4NH`$i_>n@;Xgb&n_%J#~`Cv?+f~) z%|fKk7l``8d>Ln+Xh6>l4TXBgbv?;!gj`D*$B(73jHR$9Db`X~owN7;W@85Mv{;Q6 zl%3$okc-V#4tzhBhv!!1bl#8sZDaKKr*nn$iF)N{nf&aW-@7QC>B9Rj+|bSC47m2H zoBXo|imATwaxR(q224>!yx`)HM0(?p7}v)26E3NGXF9r&hU~cUrX8=pv`06cGmyr4 zV8N#TVtk}OUvc-6@^s-_-@B;PdP5t}xFU}mFT3#eYpUebq3(2i`nD5axN>&9LIiXX zciqm#_`8-Tj!*OTWAT{l9{u?iuYZ$LRS%)S_Q9R_LiBvSPdRVPg<%WL|ccG1J$a$ ziN0FrQ}l2SELPlI`E?%5eTpld;>fNAFze~9C{-+iLq$v% zxz-Hh)<6K&lMmK{bD@(qNgFbUnxe0VLSawDCr16j6|{?<(eX~s@)(_UES;3K4o({3 z4nxjw1-qq!_Gb$+H2A$iztwxk_Uc2JBqg~fp26<7H@zF;&g2E9Js zNLSM%R)%zu_DRyI4j9ZR=mTWXCamx^N9fg8N-eVxr;f-+9Z--}${7<-pNdS$$ee%* zW6DH68CjB%btKA{GQNPtI_DrDUW=|S6!k-I_d4LoMB4-*A!{_7DzvSMnvaOfyl2>@7;uzRy$B3S)~N0 zorNE4_Y&&o|Jt2TzJyIo@opV5YP+*46!40{5YKa&@}E{iLz>_{CFJXKaFIs(YAX%C zvzMOaA-O+6Huh=UD!tqX-|jF7NZ$}z?F$Q0`T2J35*_`fNwrJTE88Z2s6%`-)D-qd z>IE^-;1Bvdbxl#eoXeVMMw!Eete?Xcn9J$;Nr{akG441n8=F#6b27D+(*hacm^ReI z0_n(LbE(eq7@c(tol~md*l1?aLk5|(ALte98$1zz)W-`nHX}kZkjL+1robrBf=*_9 zA|rxoXh{XFqhY>)b_22wuO1dxi9t1h3K{@y@?LS6DbBU-pGu+h|0D%DVrSW`l%A9; zVDyCiBJ>um?08glV!$VF_^8d2Q$n|J)Mm+)%+F?7ePV6MSs@!z(xWM8K6wSPSyG{c zZ8Vhp&LE2x%g~jl>`*BUh_-4K(Q4Riz_&;)?choyPR2?zPQWCun3c_yjy#%^HJCBM zW`k_xly()f13G3K*-*+lX|;_?1YP^Y1kzEeRN|;~jL;=lFrBxqjCI;+c9TmuL77~` zCniXA=3#r;U-X(-Ez*D6R*TJoA}kjJ0p3c_rwQrffc6J^T+Yv7KPI1Mur~7UT-K>d QC*#u3LsGWna(^b delta 4735 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 diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 00819cd7ff..14fb5c4dbc 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -15864,7 +15864,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -15879,7 +15879,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -15894,7 +15894,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -15909,7 +15909,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 6967599 stroke_color: 872415231 } @@ -16339,7 +16339,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -16373,7 +16372,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -16417,6 +16416,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -16563,7 +16563,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -16589,7 +16588,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -16625,6 +16624,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -16751,7 +16751,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -16785,7 +16784,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -16829,6 +16828,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -16975,7 +16975,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -17001,7 +17000,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -17037,6 +17036,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -17159,7 +17159,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -17185,7 +17184,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -17221,6 +17220,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -17343,7 +17343,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -17369,7 +17368,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -17405,6 +17404,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -17527,7 +17527,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -17553,7 +17552,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -17589,6 +17588,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -17711,7 +17711,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -17737,7 +17736,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -17773,6 +17772,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -49118,7 +49118,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 } apply_if: "name" } @@ -49137,15 +49136,14 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 - min_distance: 12 } caption { primary { - height: 10 + height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -49168,7 +49166,7 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 min_distance: 8 } @@ -49176,7 +49174,7 @@ cont { primary { height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -49205,7 +49203,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -49236,7 +49234,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -49451,7 +49449,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 } apply_if: "name" } @@ -49470,15 +49467,14 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 - min_distance: 12 } caption { primary { - height: 10 + height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -49501,7 +49497,7 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 min_distance: 8 } @@ -49509,7 +49505,7 @@ cont { primary { height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -49538,7 +49534,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -49569,7 +49565,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -49784,7 +49780,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 } apply_if: "name" } @@ -49803,15 +49798,14 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 - min_distance: 12 } caption { primary { - height: 10 + height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -49834,7 +49828,7 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 min_distance: 8 } @@ -49842,7 +49836,7 @@ cont { primary { height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -49871,7 +49865,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -49902,7 +49896,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50117,7 +50111,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 4800 - min_distance: 12 } apply_if: "name" } @@ -50136,15 +50129,14 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 - min_distance: 12 } caption { primary { - height: 10 + height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -50167,7 +50159,7 @@ cont { priority: -1940 } symbol { - name: "nparkf-outline-s" + name: "nparkf-outline-m" priority: 4800 min_distance: 8 } @@ -50175,7 +50167,7 @@ cont { primary { height: 11 color: 3832097 - stroke_color: 872415231 + stroke_color: 452984831 offset_y: 1 is_optional: true } @@ -50204,7 +50196,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -50235,7 +50227,7 @@ cont { } caption { primary { - height: 12 + height: 11 color: 3832097 stroke_color: 452984831 offset_y: 1 @@ -53579,7 +53571,6 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 } } element { @@ -53613,7 +53604,7 @@ cont { symbol { name: "nparkf-outline-s" priority: 6700 - min_distance: 20 + min_distance: 12 } caption { primary { @@ -53657,6 +53648,7 @@ cont { symbol { name: "nparkf-outline-m" priority: 6700 + min_distance: 12 } caption { primary { @@ -53803,7 +53795,6 @@ cont { symbol { name: "outdoor_seating-m" priority: 450 - min_distance: 10 } } element { @@ -53811,7 +53802,6 @@ cont { symbol { name: "outdoor_seating-m" priority: 450 - min_distance: 10 } } element { @@ -53819,7 +53809,6 @@ cont { symbol { name: "outdoor_seating-m" priority: 450 - min_distance: 10 } } } @@ -55017,7 +55006,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -55034,7 +55022,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -55051,7 +55038,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -55068,7 +55054,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -55085,7 +55070,6 @@ cont { symbol { name: "picnic_table-m" priority: 1200 - min_distance: 10 } caption { primary { @@ -59449,7 +59433,6 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59466,7 +59449,6 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59483,7 +59465,6 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59500,7 +59481,6 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59517,7 +59497,6 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59534,7 +59513,6 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59551,7 +59529,6 @@ cont { symbol { name: "geyser-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59860,16 +59837,6 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 6 - is_optional: true - } - priority: -5350 } } element { @@ -59877,7 +59844,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59894,7 +59860,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59911,7 +59876,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59928,7 +59892,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59945,7 +59908,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -59962,7 +59924,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -60395,6 +60356,15 @@ cont { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } element { scale: 18 @@ -60402,6 +60372,15 @@ cont { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } element { scale: 19 @@ -60409,6 +60388,15 @@ cont { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } element { scale: 20 @@ -60416,6 +60404,15 @@ cont { name: "peakt-s" priority: 2850 } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7150 + } } } cont { @@ -60618,7 +60615,6 @@ cont { symbol { name: "drinking-water-s" priority: 4650 - min_distance: 24 } caption { primary { @@ -60635,7 +60631,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -60652,7 +60647,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -60669,7 +60663,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -60686,7 +60679,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -60703,7 +60695,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -60720,7 +60711,6 @@ cont { symbol { name: "drinking-water-m" priority: 4650 - min_distance: 24 } caption { primary { @@ -60895,15 +60885,6 @@ cont { name: "volcano-s" priority: 5400 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4600 - } } element { scale: 11 @@ -60911,15 +60892,6 @@ cont { name: "volcano-s" priority: 5400 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4600 - } } element { scale: 12 @@ -60927,15 +60899,6 @@ cont { name: "volcano-s" priority: 5400 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: -4600 - } } element { scale: 13 diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 5bcf7a72692846d7c8fac561f489d75b262eb4dd..3019573411575eaf3c5a34d82f7f1c6e0e3ddc46 100644 GIT binary patch delta 1895 zcmd5+T}V@580LG=Y^SrixpR&>mwzczOa@z41bUH?KZM}Ks|cKH4PEZ9vn{BLR3eJ% zM!$>CaEc}5MWm6!sf(bbpc^m5pG2bz@t=N1c-zl6=PvwNOmFhQ_wk(Pd7tlncn{~B z8ZbN?=J4*NVjlDm*4}Tc*r7(pohsURKaN`#R@pOX+sd4*6A^F`66-))I z!S7~ruys;F^21Oh-w#6=VPQI($)dKpDIsc8@TIH@mrrD2^HLeLTRt~1rPSH6R5pC} z(=D{07Cm#h$+u`kxMwaqrG!s9)TZO)o*k$5>^Qv_$L;17xp@Wk-b9^5>3}lP%&HAq zw(XTw|26U__Mqt8iS-&Nh~EK)qLoeEtt1`Z7U7PC4D!nZ0x^4_oU}=xB1a_PaNmM5 z#`k%kW(#G*;$#~6;e}&z#0B+$dPrXrR2_gIVRGILl?Nb57g_ehx&I$Tz7vAcqJ8{b ztsXAZ?Q{h~lGEf11+Vygk}cr02VLGK-oWw&8Jun#ZSv?x8LA2Y(8NRyBuDZ!xpq(b~~|oC{N@qtS*tjClZ82g1C#2FXJJY zK7q!`)p_V*idhYrnFk{U+6|CeOrxc8Y?Jdwz$p>SEaX#4x0B*`Qo>G3+)Cxi7Z%_W zgZjzSWvHRIora7@K#yCi^ki`!a_~qTtj0lZ^`=xG2lrwiTb5R#PJ!0R`)^R$YNR36 zoYL>Kw**ZA{gVu%o>Q^vw1RuAGbOP}WFFc`%@N%!r0;VouAi`mYTq!N)@u)jB)i*m-RE}Ly*{32xdIJ$ fc=MGGsmn+?)h?WRJ9js-4saHzHK9c#s76T5Kpj4QeLHi58^a+ykKYTJ~sl!_f+&(Y{I9GyC1Iz)s0lZTVF zlQ+D8SZ?()CEwd?h#G*M=qwovgGjaqfoGO{+>>&WK?MXd)CPW}6Qoi6Q~`M9fGe!}SHuo6u`= zbp{&E)pUen+%_PP&S|iVc?Xg6UTX2rhxlqbMlpUdATWPNqZ#%Lo+E?DXYhm!p18`R zEq;SD4C)~2cc^c$)9bcyTcV15Ip))ykBWFZeO9X-VT~iMbd10cI0fhxNzTKum2>Z) z^8XCl`V;0*c{{_|R5=#c