From 7c8eb0712e16dc63a60c43de8125715de3588cba Mon Sep 17 00:00:00 2001 From: vng Date: Sat, 2 Apr 2016 15:03:35 +0300 Subject: [PATCH] Regenerated classificator. --- data/classificator.txt | 5 - data/drules_proto.bin | Bin 228886 -> 226214 bytes data/drules_proto.txt | 868 --------------------------------- data/drules_proto_clear.bin | Bin 212840 -> 210315 bytes data/drules_proto_clear.txt | 906 +---------------------------------- data/drules_proto_dark.bin | Bin 210207 -> 207682 bytes data/drules_proto_dark.txt | 906 +---------------------------------- data/drules_proto_legacy.bin | Bin 208650 -> 206086 bytes data/drules_proto_legacy.txt | 820 ------------------------------- data/types.txt | 14 +- data/visibility.txt | 5 - 11 files changed, 45 insertions(+), 3479 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 603ae586c4..13608b5f08 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -210,7 +210,6 @@ world + difficult_alpine_hiking - hiking - mountain_hiking - - no-access - permissive - tunnel - {} @@ -231,8 +230,6 @@ world + path + alpine_hiking - bicycle - - bicycle-bridge - - bicycle-tunnel - bridge - demanding_alpine_hiking - demanding_mountain_hiking - @@ -240,7 +237,6 @@ world + hiking - horse - mountain_hiking - - no-access - permissive - tunnel - {} @@ -491,7 +487,6 @@ world + vineyard - volcano - water - - waterfall - wetland + bog - marsh - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 80d7a269292d1fc97499b7e11e2c49d0d46453b8..7984a01bcdd4a80e316161e9aaf60f77c3c29b4b 100644 GIT binary patch delta 38 wcmV+>0NMYR{0*k(4X`bwvkRuVE3;D9qzr?g<+q^a0q-P-=?en4=?eoba)Wgeu>b%7 delta 530 zcmZ4XoOjwE-VM4-WN$NbNoHiGXOt&a>ZaxAmw@QJeBH$4NDC(oU3yZOgd zRmRP_OLl5YOk(AdhN&+|EXmMK%1o|I&Pm<;?R+hh#5WwWljWC*Pv*Vgzj^h&YNpN4 z&M)DSTF%TRhGG!HR^Ka&CcnA)uDR>Z_O3gO?^WuVxCHYOOG=9pb9BoSOHzx{5_58d zlsLGR1h_ci0s@Q@4YgW4T07L{oATs5z5yVQR|L5~GfURx-U=jhYDgCzh|Nd{Djf-5yTgDMFS>AptS zimud5=>3g+&GRItdPC-So?&z2`?f6~r zXD>KUV-|Tod^VTM=VdT^O-%sk;O&2AK|%TnyrZPzSe-CYp_Z(Y0ItG-q#^;PB7iwG zub>M17U!VjTa!)z9_URx5Ph=OtN_x}2=A`s^4fp(+{ViaDlxUD-L+eeu?4jH#Tzh2 zKCK@H^yLQdi$*SwKU+}yqU$xi2c{YIetdF4?I$)q{D&HkR@Yxp5MpYcHys!wpjAc1 zF)&66raqiCbNMWLM^7{2$!#~))I7p|UNX;I|9$+0ozR|geBsS8W)e*jW7M4zB}}Msl2S_;Q;ThL!%qq-Gv9hM?M?_W zu@OA0BV==%=;8KYE?-Ea_iw2(A|4&OkwsBuBt6O8_=AEBF6d4;cG&b>DNO~3948E@ zCQDNiU!?x9sk>%vm zYA~ojYS4ti>N11T<(f&xj7N;&o3AK&J*x-5s%^chpelPwuNii|jvqL!36V|5B}QH@ z&ZgM`mQ8ouNoUjTcjRo!N2|&ieBzEe00o;CeIicQ{=cO-i65s0q3U~X(+))ZNGKIQ z8BXJ;RF)~kE{QgXBb4PNp0bmrlrYiqd?^8OlgP(;TVgyV2qLEhiP4mh*e0I2p%zw8 zbbPl7J)0vcQw)e2W|b+;NM$M%1tal83sVM>x|Bk-rxry@n6&(H$8Ff8L3E6*u$cp> zSAvdD#dqIU^Oa@zuKQ46XYcUY)*vYkdkMzejGJ2pbZ=a z;6^foHgE#a296t2)|vDj$DQ;&8`3JzIuasUan{Lj9yKzRqb9>y)TE)QT*BYpSNnzV z6jaS|-w6Wd#8^1Pxv)%S;S6WOX(-hcDD>lpEZ9n3Q-n=-k=2wGA~i)r9MJ$GB_%~j zMUg=*X=>hZ4mmC8czKJ+O`;Va4vF!@A&7i9Bt{QMVw-Ee5^dXb(+j4J4G^Pcl&1z! zDg)7%kZM9ehs-gSkUp7^OF;c$atUZz9e3RCrY->zqi>nmrg~4ocOR`*LArP)?ZS3@O+Ot Sz|4gnbq#qc;tS8^KKd7x$eZv0 delta 6943 zcmcIpU5MP)6}F_cGrsdHY5vw;H}U$nHXD~_mr#eo_MxGa+KEG;5K1T7S?$hbXQhdx z^)iX+I@r)c``~0~FCny~4}Evp!a`_?H%XrYfo&h!QsN}G^H;mEQ<6S3CF#-CJsRms zv))4dG;_amboAYO?)kY_KfRv&;Pc$Y$ENxtQ{}!jRb#);vtM;}eTw{WR+G@|Y zmW|%ToNasluVqgd&8F$Pt1n(SFZIWMms|Zy|J=U%iwfC|x?RI-P0X~Ly=KRxW24gj zt7q3AmFicAsPr#BRaEgmV5of%Sk?I+L5hcor( z&VW{a3tHou!gwM6hJmFjH#MFqhDwViiK-7tmEw4&lm@B^kT&jCcI*r$(SfI*Jt^&u z56f#0T$B2{vhT@6wG3~`F*=mqr@UW2lu^fZl3g}D)0s0moeBPYh5lwz*-c-#TglSb zCzUb(UvBM<&!uB;jlCq15w~S`HO|`qKe1TffTi0;fBlwR%kK~&U1h8p+!<)<^wQh% z2vaTylUQA;8cl8uyw))w?kEH(L z)8uuDWEry=W5INK;MXGfH4}`&iAkTxx?V~V{5Gf53tSlqGi5EJ91+yMjix!c2_e&1 z@&<(1D2-5D5D*Hm$a{4?Ae0c)zMh$hfeAu?mPjF3A@j8981tq}FI|?a(zc&Jsf^NF zm*u>)jY?PLT4}4ES=o|j{vnZE@ZKOJXh*;`Rpb(2xE>;D&@BzuEki6v_5diW<5ha$ zid>dq6Te(h>h!rQvR1!mTZ&zss~%5E$=@VG0?M|%;A)3}FvQmk3?>+iakBBTT+>qU zkFUvkmBr-X8FV6(X>ofISoFjz(e+8cL_?Hb`bod5z^#iq|pES zzR{w9(I34l*VKV3u6XXRQoR%!K=chzKABJ!Hy-(uL^RIGnlqbT+qNR5#$7f|&qY#n zP-+AL%j_IO0)tYM6x1Hd#K8ow4<%AUUZ+i~ZCXt;j7r-=D5T~`W&C zcH8UOOO9)H=CGvBMlkfYxBysEx1hV{>7b;NLQEMqtzTfL(NwxMN%Gri;-OfpC3UjXRQ0ktCLZ)i|ntBh7)^KLH!g`|RRFGV6+#<~(!<$P0A zS)oZ$Wij$-K1CuL8O)>wecr4C*B67CL?B@%DH72#&LpaOo0+7jvYC|gX%fE=IvLbX z=&fg$4G1;f2jLi5C%7Gi-39+JG3cwG4z4yj#*#Jb^kP>VNlZV)W+n&{Gdm~K3;&iM z?iWwowZgK(V*Q4HO%qotc(o?>=7v3K=9IZ#?j6R-<4Qa^u& zgbm7~J=5-(jcyCNWNc8P74QMU-nSYq>;pCa06k^Kg7S^DoNm5?P8k96$b`s$c zXm`DKvu#)yfjAyI6&``29*@8fM#3xt6R0174-yd;=RjV;dlq}io3(8R>jvKrU*^r; zG;RTAG{NK&h9dahv+p2}Z*9&aObM_AaDe40fep}O(Ug!7KuQQO^bbo3amY^zkf0#d z#PGzLg!hwf*LFM??OKpN6K_YB)JiF)OM)Ch65#H#C5N~uCjLQ*ebYggL z6&-^f`#|2c*K^=|L8k#1p;ohp?*=D++1KD(4HmBleaRi<5x=2dv%iqXCZ&JUpWUY% zTR8~dO4R5V1lRwFa=bYBSVDXN@?L(6dW9|O`MWPm@1InP52U@W6gRUtgceXmFNElojLZ; diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 8eeb20006e..023a77267d 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -4520,7 +4520,7 @@ cont { symbol { name: "marketplace-l" priority: 16849 - min_distance: 15 + min_distance: 0 } caption { primary { @@ -4536,7 +4536,7 @@ cont { symbol { name: "marketplace-l" priority: 16849 - min_distance: 15 + min_distance: 0 } caption { primary { @@ -4552,7 +4552,7 @@ cont { symbol { name: "marketplace-l" priority: 16849 - min_distance: 15 + min_distance: 0 } caption { primary { @@ -12303,133 +12303,6 @@ cont { } } } -cont { - name: "highway-footway-no-access" - element { - scale: 14 - lines { - width: 1.0 - color: 16316664 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.7 - color: 16316664 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 2.0 - color: 16316664 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.4 - color: 16316664 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.4 - color: 16316664 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 16316664 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } -} cont { name: "highway-footway-permissive" element { @@ -15455,278 +15328,6 @@ cont { } } } -cont { - name: "highway-path-bicycle-bridge" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } -} -cont { - name: "highway-path-bicycle-tunnel" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 9.0 - color: 14934482 - priority: 1108 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 10.0 - color: 8421504 - dashdot { - dd: 2.0 - dd: 2.0 - } - priority: 1094 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } -} cont { name: "highway-path-bridge" element { @@ -16616,133 +16217,6 @@ cont { } } } -cont { - name: "highway-path-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 6510384 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 6510384 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 6510384 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 6510384 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 16452 - } - } -} cont { name: "highway-path-permissive" element { @@ -40679,7 +40153,6 @@ cont { scale: 11 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 min_distance: 20 } @@ -40688,7 +40161,6 @@ cont { scale: 12 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 min_distance: 15 } @@ -40705,7 +40177,6 @@ cont { scale: 13 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 min_distance: 15 } @@ -40722,7 +40193,6 @@ cont { scale: 14 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 } caption { @@ -40738,7 +40208,6 @@ cont { scale: 15 symbol { name: "cave-m" - apply_for_type: 1 priority: 16890 } caption { @@ -40754,7 +40223,6 @@ cont { scale: 16 symbol { name: "cave-m" - apply_for_type: 1 priority: 16890 } caption { @@ -40770,7 +40238,6 @@ cont { scale: 17 symbol { name: "cave-m" - apply_for_type: 1 priority: 16890 } caption { @@ -40786,7 +40253,6 @@ cont { scale: 18 symbol { name: "cave-l" - apply_for_type: 1 priority: 16890 } caption { @@ -40802,7 +40268,6 @@ cont { scale: 19 symbol { name: "cave-l" - apply_for_type: 1 priority: 16890 } caption { @@ -42888,138 +42353,6 @@ cont { apply_if: "bbox_area<4000000" } } -cont { - name: "natural-waterfall" - element { - scale: 11 - symbol { - name: "waterfall-s" - priority: 16890 - min_distance: 15 - } - } - element { - scale: 12 - symbol { - name: "waterfall-s" - priority: 16890 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 13 - symbol { - name: "waterfall-s" - priority: 16890 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 14 - symbol { - name: "waterfall-s" - priority: 16890 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 15 - symbol { - name: "waterfall-m" - priority: 16890 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 16 - symbol { - name: "waterfall-m" - priority: 16890 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 17 - symbol { - name: "waterfall-l" - apply_for_type: 1 - priority: 16890 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 18 - symbol { - name: "waterfall-l" - priority: 16890 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 19 - symbol { - name: "waterfall-l" - priority: 16890 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 10 - } - priority: 15890 - } - } -} cont { name: "natural-wetland" element { @@ -61439,7 +60772,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61455,7 +60787,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61471,7 +60802,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61487,7 +60817,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61503,7 +60832,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61554,7 +60882,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61570,7 +60897,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61586,7 +60912,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61605,7 +60930,6 @@ cont { symbol { name: "bakery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61621,7 +60945,6 @@ cont { symbol { name: "bakery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61637,7 +60960,6 @@ cont { symbol { name: "bakery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61653,7 +60975,6 @@ cont { symbol { name: "bakery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61669,7 +60990,6 @@ cont { symbol { name: "bakery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61688,7 +61008,6 @@ cont { symbol { name: "beauty-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61704,7 +61023,6 @@ cont { symbol { name: "beauty-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61720,7 +61038,6 @@ cont { symbol { name: "beauty-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61736,7 +61053,6 @@ cont { symbol { name: "beauty-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61752,7 +61068,6 @@ cont { symbol { name: "beauty-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61771,7 +61086,6 @@ cont { symbol { name: "alcohol-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61787,7 +61101,6 @@ cont { symbol { name: "alcohol-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61803,7 +61116,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61819,7 +61131,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61835,7 +61146,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61854,7 +61164,6 @@ cont { symbol { name: "shop-bicycle-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61870,7 +61179,6 @@ cont { symbol { name: "shop-bicycle-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61886,7 +61194,6 @@ cont { symbol { name: "shop-bicycle-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61902,7 +61209,6 @@ cont { symbol { name: "shop-bicycle-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61918,7 +61224,6 @@ cont { symbol { name: "shop-bicycle-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61937,7 +61242,6 @@ cont { symbol { name: "book-shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61953,7 +61257,6 @@ cont { symbol { name: "book-shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61969,7 +61272,6 @@ cont { symbol { name: "book-shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61985,7 +61287,6 @@ cont { symbol { name: "book-shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62001,7 +61302,6 @@ cont { symbol { name: "book-shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62020,7 +61320,6 @@ cont { symbol { name: "butcher-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62036,7 +61335,6 @@ cont { symbol { name: "butcher-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62052,7 +61350,6 @@ cont { symbol { name: "butcher-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62068,7 +61365,6 @@ cont { symbol { name: "butcher-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62084,7 +61380,6 @@ cont { symbol { name: "butcher-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62103,7 +61398,6 @@ cont { symbol { name: "car_sharing-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62119,7 +61413,6 @@ cont { symbol { name: "car_sharing-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62135,7 +61428,6 @@ cont { symbol { name: "car_sharing-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62151,7 +61443,6 @@ cont { symbol { name: "car_sharing-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62167,7 +61458,6 @@ cont { symbol { name: "car_sharing-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62186,7 +61476,6 @@ cont { symbol { name: "car-repair-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62202,7 +61491,6 @@ cont { symbol { name: "car-repair-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62218,7 +61506,6 @@ cont { symbol { name: "car-repair-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62234,7 +61521,6 @@ cont { symbol { name: "car-repair-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62250,7 +61536,6 @@ cont { symbol { name: "car-repair-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62269,7 +61554,6 @@ cont { symbol { name: "chemist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62285,7 +61569,6 @@ cont { symbol { name: "chemist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62301,7 +61584,6 @@ cont { symbol { name: "chemist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62317,7 +61599,6 @@ cont { symbol { name: "chemist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62333,7 +61614,6 @@ cont { symbol { name: "chemist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62352,7 +61632,6 @@ cont { symbol { name: "clothes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62368,7 +61647,6 @@ cont { symbol { name: "clothes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62384,7 +61662,6 @@ cont { symbol { name: "clothes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62400,7 +61677,6 @@ cont { symbol { name: "clothes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62416,7 +61692,6 @@ cont { symbol { name: "clothes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62435,7 +61710,6 @@ cont { symbol { name: "computer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62451,7 +61725,6 @@ cont { symbol { name: "computer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62467,7 +61740,6 @@ cont { symbol { name: "computer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62483,7 +61755,6 @@ cont { symbol { name: "computer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62499,7 +61770,6 @@ cont { symbol { name: "computer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62518,7 +61788,6 @@ cont { symbol { name: "sweets-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62534,7 +61803,6 @@ cont { symbol { name: "sweets-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62550,7 +61818,6 @@ cont { symbol { name: "sweets-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62566,7 +61833,6 @@ cont { symbol { name: "sweets-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62582,7 +61848,6 @@ cont { symbol { name: "sweets-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62601,7 +61866,6 @@ cont { symbol { name: "convenience-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62617,7 +61881,6 @@ cont { symbol { name: "convenience-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62633,7 +61896,6 @@ cont { symbol { name: "convenience-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62649,7 +61911,6 @@ cont { symbol { name: "convenience-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62665,7 +61926,6 @@ cont { symbol { name: "convenience-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62684,7 +61944,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62700,7 +61959,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62716,7 +61974,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62732,7 +61989,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62748,7 +62004,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62767,7 +62022,6 @@ cont { symbol { name: "department_store-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62783,7 +62037,6 @@ cont { symbol { name: "department_store-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62799,7 +62052,6 @@ cont { symbol { name: "department_store-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62815,7 +62067,6 @@ cont { symbol { name: "department_store-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62831,7 +62082,6 @@ cont { symbol { name: "department_store-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62850,7 +62100,6 @@ cont { symbol { name: "doityourself-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62866,7 +62115,6 @@ cont { symbol { name: "doityourself-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62882,7 +62130,6 @@ cont { symbol { name: "doityourself-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62898,7 +62145,6 @@ cont { symbol { name: "doityourself-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62914,7 +62160,6 @@ cont { symbol { name: "doityourself-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62933,7 +62178,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62949,7 +62193,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62965,7 +62208,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62981,7 +62223,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62997,7 +62238,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63016,7 +62256,6 @@ cont { symbol { name: "electronics-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63032,7 +62271,6 @@ cont { symbol { name: "electronics-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63048,7 +62286,6 @@ cont { symbol { name: "electronics-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63064,7 +62301,6 @@ cont { symbol { name: "electronics-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63080,7 +62316,6 @@ cont { symbol { name: "electronics-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63099,7 +62334,6 @@ cont { symbol { name: "florist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63115,7 +62349,6 @@ cont { symbol { name: "florist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63131,7 +62364,6 @@ cont { symbol { name: "florist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63147,7 +62379,6 @@ cont { symbol { name: "florist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63163,7 +62394,6 @@ cont { symbol { name: "florist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63182,7 +62412,6 @@ cont { symbol { name: "furniture-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63198,7 +62427,6 @@ cont { symbol { name: "furniture-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63214,7 +62442,6 @@ cont { symbol { name: "furniture-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63230,7 +62457,6 @@ cont { symbol { name: "furniture-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63246,7 +62472,6 @@ cont { symbol { name: "furniture-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63265,7 +62490,6 @@ cont { symbol { name: "garden_center-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63281,7 +62505,6 @@ cont { symbol { name: "garden_center-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63297,7 +62520,6 @@ cont { symbol { name: "garden_center-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63313,7 +62535,6 @@ cont { symbol { name: "garden_center-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63329,7 +62550,6 @@ cont { symbol { name: "garden_center-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63348,7 +62568,6 @@ cont { symbol { name: "gift-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63364,7 +62583,6 @@ cont { symbol { name: "gift-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63380,7 +62598,6 @@ cont { symbol { name: "gift-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63396,7 +62613,6 @@ cont { symbol { name: "gift-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63412,7 +62628,6 @@ cont { symbol { name: "gift-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63431,7 +62646,6 @@ cont { symbol { name: "greengrocer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63447,7 +62661,6 @@ cont { symbol { name: "greengrocer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63463,7 +62676,6 @@ cont { symbol { name: "greengrocer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63479,7 +62691,6 @@ cont { symbol { name: "greengrocer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63495,7 +62706,6 @@ cont { symbol { name: "greengrocer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63514,7 +62724,6 @@ cont { symbol { name: "hairdresser-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63530,7 +62739,6 @@ cont { symbol { name: "hairdresser-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63546,7 +62754,6 @@ cont { symbol { name: "hairdresser-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63562,7 +62769,6 @@ cont { symbol { name: "hairdresser-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63578,7 +62784,6 @@ cont { symbol { name: "hairdresser-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63597,7 +62802,6 @@ cont { symbol { name: "hardware-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63613,7 +62817,6 @@ cont { symbol { name: "hardware-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63629,7 +62832,6 @@ cont { symbol { name: "hardware-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63645,7 +62847,6 @@ cont { symbol { name: "hardware-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63661,7 +62862,6 @@ cont { symbol { name: "hardware-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63680,7 +62880,6 @@ cont { symbol { name: "jewelry-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63696,7 +62895,6 @@ cont { symbol { name: "jewelry-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63712,7 +62910,6 @@ cont { symbol { name: "jewelry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63728,7 +62925,6 @@ cont { symbol { name: "jewelry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63744,7 +62940,6 @@ cont { symbol { name: "jewelry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63763,7 +62958,6 @@ cont { symbol { name: "kiosk-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63779,7 +62973,6 @@ cont { symbol { name: "kiosk-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63795,7 +62988,6 @@ cont { symbol { name: "kiosk-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63811,7 +63003,6 @@ cont { symbol { name: "kiosk-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63827,7 +63018,6 @@ cont { symbol { name: "kiosk-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63878,7 +63068,6 @@ cont { symbol { name: "laundry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63894,7 +63083,6 @@ cont { symbol { name: "laundry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63910,7 +63098,6 @@ cont { symbol { name: "laundry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63959,7 +63146,6 @@ cont { symbol { name: "shop-m" priority: 16876 - min_distance: 0 } caption { primary { @@ -63975,7 +63161,6 @@ cont { symbol { name: "shop-m" priority: 16876 - min_distance: 0 } caption { primary { @@ -63991,7 +63176,6 @@ cont { symbol { name: "shop-l" priority: 16876 - min_distance: 0 } caption { primary { @@ -64007,7 +63191,6 @@ cont { symbol { name: "shop-l" priority: 16876 - min_distance: 0 } caption { primary { @@ -64023,7 +63206,6 @@ cont { symbol { name: "shop-l" priority: 16876 - min_distance: 0 } caption { primary { @@ -64042,7 +63224,6 @@ cont { symbol { name: "mobile_phone-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64058,7 +63239,6 @@ cont { symbol { name: "mobile_phone-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64074,7 +63254,6 @@ cont { symbol { name: "mobile_phone-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64090,7 +63269,6 @@ cont { symbol { name: "mobile_phone-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64106,7 +63284,6 @@ cont { symbol { name: "mobile_phone-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64125,7 +63302,6 @@ cont { symbol { name: "optician-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64141,7 +63317,6 @@ cont { symbol { name: "optician-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64157,7 +63332,6 @@ cont { symbol { name: "optician-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64173,7 +63347,6 @@ cont { symbol { name: "optician-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64189,7 +63362,6 @@ cont { symbol { name: "optician-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64208,7 +63380,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64224,7 +63395,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64240,7 +63410,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64256,7 +63425,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64272,7 +63440,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64291,7 +63458,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64307,7 +63473,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64323,7 +63488,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64339,7 +63503,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64355,7 +63518,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64374,7 +63536,6 @@ cont { symbol { name: "shoes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64390,7 +63551,6 @@ cont { symbol { name: "shoes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64406,7 +63566,6 @@ cont { symbol { name: "shoes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64422,7 +63581,6 @@ cont { symbol { name: "shoes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64438,7 +63596,6 @@ cont { symbol { name: "shoes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64457,7 +63614,6 @@ cont { symbol { name: "sports-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64473,7 +63629,6 @@ cont { symbol { name: "sports-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64489,7 +63644,6 @@ cont { symbol { name: "sports-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64505,7 +63659,6 @@ cont { symbol { name: "sports-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64521,7 +63674,6 @@ cont { symbol { name: "sports-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64570,7 +63722,6 @@ cont { symbol { name: "grocery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64586,7 +63737,6 @@ cont { symbol { name: "grocery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64602,7 +63752,6 @@ cont { symbol { name: "grocery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64618,7 +63767,6 @@ cont { symbol { name: "grocery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64634,7 +63782,6 @@ cont { symbol { name: "grocery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64653,7 +63800,6 @@ cont { symbol { name: "toys-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64669,7 +63815,6 @@ cont { symbol { name: "toys-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64685,7 +63830,6 @@ cont { symbol { name: "toys-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64701,7 +63845,6 @@ cont { symbol { name: "toys-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64717,7 +63860,6 @@ cont { symbol { name: "toys-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64736,7 +63878,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64752,7 +63893,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64768,7 +63908,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64784,7 +63923,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64800,7 +63938,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64819,7 +63956,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64835,7 +63971,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64851,7 +63986,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64867,7 +64001,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64883,7 +64016,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -69726,13 +68858,13 @@ cont { name: "waterfall-s" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69741,13 +68873,13 @@ cont { name: "waterfall-s" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69756,13 +68888,13 @@ cont { name: "waterfall-s" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69771,13 +68903,13 @@ cont { name: "waterfall-m" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69786,13 +68918,13 @@ cont { name: "waterfall-m" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69801,13 +68933,13 @@ cont { name: "waterfall-l" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69816,13 +68948,13 @@ cont { name: "waterfall-l" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69831,13 +68963,13 @@ cont { name: "waterfall-l" priority: 16890 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 10 } - priority: 16890 + priority: 15890 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index fb3ef253675029c4954a5d3a7dc833244abf707c..697f4a2686f3c2d6d3728384891697278ee417be 100644 GIT binary patch delta 4582 zcmb`LU2GIp6vuOC%YMv$ba%STE@|0*ER>>DF~GaN5eWffh%r%@>2%tz-R_i`*^)Iz zO?dFd2Xvy>H^fJMDIr=75dvz&7=xN1F@Y2!4TzW;6BUS3&)ko_cV?Ryk+*w(GkgE{ zo_p>&XZFaA)S2&7^E-Fo$A41N-o71WI(UT*j=#U-!n4OKZ=M_S`p)EzzjmUQJmj5S z@Xn$~dS5=JsD*~^Hf_B=YUp!j)oi%7-Y`r}izkONYSf3LPU+4eG?3SZ;;9hpejuYJ z;%fH%d*_vrcQUOF<~c&l5cy*4y;QM z5oVRi6yB9m5q*VcE-BC9`L0Mbp3v)tHD%SkW4qR+w4rWQ0_7Ng2*2t-jnpJj8q=pu zy9G|`2B*cTMV3>*58Y9si2!=*k`j$E0vbj9&do4bkw8$$)SIplB34jHLQIGdSx5p@ zhyoC*e2LTy-H|zG+WMsFXcgF$@BtOeR^r(X_#eGDd>N@Js#P;uM%~m#Kq=4lDWh_Q z5s+K;2|g8%MDgGirN>*?m0L3cL6pY>SCqVO;^nIfdw8vs8$5?pmFij6w4-eVwVaw9 z17nn6KYR*!>o+Kx>Y%?yBT?yH;>{yVN|<@`PX!RTbnuJzHk+<7W!l`KW7G^fGys`H z857|sKsm<8prl!!I>81(S?YLYLSx42Q4^$0u(o(WLac@0{E)oJ8Pd;{dy z%%Fn;kU5Ak;UEFZF+L6|)h%~Q#I`}rkdh3!5@nK78-NlUgHq*dq^7A~t(n=T3#YyT zyqZ;2gV|IIUrt4$$uPWo4N^uM62~203?r|5qx=$x4xdG;#zY$vrs3AChLn|@gQn>^ zOqXUQ8PQ}x36Z2(Nd_cYFaUaJ5g)j&fe`h|C(NXdA*B>BrL)v1X(lmF_S9t`x1cczAy%Y z?7j$4j`1<Pcivny|5PbE(b1%2EqBi&QfnX)6ZCAwYpiIoq}piGd(``C%u=@uR>qjHd#)Wf8g(!=kzcqIX#t;uz#K+ zhOAk)X4Lcsk0EXcVkiV@3~}hIV;Vy;qOC`pfb+^9@g~=5y5p8*^VGn+c={f{%lba# zAp`Dnt@|{q2t-&Obb%}oi4hD$3GqNANDf39kU*pWydu62omtCv9sYetEp`m76C*EB z#5yrT$O*7cOainMqX2}Ehxh%ZJOh`Me5%n5+M=`Zn;U@a<}wB%?B)tkj`1htXJV{vthLO?BK=!^F=Qr$8A9} zzfZF+e72%IxeYDh(zeLMc=9g#6m7)W?U4dLyn@!?i@Q(?FYbnh@97m(pymrJs2A67 L!-H41N8bJi!ZNOD delta 6034 zcmb_gUuYc18TahUcc;1kdw051olea5; zU0GZkP#XvQPzt8^Fcey+eQQe}QUoy+lGG_B1(O83D0XS(IyiA+;}9@}K)|%K-^}dJ z&g~Tk^mIGF@4NYaGv9oFW?p}%@Zz1qOW&9s+I62#d-?Ot#RNi=T_U8A#cwWbo z-QH4n&Fs%Cx^58uI_`|w=~%wMapKGiXyf_8+wInGbi7OGt(ZY~X1>?ycWi6JeEDan zb#sK2ys{rXw(;7ZDrhi9&Tc&Y@{jU^$IlhU!Wqa9IkBsVN*MhYyILms#Sadt#+=| zE+s9*Gm)Qfp=`OGD@Q8J6-0i!g&GvBq=D5Tki6BUFexGJi|MRmTigJ<}#nP3a%h_vfnZ8qTkof#oflwml=JAS6?H}Vy2aZLeMP!d$*P7)Nu$HgJ+RXNKElbW_*T%A3Jx14ceP@PE9D=HS%Ulg&`!G`N4}roy z2x3dzzJfCQ5!i(F{{!I?TfcSM^2{a6CxmG~MC}^3!Wty|sG>obx=3m{6TcD_puaRa$LN2*xnq;ECA=IabgM+>H?k z>!Z`vQvUE|VD?XhF=OVsr+i~SY`SbtFx03Mu7tGD3DOL z6YnCNgC%!N&zPd78@Nb6=lrhe^_->1{P|m2^RYC^kQ=9HSSBY4Nim;H<%|>=IrxE= zFUXUJ|9AvEbra#T;5X-4D`w9#4p5qPT%a^(7$R5>E+4HmE2CxQYEl-O8EhTR5;v#s z#PNI_&*vo@Ax0#3QC}_h{6M&i4+Rs5A?7Ys0`B42n{ndDfQj?qKlh^q(}nIqigl~q~`jD6G%2F4ve7WN1KdU&#|VC0Ew zsFf3%VET_&P$7x@>Y9Qa0mD}iHn?GD(dq;}*OAh-zh+s1FKiQ*u7^RME}4KWJx5v~Xtr!A*vIUOqs7}pU{#3T%u>0)PCk{&RmdPA!XzCK&Rp*1=&4U`Cj z03pT=%?LGE`S@$>kClE%Z2N2N9$5HU4L4xn3pDz?VA*nlIX`ec%Q!?2z!%85cePep zIzL3y`Tvtvsq|I)-+0l7=%RvPgO(qVM(RXzOY^G|_Iq_mpF6*)(=M*Xeb9 zacm_>>=a>nK1DLLhdj?qs^R(*d0vt6Jg=fsW?QsfPfDtM7?BGb6P8p}31l`7vhWUT zpaSsJCZS(}^Ry*8p~Y3t>Cx8L5*AM zgs2wNCT(HOr012_Vlfs>hV1R5=Y-a5RS)WOmZNZR!}6Q}!s?s=q_F*=wPxA$3dLJj zJ`^ORUPzTd*m5uqTLs`@E1?Hq7yc%i_)|UCKV>{j^->gN{8?#|Uryvd-Y6z0LImqFTpMrCoOCd$u*V(xuIpsI)RB zHat0lxYXg&DBUmRk~csowUTmt$5X(>9Z!)dLE^3iy-v?`M39K_NX|S+R6W+j3KYB! zO>6>zCRRqKz~!%ttFXHoEV!;GGAH-zHav{%2RnZeF+n{QxZ7_jl1euVJIeEWZGNiVTVi00>ybN*4eHWfy=5WM%o+ zAUDuEow!8lbY08bSXs+8Nn?fb%=;df-1y{5?!Ew__8RRLqH z+J<5nvT7@ahvCfpU0kpNk3MwTbMz_5>GXv$>V<83x>HVQ(5HoT`>kBK^NIGIqv#{@ zwJH7Z)BEUKZB>4}^utHoW99g<7KZ>$4aEo3BNwOiMk8&4GO14MwOWdZl&AH^dWrxZ gFy)ukQRIvyIeU~|_|iFIJ`7LOuv+r_Y5kY~1BiMHwg3PC diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index be60414a9c..97792807f2 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -4520,7 +4520,7 @@ cont { symbol { name: "marketplace-l" priority: 16849 - min_distance: 15 + min_distance: 0 } caption { primary { @@ -4536,7 +4536,7 @@ cont { symbol { name: "marketplace-l" priority: 16849 - min_distance: 15 + min_distance: 0 } caption { primary { @@ -4552,7 +4552,7 @@ cont { symbol { name: "marketplace-l" priority: 16849 - min_distance: 15 + min_distance: 0 } caption { primary { @@ -12303,133 +12303,6 @@ cont { } } } -cont { - name: "highway-footway-no-access" - element { - scale: 14 - lines { - width: 1.0 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.7 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.4 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.4 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } -} cont { name: "highway-footway-permissive" element { @@ -15455,278 +15328,6 @@ cont { } } } -cont { - name: "highway-path-bicycle-bridge" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } -} -cont { - name: "highway-path-bicycle-tunnel" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 9.0 - color: 2236945 - priority: 1108 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 10.0 - color: 4473924 - dashdot { - dd: 2.0 - dd: 2.0 - } - priority: 1094 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } -} cont { name: "highway-path-bridge" element { @@ -16616,133 +16217,6 @@ cont { } } } -cont { - name: "highway-path-no-access" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.52 - dd: 1.35 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 1452 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 1452 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 16452 - } - } -} cont { name: "highway-path-permissive" element { @@ -40679,7 +40153,6 @@ cont { scale: 11 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 min_distance: 20 } @@ -40688,7 +40161,6 @@ cont { scale: 12 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 min_distance: 15 } @@ -40705,7 +40177,6 @@ cont { scale: 13 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 min_distance: 15 } @@ -40722,7 +40193,6 @@ cont { scale: 14 symbol { name: "cave-s" - apply_for_type: 1 priority: 16890 } caption { @@ -40738,7 +40208,6 @@ cont { scale: 15 symbol { name: "cave-m" - apply_for_type: 1 priority: 16890 } caption { @@ -40754,7 +40223,6 @@ cont { scale: 16 symbol { name: "cave-m" - apply_for_type: 1 priority: 16890 } caption { @@ -40770,7 +40238,6 @@ cont { scale: 17 symbol { name: "cave-m" - apply_for_type: 1 priority: 16890 } caption { @@ -40786,7 +40253,6 @@ cont { scale: 18 symbol { name: "cave-l" - apply_for_type: 1 priority: 16890 } caption { @@ -40802,7 +40268,6 @@ cont { scale: 19 symbol { name: "cave-l" - apply_for_type: 1 priority: 16890 } caption { @@ -42888,138 +42353,6 @@ cont { apply_if: "bbox_area<4000000" } } -cont { - name: "natural-waterfall" - element { - scale: 11 - symbol { - name: "waterfall-s" - priority: 16890 - min_distance: 15 - } - } - element { - scale: 12 - symbol { - name: "waterfall-s" - priority: 16890 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 13 - symbol { - name: "waterfall-s" - priority: 16890 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 14 - symbol { - name: "waterfall-s" - priority: 16890 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 15 - symbol { - name: "waterfall-m" - priority: 16890 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 16 - symbol { - name: "waterfall-m" - priority: 16890 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 17 - symbol { - name: "waterfall-l" - apply_for_type: 1 - priority: 16890 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 18 - symbol { - name: "waterfall-l" - priority: 16890 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } - element { - scale: 19 - symbol { - name: "waterfall-l" - priority: 16890 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 10 - } - priority: 15890 - } - } -} cont { name: "natural-wetland" element { @@ -61439,7 +60772,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61455,7 +60787,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61471,7 +60802,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61487,7 +60817,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61503,7 +60832,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61554,7 +60882,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61570,7 +60897,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61586,7 +60912,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61605,7 +60930,6 @@ cont { symbol { name: "bakery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61621,7 +60945,6 @@ cont { symbol { name: "bakery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61637,7 +60960,6 @@ cont { symbol { name: "bakery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61653,7 +60975,6 @@ cont { symbol { name: "bakery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61669,7 +60990,6 @@ cont { symbol { name: "bakery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61688,7 +61008,6 @@ cont { symbol { name: "beauty-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61704,7 +61023,6 @@ cont { symbol { name: "beauty-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61720,7 +61038,6 @@ cont { symbol { name: "beauty-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61736,7 +61053,6 @@ cont { symbol { name: "beauty-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61752,7 +61068,6 @@ cont { symbol { name: "beauty-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61771,7 +61086,6 @@ cont { symbol { name: "alcohol-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61787,7 +61101,6 @@ cont { symbol { name: "alcohol-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61803,7 +61116,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61819,7 +61131,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61835,7 +61146,6 @@ cont { symbol { name: "alcohol-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61854,7 +61164,6 @@ cont { symbol { name: "shop-bicycle-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61870,7 +61179,6 @@ cont { symbol { name: "shop-bicycle-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61886,7 +61194,6 @@ cont { symbol { name: "shop-bicycle-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61902,7 +61209,6 @@ cont { symbol { name: "shop-bicycle-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61918,7 +61224,6 @@ cont { symbol { name: "shop-bicycle-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61937,7 +61242,6 @@ cont { symbol { name: "book-shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61953,7 +61257,6 @@ cont { symbol { name: "book-shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -61969,7 +61272,6 @@ cont { symbol { name: "book-shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -61985,7 +61287,6 @@ cont { symbol { name: "book-shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62001,7 +61302,6 @@ cont { symbol { name: "book-shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62020,7 +61320,6 @@ cont { symbol { name: "butcher-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62036,7 +61335,6 @@ cont { symbol { name: "butcher-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62052,7 +61350,6 @@ cont { symbol { name: "butcher-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62068,7 +61365,6 @@ cont { symbol { name: "butcher-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62084,7 +61380,6 @@ cont { symbol { name: "butcher-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62103,7 +61398,6 @@ cont { symbol { name: "car_sharing-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62119,7 +61413,6 @@ cont { symbol { name: "car_sharing-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62135,7 +61428,6 @@ cont { symbol { name: "car_sharing-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62151,7 +61443,6 @@ cont { symbol { name: "car_sharing-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62167,7 +61458,6 @@ cont { symbol { name: "car_sharing-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62186,7 +61476,6 @@ cont { symbol { name: "car-repair-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62202,7 +61491,6 @@ cont { symbol { name: "car-repair-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62218,7 +61506,6 @@ cont { symbol { name: "car-repair-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62234,7 +61521,6 @@ cont { symbol { name: "car-repair-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62250,7 +61536,6 @@ cont { symbol { name: "car-repair-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62269,7 +61554,6 @@ cont { symbol { name: "chemist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62285,7 +61569,6 @@ cont { symbol { name: "chemist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62301,7 +61584,6 @@ cont { symbol { name: "chemist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62317,7 +61599,6 @@ cont { symbol { name: "chemist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62333,7 +61614,6 @@ cont { symbol { name: "chemist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62352,7 +61632,6 @@ cont { symbol { name: "clothes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62368,7 +61647,6 @@ cont { symbol { name: "clothes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62384,7 +61662,6 @@ cont { symbol { name: "clothes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62400,7 +61677,6 @@ cont { symbol { name: "clothes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62416,7 +61692,6 @@ cont { symbol { name: "clothes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62435,7 +61710,6 @@ cont { symbol { name: "computer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62451,7 +61725,6 @@ cont { symbol { name: "computer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62467,7 +61740,6 @@ cont { symbol { name: "computer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62483,7 +61755,6 @@ cont { symbol { name: "computer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62499,7 +61770,6 @@ cont { symbol { name: "computer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62518,7 +61788,6 @@ cont { symbol { name: "sweets-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62534,7 +61803,6 @@ cont { symbol { name: "sweets-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62550,7 +61818,6 @@ cont { symbol { name: "sweets-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62566,7 +61833,6 @@ cont { symbol { name: "sweets-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62582,7 +61848,6 @@ cont { symbol { name: "sweets-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62601,7 +61866,6 @@ cont { symbol { name: "convenience-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62617,7 +61881,6 @@ cont { symbol { name: "convenience-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62633,7 +61896,6 @@ cont { symbol { name: "convenience-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62649,7 +61911,6 @@ cont { symbol { name: "convenience-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62665,7 +61926,6 @@ cont { symbol { name: "convenience-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62684,7 +61944,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62700,7 +61959,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62716,7 +61974,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62732,7 +61989,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62748,7 +62004,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62767,7 +62022,6 @@ cont { symbol { name: "department_store-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62783,7 +62037,6 @@ cont { symbol { name: "department_store-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62799,7 +62052,6 @@ cont { symbol { name: "department_store-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62815,7 +62067,6 @@ cont { symbol { name: "department_store-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62831,7 +62082,6 @@ cont { symbol { name: "department_store-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62850,7 +62100,6 @@ cont { symbol { name: "doityourself-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62866,7 +62115,6 @@ cont { symbol { name: "doityourself-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62882,7 +62130,6 @@ cont { symbol { name: "doityourself-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62898,7 +62145,6 @@ cont { symbol { name: "doityourself-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62914,7 +62160,6 @@ cont { symbol { name: "doityourself-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62933,7 +62178,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62949,7 +62193,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -62965,7 +62208,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62981,7 +62223,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -62997,7 +62238,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63016,7 +62256,6 @@ cont { symbol { name: "electronics-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63032,7 +62271,6 @@ cont { symbol { name: "electronics-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63048,7 +62286,6 @@ cont { symbol { name: "electronics-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63064,7 +62301,6 @@ cont { symbol { name: "electronics-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63080,7 +62316,6 @@ cont { symbol { name: "electronics-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63099,7 +62334,6 @@ cont { symbol { name: "florist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63115,7 +62349,6 @@ cont { symbol { name: "florist-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63131,7 +62364,6 @@ cont { symbol { name: "florist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63147,7 +62379,6 @@ cont { symbol { name: "florist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63163,7 +62394,6 @@ cont { symbol { name: "florist-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63182,7 +62412,6 @@ cont { symbol { name: "furniture-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63198,7 +62427,6 @@ cont { symbol { name: "furniture-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63214,7 +62442,6 @@ cont { symbol { name: "furniture-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63230,7 +62457,6 @@ cont { symbol { name: "furniture-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63246,7 +62472,6 @@ cont { symbol { name: "furniture-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63265,7 +62490,6 @@ cont { symbol { name: "garden_center-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63281,7 +62505,6 @@ cont { symbol { name: "garden_center-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63297,7 +62520,6 @@ cont { symbol { name: "garden_center-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63313,7 +62535,6 @@ cont { symbol { name: "garden_center-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63329,7 +62550,6 @@ cont { symbol { name: "garden_center-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63348,7 +62568,6 @@ cont { symbol { name: "gift-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63364,7 +62583,6 @@ cont { symbol { name: "gift-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63380,7 +62598,6 @@ cont { symbol { name: "gift-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63396,7 +62613,6 @@ cont { symbol { name: "gift-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63412,7 +62628,6 @@ cont { symbol { name: "gift-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63431,7 +62646,6 @@ cont { symbol { name: "greengrocer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63447,7 +62661,6 @@ cont { symbol { name: "greengrocer-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63463,7 +62676,6 @@ cont { symbol { name: "greengrocer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63479,7 +62691,6 @@ cont { symbol { name: "greengrocer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63495,7 +62706,6 @@ cont { symbol { name: "greengrocer-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63514,7 +62724,6 @@ cont { symbol { name: "hairdresser-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63530,7 +62739,6 @@ cont { symbol { name: "hairdresser-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63546,7 +62754,6 @@ cont { symbol { name: "hairdresser-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63562,7 +62769,6 @@ cont { symbol { name: "hairdresser-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63578,7 +62784,6 @@ cont { symbol { name: "hairdresser-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63597,7 +62802,6 @@ cont { symbol { name: "hardware-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63613,7 +62817,6 @@ cont { symbol { name: "hardware-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63629,7 +62832,6 @@ cont { symbol { name: "hardware-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63645,7 +62847,6 @@ cont { symbol { name: "hardware-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63661,7 +62862,6 @@ cont { symbol { name: "hardware-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63680,7 +62880,6 @@ cont { symbol { name: "jewelry-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63696,7 +62895,6 @@ cont { symbol { name: "jewelry-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63712,7 +62910,6 @@ cont { symbol { name: "jewelry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63728,7 +62925,6 @@ cont { symbol { name: "jewelry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63744,7 +62940,6 @@ cont { symbol { name: "jewelry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63763,7 +62958,6 @@ cont { symbol { name: "kiosk-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63779,7 +62973,6 @@ cont { symbol { name: "kiosk-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -63795,7 +62988,6 @@ cont { symbol { name: "kiosk-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63811,7 +63003,6 @@ cont { symbol { name: "kiosk-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63827,7 +63018,6 @@ cont { symbol { name: "kiosk-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63878,7 +63068,6 @@ cont { symbol { name: "laundry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63894,7 +63083,6 @@ cont { symbol { name: "laundry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63910,7 +63098,6 @@ cont { symbol { name: "laundry-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -63959,7 +63146,6 @@ cont { symbol { name: "shop-m" priority: 16876 - min_distance: 0 } caption { primary { @@ -63975,7 +63161,6 @@ cont { symbol { name: "shop-m" priority: 16876 - min_distance: 0 } caption { primary { @@ -63991,7 +63176,6 @@ cont { symbol { name: "shop-l" priority: 16876 - min_distance: 0 } caption { primary { @@ -64007,7 +63191,6 @@ cont { symbol { name: "shop-l" priority: 16876 - min_distance: 0 } caption { primary { @@ -64023,7 +63206,6 @@ cont { symbol { name: "shop-l" priority: 16876 - min_distance: 0 } caption { primary { @@ -64042,7 +63224,6 @@ cont { symbol { name: "mobile_phone-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64058,7 +63239,6 @@ cont { symbol { name: "mobile_phone-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64074,7 +63254,6 @@ cont { symbol { name: "mobile_phone-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64090,7 +63269,6 @@ cont { symbol { name: "mobile_phone-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64106,7 +63284,6 @@ cont { symbol { name: "mobile_phone-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64125,7 +63302,6 @@ cont { symbol { name: "optician-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64141,7 +63317,6 @@ cont { symbol { name: "optician-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64157,7 +63332,6 @@ cont { symbol { name: "optician-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64173,7 +63347,6 @@ cont { symbol { name: "optician-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64189,7 +63362,6 @@ cont { symbol { name: "optician-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64208,7 +63380,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64224,7 +63395,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64240,7 +63410,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64256,7 +63425,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64272,7 +63440,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64291,7 +63458,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64307,7 +63473,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64323,7 +63488,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64339,7 +63503,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64355,7 +63518,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64374,7 +63536,6 @@ cont { symbol { name: "shoes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64390,7 +63551,6 @@ cont { symbol { name: "shoes-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64406,7 +63566,6 @@ cont { symbol { name: "shoes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64422,7 +63581,6 @@ cont { symbol { name: "shoes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64438,7 +63596,6 @@ cont { symbol { name: "shoes-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64457,7 +63614,6 @@ cont { symbol { name: "sports-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64473,7 +63629,6 @@ cont { symbol { name: "sports-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64489,7 +63644,6 @@ cont { symbol { name: "sports-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64505,7 +63659,6 @@ cont { symbol { name: "sports-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64521,7 +63674,6 @@ cont { symbol { name: "sports-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64570,7 +63722,6 @@ cont { symbol { name: "grocery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64586,7 +63737,6 @@ cont { symbol { name: "grocery-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64602,7 +63752,6 @@ cont { symbol { name: "grocery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64618,7 +63767,6 @@ cont { symbol { name: "grocery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64634,7 +63782,6 @@ cont { symbol { name: "grocery-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64653,7 +63800,6 @@ cont { symbol { name: "toys-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64669,7 +63815,6 @@ cont { symbol { name: "toys-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64685,7 +63830,6 @@ cont { symbol { name: "toys-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64701,7 +63845,6 @@ cont { symbol { name: "toys-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64717,7 +63860,6 @@ cont { symbol { name: "toys-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64736,7 +63878,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64752,7 +63893,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64768,7 +63908,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64784,7 +63923,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64800,7 +63938,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64819,7 +63956,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64835,7 +63971,6 @@ cont { symbol { name: "shop-m" priority: 16849 - min_distance: 0 } caption { primary { @@ -64851,7 +63986,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64867,7 +64001,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -64883,7 +64016,6 @@ cont { symbol { name: "shop-l" priority: 16849 - min_distance: 0 } caption { primary { @@ -69726,13 +68858,13 @@ cont { name: "waterfall-s" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69741,13 +68873,13 @@ cont { name: "waterfall-s" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69756,13 +68888,13 @@ cont { name: "waterfall-s" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69771,13 +68903,13 @@ cont { name: "waterfall-m" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69786,13 +68918,13 @@ cont { name: "waterfall-m" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69801,13 +68933,13 @@ cont { name: "waterfall-l" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69816,13 +68948,13 @@ cont { name: "waterfall-l" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } element { @@ -69831,13 +68963,13 @@ cont { name: "waterfall-l" priority: 16890 } - path_text { + caption { primary { height: 10 color: 5592405 offset_y: 10 } - priority: 16890 + priority: 15890 } } } diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin index 04795e647971bb3d46751caffeeeeb125ea1934d..845d91ed16bc7d802a92a9aaf901e29b442f08d4 100644 GIT binary patch delta 38 wcmV+>0NMYF-VBDy46rJfvj~~@DYK2pqzr@G*0hm2tDy^zWJylUTW=VfqRZOEPqmGLtKlb5b`O9;{`O_=Zci;rv6U&58$? z@JKCZ<`P3O0B-B%iTfuoHXl8^{peZ7Eh6==8My@W5=%;p5_5FR6H8Ky(h_rWgp@e= zlmxgq;Q|7T5)HLlJY4J?JOck2HMk^ZlmgZ86QM=`znXfmL4x=dfz=2Rp+=aH8m_5~ WT>NnFrk3QicRpg=-uZ~B)(HR{x{4G4 diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt index c6e4713bc8..cf20da1baa 100644 --- a/data/drules_proto_legacy.txt +++ b/data/drules_proto_legacy.txt @@ -12483,159 +12483,6 @@ cont { } } } -cont { - name: "highway-footway-no-access" - element { - scale: 13 - lines { - width: 1.0 - color: 13683900 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 13683900 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 13683900 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 5263440 - } - priority: 16033 - } - } - element { - scale: 16 - lines { - width: 2.0 - color: 13683900 - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 5263440 - } - priority: 16033 - } - } - element { - scale: 17 - lines { - width: 5.0 - color: 13683900 - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 4.0 - color: 13683900 - dashdot { - dd: 1.0 - dd: 3.0 - } - priority: 1766 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 5263440 - } - priority: 16033 - } - } - element { - scale: 18 - lines { - width: 9.0 - color: 13683900 - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 8.0 - color: 13683900 - dashdot { - dd: 1.0 - dd: 3.0 - } - priority: 1766 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 5263440 - } - priority: 16033 - } - } - element { - scale: 19 - lines { - width: 17.0 - color: 13683900 - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 16.0 - color: 13683900 - dashdot { - dd: 1.0 - dd: 4.0 - } - priority: 1766 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 5263440 - } - priority: 16033 - } - } -} cont { name: "highway-footway-permissive" element { @@ -16192,438 +16039,6 @@ cont { } } } -cont { - name: "highway-path-bicycle-bridge" - element { - scale: 13 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 16 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } -} -cont { - name: "highway-path-bicycle-tunnel" - element { - scale: 13 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 16 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 9.0 - color: 16777215 - priority: 1029 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 7368816 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1026 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } -} cont { name: "highway-path-bridge" element { @@ -17646,142 +17061,6 @@ cont { } } } -cont { - name: "highway-path-no-access" - element { - scale: 13 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 16 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 14127921 - dashdot { - dd: 4.0 - dd: 4.0 - } - priority: 1033 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 7368816 - } - priority: 16033 - } - } -} cont { name: "highway-path-permissive" element { @@ -41664,105 +40943,6 @@ cont { } } } -cont { - name: "natural-waterfall" - element { - scale: 14 - symbol { - name: "waterfall" - apply_for_type: 1 - priority: 16000 - } - caption { - primary { - height: 12 - color: 255 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 15 - symbol { - name: "waterfall" - apply_for_type: 1 - priority: 16000 - } - caption { - primary { - height: 12 - color: 255 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 16 - symbol { - name: "waterfall" - apply_for_type: 1 - priority: 16000 - } - caption { - primary { - height: 12 - color: 255 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 17 - symbol { - name: "waterfall" - apply_for_type: 1 - priority: 16000 - } - caption { - primary { - height: 12 - color: 255 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 18 - symbol { - name: "waterfall" - apply_for_type: 1 - priority: 16000 - } - caption { - primary { - height: 12 - color: 255 - offset_y: 10 - } - priority: 15000 - } - } - element { - scale: 19 - symbol { - name: "waterfall" - apply_for_type: 1 - priority: 16000 - } - caption { - primary { - height: 12 - color: 255 - offset_y: 10 - } - priority: 15000 - } - } -} cont { name: "natural-wetland" element { diff --git a/data/types.txt b/data/types.txt index d0963c7564..c4941c87c2 100644 --- a/data/types.txt +++ b/data/types.txt @@ -764,7 +764,7 @@ highway|footway highway|footway highway|footway highway|footway -highway|footway|no-access +highway|footway highway|footway highway|footway highway|footway @@ -785,16 +785,16 @@ highway|motorway highway|motorway highway|path highway|path -highway|path|bicycle-bridge -highway|path -highway|path -highway|path|bicycle-tunnel +highway|path|bicycle +highway|path|bicycle +highway|path|bicycle +highway|path|bicycle +highway|path highway|path highway|path highway|path highway|path highway|path -highway|path|no-access highway|path highway|path highway|pedestrian @@ -954,7 +954,7 @@ amenity|ferry_terminal amenity shop|furniture natural|grassland -natural|waterfall +waterway|waterfall waterway|waterfall railway|proposed amenity|casino diff --git a/data/visibility.txt b/data/visibility.txt index 88f376ce6e..de282d1cfe 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -210,7 +210,6 @@ world 00000000000000000000 + difficult_alpine_hiking 00000000000001111111 - hiking 00000000000001111111 - mountain_hiking 00000000000001111111 - - no-access 00000000000001111111 - permissive 00000000000001111111 - tunnel 00000000000001111111 - {} @@ -231,8 +230,6 @@ world 00000000000000000000 + path 00000000000001111111 + alpine_hiking 00000000000001111111 - bicycle 00000000000001111111 - - bicycle-bridge 00000000000001111111 - - bicycle-tunnel 00000000000001111111 - bridge 00000000000001111111 - demanding_alpine_hiking 00000000000001111111 - demanding_mountain_hiking 00000000000001111111 - @@ -240,7 +237,6 @@ world 00000000000000000000 + hiking 00000000000001111111 - horse 00000000000001111111 - mountain_hiking 00000000000001111111 - - no-access 00000000000001111111 - permissive 00000000000001111111 - tunnel 00000000000001111111 - {} @@ -491,7 +487,6 @@ world 00000000000000000000 + vineyard 00000000000000011111 - volcano 00000000000011111111 - water 11111111111111111111 - - waterfall 00000000000000111111 - wetland 00000000000000111111 + bog 00000000000011111111 - marsh 00000000000000111111 -