diff --git a/3party/protobuf/protobuf b/3party/protobuf/protobuf index a6189acd18..bda4bb9068 160000 --- a/3party/protobuf/protobuf +++ b/3party/protobuf/protobuf @@ -1 +1 @@ -Subproject commit a6189acd18b00611c1dc7042299ad75486f08a1a +Subproject commit bda4bb90688a36e1311d798030894dcd5f6105ef diff --git a/data/classificator.txt b/data/classificator.txt index b00b44e8b9..898aab2cfe 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -423,6 +423,10 @@ world + construction - cycleway + bridge - + difficult - + easy - + expert - + intermediate - tunnel - {} elevator - diff --git a/data/colors.txt b/data/colors.txt index f970ee2285..4a5d166625 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -19,6 +19,7 @@ 152955 160412 240116 +262778 328965 352205 394752 @@ -134,6 +135,7 @@ 5395026 5459435 5592405 +5657855 5666134 5717555 5845795 @@ -208,6 +210,7 @@ 10506258 10592406 10790054 +10879133 11053224 11057133 11112295 @@ -228,6 +231,7 @@ 12000284 12039862 12105912 +12218495 12372094 12517551 12700809 @@ -342,6 +346,7 @@ 671057702 671061056 671088639 +855900794 856032768 856756480 856756497 @@ -361,7 +366,6 @@ 860629531 861027891 861097451 -861295871 861355571 861690961 861690972 @@ -494,6 +498,7 @@ 1545508592 1560281087 1711276032 +1711538810 1711670784 1711677478 1712264192 @@ -534,6 +539,7 @@ 1931024665 1943327690 2147483648 +2147746426 2147812613 2147878400 2147885094 @@ -555,7 +561,6 @@ 2152483916 2152615485 2153076053 -2153141503 2153536593 2153769774 2153921919 @@ -587,6 +592,7 @@ 2370396489 2371253590 2566914048 +2567176826 2567571981 2567645179 2567902208 @@ -599,7 +605,6 @@ 2570486556 2571723081 2571847235 -2572571903 2572580182 2573200174 2573352319 @@ -620,6 +625,7 @@ 2790683990 2801593470 3003121664 +3003384442 3003473869 3003715338 3003779597 @@ -631,7 +637,6 @@ 3006694172 3007916315 3008113177 -3008779519 3009559935 3010346311 3015998207 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 79062d18f9..93976db3d7 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 56b232bfa8..cd85ec0112 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -23418,7 +23418,7 @@ cont { scale: 11 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23427,7 +23427,7 @@ cont { scale: 12 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23436,7 +23436,7 @@ cont { scale: 13 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23445,7 +23445,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 330 cap: BUTTCAP } @@ -23454,7 +23454,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 330 cap: BUTTCAP } @@ -23471,7 +23471,7 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -23487,7 +23487,7 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -23503,7 +23503,7 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -23519,7 +23519,7 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -23535,7 +23535,7 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -23554,7 +23554,7 @@ cont { scale: 11 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23563,7 +23563,7 @@ cont { scale: 12 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23572,7 +23572,7 @@ cont { scale: 13 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23581,7 +23581,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 330 cap: BUTTCAP } @@ -23596,7 +23596,7 @@ cont { } lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 330 cap: BUTTCAP } @@ -23619,7 +23619,7 @@ cont { } lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -23647,7 +23647,7 @@ cont { } lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -23675,7 +23675,7 @@ cont { } lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -23703,7 +23703,7 @@ cont { } lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -23731,7 +23731,651 @@ cont { } lines { width: 1.8 - color: 861295871 + color: 855900794 + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-difficult" + element { + scale: 11 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 5657855 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5657855 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 5657855 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-easy" + element { + scale: 11 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 262778 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 262778 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 262778 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-expert" + element { + scale: 11 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 10879133 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.0 + color: 10879133 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.5 + color: 10879133 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 10879133 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-intermediate" + element { + scale: 11 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 5657855 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5657855 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 5657855 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 6.0 + dd: 3.5 + } priority: 330 } path_text { @@ -23750,7 +24394,7 @@ cont { scale: 11 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23759,7 +24403,7 @@ cont { scale: 12 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23768,7 +24412,7 @@ cont { scale: 13 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -23777,7 +24421,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 330 cap: BUTTCAP } @@ -23786,7 +24430,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 330 cap: BUTTCAP } @@ -23803,7 +24447,7 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -23819,7 +24463,7 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 330 } lines { @@ -23851,7 +24495,7 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 330 } lines { @@ -23883,7 +24527,7 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } lines { @@ -23915,7 +24559,7 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } lines { @@ -24365,7 +25009,7 @@ cont { scale: 11 lines { width: 1.2 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -24392,7 +25036,7 @@ cont { scale: 12 lines { width: 1.2 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -24419,7 +25063,7 @@ cont { scale: 13 lines { width: 1.2 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -24446,7 +25090,7 @@ cont { scale: 14 lines { width: 1.2 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -24473,7 +25117,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -24500,7 +25144,7 @@ cont { scale: 16 lines { width: 1.3 - color: 2572571903 + color: 2567176826 priority: 170 } lines { @@ -24525,7 +25169,7 @@ cont { scale: 17 lines { width: 1.4 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -24550,7 +25194,7 @@ cont { scale: 18 lines { width: 1.6 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -24575,7 +25219,7 @@ cont { scale: 19 lines { width: 1.8 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -24600,7 +25244,7 @@ cont { scale: 20 lines { width: 1.8 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -28171,7 +28815,7 @@ cont { scale: 11 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -28190,7 +28834,7 @@ cont { scale: 12 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -28209,7 +28853,7 @@ cont { scale: 13 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -28228,7 +28872,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -28247,7 +28891,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 170 cap: BUTTCAP } @@ -28274,7 +28918,7 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 170 } lines { @@ -28299,7 +28943,7 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 170 } lines { @@ -28324,7 +28968,7 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 170 } lines { @@ -28349,7 +28993,7 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 170 } lines { @@ -28374,7 +29018,7 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 170 } lines { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 506d6ad45e..42a8a6a6d0 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index ee539287ed..abd04481d2 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -22423,6 +22423,586 @@ cont { } } } +cont { + name: "highway-cycleway-difficult" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 12218495 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 12218495 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 12218495 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-easy" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 7224647 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 7224647 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 7224647 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 7224647 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-expert" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 10879133 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.0 + color: 10879133 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.5 + color: 10879133 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 10879133 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-intermediate" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 12218495 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 12218495 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 12218495 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 12218495 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} cont { name: "highway-cycleway-tunnel" element { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index c77aa6cfe1..21bad76186 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 32246d03ca..cf911a9e4a 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -22133,7 +22133,7 @@ cont { scale: 13 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -22142,7 +22142,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 330 cap: BUTTCAP } @@ -22151,7 +22151,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 330 cap: BUTTCAP } @@ -22168,7 +22168,7 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -22184,7 +22184,7 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -22200,7 +22200,7 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -22216,7 +22216,7 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -22232,7 +22232,7 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -22251,7 +22251,7 @@ cont { scale: 13 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -22260,7 +22260,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 330 cap: BUTTCAP } @@ -22275,7 +22275,7 @@ cont { } lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 330 cap: BUTTCAP } @@ -22298,7 +22298,7 @@ cont { } lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -22326,7 +22326,7 @@ cont { } lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -22354,7 +22354,7 @@ cont { } lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -22382,7 +22382,7 @@ cont { } lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } path_text { @@ -22410,7 +22410,587 @@ cont { } lines { width: 1.8 - color: 861295871 + color: 855900794 + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-difficult" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 5657855 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5657855 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 5657855 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-easy" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 262778 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 262778 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 262778 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 262778 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-expert" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 10879133 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.0 + color: 10879133 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.5 + color: 10879133 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 10879133 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.5 + color: 10879133 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-intermediate" + element { + scale: 13 + lines { + width: 0.9 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 5657855 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5657855 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 2.5 + color: 5657855 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 3.0 + color: 5657855 + dashdot { + dd: 6.0 + dd: 3.5 + } priority: 330 } path_text { @@ -22429,7 +23009,7 @@ cont { scale: 13 lines { width: 0.9 - color: 3008779519 + color: 3003384442 priority: 330 cap: BUTTCAP } @@ -22438,7 +23018,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 330 cap: BUTTCAP } @@ -22447,7 +23027,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 330 cap: BUTTCAP } @@ -22464,7 +23044,7 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 330 } path_text { @@ -22480,7 +23060,7 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 330 } lines { @@ -22512,7 +23092,7 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 330 } lines { @@ -22544,7 +23124,7 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } lines { @@ -22576,7 +23156,7 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 330 } lines { @@ -22921,7 +23501,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -22948,7 +23528,7 @@ cont { scale: 16 lines { width: 1.3 - color: 2572571903 + color: 2567176826 priority: 170 } lines { @@ -22973,7 +23553,7 @@ cont { scale: 17 lines { width: 1.4 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -22998,7 +23578,7 @@ cont { scale: 18 lines { width: 1.6 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -23023,7 +23603,7 @@ cont { scale: 19 lines { width: 1.8 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -23048,7 +23628,7 @@ cont { scale: 20 lines { width: 1.8 - color: 2153141503 + color: 2147746426 priority: 170 } lines { @@ -26388,7 +26968,7 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 priority: 170 cap: BUTTCAP } @@ -26407,7 +26987,7 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 priority: 170 cap: BUTTCAP } @@ -26434,7 +27014,7 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 priority: 170 } lines { @@ -26459,7 +27039,7 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 priority: 170 } lines { @@ -26484,7 +27064,7 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 priority: 170 } lines { @@ -26509,7 +27089,7 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 170 } lines { @@ -26534,7 +27114,7 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 priority: 170 } lines { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 697962584c..0a278dffaf 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 90c414b474..5c550267ae 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -23333,6 +23333,734 @@ cont { } } } +cont { + name: "highway-cycleway-difficult" + element { + scale: 11 + lines { + width: 0.9 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 862862663 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 7224647 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 7224647 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 7224647 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 7224647 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-easy" + element { + scale: 11 + lines { + width: 0.9 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 862862663 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 7224647 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 7224647 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 7224647 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 7224647 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-expert" + element { + scale: 11 + lines { + width: 0.9 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 862862663 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 7224647 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 7224647 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 7224647 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 7224647 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-intermediate" + element { + scale: 11 + lines { + width: 0.9 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 862862663 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 7224647 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 7224647 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 7224647 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 7224647 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 7224647 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2953 + } + } +} cont { name: "highway-cycleway-tunnel" element { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index acf5f8f45c..b43aff0e95 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index a4d1677a2f..d883e5b5d7 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -23333,6 +23333,734 @@ cont { } } } +cont { + name: "highway-cycleway-difficult" + element { + scale: 11 + lines { + width: 0.9 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 5459435 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 5459435 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 5459435 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 5459435 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-easy" + element { + scale: 11 + lines { + width: 0.9 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 5459435 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 5459435 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 5459435 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 5459435 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-expert" + element { + scale: 11 + lines { + width: 0.9 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 5459435 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 5459435 + dashdot { + dd: 1.0 + dd: 4.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 5459435 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 5459435 + dashdot { + dd: 1.6 + dd: 6.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 2.8 + dd: 8.0 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} +cont { + name: "highway-cycleway-intermediate" + element { + scale: 11 + lines { + width: 0.9 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 5459435 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 5459435 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 5459435 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 5459435 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 5459435 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 330 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2953 + } + } +} cont { name: "highway-cycleway-tunnel" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index c74564bfd9..6dc4b1502b 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 603de1a800..9ea452868c 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -9130,6 +9130,114 @@ cont { } } } +cont { + name: "highway-cycleway-difficult" + element { + scale: 18 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } +} +cont { + name: "highway-cycleway-easy" + element { + scale: 18 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } +} +cont { + name: "highway-cycleway-expert" + element { + scale: 18 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } +} +cont { + name: "highway-cycleway-intermediate" + element { + scale: 18 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1718500679 + priority: 130 + } + } +} cont { name: "highway-footway" element { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index 4315358288..ccbf7435c6 100644 Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index 850cdf08a9..3efa6c9bae 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -9130,6 +9130,114 @@ cont { } } } +cont { + name: "highway-cycleway-difficult" + element { + scale: 18 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } +} +cont { + name: "highway-cycleway-easy" + element { + scale: 18 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } +} +cont { + name: "highway-cycleway-expert" + element { + scale: 18 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } +} +cont { + name: "highway-cycleway-intermediate" + element { + scale: 18 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1716933887 + priority: 130 + } + } +} cont { name: "highway-footway" element { diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index da9e25558b..7234ba15de 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -730,10 +730,11 @@ piste:type|snow_park;616; deprecated|deprecated;617;x deprecated|deprecated;618;x aerialway|j-bar;619; -deprecated|deprecated;620;x -deprecated|deprecated;621;x -deprecated|deprecated;622;x -deprecated|deprecated;623;x +# _mtb_rating is a mix of mtb:scale, surface smoothness and imba rating, see osm2type +highway|cycleway|easy;[highway=cycleway][_mtb_rating=easy];;name;int_name;620; +highway|cycleway|intermediate;[highway=cycleway][_mtb_rating=intermediate];;name;int_name;621; +highway|cycleway|difficult;[highway=cycleway][_mtb_rating=difficult];;name;int_name;622; +highway|cycleway|expert;[highway=cycleway][_mtb_rating=expert];;name;int_name;623; deprecated|deprecated;624;x deprecated|deprecated;625;x deprecated:railway|siding|bridge:06.2023;626;x diff --git a/data/patterns.txt b/data/patterns.txt index 83ab80f6ec..1d12aeae08 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -24,6 +24,12 @@ 10.8 4.5 13.5 5.4 18.0 6.2 +1.0 4.0 +1.6 6.0 +2.8 8.0 +3.5 2.0 +4.0 2.5 +6.0 3.5 5.0 2.0 6.0 2.5 8.0 3.0 @@ -40,9 +46,6 @@ 16.2 8.1 5.0 5.0 4.0 4.0 -3.5 2.0 -4.0 2.5 -6.0 3.5 8.0 4.5 3.5 2.7 4.0 3.2 @@ -51,9 +54,6 @@ 1.0 2.0 1.8 2.5 2.8 3.5 -1.0 4.0 -1.6 6.0 -2.8 8.0 1.5 1.3 1.8 1.6 2.5 2.2 diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index ad2329497b..4cf91a7a8b 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -12755,6 +12755,22 @@ pl = Most drogowy dla rowerów pt-BR = Ponte para ciclistas + [type.highway.cycleway.easy] + en = easy mountainbike trail + de = leichter Mountainbike Trail + + [type.highway.cycleway.intermediate] + en = intermediate mountainbike trail + de = mittelschwerer Mountainbike Trail + + [type.highway.cycleway.difficult] + en = difficult mountainbike trail + de = schwerer Mountainbike Trail + + [type.highway.cycleway.expert] + en = expert mountainbike trail + de = Sehr schwerer Mountainbike Trail + [type.highway.cycleway.permissive] ref = type.highway.cycleway et = Piiratud jalgrattatee diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 7c367088f6..71dbb3558e 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -114,6 +114,8 @@ @pedestrian: #4D4744; @footway: #4B4643; @cycleway: #6E3D47; +@cycleway_mtbintermediate: #BA707f; +@cycleway_mtbexpert: #FF5CF6; @construction: #332F2D; @track: #5F532D; @path: #944A12; diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 6fd441ae82..18f4fb5d3a 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -644,10 +644,11 @@ line|z19-[highway=busway], line|z13-[highway=pedestrian], line|z13-[highway=ford] {color: @pedestrian;opacity: 0.85;} -line|z13-[highway=cycleway], +line|z13-[highway=cycleway][!_mtb_rating], line|z14-[highway=path][bicycle=designated]::cycleline, line|z15-[highway=footway][bicycle=designated]::cycleline, {color: @cycleway;} + line|z13-[highway=construction], {color: @construction;opacity: 0.7;} line|z13-[highway=pedestrian][bridge?]::bridgewhite, @@ -756,18 +757,18 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack, /* 8.4 Cycleway 13-22 ZOOM */ -line|z13[highway=cycleway], +line|z13[highway=cycleway][!_mtb_rating], {opacity: 0.3;} -line|z14[highway=cycleway], +line|z14[highway=cycleway][!_mtb_rating], line|z14[highway=path][bicycle=designated]::cycleline, {opacity: 0.4;} -line|z15[highway=cycleway], +line|z15[highway=cycleway][!_mtb_rating], line|z15[highway=path][bicycle=designated]::cycleline, {opacity: 0.5;} -line|z16-17[highway=cycleway], +line|z16-17[highway=cycleway][!_mtb_rating], line|z16-17[highway=path][bicycle=designated]::cycleline, {opacity: 0.6;} -line|z18-[highway=cycleway], +line|z18-[highway=cycleway][!_mtb_rating], line|z18-[highway=path][bicycle=designated]::cycleline, {opacity: 0.8;} @@ -776,7 +777,7 @@ line|z15-16[highway=footway][bicycle=designated]::cycleline, line|z17-[highway=footway][bicycle=designated]::cycleline, {opacity: 0.5;} -line|z13[highway=cycleway] +line|z13[highway=cycleway], {width: 0.9;} line|z14[highway=cycleway], line|z14[highway=path][bicycle=designated]::cycleline, @@ -830,6 +831,50 @@ line|z18[highway=cycleway][bridge?]::bridgeblack line|z19-[highway=cycleway][bridge?]::bridgeblack {casing-width-add: 3;} +line|z14[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 1; dashes: 3.5,2;} +line|z15[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 2; dashes: 3.5,2;} +line|z16[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 2.5; dashes: 4,2.5;} +line|z17[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 3; dashes: 4,2.5;} +line|z18-[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 3; dashes: 6,3.5;} + +line|z14[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtbintermediate;width: 1; dashes: 3.5,2;} +line|z15[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtbintermediate;width: 2; dashes: 3.5,2;} +line|z16[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtbintermediate;width: 2.5; dashes: 4,2.5;} +line|z17[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtbintermediate;width: 3; dashes: 4,2.5} +line|z18-[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtbintermediate;width: 3; dashes: 6,3.5;} + +line|z14[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtbintermediate;width: 1; dashes: 1,4;} +line|z15[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtbintermediate;width: 2; dashes: 1,4;} +line|z16[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtbintermediate;width: 2.5; dashes: 1.6,6;} +line|z17[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtbintermediate;width: 3; dashes: 1.6,6;} +line|z18-[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtbintermediate;width: 3; dashes: 2.8,8;} + +line|z14[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 1; dashes: 1,4;} +line|z15[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 1; dashes: 1,4;} +line|z16[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 1.5; dashes: 1.6,6;} +line|z17[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 2; dashes: 1.6,6;} +line|z18-[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 2.5; dashes: 2.8,8;} + /* 8.5 Construction 13-22 ZOOM */ line|z13[highway=construction], diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 809bd68dc5..fdecc19a6c 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -47,6 +47,10 @@ power-line::dash # line::dash z19- (also has highway-cycleway # line z13- (also has pathtext z15-) highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +highway-cycleway-difficult # line z13- (also has pathtext z15-) +highway-cycleway-easy # line z13- (also has pathtext z15-) +highway-cycleway-expert # line z13- (also has pathtext z15-) +highway-cycleway-intermediate # line z13- (also has pathtext z15-) highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) highway-footway-crossing # line z16- highway-steps # line z15- (also has pathtext z16-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index d9cb980cdc..0726988b34 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -661,6 +661,10 @@ highway-residential-tunnel::shield # shield::shield z15- (also highway-cycleway # pathtext z15- (also has line z13-) highway-cycleway-bridge # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-cycleway-difficult # pathtext z15- (also has line z13-) +highway-cycleway-easy # pathtext z15- (also has line z13-) +highway-cycleway-expert # pathtext z15- (also has line z13-) +highway-cycleway-intermediate # pathtext z15- (also has line z13-) highway-cycleway-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2953 diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index a453550ec3..3a25105be6 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -113,7 +113,9 @@ @residential: #F8F8F8; @pedestrian: #F8F8F8; @footway: #F8F8F8; -@cycleway: #5654FF; +@cycleway: #04027A; +@cycleway_mtbintermediate: #5654FF; +@cycleway_mtbexpert: #A6009D; @construction: #BBBBAA; @track: #635730; @path: #A05012; diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 441889b669..c6bf30217c 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -47,6 +47,10 @@ power-line::dash # line::dash z15- (also has highway-cycleway # line z11- (also has pathtext z13-) highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-cycleway-difficult # line z11- (also has pathtext z13-) +highway-cycleway-easy # line z11- (also has pathtext z13-) +highway-cycleway-expert # line z11- (also has pathtext z13-) +highway-cycleway-intermediate # line z11- (also has pathtext z13-) highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-footway-crossing # line z16- highway-steps # line z12- (also has pathtext z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 63a973fdb9..f67d0ce12d 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -661,6 +661,10 @@ highway-residential-tunnel::shield # shield::shield z15- (also highway-cycleway # pathtext z13- (also has line z11-) highway-cycleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-cycleway-difficult # pathtext z13- (also has line z11-) +highway-cycleway-easy # pathtext z13- (also has line z11-) +highway-cycleway-expert # pathtext z13- (also has line z11-) +highway-cycleway-intermediate # pathtext z13- (also has line z11-) highway-cycleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2953 diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 348d258813..488e816087 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -246,6 +246,10 @@ highway-bridleway # line z18- highway-bridleway-bridge # line z18- highway-cycleway # line z18- highway-cycleway-bridge # line z18- +highway-cycleway-difficult # line z18- +highway-cycleway-easy # line z18- +highway-cycleway-expert # line z18- +highway-cycleway-intermediate # line z18- highway-footway # line z18- highway-footway-area # line z18- highway-footway-bicycle # line z18- diff --git a/data/types.txt b/data/types.txt index 082497e911..8c266e40ae 100644 --- a/data/types.txt +++ b/data/types.txt @@ -617,10 +617,10 @@ mapswithme mapswithme mapswithme *aerialway|j-bar -mapswithme -mapswithme -mapswithme -mapswithme +*highway|cycleway|easy +*highway|cycleway|intermediate +*highway|cycleway|difficult +*highway|cycleway|expert mapswithme mapswithme mapswithme diff --git a/data/visibility.txt b/data/visibility.txt index fe4405ce83..3dbe77ab2b 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -423,6 +423,10 @@ world 000000000000000000000 + construction 000000000000011111111 - cycleway 000000000000000000111 + bridge 000000000000000000111 - + difficult 000000000000000000111 - + easy 000000000000000000111 - + expert 000000000000000000111 - + intermediate 000000000000000000111 - tunnel 000000000000000000000 - {} elevator 000000000000000000000 - diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 1316eba69c..720d30f81d 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -3166,4 +3166,36 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_MultipleComplexTypesSmoke) } } +UNIT_CLASS_TEST(TestWithClassificator, OsmType_Mtb_Rating) +{ + using Type = std::vector; + std::vector> const conversions = { + {{"highway", "cycleway", "easy"}, {{"highway", "cycleway"}, {"mtb:scale", "0"}, {"smoothness", "good"}}}, + {{"highway", "cycleway", "easy"}, {{"highway", "cycleway"}, {"mtb:scale", "S0"}}}, + {{"highway", "cycleway", "easy"}, {{"highway", "cycleway"}, {"mtb:scale:imba", "1"}}}, + {{"highway", "cycleway", "easy"}, {{"highway", "cycleway"}, {"smoothness", "bad"}}}, + + {{"highway", "cycleway", "intermediate"}, {{"highway", "cycleway"}, {"mtb:scale", "1"}, {"smoothness", "good"}}}, + {{"highway", "cycleway", "intermediate"}, {{"highway", "cycleway"}, {"mtb:scale", "S2"}}}, + {{"highway", "cycleway", "intermediate"}, {{"highway", "cycleway"}, {"mtb:scale:imba", "2"}}}, + {{"highway", "cycleway", "intermediate"}, {{"highway", "cycleway"}, {"smoothness", "horrible"}}}, + + {{"highway", "cycleway", "difficult"}, {{"highway", "cycleway"}, {"mtb:scale", "3"}, {"smoothness", "very_bad"}}}, + {{"highway", "cycleway", "difficult"}, {{"highway", "cycleway"}, {"mtb:scale", "S3"}}}, + {{"highway", "cycleway", "difficult"}, {{"highway", "cycleway"}, {"mtb:scale:imba", "3"}, {"smoothness", "bad"}}}, + {{"highway", "cycleway", "difficult"}, {{"highway", "cycleway"}, {"smoothness", "very_horrible"}}}, + + {{"highway", "cycleway", "expert"}, {{"highway", "cycleway"}, {"mtb:scale", "4"}, {"smoothness", "very_bad"}}}, + {{"highway", "cycleway", "expert"}, {{"highway", "cycleway"}, {"mtb:scale", "S5"}}}, + {{"highway", "cycleway", "expert"}, {{"highway", "cycleway"}, {"mtb:scale:imba", "4"}, {"smoothness", "bad"}}} + + }; + + for (auto const & type : conversions) + { + auto const params = GetFeatureBuilderParams(type.second); + TEST(params.IsTypeExist(GetType(type.first)), (type, params)); + } +} + } // namespace osm_type_test diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 806b2ca4c1..607f0c8fb9 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -575,6 +575,7 @@ string DetermineSurfaceAndHighwayType(OsmElement * p) double surfaceGrade = 2; // default is "normal" string highway; string trackGrade; + string mtb_rating; for (auto const & tag : p->m_tags) { @@ -590,6 +591,8 @@ string DetermineSurfaceAndHighwayType(OsmElement * p) highway = tag.m_value; else if (tag.m_key == "4wd_only" && (tag.m_value == "yes" || tag.m_value == "recommended")) return "unpaved_bad"; + else if (tag.m_key == "_mtb_rating") + mtb_rating = tag.m_value; } // According to https://wiki.openstreetmap.org/wiki/Key:surface @@ -736,7 +739,7 @@ string DetermineSurfaceAndHighwayType(OsmElement * p) } } - if (highway.empty() || (surface.empty() && smoothness.empty())) + if (highway.empty() || (surface.empty() && smoothness.empty() && mtb_rating.empty())) return {}; bool isGood = true; @@ -782,6 +785,8 @@ string DetermineSurfaceAndHighwayType(OsmElement * p) isGood = false; else if (!surface.empty() && surfaceGrade < 3) isGood = isPaved ? !Has(badSurfaces, surface) : !Has(veryBadSurfaces, surface); + else if (!mtb_rating.empty()) + isGood = false; // if path has an mtb:score(:imba)-tag, the surface is certainly bad string psurface = isPaved ? "paved_" : "unpaved_"; psurface += isGood ? "good" : "bad"; @@ -818,6 +823,76 @@ string DeterminePathGrade(OsmElement * p) return {}; } +string DetermineMtbRating(OsmElement * p) +{ + if ((!p->HasTag("mtb:scale") && !p->HasTag("mtb:scale:imba") && !p->HasTag("smoothness"))) + return {}; + + enum eMtbRating : int + { + none = 0, + easy, + intermediate, + difficult, + expert + }; + + string mtbscale = p->GetTag("mtb:scale"); + string imbascale = p->GetTag("mtb:scale:imba"); + string SmoothnessType = p->GetTag("smoothness"); + + static std::map mtbscaleToRatingConversion = { + {"0", eMtbRating::easy}, + {"1", eMtbRating::intermediate}, + {"2", eMtbRating::intermediate}, + {"3", eMtbRating::difficult}, + {"4", eMtbRating::expert}, + {"5", eMtbRating::expert}, + }; + + static std::map imbabscaleToRatingConversion = { + {"1", eMtbRating::easy}, + {"2", eMtbRating::intermediate}, + {"3", eMtbRating::difficult}, + {"4", eMtbRating::expert}, + }; + + static std::map SmoothnessToRatingConversion = { + {"bad", eMtbRating::easy}, + {"very_bad", eMtbRating::easy}, + {"horrible", eMtbRating::intermediate}, + {"very_horrible", eMtbRating::difficult}, + }; + + int tmpRatingFromMtbScale = 0; + int tmpRatingFromImbaScale = 0; + int tmpRatingFromSmoothness = 0; + if (!mtbscale.empty() && mtbscaleToRatingConversion.count(mtbscale)) + tmpRatingFromMtbScale = mtbscaleToRatingConversion[mtbscale]; + + if (!imbascale.empty() && imbabscaleToRatingConversion.count(imbascale)) + tmpRatingFromImbaScale = imbabscaleToRatingConversion[imbascale]; + + if (!SmoothnessType.empty() && SmoothnessToRatingConversion.count(SmoothnessType)) + tmpRatingFromSmoothness = SmoothnessToRatingConversion[SmoothnessType]; + + int overallRating = std::max({tmpRatingFromMtbScale, tmpRatingFromImbaScale, tmpRatingFromSmoothness}); + switch (overallRating) + { + case eMtbRating::easy: + return "easy"; + case eMtbRating::intermediate: + return "intermediate"; + case eMtbRating::difficult: + return "difficult"; + case eMtbRating::expert: + return "expert"; + default: + return {}; + } + +} + void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) { bool hasLayer = false; @@ -898,6 +973,8 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg) p->AddTag("area", "yes"); } + p->AddTag("_mtb_rating", DetermineMtbRating(p)); + p->AddTag("psurface", DetermineSurfaceAndHighwayType(p)); p->AddTag("_path_grade", DeterminePathGrade(p));