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 e6f54d1fcd..fb271d46aa 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ 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 f0e5d18948..c6eb300319 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index e57e4d1d10..4727652d0a 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -61593,16 +61593,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 { @@ -61611,14 +61602,6 @@ cont { priority: 120 cap: BUTTCAP } - path_text { - primary { - height: 9 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 16 @@ -61627,14 +61610,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 10 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 17 @@ -61643,14 +61618,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 10 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 18 @@ -61659,14 +61626,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 19 @@ -61675,14 +61634,6 @@ cont { color: 1724152575 priority: 120 } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 1308622847 - } - priority: 2950 - } } element { scale: 20 @@ -61691,13 +61642,114 @@ cont { color: 1724152575 priority: 120 } + } +} +cont { + name: "piste:type-downhill" + 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 } } } @@ -61707,7 +61759,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1711933965 + color: 2567571981 priority: 120 cap: BUTTCAP } @@ -61715,8 +61767,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1711933965 + width: 1.6 + color: 2148141581 priority: 120 cap: BUTTCAP } @@ -61726,14 +61778,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 { @@ -61742,14 +61794,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 { @@ -61758,14 +61810,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 { @@ -61774,14 +61826,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 { @@ -61790,14 +61842,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 { @@ -61806,7 +61858,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } @@ -61816,7 +61868,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1712007163 + color: 2567645179 priority: 120 cap: BUTTCAP } @@ -61824,8 +61876,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1712007163 + width: 1.6 + color: 2148214779 priority: 120 cap: BUTTCAP } @@ -61835,14 +61887,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 { @@ -61851,14 +61903,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 { @@ -61867,14 +61919,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 { @@ -61883,14 +61935,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 { @@ -61899,14 +61951,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 { @@ -61915,7 +61967,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } @@ -61925,7 +61977,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1713505829 + color: 2569143845 priority: 120 cap: BUTTCAP } @@ -61933,8 +61985,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713505829 + width: 1.6 + color: 2149713445 priority: 120 cap: BUTTCAP } @@ -61944,14 +61996,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 { @@ -61960,14 +62012,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 { @@ -61976,14 +62028,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 { @@ -61992,14 +62044,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 { @@ -62008,14 +62060,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 { @@ -62024,7 +62076,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } @@ -62034,7 +62086,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1713505829 + color: 2582553856 priority: 120 cap: BUTTCAP } @@ -62042,8 +62094,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713505829 + width: 1.6 + color: 2163123456 priority: 120 cap: BUTTCAP } @@ -62053,14 +62105,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 { @@ -62069,14 +62121,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 { @@ -62085,14 +62137,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 { @@ -62101,14 +62153,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 { @@ -62117,14 +62169,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 { @@ -62133,7 +62185,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } @@ -62143,7 +62195,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1727794715 + color: 2583432731 priority: 120 cap: BUTTCAP } @@ -62151,8 +62203,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1727794715 + width: 1.6 + color: 2164002331 priority: 120 cap: BUTTCAP } @@ -62162,14 +62214,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 { @@ -62178,14 +62230,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 { @@ -62194,14 +62246,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 { @@ -62210,14 +62262,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 { @@ -62226,14 +62278,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 { @@ -62242,7 +62294,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } @@ -62252,7 +62304,7 @@ cont { scale: 14 lines { width: 1.0 - color: 1717562158 + color: 2573200174 priority: 120 cap: BUTTCAP } @@ -62260,8 +62312,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1717562158 + width: 1.6 + color: 1298131758 priority: 120 cap: BUTTCAP } @@ -62271,14 +62323,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 { @@ -62287,14 +62339,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 { @@ -62303,14 +62355,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 { @@ -62319,14 +62371,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 { @@ -62335,14 +62387,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 { @@ -62351,7 +62403,144 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-hike" + 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 } } } @@ -62380,7 +62569,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62396,7 +62585,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62412,7 +62601,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62428,7 +62617,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62444,7 +62633,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62460,12 +62649,12 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } cont { - name: "piste:type-sled" + name: "piste:type-skitour" element { scale: 14 lines { @@ -62489,7 +62678,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62505,7 +62694,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62521,7 +62710,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62537,7 +62726,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62553,7 +62742,7 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { @@ -62569,7 +62758,216 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-sled" + 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: 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-snow_park" + 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_dark.bin b/data/drules_proto_dark.bin index 500b43ac70..5b1b88d067 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ 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 ddcacbbc30..e897925dd3 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index bc7c5fee73..6b834f9a69 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -65116,13 +65116,84 @@ cont { } } } +cont { + name: "piste:type-connection" + element { + scale: 15 + lines { + width: 1.4 + color: 868514559 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.6 + color: 868514559 + priority: 120 + } + } + element { + scale: 17 + lines { + width: 1.9 + color: 868514559 + priority: 120 + } + } + element { + scale: 18 + lines { + width: 2.3 + color: 868514559 + priority: 120 + } + } + element { + scale: 19 + lines { + width: 2.3 + color: 868514559 + priority: 120 + } + } + element { + scale: 20 + lines { + width: 2.3 + color: 868514559 + priority: 120 + } + } +} cont { name: "piste:type-downhill" + element { + scale: 12 + lines { + width: 1.0 + color: 2579790591 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3015998207 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 0.8 - color: 1724152575 + width: 1.4 + color: 3015998207 priority: 120 cap: BUTTCAP } @@ -65130,8 +65201,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1724152575 + width: 2.2 + color: 3015998207 priority: 120 cap: BUTTCAP } @@ -65141,14 +65212,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1724152575 + width: 2.2 + color: 3015998207 priority: 120 } path_text { @@ -65157,14 +65228,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -65173,14 +65244,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -65189,14 +65260,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -65205,14 +65276,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -65221,17 +65292,36 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } cont { name: "piste:type-downhill-advanced" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1711933965 + color: 2567571981 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3003779597 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3003779597 priority: 120 cap: BUTTCAP } @@ -65239,8 +65329,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1711933965 + width: 2.2 + color: 3003779597 priority: 120 cap: BUTTCAP } @@ -65250,14 +65340,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1711933965 + width: 2.2 + color: 3003779597 priority: 120 } path_text { @@ -65266,14 +65356,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1711933965 + width: 3.2 + color: 3003779597 priority: 120 } path_text { @@ -65282,14 +65372,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1711933965 + width: 3.2 + color: 3003779597 priority: 120 } path_text { @@ -65298,14 +65388,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1711933965 + width: 3.2 + color: 3003779597 priority: 120 } path_text { @@ -65314,14 +65404,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1711933965 + width: 3.2 + color: 3003779597 priority: 120 } path_text { @@ -65330,17 +65420,154 @@ 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 + } + } + element { + scale: 20 + 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 + } + } + element { + scale: 20 + area { + color: 3653532415 + priority: 15 } } } cont { name: "piste:type-downhill-easy" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1712007163 + color: 2567645179 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3003852795 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3003852795 priority: 120 cap: BUTTCAP } @@ -65348,8 +65575,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1712007163 + width: 2.2 + color: 3003852795 priority: 120 cap: BUTTCAP } @@ -65359,14 +65586,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1712007163 + width: 2.2 + color: 3003852795 priority: 120 } path_text { @@ -65375,14 +65602,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65391,14 +65618,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65407,14 +65634,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65423,14 +65650,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65439,17 +65666,95 @@ 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 + } + } + element { + scale: 20 + area { + color: 3641387003 + priority: 15 } } } cont { name: "piste:type-downhill-expert" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1713505829 + color: 2569143845 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3005351461 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3005351461 priority: 120 cap: BUTTCAP } @@ -65457,8 +65762,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713505829 + width: 2.2 + color: 3005351461 priority: 120 cap: BUTTCAP } @@ -65468,14 +65773,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1713505829 + width: 2.2 + color: 3005351461 priority: 120 } path_text { @@ -65484,14 +65789,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3005351461 priority: 120 } path_text { @@ -65500,14 +65805,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3005351461 priority: 120 } path_text { @@ -65516,14 +65821,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3005351461 priority: 120 } path_text { @@ -65532,14 +65837,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3005351461 priority: 120 } path_text { @@ -65548,17 +65853,95 @@ 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 + } + } + element { + scale: 20 + area { + color: 3642885669 + priority: 15 } } } cont { name: "piste:type-downhill-freeride" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1713505829 + color: 2582553856 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3018761472 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3018761472 priority: 120 cap: BUTTCAP } @@ -65566,8 +65949,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713505829 + width: 2.2 + color: 3018761472 priority: 120 cap: BUTTCAP } @@ -65577,14 +65960,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1713505829 + width: 2.2 + color: 3018761472 priority: 120 } path_text { @@ -65593,14 +65976,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65609,14 +65992,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65625,14 +66008,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65641,14 +66024,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1713505829 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65657,17 +66040,36 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } } cont { name: "piste:type-downhill-intermediate" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1727794715 + color: 2583432731 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3019640347 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3019640347 priority: 120 cap: BUTTCAP } @@ -65675,8 +66077,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1727794715 + width: 2.2 + color: 3019640347 priority: 120 cap: BUTTCAP } @@ -65686,14 +66088,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1727794715 + width: 2.2 + color: 3019640347 priority: 120 } path_text { @@ -65702,14 +66104,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65718,14 +66120,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65734,14 +66136,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65750,14 +66152,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65766,17 +66168,95 @@ 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 + } + } + element { + scale: 20 + area { + color: 3657174555 + priority: 15 } } } cont { name: "piste:type-downhill-novice" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1717562158 + color: 2573200174 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 2153769774 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 2153769774 priority: 120 cap: BUTTCAP } @@ -65784,8 +66264,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1717562158 + width: 2.2 + color: 2153769774 priority: 120 cap: BUTTCAP } @@ -65795,14 +66275,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1717562158 + width: 2.2 + color: 2153769774 priority: 120 } path_text { @@ -65811,14 +66291,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -65827,14 +66307,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -65843,14 +66323,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -65859,14 +66339,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -65875,25 +66355,426 @@ 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 + } + } + element { + scale: 20 + area { + color: 3227511598 + priority: 15 + } + } +} +cont { + name: "piste:type-hike" + element { + scale: 12 + lines { + width: 1.1 + color: 1304722175 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 1304722175 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 1304722175 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 1304722175 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 1304722175 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 3.3 + color: 1304722175 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 1304722175 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 1304722175 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 1304722175 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 } } } cont { name: "piste:type-nordic" element { - scale: 14 + scale: 12 lines { width: 0.8 color: 1724152575 priority: 120 + join: BEVELJOIN cap: BUTTCAP } } + element { + scale: 13 + lines { + width: 1.0 + color: 1304722175 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 14 + lines { + width: 1.2 + color: 868514559 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } element { scale: 15 lines { - width: 1.1 + width: 1.4 + color: 868514559 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.6 + color: 868514559 + priority: 120 + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 1.9 + color: 868514559 + priority: 120 + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 2.3 + color: 868514559 + priority: 120 + } + path_text { + primary { + height: 12 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 2.3 + color: 868514559 + priority: 120 + } + path_text { + primary { + height: 12 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 2.3 + color: 868514559 + priority: 120 + } + path_text { + primary { + height: 12 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } +} +cont { + name: "piste:type-skitour" + element { + scale: 12 + lines { + width: 0.8 + color: 1724152575 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 1304722175 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 + } + } + element { + scale: 14 + lines { + width: 1.2 color: 1724152575 priority: 120 cap: BUTTCAP @@ -65901,100 +66782,136 @@ cont { path_text { primary { height: 9 - color: 2236962 - stroke_color: 1308622847 + color: 4473924 + stroke_color: 871230427 } - priority: 2950 + priority: 2770 + } + } + element { + scale: 15 + lines { + width: 1.4 + color: 1724152575 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 4473924 + stroke_color: 871230427 + } + priority: 2770 } } element { scale: 16 lines { - width: 1.1 + width: 1.6 color: 1724152575 priority: 120 } path_text { primary { height: 10 - color: 2236962 - stroke_color: 1308622847 + color: 4473924 + stroke_color: 871230427 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 + width: 1.9 color: 1724152575 priority: 120 } path_text { primary { height: 10 - color: 2236962 - stroke_color: 1308622847 + color: 4473924 + stroke_color: 871230427 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 + width: 2.3 color: 1724152575 priority: 120 } path_text { primary { height: 12 - color: 2236962 - stroke_color: 1308622847 + color: 4473924 + stroke_color: 871230427 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 + width: 2.3 color: 1724152575 priority: 120 } path_text { primary { height: 12 - color: 2236962 - stroke_color: 1308622847 + color: 4473924 + stroke_color: 871230427 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 + width: 2.3 color: 1724152575 priority: 120 } path_text { primary { height: 12 - color: 2236962 - stroke_color: 1308622847 + color: 4473924 + stroke_color: 871230427 } - priority: 2950 + priority: 2770 } } } cont { name: "piste:type-sled" + element { + scale: 12 + lines { + width: 1.0 + color: 2579790591 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3015998207 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 0.8 - color: 1724152575 + width: 1.4 + color: 3015998207 priority: 120 cap: BUTTCAP } @@ -66002,8 +66919,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1724152575 + width: 2.2 + color: 3015998207 priority: 120 cap: BUTTCAP } @@ -66013,14 +66930,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1724152575 + width: 2.2 + color: 3015998207 priority: 120 } path_text { @@ -66029,14 +66946,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -66045,14 +66962,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -66061,14 +66978,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -66077,14 +66994,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1724152575 + width: 3.2 + color: 3015998207 priority: 120 } path_text { @@ -66093,7 +67010,173 @@ 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 + } + } + element { + scale: 20 + area { + color: 3653532415 + priority: 15 + } + } +} +cont { + name: "piste:type-snow_park" + element { + scale: 13 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3653532415 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3653532415 + priority: 15 + } + caption { + primary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 16 + area { + color: 3653532415 + priority: 15 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 17 + area { + color: 3653532415 + priority: 15 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 18 + area { + color: 3653532415 + priority: 15 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 19 + area { + color: 3653532415 + priority: 15 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 + } + } + element { + scale: 20 + area { + color: 3653532415 + priority: 15 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 1308622847 + } + priority: 2770 } } } diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 46c5b517d0..6113c6c969 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 74bd2e092b..44896eb23e 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -65342,13 +65342,84 @@ cont { } } } +cont { + name: "piste:type-connection" + element { + scale: 15 + lines { + width: 1.4 + color: 862076287 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.6 + color: 862076287 + priority: 120 + } + } + element { + scale: 17 + lines { + width: 1.9 + color: 862076287 + priority: 120 + } + } + element { + scale: 18 + lines { + width: 2.3 + color: 862076287 + priority: 120 + } + } + element { + scale: 19 + lines { + width: 2.3 + color: 862076287 + priority: 120 + } + } + element { + scale: 20 + lines { + width: 2.3 + color: 862076287 + priority: 120 + } + } +} cont { name: "piste:type-downhill" + element { + scale: 12 + lines { + width: 1.0 + color: 2573352319 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3009559935 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 0.8 - color: 1717714303 + width: 1.4 + color: 3009559935 priority: 120 cap: BUTTCAP } @@ -65356,8 +65427,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1717714303 + width: 2.2 + color: 3009559935 priority: 120 cap: BUTTCAP } @@ -65367,14 +65438,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1717714303 + width: 2.2 + color: 3009559935 priority: 120 } path_text { @@ -65383,14 +65454,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -65399,14 +65470,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -65415,14 +65486,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -65431,14 +65502,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -65447,17 +65518,36 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } cont { name: "piste:type-downhill-advanced" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1713512994 + color: 2569151010 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3005358626 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3005358626 priority: 120 cap: BUTTCAP } @@ -65465,8 +65555,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1713512994 + width: 2.2 + color: 3005358626 priority: 120 cap: BUTTCAP } @@ -65476,14 +65566,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1713512994 + width: 2.2 + color: 3005358626 priority: 120 } path_text { @@ -65492,14 +65582,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1713512994 + width: 3.2 + color: 3005358626 priority: 120 } path_text { @@ -65508,14 +65598,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1713512994 + width: 3.2 + color: 3005358626 priority: 120 } path_text { @@ -65524,14 +65614,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1713512994 + width: 3.2 + color: 3005358626 priority: 120 } path_text { @@ -65540,14 +65630,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1713512994 + width: 3.2 + color: 3005358626 priority: 120 } path_text { @@ -65556,17 +65646,154 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-downhill-advanced-area" + element { + scale: 13 + area { + color: 3642892834 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3642892834 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3642892834 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3642892834 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3642892834 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3642892834 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3642892834 + priority: 15 + } + } + element { + scale: 20 + area { + color: 3642892834 + priority: 15 + } + } +} +cont { + name: "piste:type-downhill-area" + element { + scale: 13 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 20 + area { + color: 3647094143 + priority: 15 } } } cont { name: "piste:type-downhill-easy" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1712007163 + color: 2567645179 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3003852795 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3003852795 priority: 120 cap: BUTTCAP } @@ -65574,8 +65801,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1712007163 + width: 2.2 + color: 3003852795 priority: 120 cap: BUTTCAP } @@ -65585,14 +65812,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1712007163 + width: 2.2 + color: 3003852795 priority: 120 } path_text { @@ -65601,14 +65828,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65617,14 +65844,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65633,14 +65860,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65649,14 +65876,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1712007163 + width: 3.2 + color: 3003852795 priority: 120 } path_text { @@ -65665,17 +65892,95 @@ cont { color: 8947848 stroke_color: 1292964096 } - 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 + } + } + element { + scale: 20 + area { + color: 3641387003 + priority: 15 } } } cont { name: "piste:type-downhill-expert" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1714631475 + color: 2570269491 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3006477107 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3006477107 priority: 120 cap: BUTTCAP } @@ -65683,8 +65988,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1714631475 + width: 2.2 + color: 3006477107 priority: 120 cap: BUTTCAP } @@ -65694,14 +65999,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1714631475 + width: 2.2 + color: 3006477107 priority: 120 } path_text { @@ -65710,14 +66015,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3006477107 priority: 120 } path_text { @@ -65726,14 +66031,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3006477107 priority: 120 } path_text { @@ -65742,14 +66047,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3006477107 priority: 120 } path_text { @@ -65758,14 +66063,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3006477107 priority: 120 } path_text { @@ -65774,17 +66079,95 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-downhill-expert-area" + element { + scale: 13 + area { + color: 3644011315 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3644011315 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3644011315 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3644011315 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3644011315 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3644011315 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3644011315 + priority: 15 + } + } + element { + scale: 20 + area { + color: 3644011315 + priority: 15 } } } cont { name: "piste:type-downhill-freeride" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1714631475 + color: 2582553856 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3018761472 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3018761472 priority: 120 cap: BUTTCAP } @@ -65792,8 +66175,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1714631475 + width: 2.2 + color: 3018761472 priority: 120 cap: BUTTCAP } @@ -65803,14 +66186,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1714631475 + width: 2.2 + color: 3018761472 priority: 120 } path_text { @@ -65819,14 +66202,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65835,14 +66218,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65851,14 +66234,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65867,14 +66250,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1714631475 + width: 3.2 + color: 3018761472 priority: 120 } path_text { @@ -65883,17 +66266,36 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } } cont { name: "piste:type-downhill-intermediate" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1727794715 + color: 2583432731 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3019640347 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 3019640347 priority: 120 cap: BUTTCAP } @@ -65901,8 +66303,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1727794715 + width: 2.2 + color: 3019640347 priority: 120 cap: BUTTCAP } @@ -65912,14 +66314,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1727794715 + width: 2.2 + color: 3019640347 priority: 120 } path_text { @@ -65928,14 +66330,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65944,14 +66346,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65960,14 +66362,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65976,14 +66378,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1727794715 + width: 3.2 + color: 3019640347 priority: 120 } path_text { @@ -65992,17 +66394,95 @@ cont { color: 8947848 stroke_color: 1292964096 } - 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 + } + } + element { + scale: 20 + area { + color: 3657174555 + priority: 15 } } } cont { name: "piste:type-downhill-novice" element { - scale: 14 + scale: 12 lines { width: 1.0 - color: 1717562158 + color: 2573200174 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 2153769774 + priority: 120 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.4 + color: 2153769774 priority: 120 cap: BUTTCAP } @@ -66010,8 +66490,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1717562158 + width: 2.2 + color: 2153769774 priority: 120 cap: BUTTCAP } @@ -66021,14 +66501,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1717562158 + width: 2.2 + color: 2153769774 priority: 120 } path_text { @@ -66037,14 +66517,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -66053,14 +66533,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -66069,14 +66549,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -66085,14 +66565,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1717562158 + width: 3.2 + color: 2153769774 priority: 120 } path_text { @@ -66101,25 +66581,426 @@ cont { color: 8947848 stroke_color: 1292964096 } - 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 + } + } + element { + scale: 20 + area { + color: 3227511598 + priority: 15 + } + } +} +cont { + name: "piste:type-hike" + element { + scale: 12 + lines { + width: 1.1 + color: 1298283903 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 1298283903 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 1298283903 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 1298283903 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 1298283903 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 3.3 + color: 1298283903 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 1298283903 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 1298283903 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 1298283903 + dashdot { + dd: 8.0 + dd: 4.5 + } + priority: 120 + } + path_text { + primary { + height: 12 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 } } } cont { name: "piste:type-nordic" element { - scale: 14 + scale: 12 lines { width: 0.8 color: 1717714303 priority: 120 + join: BEVELJOIN cap: BUTTCAP } } + element { + scale: 13 + lines { + width: 1.0 + color: 1298283903 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 14 + lines { + width: 1.2 + color: 862076287 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } element { scale: 15 lines { - width: 1.1 + width: 1.4 + color: 862076287 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 16 + lines { + width: 1.6 + color: 862076287 + priority: 120 + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 17 + lines { + width: 1.9 + color: 862076287 + priority: 120 + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 18 + lines { + width: 2.3 + color: 862076287 + priority: 120 + } + path_text { + primary { + height: 12 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 19 + lines { + width: 2.3 + color: 862076287 + priority: 120 + } + path_text { + primary { + height: 12 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 20 + lines { + width: 2.3 + color: 862076287 + priority: 120 + } + path_text { + primary { + height: 12 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } +} +cont { + name: "piste:type-skitour" + element { + scale: 12 + lines { + width: 0.8 + color: 1717714303 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.0 + color: 1298283903 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 + } + } + element { + scale: 14 + lines { + width: 1.2 color: 1717714303 priority: 120 cap: BUTTCAP @@ -66127,100 +67008,136 @@ cont { path_text { primary { height: 9 - color: 8947848 - stroke_color: 1292964096 + color: 6710886 + stroke_color: 856756480 } - priority: 2950 + priority: 2770 + } + } + element { + scale: 15 + lines { + width: 1.4 + color: 1717714303 + priority: 120 + cap: BUTTCAP + } + path_text { + primary { + height: 9 + color: 6710886 + stroke_color: 856756480 + } + priority: 2770 } } element { scale: 16 lines { - width: 1.1 + width: 1.6 color: 1717714303 priority: 120 } path_text { primary { height: 10 - color: 8947848 - stroke_color: 1292964096 + color: 6710886 + stroke_color: 856756480 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 + width: 1.9 color: 1717714303 priority: 120 } path_text { primary { height: 10 - color: 8947848 - stroke_color: 1292964096 + color: 6710886 + stroke_color: 856756480 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 + width: 2.3 color: 1717714303 priority: 120 } path_text { primary { height: 12 - color: 8947848 - stroke_color: 1292964096 + color: 6710886 + stroke_color: 856756480 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 + width: 2.3 color: 1717714303 priority: 120 } path_text { primary { height: 12 - color: 8947848 - stroke_color: 1292964096 + color: 6710886 + stroke_color: 856756480 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 + width: 2.3 color: 1717714303 priority: 120 } path_text { primary { height: 12 - color: 8947848 - stroke_color: 1292964096 + color: 6710886 + stroke_color: 856756480 } - priority: 2950 + priority: 2770 } } } cont { name: "piste:type-sled" + element { + scale: 12 + lines { + width: 1.0 + color: 2573352319 + priority: 120 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.4 + color: 3009559935 + priority: 120 + cap: BUTTCAP + } + } element { scale: 14 lines { - width: 0.8 - color: 1717714303 + width: 1.4 + color: 3009559935 priority: 120 cap: BUTTCAP } @@ -66228,8 +67145,8 @@ cont { element { scale: 15 lines { - width: 1.1 - color: 1717714303 + width: 2.2 + color: 3009559935 priority: 120 cap: BUTTCAP } @@ -66239,14 +67156,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 16 lines { - width: 1.1 - color: 1717714303 + width: 2.2 + color: 3009559935 priority: 120 } path_text { @@ -66255,14 +67172,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 17 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -66271,14 +67188,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 18 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -66287,14 +67204,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 19 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -66303,14 +67220,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 } } element { scale: 20 lines { - width: 1.5 - color: 1717714303 + width: 3.2 + color: 3009559935 priority: 120 } path_text { @@ -66319,7 +67236,173 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 2950 + priority: 2770 + } + } +} +cont { + name: "piste:type-sled-area" + element { + scale: 13 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 16 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 17 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 18 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 19 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 20 + area { + color: 3647094143 + priority: 15 + } + } +} +cont { + name: "piste:type-snow_park" + element { + scale: 13 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 14 + area { + color: 3647094143 + priority: 15 + } + } + element { + scale: 15 + area { + color: 3647094143 + priority: 15 + } + caption { + primary { + height: 9 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 16 + area { + color: 3647094143 + priority: 15 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 17 + area { + color: 3647094143 + priority: 15 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 18 + area { + color: 3647094143 + priority: 15 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 19 + area { + color: 3647094143 + priority: 15 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 + } + } + element { + scale: 20 + area { + color: 3647094143 + priority: 15 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + } + priority: 2770 } } } diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index 3744d4c89d..9977573e76 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -384,6 +384,7 @@ building-has_parts # area z14- (also has captio building-train_station # area z14- (also has caption z16-) === 130 +piste:type-connection # line z15- piste:type-downhill # line z14- (also has pathtext z15-) piste:type-downhill-advanced # line z14- (also has pathtext z15-) piste:type-downhill-easy # line z14- (also has pathtext z15-) @@ -391,11 +392,10 @@ piste:type-downhill-expert # line z14- (also has pathte piste:type-downhill-freeride # line z14- (also has pathtext z15-) piste:type-downhill-intermediate # line z14- (also has pathtext z15-) piste:type-downhill-novice # line z14- (also has pathtext z15-) +piste:type-hike # line z14- (also has pathtext z15-) piste:type-nordic # line z14- (also has pathtext z15-) +piste:type-skitour # line z14- (also has pathtext z15-) piste:type-sled # line z14- (also has pathtext z15-) -piste:type-skitour -piste:type-hike -piste:type-connection === 120 building:part # area z16- @@ -461,7 +461,7 @@ landuse-military-danger_area # area z10- (also has icon z leisure-nature_reserve # area z10- (also has icon z11-, caption(optional) z12-) === 20 -piste:type-snow_park +piste:type-snow_park # area z14- (also has caption z15-) === 15 man_made-bridge # area z14- diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 266863f125..1fb40653b8 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -729,18 +729,18 @@ highway-service-bridge # pathtext z16- (also has li highway-service-driveway # pathtext z16- (also has line z16-) highway-service-parking_aisle # pathtext z16- (also has line z15-) highway-service-tunnel # pathtext z16- (also has line z15-) -piste:type-downhill -piste:type-downhill-advanced -piste:type-downhill-easy -piste:type-downhill-expert -piste:type-downhill-freeride -piste:type-downhill-intermediate -piste:type-downhill-novice -piste:type-nordic -piste:type-sled -piste:type-skitour -piste:type-hike -piste:type-snow_park +piste:type-downhill # pathtext z15- (also has line z14-) +piste:type-downhill-advanced # pathtext z15- (also has line z14-) +piste:type-downhill-easy # pathtext z15- (also has line z14-) +piste:type-downhill-expert # pathtext z15- (also has line z14-) +piste:type-downhill-freeride # pathtext z15- (also has line z14-) +piste:type-downhill-intermediate # pathtext z15- (also has line z14-) +piste:type-downhill-novice # pathtext z15- (also has line z14-) +piste:type-hike # pathtext z15- (also has line z14-) +piste:type-nordic # pathtext z15- (also has line z14-) +piste:type-skitour # pathtext z15- (also has line z14-) +piste:type-sled # pathtext z15- (also has line z14-) +piste:type-snow_park # caption z15- (also has area z14-) === 2770 amenity-townhall # icon z16- (also has caption(optional) z16-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 95903259f0..1d313df3e2 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -384,18 +384,18 @@ building-has_parts # area z14- (also has captio building-train_station # area z14- (also has caption z16-) === 130 -piste:type-downhill # line z14- (also has pathtext z15-) -piste:type-downhill-advanced # line z14- (also has pathtext z15-) -piste:type-downhill-easy # line z14- (also has pathtext z15-) -piste:type-downhill-expert # line z14- (also has pathtext z15-) -piste:type-downhill-freeride # line z14- (also has pathtext z15-) -piste:type-downhill-intermediate # line z14- (also has pathtext z15-) -piste:type-downhill-novice # line z14- (also has pathtext z15-) -piste:type-nordic # line z14- (also has pathtext z15-) -piste:type-sled # line z14- (also has pathtext z15-) -piste:type-skitour -piste:type-hike -piste:type-connection +piste:type-connection # line z15- +piste:type-downhill # line z12- (also has pathtext z15-) +piste:type-downhill-advanced # line z12- (also has pathtext z15-) +piste:type-downhill-easy # line z12- (also has pathtext z15-) +piste:type-downhill-expert # line z12- (also has pathtext z15-) +piste:type-downhill-freeride # line z12- (also has pathtext z15-) +piste:type-downhill-intermediate # line z12- (also has pathtext z15-) +piste:type-downhill-novice # line z12- (also has pathtext z15-) +piste:type-hike # line z12- (also has pathtext z13-) +piste:type-nordic # line z12- (also has pathtext z13-) +piste:type-skitour # line z12- (also has pathtext z13-) +piste:type-sled # line z12- (also has pathtext z15-) === 120 building:part # area z16- @@ -461,14 +461,14 @@ landuse-military-danger_area # area z10- (also has icon z leisure-nature_reserve # area z10- (also has icon z10-, caption(optional) z11-) === 20 -piste:type-downhill-area -piste:type-downhill-advanced-area -piste:type-downhill-easy-area -piste:type-downhill-expert-area -piste:type-downhill-intermediate-area -piste:type-downhill-novice-area -piste:type-sled-area -piste:type-snow_park +piste:type-downhill-advanced-area # area z13- +piste:type-downhill-area # area z13- +piste:type-downhill-easy-area # area z13- +piste:type-downhill-expert-area # area z13- +piste:type-downhill-intermediate-area # area z13- +piste:type-downhill-novice-area # area z13- +piste:type-sled-area # area z13- +piste:type-snow_park # area z13- (also has caption z15-) === 15 man_made-bridge # area z14- diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 42f4fe6532..b8940875e3 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -729,18 +729,18 @@ highway-service-bridge # pathtext z16- (also has li highway-service-driveway # pathtext z16- (also has line z16-) highway-service-parking_aisle # pathtext z16- (also has line z15-) highway-service-tunnel # pathtext z16- (also has line z13-) -piste:type-downhill -piste:type-downhill-advanced -piste:type-downhill-easy -piste:type-downhill-expert -piste:type-downhill-freeride -piste:type-downhill-intermediate -piste:type-downhill-novice -piste:type-nordic -piste:type-sled -piste:type-skitour -piste:type-hike -piste:type-snow_park +piste:type-downhill # pathtext z15- (also has line z12-) +piste:type-downhill-advanced # pathtext z15- (also has line z12-) +piste:type-downhill-easy # pathtext z15- (also has line z12-) +piste:type-downhill-expert # pathtext z15- (also has line z12-) +piste:type-downhill-freeride # pathtext z15- (also has line z12-) +piste:type-downhill-intermediate # pathtext z15- (also has line z12-) +piste:type-downhill-novice # pathtext z15- (also has line z12-) +piste:type-hike # pathtext z13- (also has line z12-) +piste:type-nordic # pathtext z13- (also has line z12-) +piste:type-skitour # pathtext z13- (also has line z12-) +piste:type-sled # pathtext z15- (also has line z12-) +piste:type-snow_park # caption z15- (also has area z13-) === 2770 amenity-townhall # icon z16- (also has caption(optional) z16-) diff --git a/data/types.txt b/data/types.txt index 3e6fa8b3ee..89c1416e1a 100644 --- a/data/types.txt +++ b/data/types.txt @@ -602,18 +602,18 @@ mapswithme mapswithme mapswithme *boundary|administrative|nation -mapswithme -mapswithme -mapswithme +*piste:type|hike +*piste:type|connection +*piste:type|skitour *aerialway|magic_carpet -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme +*piste:type|downhill|novice|area +*piste:type|downhill|easy|area +*piste:type|downhill|intermediate|area +*piste:type|downhill|advanced|area +*piste:type|downhill|expert|area +*piste:type|downhill|area +*piste:type|sled|area +*piste:type|snow_park mapswithme mapswithme *aerialway|j-bar diff --git a/data/visibility.txt b/data/visibility.txt index 5bec84780c..b5a08d9360 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -790,16 +790,33 @@ world 000000000000000000000 + yes 000000000000000000000 - {} piste:type 000000000000000000000 + + connection 000000000000000000000 - downhill 000000000000000000000 + - advanced 000000000000000000000 - - easy 000000000000000000000 - - expert 000000000000000000000 - + advanced 000000000000000000000 + + area 000000000000000000000 - + {} + area 000000000000000000000 - + easy 000000000000000000000 + + area 000000000000000000000 - + {} + expert 000000000000000000000 + + area 000000000000000000000 - + {} freeride 000000000000000000000 - - intermediate 000000000000000000000 - - novice 000000000000000000000 - + intermediate 000000000000000000000 + + area 000000000000000000000 - + {} + novice 000000000000000000000 + + area 000000000000000000000 - + {} {} + hike 000000000000000000000 - nordic 000000000000000000000 - - sled 000000000000000000000 - + skitour 000000000000000000000 - + sled 000000000000000000000 + + area 000000000000000000000 - + {} + snow_park 000000000000000000000 - {} place 000000000000000000000 + city 000011111111111111111 +