From 0aa3f00d57b1b99cf5eba920d9d816981e3ec759 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 28 Dec 2023 09:24:35 +0200 Subject: [PATCH] [styles] Regenerate for pistes Signed-off-by: Konstantin Pastbin --- data/classificator.txt | 29 +- data/colors.txt | 48 +- data/drules_proto.bin | Bin 424303 -> 426993 bytes data/drules_proto.txt | 1357 ++++++++++++--- data/drules_proto_clear.bin | Bin 414501 -> 415663 bytes data/drules_proto_clear.txt | 754 +++++++-- data/drules_proto_dark.bin | Bin 413243 -> 414405 bytes data/drules_proto_dark.txt | 754 +++++++-- data/drules_proto_outdoors_clear.bin | Bin 428701 -> 431633 bytes data/drules_proto_outdoors_clear.txt | 1453 ++++++++++++++--- data/drules_proto_outdoors_dark.bin | Bin 427328 -> 430260 bytes data/drules_proto_outdoors_dark.txt | 1453 ++++++++++++++--- .../clear/include/priorities_3_FG.prio.txt | 8 +- .../include/priorities_4_overlays.prio.txt | 24 +- .../outdoors/include/priorities_3_FG.prio.txt | 40 +- .../include/priorities_4_overlays.prio.txt | 24 +- data/types.txt | 22 +- data/visibility.txt | 29 +- 18 files changed, 5001 insertions(+), 994 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index cccde34955..3f20bbc0b1 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -790,16 +790,33 @@ world + yes - {} piste:type + + connection - downhill + - advanced - - easy - - expert - + advanced + + area - + {} + area - + easy + + area - + {} + expert + + area - + {} freeride - - intermediate - - novice - + intermediate + + area - + {} + novice + + area - + {} {} + hike - nordic - - sled - + skitour - + sled + + area - + {} + snow_park - {} place + city + diff --git a/data/colors.txt b/data/colors.txt index 501269e598..be1afe4c57 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -332,6 +332,7 @@ 861690961 861690972 861885229 +862076287 862148400 862348902 863203947 @@ -343,6 +344,7 @@ 865356306 865871792 866144274 +868514559 868862139 869387687 869585866 @@ -397,6 +399,8 @@ 1297898588 1298019613 1298092845 +1298131758 +1298283903 1298356016 1298359132 1298556518 @@ -419,6 +423,7 @@ 1303556514 1304148906 1304608947 +1304722175 1304938175 1305069755 1305595303 @@ -447,13 +452,9 @@ 1560281087 1711276032 1711677478 -1711933965 -1712007163 1712264192 1712394496 1713184029 -1713505829 -1713512994 1714039338 1714046273 1714104359 @@ -468,7 +469,6 @@ 1716868437 1717328977 1717523245 -1717562158 1717714303 1717786416 1717789532 @@ -486,7 +486,6 @@ 1724500155 1724896680 1727592696 -1727794715 1728022445 1728053247 1931024665 @@ -494,8 +493,11 @@ 2147483648 2147812613 2147885094 +2148141581 +2148214779 2148602112 2149069336 +2149713445 2149720610 2150246954 2150377008 @@ -511,6 +513,8 @@ 2152615485 2153076053 2153536593 +2153769774 +2153921919 2153997148 2154984050 2155510394 @@ -526,31 +530,43 @@ 2159194530 2159483932 2160246963 +2160360191 2160707771 2162418130 2162506037 +2163123456 2163800312 +2164002331 2164214668 2164260863 2370396489 2371253590 2566914048 +2567571981 +2567645179 2567902208 2568240148 2568499736 2568822045 +2569143845 +2569151010 2570269491 2570486556 2571723081 2571847235 2572580182 +2573200174 +2573352319 2575126307 2576111654 2576201856 2576782726 +2579790591 2580006591 2580534696 +2582553856 2583230712 +2583432731 2583691263 2787649562 2789826889 @@ -559,21 +575,41 @@ 3003121664 3003473869 3003715338 +3003779597 +3003852795 3004447764 +3005351461 +3005358626 +3006477107 3006694172 +3009559935 +3015998207 3016153515 +3018761472 +3019640347 3019898879 3226034505 3226891606 +3227511598 3258727484 3422763904 3425648640 3427361097 3428218198 +3428990335 3431500856 3432785840 +3435428607 3640664610 +3641313805 +3641387003 +3642885669 +3642892834 +3644011315 +3647094143 3649819616 +3653532415 +3657174555 3942645760 4043309055 4278401920 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index e6f54d1fcd7580329a8c2675793bbafdd9504245..fb271d46aa08949ac947418d3916fb204e118a3c 100644 GIT binary patch delta 3902 zcmd6qL5Le=6vsRB#qI3JX0tQNm{?kjhqlxuUF-^73Z*R`JxDL&Z3)?dO?R7wY;0E$ zveoKVu%K*lPP zUf%zGZ|7y}!Bab{`&KSnm+h}aP^z|)hioV>!|R%@>g5twQO_E zi;emE;v(c4gIs&mV_W4~A62=EPBsmU4+fLk*Zx~w>TL%vb;6TtFT1(ortclm3fK(^ zPfv+L1YM}^#~<+VF#fy-y?%Hj`DA_=EDVO3O<&#*Upgj==c;oTs*PGOXWDV~+UGY1 z+Mxqx2LZzl04rd}+F3U)mRbo;D5@39oG>ACB7!MSn2;#R`RYbORDN{drIt`WwY?l#utN|uLIV60!H%z3~9ciY0WnwYkmY%nr}kZ ze1h2gOO`y4*pR8~orgfJ^Q6#yQs_P@be|NuPYT_SmHa*2cwQ9egXLDx?wGUp*}GS6 z4V*n4F#8D@_5-+-K6{F$*>6H-e*{zPHzBj1AlmsY=aJ18weO}0I-_g21V1_U_#c02&S~b zgscq&@n*0SUY!<)c=;b+-yU4P4p{jFjPd~tDPPgF@=eIfk6=pqCS>Ik#8dc=B@f~$ zEVKECm<>9Ar11Qa!t+N8&mSo~f28pI#VVTrGB^CopL(|ko;MvZ!wDFM1Gtw-z2z#J zX1EEN;So$R+=R?`yJla8B2>^Y4)Fe8}N5TZNO?rFNL#5MK*dvt?JPm80kXf0myX6 zmY$YrX`$X}zS@55sk)HrXPX^}rN#bDSQ-BKe;8z)wO8Ei|L&&&nzAely8YmZKA*Hs z;zCRc=aUr9Cn=myQaGQaa6V%t|Fyb2ccXc6wpDE}#LGCu{YL*Ac2(Jlb0d4!lUZkU z;*;;MSfyUCx0NZu*(*Eo_emmTUqtjByDEXYNPkHD#gmJS^<5+`W=KRKDmN`+_56&0 PX9k{6d~<$g#6I&MVmjI( delta 1464 zcmey^F7^JCWJ3#M3)2?nR9(hR(|PomC8tlcWp-q06Q6En&#Vce|Jy?72~hrSDBWPk ztjW?Q&b52`SyN{5>0SEF+**7>!ki3X@WEc7cgl(lYzh??j6&KR{6L9WGeO`ZL}I$4 zJ+ruYo4AlBhk%eEsvO(&iAKyK5J^FxB*erYP!o|Pg)k*Q+Q4)Q4*0 zL-oq+IUlxTjTMjtu2=zU!WAp%k|?nPk;D-z=#nV0f{+Bo%FgMwmdpyMURihT|0b+n z0ZHKU3Rn{^ub@k!cm*Pf!z<{LC|*HGN&vmGfr(47AhWn6)vBbjAXPUnzbGX$d3v8M rvkS3hqZrVXbxd6RNTw9$q^6K$2GFkd_fE_}%mT!$+uu8}F*yPNeFvD6 diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 9e06346ba1..16a9e0416b 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -64436,16 +64436,7 @@ cont { } } cont { - name: "piste:type-downhill" - element { - scale: 14 - lines { - width: 0.8 - color: 1724152575 - priority: 120 - cap: BUTTCAP - } - } + name: "piste:type-connection" element { scale: 15 lines { @@ -64454,14 +64445,6 @@ cont { priority: 120 cap: BUTTCAP } - path_text { - primary { - height: 9 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 16 @@ -64470,14 +64453,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 10 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 17 @@ -64486,14 +64461,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 10 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 18 @@ -64502,14 +64469,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 19 @@ -64518,14 +64477,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 20 @@ -64534,23 +64485,160 @@ cont { color: 1724152575 priority: 120 } + } +} +cont { + name: "piste:type-downhill" + element { + scale: 12 + lines { + width: 1.0 + color: 2579790591 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2579790591 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 2579790591 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 2160360191 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.6 + color: 2160360191 + priority: 120 + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 1.8 + color: 2160360191 + priority: 120 + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 1.8 + color: 2160360191 + priority: 120 + } path_text { primary { height: 12 color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 2160360191 + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 2160360191 + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 } } } cont { name: "piste:type-downhill-advanced" + element { + scale: 12 + lines { + width: 1.0 + color: 2567571981 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2567571981 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 1.0 - color: 1711933965 + color: 2567571981 priority: 120 cap: BUTTCAP } @@ -64558,8 +64646,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1711933965 + width: 1.6 + color: 2148141581 priority: 120 cap: BUTTCAP } @@ -64569,14 +64657,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1711933965 + width: 1.6 + color: 2148141581 priority: 120 } path_text { @@ -64585,14 +64673,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1711933965 + width: 1.8 + color: 2148141581 priority: 120 } path_text { @@ -64601,14 +64689,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1711933965 + width: 1.8 + color: 2148141581 priority: 120 } path_text { @@ -64617,14 +64705,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1711933965 + width: 1.8 + color: 2148141581 priority: 120 } path_text { @@ -64633,14 +64721,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1711933965 + width: 1.8 + color: 2148141581 priority: 120 } path_text { @@ -64649,17 +64737,139 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-downhill-advanced-area" + element { + scale: 13 + area { + color: 3641313805 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3641313805 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3641313805 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3641313805 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3641313805 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3641313805 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3641313805 + priority: 15 + } + } +} +cont { + name: "piste:type-downhill-area" + element { + scale: 13 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3653532415 + priority: 15 } } } cont { name: "piste:type-downhill-easy" + element { + scale: 12 + lines { + width: 1.0 + color: 2567645179 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2567645179 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 1.0 - color: 1712007163 + color: 2567645179 priority: 120 cap: BUTTCAP } @@ -64667,8 +64877,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1712007163 + width: 1.6 + color: 2148214779 priority: 120 cap: BUTTCAP } @@ -64678,14 +64888,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1712007163 + width: 1.6 + color: 2148214779 priority: 120 } path_text { @@ -64694,14 +64904,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -64710,14 +64920,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -64726,14 +64936,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -64742,14 +64952,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -64758,17 +64968,87 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-downhill-easy-area" + element { + scale: 13 + area { + color: 3641387003 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3641387003 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3641387003 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3641387003 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3641387003 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3641387003 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3641387003 + priority: 15 } } } cont { name: "piste:type-downhill-expert" + element { + scale: 12 + lines { + width: 1.0 + color: 2569143845 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2569143845 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 1.0 - color: 1713505829 + color: 2569143845 priority: 120 cap: BUTTCAP } @@ -64776,8 +65056,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713505829 + width: 1.6 + color: 2149713445 priority: 120 cap: BUTTCAP } @@ -64787,14 +65067,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1713505829 + width: 1.6 + color: 2149713445 priority: 120 } path_text { @@ -64803,14 +65083,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2149713445 priority: 120 } path_text { @@ -64819,14 +65099,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2149713445 priority: 120 } path_text { @@ -64835,14 +65115,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2149713445 priority: 120 } path_text { @@ -64851,14 +65131,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2149713445 priority: 120 } path_text { @@ -64867,17 +65147,87 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-downhill-expert-area" + element { + scale: 13 + area { + color: 3642885669 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3642885669 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3642885669 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3642885669 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3642885669 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3642885669 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3642885669 + priority: 15 } } } cont { name: "piste:type-downhill-freeride" + element { + scale: 12 + lines { + width: 1.0 + color: 2582553856 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2582553856 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 1.0 - color: 1713505829 + color: 2582553856 priority: 120 cap: BUTTCAP } @@ -64885,8 +65235,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713505829 + width: 1.6 + color: 2163123456 priority: 120 cap: BUTTCAP } @@ -64896,14 +65246,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1713505829 + width: 1.6 + color: 2163123456 priority: 120 } path_text { @@ -64912,14 +65262,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -64928,14 +65278,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -64944,14 +65294,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -64960,14 +65310,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1713505829 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -64976,17 +65326,35 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } cont { name: "piste:type-downhill-intermediate" + element { + scale: 12 + lines { + width: 1.0 + color: 2583432731 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2583432731 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 1.0 - color: 1727794715 + color: 2583432731 priority: 120 cap: BUTTCAP } @@ -64994,8 +65362,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1727794715 + width: 1.6 + color: 2164002331 priority: 120 cap: BUTTCAP } @@ -65005,14 +65373,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1727794715 + width: 1.6 + color: 2164002331 priority: 120 } path_text { @@ -65021,14 +65389,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -65037,14 +65405,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -65053,14 +65421,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -65069,14 +65437,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -65085,17 +65453,87 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-downhill-intermediate-area" + element { + scale: 13 + area { + color: 3657174555 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3657174555 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3657174555 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3657174555 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3657174555 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3657174555 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3657174555 + priority: 15 } } } cont { name: "piste:type-downhill-novice" + element { + scale: 12 + lines { + width: 1.0 + color: 2573200174 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2573200174 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { width: 1.0 - color: 1717562158 + color: 2573200174 priority: 120 cap: BUTTCAP } @@ -65103,8 +65541,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1717562158 + width: 1.6 + color: 1298131758 priority: 120 cap: BUTTCAP } @@ -65114,14 +65552,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1717562158 + width: 1.6 + color: 1298131758 priority: 120 } path_text { @@ -65130,14 +65568,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -65146,14 +65584,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -65162,14 +65600,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -65178,14 +65616,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -65194,12 +65632,245 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-downhill-novice-area" + element { + scale: 13 + area { + color: 3227511598 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3227511598 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3227511598 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3227511598 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3227511598 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3227511598 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3227511598 + priority: 15 + } + } +} +cont { + name: "piste:type-hike" + element { + scale: 12 + lines { + width: 0.9 + color: 2579790591 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + color: 2579790591 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.9 + color: 2579790591 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.1 + color: 2579790591 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.5 + color: 2579790591 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 2579790591 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 2.0 + color: 2579790591 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 2.0 + color: 2579790591 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 2.0 + color: 2579790591 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 } } } cont { name: "piste:type-nordic" + element { + scale: 12 + lines { + width: 0.8 + color: 1724152575 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.8 + color: 1724152575 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -65223,7 +65894,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -65239,7 +65910,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -65255,7 +65926,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -65271,7 +65942,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -65287,7 +65958,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -65303,17 +65974,162 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-skitour" + element { + scale: 12 + lines { + width: 0.8 + color: 1724152575 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.8 + color: 1724152575 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.8 + color: 1724152575 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.1 + color: 1724152575 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.1 + color: 1724152575 + priority: 120 + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 1.5 + color: 1724152575 + priority: 120 + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 1.5 + color: 1724152575 + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 1724152575 + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 1724152575 + priority: 120 + } + path_text { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 } } } cont { name: "piste:type-sled" + element { + scale: 12 + lines { + width: 1.0 + color: 2579790591 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 2579790591 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 0.8 - color: 1724152575 + width: 1.0 + color: 2579790591 priority: 120 cap: BUTTCAP } @@ -65321,8 +66137,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1724152575 + width: 1.6 + color: 2160360191 priority: 120 cap: BUTTCAP } @@ -65332,14 +66148,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1724152575 + width: 1.6 + color: 2160360191 priority: 120 } path_text { @@ -65348,14 +66164,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1724152575 + width: 1.8 + color: 2160360191 priority: 120 } path_text { @@ -65364,14 +66180,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1724152575 + width: 1.8 + color: 2160360191 priority: 120 } path_text { @@ -65380,14 +66196,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1724152575 + width: 1.8 + color: 2160360191 priority: 120 } path_text { @@ -65396,14 +66212,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1724152575 + width: 1.8 + color: 2160360191 priority: 120 } path_text { @@ -65412,7 +66228,166 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-sled-area" + element { + scale: 13 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3653532415 + priority: 15 + } + } +} +cont { + name: "piste:type-snow_park" + element { + scale: 13 + area { + color: 3435428607 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3435428607 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3435428607 + priority: 15 + } + caption { + primary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 16 + area { + color: 3435428607 + priority: 15 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 17 + area { + color: 3435428607 + priority: 15 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 18 + area { + color: 3435428607 + priority: 15 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 19 + area { + color: 3435428607 + priority: 15 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 20 + area { + color: 3435428607 + priority: 15 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index f0e5d189487f3d4441a1da41d5d2cd3f8cfda1f2..c6eb300319a8f1144dd921738464185d94e99925 100644 GIT binary patch delta 2340 zcmdUw&1(}u7{pj2DWMjFiiaXd6#N4`iz1~243Q+X5$mZHiY-+^ zK^Qb1{Gj4NY%8KzK~Ows(H45}=Z8_khcH)wZ; zp$&(;(!oLRT}S6vZ#D86>jtMB3RVLt2kwAt*0uB`kWGEyEAWN_m10!B%=e66LYUdm(oXb#f&Y{A& z3H_t2sV#N^{6^6j)qg zZYz3@u;x$akQ7*rHKnR%cT~c58J?<@2X2qvJ&! zg|Pt$>1+QIb>lb<SrbH`1uAB56X)8^#3eKRArG_2^ja=vX~qrH--|GdviD9|v4KsY zVsfCMh#1&J0U<%oSu;W4qrCt~b~+KQQEkFytPJ!t@E_krTlx2XgRs zCN2q(gGHzB;bs1P z9UF0nD@YcXGtuNwoC%i0;Y>6+6lcQaP!ob7AF~7tSPq;PK&(OP=KV}u3XsH`&(AE+ zxE&J6v*&!+j@!W?SzLjPCWjKpU^yItj3$Q?$Z$DmT9BN+QGi*JaTCO?>#qIZgxjqk zSzK;KlS6SUSPq9<(d1Cv3YP=9b)qnH6o^(NwO9d`3S8@$xcCb)i%U|iN-7Idb&GRS eQ>Nb*VRj+QK%k~}83|?}W&vW>?J^QB!=xS4D|c6T;Q6D637lo*66Jyfxzf+s=HgBLFnL%B>d7ytGqXu|XR?#x(S>C{3YxTmZ`mJi=SiVv&7xMLDrHn?Qij3g>d*s^5YP-LhD{^Xf zQbMNnMh2!2KVNIW^dl1@Ye@wLc{Au6VP|w;S~(dUPLI&5OG|79X^D)h_D>3K!_@4Z zi+XIdW1=+Fkly=ppISR1(1SXLAGXN#r?=Dv(I9LD`YVlLFy;+?9n-oS029ggp6ac& z=Db*)QkNa0&O=7sh5~gSGU^T_>K`E(Pp*5a|875Sh}9_-sq>Igx1m6thm5)diF#B4 zCj?zz`Mfox>y(PrdB~{SP@v93M%{r#{agqfPc=4H+n$ZbU{Tz7N=5cOWbADyu;(FT z??7VT41>v}xB7$S?htiKMe00c)NLqG=OLr+z}|l*VQoi1BDvw&`X`@uzxsufhEkC~ z4;gr7W^BOq&&-KWH zlNvbmpC4RvxGh~tiMiWSuH3v*&CQfh7)B35i1&Fr99K~as?M*YNQuCp)?8}&lG delta 1516 zcmX@QRC4zm$%Yoj7N#xCNo*{en7D+eJ901!PnTzBW}n_B$ZX5hCO-YA5VIzT{vZgU z{e_t|+1kW~G&z6@g_u=Aa)mH8+{}{GLphkGr8lxER9G+yX>;%k33JYx2?8JO1r{CY z*vK}Wk(*g87i@xnkRY0*LWPwO7cU2wK*z*IED{Zij=W%z04o&)DrEqJA5e2}Diy*| zI{gAWvxqpv(fA}quuHPHiF0jd;*tP`j>z=MoXq0V8?gHC_xUv&aQY7{iPO<2{==^n z#eWbharh5i62*TANl+9P@ByRlEElsRj;P!G>=hCX>!Wp_AjE$K+FQftlPhcvR$+R0EtPbdjJ3c diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index fdbb88093f..6a6aa07039 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -61819,16 +61819,7 @@ cont { } } cont { - name: "piste:type-downhill" - element { - scale: 14 - lines { - width: 0.8 - color: 1717714303 - priority: 120 - cap: BUTTCAP - } - } + name: "piste:type-connection" element { scale: 15 lines { @@ -61837,14 +61828,6 @@ cont { priority: 120 cap: BUTTCAP } - path_text { - primary { - height: 9 - color: 8947848 - stroke_color: 1292964096 - } - priority: 2950 - } } element { scale: 16 @@ -61853,14 +61836,6 @@ cont { color: 1717714303 priority: 120 } - path_text { - primary { - height: 10 - color: 8947848 - stroke_color: 1292964096 - } - priority: 2950 - } } element { scale: 17 @@ -61869,14 +61844,6 @@ cont { color: 1717714303 priority: 120 } - path_text { - primary { - height: 10 - color: 8947848 - stroke_color: 1292964096 - } - priority: 2950 - } } element { scale: 18 @@ -61885,14 +61852,6 @@ cont { color: 1717714303 priority: 120 } - path_text { - primary { - height: 12 - color: 8947848 - stroke_color: 1292964096 - } - priority: 2950 - } } element { scale: 19 @@ -61901,14 +61860,6 @@ cont { color: 1717714303 priority: 120 } - path_text { - primary { - height: 12 - color: 8947848 - stroke_color: 1292964096 - } - priority: 2950 - } } element { scale: 20 @@ -61917,13 +61868,114 @@ cont { color: 1717714303 priority: 120 } + } +} +cont { + name: "piste:type-downhill" + element { + scale: 14 + lines { + width: 1.0 + color: 2573352319 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 2153921919 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.6 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } path_text { primary { height: 12 color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 } } } @@ -61933,7 +61985,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1713512994 + color: 2569151010 priority: 120 cap: BUTTCAP } @@ -61941,8 +61993,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713512994 + width: 1.6 + color: 2149720610 priority: 120 cap: BUTTCAP } @@ -61952,14 +62004,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1713512994 + width: 1.6 + color: 2149720610 priority: 120 } path_text { @@ -61968,14 +62020,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1713512994 + width: 1.8 + color: 2149720610 priority: 120 } path_text { @@ -61984,14 +62036,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1713512994 + width: 1.8 + color: 2149720610 priority: 120 } path_text { @@ -62000,14 +62052,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1713512994 + width: 1.8 + color: 2149720610 priority: 120 } path_text { @@ -62016,14 +62068,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1713512994 + width: 1.8 + color: 2149720610 priority: 120 } path_text { @@ -62032,7 +62084,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } @@ -62042,7 +62094,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1712007163 + color: 2567645179 priority: 120 cap: BUTTCAP } @@ -62050,8 +62102,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1712007163 + width: 1.6 + color: 2148214779 priority: 120 cap: BUTTCAP } @@ -62061,14 +62113,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1712007163 + width: 1.6 + color: 2148214779 priority: 120 } path_text { @@ -62077,14 +62129,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -62093,14 +62145,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -62109,14 +62161,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -62125,14 +62177,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1712007163 + width: 1.8 + color: 2148214779 priority: 120 } path_text { @@ -62141,7 +62193,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } @@ -62151,7 +62203,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1714631475 + color: 2570269491 priority: 120 cap: BUTTCAP } @@ -62159,8 +62211,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1714631475 + width: 1.6 + color: 2150839091 priority: 120 cap: BUTTCAP } @@ -62170,14 +62222,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1714631475 + width: 1.6 + color: 2150839091 priority: 120 } path_text { @@ -62186,14 +62238,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2150839091 priority: 120 } path_text { @@ -62202,14 +62254,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2150839091 priority: 120 } path_text { @@ -62218,14 +62270,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2150839091 priority: 120 } path_text { @@ -62234,14 +62286,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2150839091 priority: 120 } path_text { @@ -62250,7 +62302,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } @@ -62260,7 +62312,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1714631475 + color: 2582553856 priority: 120 cap: BUTTCAP } @@ -62268,8 +62320,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1714631475 + width: 1.6 + color: 2163123456 priority: 120 cap: BUTTCAP } @@ -62279,14 +62331,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1714631475 + width: 1.6 + color: 2163123456 priority: 120 } path_text { @@ -62295,14 +62347,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -62311,14 +62363,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -62327,14 +62379,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -62343,14 +62395,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1714631475 + width: 1.8 + color: 2163123456 priority: 120 } path_text { @@ -62359,7 +62411,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } @@ -62369,7 +62421,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1727794715 + color: 2583432731 priority: 120 cap: BUTTCAP } @@ -62377,8 +62429,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1727794715 + width: 1.6 + color: 2164002331 priority: 120 cap: BUTTCAP } @@ -62388,14 +62440,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1727794715 + width: 1.6 + color: 2164002331 priority: 120 } path_text { @@ -62404,14 +62456,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -62420,14 +62472,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -62436,14 +62488,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -62452,14 +62504,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1727794715 + width: 1.8 + color: 2164002331 priority: 120 } path_text { @@ -62468,7 +62520,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } @@ -62478,7 +62530,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1717562158 + color: 2573200174 priority: 120 cap: BUTTCAP } @@ -62486,8 +62538,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1717562158 + width: 1.6 + color: 1298131758 priority: 120 cap: BUTTCAP } @@ -62497,14 +62549,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1717562158 + width: 1.6 + color: 1298131758 priority: 120 } path_text { @@ -62513,14 +62565,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -62529,14 +62581,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -62545,14 +62597,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -62561,14 +62613,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1717562158 + width: 1.8 + color: 1298131758 priority: 120 } path_text { @@ -62577,7 +62629,144 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-hike" + element { + scale: 14 + lines { + width: 0.9 + color: 2573352319 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.1 + color: 2573352319 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.5 + color: 2573352319 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 2573352319 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 2.0 + color: 2573352319 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 2.0 + color: 2573352319 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 2.0 + color: 2573352319 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 } } } @@ -62606,7 +62795,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62622,7 +62811,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62638,7 +62827,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62654,7 +62843,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62670,7 +62859,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62686,12 +62875,12 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } cont { - name: "piste:type-sled" + name: "piste:type-skitour" element { scale: 14 lines { @@ -62715,7 +62904,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62731,7 +62920,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62747,7 +62936,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62763,7 +62952,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62779,7 +62968,7 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { @@ -62795,7 +62984,216 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-sled" + element { + scale: 14 + lines { + width: 1.0 + color: 2573352319 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 2153921919 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.6 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 2153921919 + priority: 120 + } + path_text { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } +} +cont { + name: "piste:type-snow_park" + element { + scale: 14 + area { + color: 3428990335 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3428990335 + priority: 15 + } + caption { + primary { + height: 9 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 16 + area { + color: 3428990335 + priority: 15 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 17 + area { + color: 3428990335 + priority: 15 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 18 + area { + color: 3428990335 + priority: 15 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 19 + area { + color: 3428990335 + priority: 15 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 20 + area { + color: 3428990335 + priority: 15 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 } } } diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index ddcacbbc30e9a58623d827d6116a4a099c26e5e4..e897925dd31b56a5020a4c9889df8bbac1c79d81 100644 GIT binary patch delta 4774 zcmcIn-HTgA6z|PVw>M+bBsYmkgC8kn(YRf7U3S%_rRyKyL;nIlPy`=}Ph!Cb?L(m-Xczj>KKSN?AmX-C6hzo~&dlVVnc10bMGWNOcYkN@ zJ#&6%=A84%`}M*3`tcLqiPTsAcT>@49;@`)%PXz9m1DiuY@g=rv$n!pDzud+mAI zV$Ob!FHZT@#XUhbtYmiZ-yQyq>zT&tQyzF#4RWTt4{&#@!EQS-!8a)O;R(-R#p%Pv za`i?fY%04PvGLT?z9ez4VrfP$RY=^iK@Mg|D{Nul7ow1%#A`B@c;gEu}E-6e>lR}UVDNIt6f=HBN;IT(hin?|@ z!R9I*4ML~`A=H5o>Ocr}AcQ&)LLDUH*Cid#_~Pu=JM;LpZ`K`p0Cmo)2N8xIl5pt3 zS(hFrsp%m|haM)W=|LpwaW};p;?CTB#?P6l`O(LBT%iEU9tt9iP)NcN3eLJhVUk)X z1nCHcNot`W5 zr@Mo9n6P4MW}9yugobrI^TYS}ORFoItK27M_;e8Z^>Nv+GhrV;zvh?rhw}~BiV#)^ zp9xwAx%J>F5>9e9T!F0O)Bke`m1&LPr7cSb@V{%fM;FE$nL~Nw- zC|Q-8;M2qObTkdWyUAGNw6@Po)>o?&2F+1ct(rk(8?GF-cs|7(MuQbMH9`k74j;md z8O&-LH3K}n_w!nI%4eaX$nsKqrF*ph-z15Y(=^hABtdQOTas;zw@QM>7?3D1&rfs9 zygRbBn3|F#ruUXam_~4`Y_&BdalMxPl#&;lxYw3nZ5=TO1)M1y)dr~9v(|P97)coA zMiP#4!&z6kF-fi52+~n*Oj0X1L`Kj9yyda7nxha9bzT7D|8Ing0<1am6KvD)q|<%< z#oj`HNe;AjPZ|LhKgm5IO3tU3*1XzqIJ}+4lG6yVAgUIuAT6TA1goUgB(cECsaj-5 jFG(!0nr?5Q?3TNlH(v7gevLtc zh)E>U;Gf{;(AHR!4MEUg=RN0L@7w#dMjhPrx%ckAJolqo3tgRt_REg4a7Q`|>rFun z|zl0%yF_$+ueL3>&xlX69t zW<7ps!dzwHib8^b6FQC=+xuvxjna2aMMoLQN8WyPa5oUegl9DbBDWYARncCuTK%bZh)Z1F%Lwq>)9c5fEu) zk!rMYLvL&gVu;&V%&9vCw(|Pu@RmDC1F%X!q>@Fd5)i3mk*c)OdM;&cFGjrV!)YAI zd)43!$g2kUn@Jt*Q6V#I&BbNE#T}3V*nj|$8WyPm0U`rpks6SV!vVFmmt``|*3^50 zCbz}_tOgLNVUel1C6zI9An&dglD*Xzu!bo;%q8sx)L zW?nqMA1XZlbA7|FufFPqm7ow7GoM_<=Z~0x*F|_O?H}o{!}xXT@Xj(|UBcHd2z%pw zIl-LW;b-^z)w#(a8&)#A#B*Q#$Bj&Vb=Cu~szJ_n_i5p7HQ1d@Op6W5eR$F{_~QKA z#d7slC2VNB++n#l>njrXDnHGrPc;&EY?18)J740yog{8PfgHb8VfRw(S$??bm-)}L ze#Q>P=9Tqpj!*z~F)&#&l^f&(A@qR| z`alSMAcQ^;LLUgB4+^nCO8L;@Z-5iW+RGx}%h{nb@RVgPj^F)@g+5KOE3`sf?!zPWyAQBVfjK`kC#Hd6N2|X>q>?%n@2qhtek`O{k2%#i|P!d8Yi9+md ziq#go{I#Y(X`j(ccW%1QC{W2~ln6@-ML47otV;@;G^CKELkgQTq#zQdIOnlFC`HXU zo?xRLPeP~zA=H5o>Ocr}AcQ&)LLC$m*CicKe)hodow;`X+il0u0P3^Eqd|nFhawz$ z2-c;CO&WSg(xHb<8hQ|kdOS?Ay1X-geA&<0sk!m#eOD-eN)81PRwxwV2!&u>p|D9K z6q0m=!X}MS5Q(AS9-E3oku~xY47cf?AcXlz2=kK=<|iS{PePcVgfKr9QuhQjUZQ;P z!Ylr`Ey~wFJ-+V9PoUlplG+<0EKwBU5Jj*qQEbu>MUoCtY|;>gNd3MjV<^T9QP40O z*K|TC3LzAQ5Q;(wMInTu5JFKDVq0mJ7njB!*$%(kUFd`}&~!FbSN1?Oor5%QzvxxG zRsNvumD5m-2mF`g-ZRtC9=Af43o-?`&;5zD%_|rD31}t{K@a-8T0*wWPy8ScAIL^` zmuN5t{K!iq{^20Bt5caDZsL>HK4`28hnVHiL1@;eRI|>M`S-BC(>w%o=}uwTJUg^{ z>ED@`6U`&(yR|y|$Y(`uWa;&nj&|o%+ar7D--Jq+#?)vqEk*-?BGxEyjf= zK2h^wJjXb#lZT|lrS*}52B$=Q8aPbxx3;|Th-N8=B_2mPcF`OqOs&AdNF!!0Yvgj6 z;!#D*Xnub5vg~7@g_<7A3*D9eiKYKakSNp?QG%ed|5%U_#>0Z3u^DE5WXmfl5r$cH zz8irpLTvhE5k{B}iQuwjw^Qook{8$V@y=0u62PIsQBHu`NNjf$F$n{WL&B^~5HPdO~CbMg9YimG!KIfan7O82^7WS`=VWQGdZ6S)TOz@4d6wURqES zYqBTx0IQqg_Q{&Eer_|3HRabd)|7gH6;HQd1!WP%CRhd&O=1fyjk-m4XOY+f%jIYb aZMVYJytT-Oyye3$4Zo+p;jOVR-~1b-pRRcT delta 1968 zcmdtjze@sP7{KwoS4B@qJ*5kWaA=8;5E`@w8_FRF|AxSW1Sv@&-5SKirLChM5VaK{ z{sOUv8XAMP{)C{-wy43*d(OMwxA$p{I=Ja`?|EOI_s-5)=&lypE!)aMhwRU-v;;Ab z%j65nLZOsXBI&K2&5cYpE6J{LDd0Xj93C$T-{8I4c7}^Fn>6e4n(%6X+MFj7az&PA zTt3NftTNFbCqY2JhGY8iHd<++^c|zo(aOM2804e9B8xZbX_SN`Py;{RPx#L7t4(f= z4pzduu4Frl0~W#5UFI5sQi)4zesXq-` z+!`IQ8bG9mMXCl6sbP_-vCyH_G=zgC5;SW5^hbSJtEmg3_sb_DpH