diff --git a/data/classificator.txt b/data/classificator.txt index bf8c3aa5e9..cccde34955 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -403,7 +403,6 @@ world + highway + bridleway + bridge - - permissive - tunnel - {} bus_stop - @@ -414,7 +413,6 @@ world + construction - cycleway + bridge - - permissive - tunnel - {} elevator - @@ -455,7 +453,6 @@ world + hiking - horse - mountain_hiking - - permissive - tunnel - {} pedestrian + @@ -520,7 +517,6 @@ world + grade4 - grade5 - no-access - - permissive - tunnel - {} traffic_signals - diff --git a/data/colors.txt b/data/colors.txt index 24e194e02b..501269e598 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -326,7 +326,6 @@ 857809179 858401322 858532890 -858992429 859519289 860111940 860571203 @@ -344,7 +343,6 @@ 865356306 865871792 866144274 -866888602 868862139 869387687 869585866 @@ -381,6 +379,7 @@ 1295658816 1295727419 1295855912 +1295857182 1296316234 1296319556 1296381741 @@ -464,6 +463,7 @@ 1715287582 1715749956 1715771835 +1716209219 1716276300 1716868437 1717328977 @@ -485,6 +485,7 @@ 1724368575 1724500155 1724896680 +1727592696 1727794715 1728022445 1728053247 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3fbdd56407..f797725026 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 d88df50914..8ba0f7bd5e 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -20688,6 +20688,45 @@ cont { } cont { name: "highway-bridleway" + element { + scale: 11 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -20697,7 +20736,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20710,7 +20749,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20719,7 +20758,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20731,7 +20770,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20739,7 +20778,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20751,7 +20790,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20759,7 +20798,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20771,7 +20810,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } path_text { primary { @@ -20779,7 +20818,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20791,7 +20830,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20799,7 +20838,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20811,7 +20850,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20819,12 +20858,51 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } } cont { name: "highway-bridleway-bridge" + element { + scale: 11 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -20834,7 +20912,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20853,7 +20931,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20862,7 +20940,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20880,7 +20958,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20888,7 +20966,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20912,7 +20990,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20920,7 +20998,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20944,7 +21022,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } path_text { primary { @@ -20952,7 +21030,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20976,7 +21054,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20984,7 +21062,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -21008,7 +21086,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -21016,149 +21094,51 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 - } - } -} -cont { - name: "highway-bridleway-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 1715287582 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1715287582 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 1715287582 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 1715287582 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 1715287582 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 1715287582 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 20 - lines { - width: 4.0 - color: 1715287582 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 + priority: 2820 } } } cont { name: "highway-bridleway-tunnel" + element { + scale: 11 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + color: 1715287582 + dashdot { + dd: 2.7 + dd: 1.26 + } + priority: 180 + cap: BUTTCAP + } + } element { scale: 14 lines { @@ -21168,7 +21148,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -21181,7 +21161,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -21190,7 +21170,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -21202,7 +21182,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -21210,7 +21190,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -21222,7 +21202,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } lines { width: 5.0 @@ -21246,7 +21226,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -21258,7 +21238,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } lines { width: 7.0 @@ -21282,7 +21262,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -21294,7 +21274,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -21318,7 +21298,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -21330,7 +21310,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -21354,7 +21334,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } } @@ -21918,6 +21898,24 @@ cont { } cont { name: "highway-cycleway" + element { + scale: 11 + lines { + width: 1.0 + color: 1308592045 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1308592045 + priority: 330 + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -22036,6 +22034,24 @@ cont { } cont { name: "highway-cycleway-bridge" + element { + scale: 11 + lines { + width: 1.0 + color: 1308592045 + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.0 + color: 1308592045 + priority: 330 + cap: BUTTCAP + } + } element { scale: 13 lines { @@ -22213,9 +22229,9 @@ cont { } } cont { - name: "highway-cycleway-permissive" + name: "highway-cycleway-tunnel" element { - scale: 13 + scale: 11 lines { width: 1.0 color: 1308592045 @@ -22224,114 +22240,14 @@ cont { } } element { - scale: 14 + scale: 12 lines { - width: 1.2 + width: 1.0 color: 1308592045 priority: 330 cap: BUTTCAP } } - element { - scale: 15 - lines { - width: 1.4 - color: 1308592045 - priority: 330 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 1308592045 - priority: 330 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 17 - lines { - width: 1.8 - color: 1308592045 - priority: 330 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 18 - lines { - width: 2.0 - color: 452954029 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 19 - lines { - width: 2.2 - color: 452954029 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 20 - lines { - width: 2.2 - color: 452954029 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } -} -cont { - name: "highway-cycleway-tunnel" element { scale: 13 lines { @@ -22545,6 +22461,90 @@ cont { } cont { name: "highway-footway" + element { + scale: 11 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 12 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 13 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } element { scale: 15 lines { @@ -22845,6 +22845,27 @@ cont { } cont { name: "highway-footway-area" + element { + scale: 11 + area { + color: 15591638 + priority: -1840 + } + } + element { + scale: 12 + area { + color: 15591638 + priority: -1840 + } + } + element { + scale: 13 + area { + color: 15591638 + priority: -1840 + } + } element { scale: 14 area { @@ -23000,6 +23021,114 @@ cont { } cont { name: "highway-footway-bridge" + element { + scale: 11 + lines { + width: 4.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 12 + lines { + width: 4.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 13 + lines { + width: 4.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 4.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } element { scale: 15 lines { @@ -24190,6 +24319,90 @@ cont { } cont { name: "highway-footway-tunnel" + element { + scale: 11 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 12 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 13 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.5 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } element { scale: 15 lines { @@ -28849,182 +29062,6 @@ cont { } } } -cont { - name: "highway-path-permissive" - element { - scale: 11 - lines { - width: 0.9 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 0.9 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 0.9 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 0.9 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 16 - lines { - width: 1.5 - color: 1721782290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 1721782290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 18 - lines { - width: 2.8 - color: 866144274 - dashdot { - dd: 6.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 19 - lines { - width: 3.7 - color: 866144274 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 20 - lines { - width: 3.7 - color: 866144274 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } -} cont { name: "highway-path-tunnel" element { @@ -35627,6 +35664,45 @@ cont { } cont { name: "highway-steps" + element { + scale: 12 + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -35743,6 +35819,63 @@ cont { } cont { name: "highway-steps-bridge" + element { + scale: 12 + lines { + width: 0.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -35919,6 +36052,45 @@ cont { } cont { name: "highway-steps-tunnel" + element { + scale: 12 + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 2.4 + color: 670628088 + dashdot { + dd: 1.5 + dd: 1.3 + } + priority: 330 + cap: BUTTCAP + } + } element { scale: 15 lines { @@ -38855,182 +39027,6 @@ cont { } } } -cont { - name: "highway-track-permissive" - element { - scale: 11 - lines { - width: 1.1 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.1 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.1 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.1 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 16 - lines { - width: 1.9 - color: 1717786416 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 17 - lines { - width: 2.5 - color: 1717786416 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 18 - lines { - width: 3.3 - color: 862148400 - dashdot { - dd: 9.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 19 - lines { - width: 4.2 - color: 862148400 - dashdot { - dd: 12.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 20 - lines { - width: 4.2 - color: 862148400 - dashdot { - dd: 12.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } -} cont { name: "highway-track-tunnel" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index b64b34ee5a..a6c289979a 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 a8cf0894b0..782cf13446 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -20312,7 +20312,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20325,7 +20325,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20334,7 +20334,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20346,7 +20346,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20354,7 +20354,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20366,7 +20366,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20374,7 +20374,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20386,7 +20386,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } path_text { primary { @@ -20394,7 +20394,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20406,7 +20406,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20414,7 +20414,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20426,7 +20426,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20434,7 +20434,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } } @@ -20449,7 +20449,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20468,7 +20468,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20477,7 +20477,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20495,7 +20495,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20503,7 +20503,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20527,7 +20527,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20535,7 +20535,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20559,7 +20559,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } path_text { primary { @@ -20567,7 +20567,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20591,7 +20591,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20599,7 +20599,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20623,7 +20623,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20631,144 +20631,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 - } - } -} -cont { - name: "highway-bridleway-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 1715287582 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1715287582 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 1715287582 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 1715287582 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 1715287582 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 1715287582 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 20 - lines { - width: 4.0 - color: 1715287582 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 + priority: 2820 } } } @@ -20783,7 +20646,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20796,7 +20659,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20805,7 +20668,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20817,7 +20680,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20825,7 +20688,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20837,7 +20700,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } lines { width: 5.0 @@ -20861,7 +20724,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20873,7 +20736,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } lines { width: 7.0 @@ -20897,7 +20760,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20909,7 +20772,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -20933,7 +20796,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20945,7 +20808,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -20969,7 +20832,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } } @@ -21801,124 +21664,6 @@ cont { } } } -cont { - name: "highway-cycleway-permissive" - element { - scale: 13 - lines { - width: 1.0 - color: 1308592045 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.2 - color: 1308592045 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1308592045 - priority: 330 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 1308592045 - priority: 330 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 17 - lines { - width: 1.8 - color: 1308592045 - priority: 330 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 18 - lines { - width: 2.0 - color: 452954029 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 19 - lines { - width: 2.2 - color: 452954029 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 20 - lines { - width: 2.2 - color: 452954029 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } -} cont { name: "highway-cycleway-tunnel" element { @@ -27814,143 +27559,6 @@ cont { } } } -cont { - name: "highway-path-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 16 - lines { - width: 1.5 - color: 1721782290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 1721782290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 18 - lines { - width: 2.8 - color: 866144274 - dashdot { - dd: 6.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 19 - lines { - width: 3.7 - color: 866144274 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 20 - lines { - width: 3.7 - color: 866144274 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } -} cont { name: "highway-path-tunnel" element { @@ -37191,143 +36799,6 @@ cont { } } } -cont { - name: "highway-track-permissive" - element { - scale: 14 - lines { - width: 1.1 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 16 - lines { - width: 1.9 - color: 1717786416 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 17 - lines { - width: 2.5 - color: 1717786416 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 18 - lines { - width: 3.3 - color: 862148400 - dashdot { - dd: 9.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 19 - lines { - width: 4.2 - color: 862148400 - dashdot { - dd: 12.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 20 - lines { - width: 4.2 - color: 862148400 - dashdot { - dd: 12.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } -} cont { name: "highway-track-tunnel" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index ad09598d6c..0d0d5df095 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 38e841bb80..5787a4bc7e 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -20312,7 +20312,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20325,7 +20325,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20334,7 +20334,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20346,7 +20346,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20354,7 +20354,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20366,7 +20366,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20374,7 +20374,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20386,7 +20386,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } path_text { primary { @@ -20394,7 +20394,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20406,7 +20406,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20414,7 +20414,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20426,7 +20426,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20434,7 +20434,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } } @@ -20449,7 +20449,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20468,7 +20468,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20477,7 +20477,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20495,7 +20495,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20503,7 +20503,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20527,7 +20527,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20535,7 +20535,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20559,7 +20559,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } path_text { primary { @@ -20567,7 +20567,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20591,7 +20591,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20599,7 +20599,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20623,7 +20623,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } path_text { primary { @@ -20631,144 +20631,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 - } - } -} -cont { - name: "highway-bridleway-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 1714104359 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1714104359 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 16 - lines { - width: 1.8 - color: 1714104359 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 1714104359 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 1714104359 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 1714104359 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 20 - lines { - width: 4.0 - color: 1714104359 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 + priority: 2820 } } } @@ -20783,7 +20646,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } } @@ -20796,7 +20659,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { @@ -20805,7 +20668,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20817,7 +20680,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 170 + priority: 180 } path_text { primary { @@ -20825,7 +20688,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20837,7 +20700,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 170 + priority: 180 } lines { width: 5.0 @@ -20861,7 +20724,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20873,7 +20736,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 170 + priority: 180 } lines { width: 7.0 @@ -20897,7 +20760,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20909,7 +20772,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -20933,7 +20796,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20945,7 +20808,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -20969,7 +20832,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } } @@ -21801,124 +21664,6 @@ cont { } } } -cont { - name: "highway-cycleway-permissive" - element { - scale: 13 - lines { - width: 1.0 - color: 1299070279 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.2 - color: 1299070279 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1299070279 - priority: 330 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 1299070279 - priority: 330 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 17 - lines { - width: 1.8 - color: 1299070279 - priority: 330 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 18 - lines { - width: 2.0 - color: 443432263 - priority: 330 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 19 - lines { - width: 2.2 - color: 443432263 - priority: 330 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 20 - lines { - width: 2.2 - color: 443432263 - priority: 330 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } -} cont { name: "highway-cycleway-tunnel" element { @@ -27880,143 +27625,6 @@ cont { } } } -cont { - name: "highway-path-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 1720994322 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.1 - color: 1720994322 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 16 - lines { - width: 1.5 - color: 1720994322 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 1720994322 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 18 - lines { - width: 2.8 - color: 865356306 - dashdot { - dd: 6.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 19 - lines { - width: 3.7 - color: 865356306 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 20 - lines { - width: 3.7 - color: 865356306 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } -} cont { name: "highway-path-tunnel" element { @@ -37395,143 +37003,6 @@ cont { } } } -cont { - name: "highway-track-permissive" - element { - scale: 14 - lines { - width: 1.1 - color: 1717523245 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 1717523245 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 16 - lines { - width: 1.9 - color: 1717523245 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 17 - lines { - width: 2.5 - color: 1717523245 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 18 - lines { - width: 3.3 - color: 861885229 - dashdot { - dd: 9.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 19 - lines { - width: 4.2 - color: 861885229 - dashdot { - dd: 12.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 20 - lines { - width: 4.2 - color: 861885229 - dashdot { - dd: 12.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } -} cont { name: "highway-track-tunnel" element { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 8a9188216a..a84f5fbe31 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 0a7df9e5d7..b01bcf455b 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -20658,97 +20658,154 @@ cont { cont { name: "highway-bridleway" element { - scale: 14 + scale: 11 lines { - width: 0.9 + width: 1.0 + color: 1715287582 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1295857182 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 color: 4011550 dashdot { - dd: 2.7 - dd: 1.26 + dd: 7.0 + dd: 1.2 } - priority: 170 + priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4011550 + dashdot { + dd: 7.0 + dd: 1.2 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 lines { - width: 1.4 + width: 2.0 color: 4011550 dashdot { - dd: 2.7 - dd: 1.26 + dd: 9.0 + dd: 1.7 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } - priority: 2790 + priority: 2820 } } element { scale: 16 lines { - width: 1.8 + width: 2.6 color: 4011550 dashdot { - dd: 3.6 - dd: 1.8 + dd: 9.0 + dd: 1.7 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 4011550 dashdot { - dd: 4.5 - dd: 1.8 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { scale: 18 lines { - width: 3.0 + width: 4.0 color: 4011550 dashdot { - dd: 7.2 - dd: 2.7 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20757,18 +20814,18 @@ cont { width: 4.0 color: 4011550 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -20777,97 +20834,95 @@ cont { width: 4.0 color: 4011550 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } } cont { name: "highway-bridleway-bridge" element { - scale: 14 + scale: 11 lines { - width: 0.9 + width: 1.0 + color: 1715287582 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1295857182 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 color: 4011550 dashdot { - dd: 2.7 - dd: 1.26 + dd: 7.0 + dd: 1.2 } - priority: 170 + priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4011550 + dashdot { + dd: 7.0 + dd: 1.2 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 - lines { - width: 3.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.4 - color: 4011550 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 16 - lines { - width: 4.6 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.8 - color: 4011550 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } lines { width: 5.0 color: 871230427 @@ -20877,381 +20932,360 @@ cont { lines { width: 2.0 color: 4011550 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 18 - lines { - width: 8.0 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 7.0 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.0 - color: 4011550 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 19 - lines { - width: 10.0 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.0 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 4.0 - color: 4011550 dashdot { dd: 9.0 - dd: 3.6 + dd: 1.7 } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 20 - lines { - width: 10.0 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.0 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 4.0 - color: 4011550 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } -} -cont { - name: "highway-bridleway-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 4011550 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 4011550 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } - priority: 2790 + priority: 2820 } } element { scale: 16 lines { - width: 1.8 + width: 6.2 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.6 color: 4011550 dashdot { - dd: 3.6 - dd: 1.8 + dd: 9.0 + dd: 1.7 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { scale: 17 lines { - width: 2.0 + width: 8.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 7.6 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 3.3 color: 4011550 dashdot { - dd: 4.5 - dd: 1.8 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { scale: 18 lines { - width: 3.0 + width: 10.0 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 4.0 color: 4011550 dashdot { - dd: 7.2 - dd: 2.7 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { scale: 19 + lines { + width: 10.0 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } lines { width: 4.0 color: 4011550 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { scale: 20 + lines { + width: 10.0 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 871230427 + priority: 150 + cap: BUTTCAP + } lines { width: 4.0 color: 4011550 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } } cont { name: "highway-bridleway-tunnel" element { - scale: 14 + scale: 11 lines { - width: 0.9 - color: 4011550 + width: 1.0 + color: 1715287582 dashdot { - dd: 2.7 - dd: 1.26 + dd: 6.0 + dd: 1.0 } - priority: 170 + priority: 180 + join: BEVELJOIN cap: BUTTCAP } } element { - scale: 15 + scale: 12 lines { - width: 1.4 - color: 4011550 + width: 1.1 + color: 1295857182 dashdot { - dd: 2.7 - dd: 1.26 + dd: 6.0 + dd: 1.0 } - priority: 170 + priority: 180 + join: BEVELJOIN cap: BUTTCAP } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } } element { - scale: 16 + scale: 13 lines { - width: 1.8 + width: 1.3 color: 4011550 dashdot { - dd: 3.6 - dd: 1.8 + dd: 7.0 + dd: 1.2 } - priority: 170 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 4011550 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 170 - } - lines { - width: 5.0 - color: 1307438043 - priority: 50 - cap: BUTTCAP - } - lines { - width: 6.0 - color: 1300267136 - dashdot { - dd: 2.0 - dd: 2.0 - } - priority: 40 - cap: BUTTCAP - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2790 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 4011550 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 170 - } - lines { - width: 7.0 - color: 1307438043 - priority: 50 - cap: BUTTCAP - } - lines { - width: 8.0 - color: 1300267136 - dashdot { - dd: 2.0 - dd: 2.0 - } - priority: 40 + priority: 180 cap: BUTTCAP } path_text { primary { height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4011550 + dashdot { + dd: 7.0 + dd: 1.2 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 4011550 + dashdot { + dd: 9.0 + dd: 1.7 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 4011550 + dashdot { + dd: 9.0 + dd: 1.7 + } + priority: 180 + } + path_text { + primary { + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 + } + } + element { + scale: 17 + lines { + width: 3.3 + color: 4011550 + dashdot { + dd: 12.0 + dd: 2.2 + } + priority: 180 + } + lines { + width: 7.6 + color: 1307438043 + priority: 50 + cap: BUTTCAP + } + lines { + width: 8.6 + color: 1300267136 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 4011550 + dashdot { + dd: 12.0 + dd: 2.2 + } + priority: 180 + } + lines { + width: 9.0 + color: 1307438043 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.0 + color: 1300267136 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2820 } } element { @@ -21260,10 +21294,10 @@ cont { width: 4.0 color: 4011550 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -21283,11 +21317,11 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } element { @@ -21296,10 +21330,10 @@ cont { width: 4.0 color: 4011550 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -21319,11 +21353,11 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } - priority: 2790 + priority: 2820 } } } @@ -21715,7 +21749,7 @@ cont { scale: 11 lines { width: 1.2 - color: 866888602 + color: 11250586 dashdot { dd: 3.6 dd: 1.8 @@ -21729,7 +21763,7 @@ cont { scale: 12 lines { width: 1.2 - color: 866888602 + color: 11250586 dashdot { dd: 3.6 dd: 1.8 @@ -21889,26 +21923,45 @@ cont { } cont { name: "highway-cycleway" + element { + scale: 11 + lines { + width: 0.7 + color: 1728022445 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.8 + color: 1308592045 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { - width: 1.0 + width: 1.1 color: 16746413 priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } } element { scale: 14 - lines { - width: 1.2 - color: 16746413 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 lines { width: 1.4 color: 16746413 @@ -21917,9 +21970,26 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 16746413 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2953 } @@ -21927,13 +21997,13 @@ cont { element { scale: 16 lines { - width: 1.6 + width: 1.9 color: 16746413 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -21943,13 +22013,13 @@ cont { element { scale: 17 lines { - width: 1.8 + width: 2.3 color: 16746413 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -21959,13 +22029,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 2.8 color: 16746413 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -21975,13 +22045,13 @@ cont { element { scale: 19 lines { - width: 2.2 + width: 2.8 color: 16746413 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -21991,13 +22061,13 @@ cont { element { scale: 20 lines { - width: 2.2 + width: 2.8 color: 16746413 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22007,32 +22077,45 @@ cont { } cont { name: "highway-cycleway-bridge" + element { + scale: 11 + lines { + width: 0.7 + color: 1728022445 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.8 + color: 1308592045 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { - width: 1.0 + width: 1.1 color: 16746413 priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } } element { scale: 14 - lines { - width: 1.2 - color: 16746413 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 3.8 - color: 871230427 - priority: 150 - cap: BUTTCAP - } lines { width: 1.4 color: 16746413 @@ -22041,15 +22124,15 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2953 } } element { - scale: 16 + scale: 15 lines { width: 4.2 color: 871230427 @@ -22060,162 +22143,13 @@ cont { width: 1.6 color: 16746413 priority: 330 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 17 - lines { - width: 6.6 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 5.6 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.8 - color: 16746413 - priority: 330 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 18 - lines { - width: 9.0 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 8.0 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 2.0 - color: 16746413 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 19 - lines { - width: 10.4 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 2.2 - color: 16746413 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } - element { - scale: 20 - lines { - width: 10.4 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 2.2 - color: 16746413 - priority: 330 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2953 - } - } -} -cont { - name: "highway-cycleway-permissive" - element { - scale: 13 - lines { - width: 1.0 - color: 16746413 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.2 - color: 16746413 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 16746413 - priority: 330 cap: BUTTCAP } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2953 } @@ -22223,13 +22157,19 @@ cont { element { scale: 16 lines { - width: 1.6 + width: 4.8 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.9 color: 16746413 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22239,13 +22179,25 @@ cont { element { scale: 17 lines { - width: 1.8 + width: 7.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 6.6 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.3 color: 16746413 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22255,13 +22207,25 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 10.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.6 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.8 color: 16746413 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22271,13 +22235,25 @@ cont { element { scale: 19 lines { - width: 2.2 + width: 11.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 10.6 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.8 color: 16746413 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22287,13 +22263,25 @@ cont { element { scale: 20 lines { - width: 2.2 + width: 11.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 10.6 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.8 color: 16746413 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22303,26 +22291,45 @@ cont { } cont { name: "highway-cycleway-tunnel" + element { + scale: 11 + lines { + width: 0.7 + color: 1728022445 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.8 + color: 1308592045 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { - width: 1.0 + width: 1.1 color: 16746413 priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } } element { scale: 14 - lines { - width: 1.2 - color: 16746413 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 lines { width: 1.4 color: 16746413 @@ -22331,9 +22338,26 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 16746413 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2953 } @@ -22341,13 +22365,13 @@ cont { element { scale: 16 lines { - width: 1.6 + width: 1.9 color: 16746413 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22357,18 +22381,18 @@ cont { element { scale: 17 lines { - width: 1.8 + width: 2.3 color: 16746413 priority: 330 } lines { - width: 5.6 + width: 6.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 7.6 color: 1300267136 dashdot { dd: 2.0 @@ -22379,7 +22403,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22389,18 +22413,18 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 2.8 color: 16746413 priority: 330 } lines { - width: 8.0 + width: 9.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 10.6 color: 1300267136 dashdot { dd: 2.0 @@ -22411,7 +22435,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22421,18 +22445,18 @@ cont { element { scale: 19 lines { - width: 2.2 + width: 2.8 color: 16746413 priority: 330 } lines { - width: 9.4 + width: 10.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 1300267136 dashdot { dd: 2.0 @@ -22443,7 +22467,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22453,18 +22477,18 @@ cont { element { scale: 20 lines { - width: 2.2 + width: 2.8 color: 16746413 priority: 330 } lines { - width: 9.4 + width: 10.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 1300267136 dashdot { dd: 2.0 @@ -22475,7 +22499,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22517,22 +22541,92 @@ cont { cont { name: "highway-footway" element { - scale: 15 + scale: 11 lines { - width: 1.5 - color: 1090058488 + width: 1.0 + color: 1727592696 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 16316664 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2950 } @@ -22540,17 +22634,17 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1090058488 + width: 2.6 + color: 16316664 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22560,17 +22654,17 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1090058488 + width: 3.3 + color: 16316664 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22580,17 +22674,17 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 16316664 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22600,17 +22694,17 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22620,17 +22714,17 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22680,6 +22774,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 14 @@ -22693,6 +22795,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 @@ -22708,9 +22818,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -22728,7 +22838,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22748,7 +22858,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22768,7 +22878,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22788,7 +22898,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22808,7 +22918,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22819,22 +22929,64 @@ cont { cont { name: "highway-footway-area" element { - scale: 14 - area { - color: 15591638 - priority: -1840 + scale: 11 + lines { + width: 1.0 + color: 1727592696 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP } } element { - scale: 15 + scale: 12 lines { - width: 1.5 - color: 1090058488 + width: 1.1 + color: 1308162296 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } area { @@ -22843,9 +22995,34 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 16316664 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + area { + color: 15591638 + priority: -1840 + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2950 } @@ -22853,11 +23030,11 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1090058488 + width: 2.6 + color: 16316664 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } @@ -22867,7 +23044,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22877,11 +23054,11 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1090058488 + width: 3.3 + color: 16316664 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -22891,7 +23068,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22901,11 +23078,11 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 16316664 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } @@ -22915,7 +23092,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22925,11 +23102,11 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -22939,7 +23116,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22949,11 +23126,11 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -22963,7 +23140,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -22974,34 +23151,77 @@ cont { cont { name: "highway-footway-bridge" element { - scale: 15 + scale: 11 lines { - width: 4.0 - color: 871230427 - priority: 150 + width: 1.0 + color: 1727592696 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN cap: BUTTCAP } + } + element { + scale: 12 lines { - width: 1.5 - color: 1090058488 + width: 1.1 + color: 1308162296 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2950 } } element { - scale: 16 + scale: 14 + lines { + width: 1.6 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 15 lines { width: 5.0 color: 871230427 @@ -23010,16 +23230,43 @@ cont { } lines { width: 2.0 - color: 1090058488 + color: 16316664 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 6.2 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.6 + color: 16316664 + dashdot { + dd: 6.0 + dd: 3.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23029,29 +23276,29 @@ cont { element { scale: 17 lines { - width: 6.8 + width: 8.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 5.8 + width: 7.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1090058488 + width: 3.3 + color: 16316664 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23061,29 +23308,29 @@ cont { element { scale: 18 lines { - width: 8.4 + width: 10.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 7.4 + width: 9.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 3.2 + width: 4.0 color: 16316664 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23093,29 +23340,29 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 10.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 9.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23125,29 +23372,29 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 10.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 9.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23160,11 +23407,11 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1090058488 + width: 2.6 + color: 16316664 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23172,11 +23419,11 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1090058488 + width: 3.3 + color: 16316664 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 330 } @@ -23184,11 +23431,11 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 16316664 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 330 } @@ -23196,11 +23443,11 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 330 } @@ -23208,11 +23455,11 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 330 } @@ -23260,6 +23507,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 14 @@ -23273,6 +23528,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 @@ -23288,9 +23551,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -23308,7 +23571,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23328,7 +23591,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23348,7 +23611,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23368,7 +23631,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23388,7 +23651,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23438,6 +23701,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 14 @@ -23451,6 +23722,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 @@ -23466,9 +23745,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -23486,7 +23765,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23506,7 +23785,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23526,7 +23805,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23546,7 +23825,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23566,7 +23845,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23616,6 +23895,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 14 @@ -23629,6 +23916,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 @@ -23644,9 +23939,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -23664,7 +23959,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23684,7 +23979,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23704,7 +23999,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23724,7 +24019,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23744,7 +24039,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23794,6 +24089,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 14 @@ -23807,6 +24110,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 @@ -23822,9 +24133,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -23842,7 +24153,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23862,7 +24173,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23882,7 +24193,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23902,7 +24213,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23922,7 +24233,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -23972,6 +24283,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 14 @@ -23985,6 +24304,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2820 + } } element { scale: 15 @@ -24000,9 +24327,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -24020,7 +24347,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24040,7 +24367,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24060,7 +24387,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24080,7 +24407,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24100,7 +24427,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24113,11 +24440,11 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1090058488 + width: 2.6 + color: 16316664 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } @@ -24125,11 +24452,11 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1090058488 + width: 3.3 + color: 16316664 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -24137,11 +24464,11 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 16316664 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } @@ -24149,11 +24476,11 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -24161,11 +24488,11 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -24174,22 +24501,92 @@ cont { cont { name: "highway-footway-tunnel" element { - scale: 15 + scale: 11 lines { - width: 1.5 - color: 1090058488 + width: 1.0 + color: 1727592696 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 16316664 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2950 } @@ -24197,17 +24594,17 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1090058488 + width: 2.6 + color: 16316664 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24217,22 +24614,22 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1090058488 + width: 3.3 + color: 16316664 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } lines { - width: 5.8 + width: 7.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 6.8 + width: 8.6 color: 1300267136 dashdot { dd: 2.0 @@ -24243,7 +24640,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24253,22 +24650,22 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 16316664 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } lines { - width: 7.4 + width: 9.0 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 8.4 + width: 10.0 color: 1300267136 dashdot { dd: 2.0 @@ -24279,7 +24676,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24289,22 +24686,22 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } lines { - width: 9.4 + width: 9.0 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 10.0 color: 1300267136 dashdot { dd: 2.0 @@ -24315,7 +24712,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -24325,22 +24722,22 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 16316664 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } lines { - width: 9.4 + width: 9.0 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 10.0 color: 1300267136 dashdot { dd: 2.0 @@ -24351,7 +24748,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27064,9 +27461,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27085,9 +27482,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27106,9 +27503,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27126,7 +27523,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27146,7 +27543,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27166,7 +27563,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27186,7 +27583,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27206,7 +27603,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27258,9 +27655,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27279,9 +27676,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27300,9 +27697,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27320,7 +27717,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27340,7 +27737,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27360,7 +27757,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27380,7 +27777,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27400,7 +27797,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27452,9 +27849,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27473,9 +27870,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27494,9 +27891,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27514,7 +27911,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27534,7 +27931,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27554,7 +27951,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27574,7 +27971,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27594,7 +27991,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27646,9 +28043,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27667,9 +28064,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27694,9 +28091,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27720,7 +28117,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27752,7 +28149,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27784,7 +28181,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27816,7 +28213,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27848,7 +28245,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27900,9 +28297,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27921,9 +28318,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27942,9 +28339,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -27962,7 +28359,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -27982,7 +28379,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28002,7 +28399,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28022,7 +28419,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28042,7 +28439,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28094,9 +28491,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28115,9 +28512,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28136,9 +28533,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28156,7 +28553,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28176,7 +28573,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28196,7 +28593,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28216,7 +28613,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28236,7 +28633,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28288,9 +28685,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28309,9 +28706,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28330,9 +28727,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28350,7 +28747,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28370,7 +28767,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28390,7 +28787,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28410,7 +28807,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28430,7 +28827,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28482,9 +28879,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28503,9 +28900,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28524,9 +28921,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28544,7 +28941,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28564,7 +28961,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28584,7 +28981,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28604,7 +29001,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28624,7 +29021,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28676,9 +29073,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28697,9 +29094,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28718,9 +29115,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28738,7 +29135,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28758,7 +29155,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28778,7 +29175,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28798,7 +29195,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28818,7 +29215,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28870,9 +29267,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28891,9 +29288,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28912,9 +29309,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -28932,7 +29329,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28952,7 +29349,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28972,7 +29369,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -28992,7 +29389,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -29012,201 +29409,7 @@ cont { } path_text { primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } -} -cont { - name: "highway-path-permissive" - element { - scale: 11 - lines { - width: 1.0 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.1 - color: 1302351890 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.3 - color: 10506258 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 10506258 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 15 - lines { - width: 2.0 - color: 10506258 - dashdot { - dd: 6.0 - dd: 3.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 16 - lines { - width: 2.6 - color: 10506258 - dashdot { - dd: 6.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 17 - lines { - width: 3.3 - color: 10506258 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 18 - lines { - width: 4.0 - color: 10506258 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 10506258 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } - element { - scale: 20 - lines { - width: 4.0 - color: 10506258 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -29258,9 +29461,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -29279,9 +29482,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -29300,9 +29503,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2820 } @@ -29320,7 +29523,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -29356,7 +29559,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -29392,7 +29595,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -29428,7 +29631,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -29464,7 +29667,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35706,11 +35909,67 @@ cont { } cont { name: "highway-steps" + element { + scale: 12 + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } + } element { scale: 15 lines { width: 2.4 - color: 670628088 + color: 16316664 dashdot { dd: 1.5 dd: 1.3 @@ -35718,12 +35977,20 @@ cont { priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } } element { scale: 16 lines { width: 4.0 - color: 670628088 + color: 16316664 dashdot { dd: 1.8 dd: 1.6 @@ -35732,7 +35999,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35752,7 +36019,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35772,7 +36039,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35792,7 +36059,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35812,7 +36079,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35822,6 +36089,62 @@ cont { } cont { name: "highway-steps-bridge" + element { + scale: 12 + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } + } element { scale: 15 lines { @@ -35832,7 +36155,7 @@ cont { } lines { width: 2.4 - color: 670628088 + color: 16316664 dashdot { dd: 1.5 dd: 1.3 @@ -35840,6 +36163,14 @@ cont { priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } } element { scale: 16 @@ -35851,7 +36182,7 @@ cont { } lines { width: 4.0 - color: 670628088 + color: 16316664 dashdot { dd: 1.8 dd: 1.6 @@ -35860,7 +36191,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35892,7 +36223,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35924,7 +36255,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35956,7 +36287,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35988,7 +36319,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -35998,11 +36329,67 @@ cont { } cont { name: "highway-steps-tunnel" + element { + scale: 12 + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 16316664 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } + } element { scale: 15 lines { width: 2.4 - color: 670628088 + color: 16316664 dashdot { dd: 1.5 dd: 1.3 @@ -36010,12 +36397,20 @@ cont { priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2810 + } } element { scale: 16 lines { width: 4.0 - color: 670628088 + color: 16316664 dashdot { dd: 1.8 dd: 1.6 @@ -36024,7 +36419,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -36060,7 +36455,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -36096,7 +36491,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -36132,7 +36527,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -36168,7 +36563,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37334,9 +37729,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37355,9 +37750,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37376,9 +37771,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37396,7 +37791,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37416,7 +37811,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37436,7 +37831,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37456,7 +37851,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37476,7 +37871,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37528,9 +37923,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37549,9 +37944,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37570,9 +37965,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37590,7 +37985,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37610,7 +38005,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37630,7 +38025,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37650,7 +38045,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37670,7 +38065,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37722,9 +38117,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37743,9 +38138,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37770,9 +38165,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37796,7 +38191,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37828,7 +38223,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37860,7 +38255,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37892,7 +38287,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37924,7 +38319,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -37976,9 +38371,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -37997,9 +38392,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38018,9 +38413,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38038,7 +38433,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38058,7 +38453,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38078,7 +38473,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38098,7 +38493,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38118,7 +38513,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38170,9 +38565,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38191,9 +38586,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38212,9 +38607,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38232,7 +38627,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38252,7 +38647,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38272,7 +38667,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38292,7 +38687,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38312,7 +38707,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38364,9 +38759,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38385,9 +38780,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38406,9 +38801,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38426,7 +38821,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38446,7 +38841,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38466,7 +38861,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38486,7 +38881,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38506,7 +38901,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38558,9 +38953,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38579,9 +38974,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38600,9 +38995,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38620,7 +39015,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38640,7 +39035,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38660,7 +39055,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38680,7 +39075,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38700,7 +39095,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38752,9 +39147,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38773,9 +39168,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38794,9 +39189,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38814,7 +39209,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38834,7 +39229,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38854,7 +39249,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38874,7 +39269,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38894,7 +39289,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -38946,9 +39341,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38967,9 +39362,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -38988,9 +39383,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -39008,7 +39403,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39028,7 +39423,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39048,7 +39443,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39068,7 +39463,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39088,201 +39483,7 @@ cont { } path_text { primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } -} -cont { - name: "highway-track-permissive" - element { - scale: 11 - lines { - width: 1.1 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.3 - color: 1298356016 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.6 - color: 6510384 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 14 - lines { - width: 2.0 - color: 6510384 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 15 - lines { - width: 2.5 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 16 - lines { - width: 3.2 - color: 6510384 - dashdot { - dd: 9.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 17 - lines { - width: 4.0 - color: 6510384 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 18 - lines { - width: 5.0 - color: 6510384 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 19 - lines { - width: 5.0 - color: 6510384 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2780 - } - } - element { - scale: 20 - lines { - width: 5.0 - color: 6510384 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39334,9 +39535,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 10 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -39355,9 +39556,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -39376,9 +39577,9 @@ cont { } path_text { primary { - height: 8 - color: 3355443 - stroke_color: 872415231 + height: 11 + color: 4473924 + stroke_color: 871230427 } priority: 2780 } @@ -39396,7 +39597,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39432,7 +39633,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39468,7 +39669,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39504,7 +39705,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } @@ -39540,7 +39741,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 872415231 } diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index b99da7591a..323c7a11a4 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 6fba8e96b4..06e103c95f 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -20658,97 +20658,154 @@ cont { cont { name: "highway-bridleway" element { - scale: 14 + scale: 11 lines { - width: 0.9 + width: 1.0 + color: 1714104359 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1294673959 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 color: 2828327 dashdot { - dd: 2.7 - dd: 1.26 + dd: 7.0 + dd: 1.2 } - priority: 170 + priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 2828327 + dashdot { + dd: 7.0 + dd: 1.2 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 lines { - width: 1.4 + width: 2.0 color: 2828327 dashdot { - dd: 2.7 - dd: 1.26 + dd: 9.0 + dd: 1.7 } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 16 lines { - width: 1.8 + width: 2.6 color: 2828327 dashdot { - dd: 3.6 - dd: 1.8 + dd: 9.0 + dd: 1.7 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 2828327 dashdot { - dd: 4.5 - dd: 1.8 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 18 lines { - width: 3.0 + width: 4.0 color: 2828327 dashdot { - dd: 7.2 - dd: 2.7 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20757,18 +20814,18 @@ cont { width: 4.0 color: 2828327 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -20777,97 +20834,95 @@ cont { width: 4.0 color: 2828327 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } } cont { name: "highway-bridleway-bridge" element { - scale: 14 + scale: 11 lines { - width: 0.9 + width: 1.0 + color: 1714104359 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1294673959 + dashdot { + dd: 6.0 + dd: 1.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 color: 2828327 dashdot { - dd: 2.7 - dd: 1.26 + dd: 7.0 + dd: 1.2 } - priority: 170 + priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 2828327 + dashdot { + dd: 7.0 + dd: 1.2 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 - lines { - width: 3.8 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.4 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 16 - lines { - width: 4.6 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.8 - color: 2828327 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 17 - lines { - width: 6.0 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } lines { width: 5.0 color: 858532890 @@ -20877,381 +20932,360 @@ cont { lines { width: 2.0 color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 170 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 18 - lines { - width: 8.0 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 7.0 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 19 - lines { - width: 10.0 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.0 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 4.0 - color: 2828327 dashdot { dd: 9.0 - dd: 3.6 + dd: 1.7 } - priority: 170 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 20 - lines { - width: 10.0 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.0 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 4.0 - color: 2828327 - dashdot { - dd: 9.0 - dd: 3.6 - } - priority: 170 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } -} -cont { - name: "highway-bridleway-permissive" - element { - scale: 14 - lines { - width: 0.9 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 2828327 - dashdot { - dd: 2.7 - dd: 1.26 - } - priority: 170 + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 16 lines { - width: 1.8 + width: 6.2 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.6 color: 2828327 dashdot { - dd: 3.6 - dd: 1.8 + dd: 9.0 + dd: 1.7 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 17 lines { - width: 2.0 + width: 8.6 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 7.6 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 3.3 color: 2828327 dashdot { - dd: 4.5 - dd: 1.8 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 18 lines { - width: 3.0 + width: 10.0 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 4.0 color: 2828327 dashdot { - dd: 7.2 - dd: 2.7 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 19 + lines { + width: 10.0 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 858532890 + priority: 150 + cap: BUTTCAP + } lines { width: 4.0 color: 2828327 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { scale: 20 + lines { + width: 10.0 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 858532890 + priority: 150 + cap: BUTTCAP + } lines { width: 4.0 color: 2828327 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } } cont { name: "highway-bridleway-tunnel" element { - scale: 14 + scale: 11 lines { - width: 0.9 - color: 2828327 + width: 1.0 + color: 1714104359 dashdot { - dd: 2.7 - dd: 1.26 + dd: 6.0 + dd: 1.0 } - priority: 170 + priority: 180 + join: BEVELJOIN cap: BUTTCAP } } element { - scale: 15 + scale: 12 lines { - width: 1.4 - color: 2828327 + width: 1.1 + color: 1294673959 dashdot { - dd: 2.7 - dd: 1.26 + dd: 6.0 + dd: 1.0 } - priority: 170 + priority: 180 + join: BEVELJOIN cap: BUTTCAP } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } } element { - scale: 16 + scale: 13 lines { - width: 1.8 + width: 1.3 color: 2828327 dashdot { - dd: 3.6 - dd: 1.8 + dd: 7.0 + dd: 1.2 } - priority: 170 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 17 - lines { - width: 2.0 - color: 2828327 - dashdot { - dd: 4.5 - dd: 1.8 - } - priority: 170 - } - lines { - width: 5.0 - color: 1294740506 - priority: 50 - cap: BUTTCAP - } - lines { - width: 6.0 - color: 1297109072 - dashdot { - dd: 2.0 - dd: 2.0 - } - priority: 40 - cap: BUTTCAP - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2790 - } - } - element { - scale: 18 - lines { - width: 3.0 - color: 2828327 - dashdot { - dd: 7.2 - dd: 2.7 - } - priority: 170 - } - lines { - width: 7.0 - color: 1294740506 - priority: 50 - cap: BUTTCAP - } - lines { - width: 8.0 - color: 1297109072 - dashdot { - dd: 2.0 - dd: 2.0 - } - priority: 40 + priority: 180 cap: BUTTCAP } path_text { primary { height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 2828327 + dashdot { + dd: 7.0 + dd: 1.2 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 2828327 + dashdot { + dd: 9.0 + dd: 1.7 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 2828327 + dashdot { + dd: 9.0 + dd: 1.7 + } + priority: 180 + } + path_text { + primary { + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 + } + } + element { + scale: 17 + lines { + width: 3.3 + color: 2828327 + dashdot { + dd: 12.0 + dd: 2.2 + } + priority: 180 + } + lines { + width: 7.6 + color: 1294740506 + priority: 50 + cap: BUTTCAP + } + lines { + width: 8.6 + color: 1297109072 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 2828327 + dashdot { + dd: 12.0 + dd: 2.2 + } + priority: 180 + } + lines { + width: 9.0 + color: 1294740506 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.0 + color: 1297109072 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856756480 + } + priority: 2820 } } element { @@ -21260,10 +21294,10 @@ cont { width: 4.0 color: 2828327 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -21283,11 +21317,11 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } element { @@ -21296,10 +21330,10 @@ cont { width: 4.0 color: 2828327 dashdot { - dd: 9.0 - dd: 3.6 + dd: 12.0 + dd: 2.2 } - priority: 170 + priority: 180 } lines { width: 9.0 @@ -21319,11 +21353,11 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } - priority: 2790 + priority: 2820 } } } @@ -21715,7 +21749,7 @@ cont { scale: 11 lines { width: 1.2 - color: 858992429 + color: 3354413 dashdot { dd: 3.6 dd: 1.8 @@ -21729,7 +21763,7 @@ cont { scale: 12 lines { width: 1.2 - color: 858992429 + color: 3354413 dashdot { dd: 3.6 dd: 1.8 @@ -21889,26 +21923,45 @@ cont { } cont { name: "highway-cycleway" + element { + scale: 11 + lines { + width: 0.7 + color: 1718500679 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.8 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { - width: 1.0 + width: 1.1 color: 7224647 priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } } element { scale: 14 - lines { - width: 1.2 - color: 7224647 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 lines { width: 1.4 color: 7224647 @@ -21917,8 +21970,25 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 7224647 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2953 @@ -21927,13 +21997,13 @@ cont { element { scale: 16 lines { - width: 1.6 + width: 1.9 color: 7224647 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -21943,13 +22013,13 @@ cont { element { scale: 17 lines { - width: 1.8 + width: 2.3 color: 7224647 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -21959,13 +22029,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 2.8 color: 7224647 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -21975,13 +22045,13 @@ cont { element { scale: 19 lines { - width: 2.2 + width: 2.8 color: 7224647 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -21991,13 +22061,13 @@ cont { element { scale: 20 lines { - width: 2.2 + width: 2.8 color: 7224647 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22007,32 +22077,45 @@ cont { } cont { name: "highway-cycleway-bridge" + element { + scale: 11 + lines { + width: 0.7 + color: 1718500679 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.8 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { - width: 1.0 + width: 1.1 color: 7224647 priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } } element { scale: 14 - lines { - width: 1.2 - color: 7224647 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 3.8 - color: 858532890 - priority: 150 - cap: BUTTCAP - } lines { width: 1.4 color: 7224647 @@ -22041,15 +22124,15 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2953 } } element { - scale: 16 + scale: 15 lines { width: 4.2 color: 858532890 @@ -22060,161 +22143,12 @@ cont { width: 1.6 color: 7224647 priority: 330 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 17 - lines { - width: 6.6 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 5.6 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.8 - color: 7224647 - priority: 330 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 18 - lines { - width: 9.0 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 8.0 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 2.0 - color: 7224647 - priority: 330 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 19 - lines { - width: 10.4 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.4 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 2.2 - color: 7224647 - priority: 330 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } - element { - scale: 20 - lines { - width: 10.4 - color: 1297109072 - priority: 140 - cap: BUTTCAP - } - lines { - width: 9.4 - color: 858532890 - priority: 150 - cap: BUTTCAP - } - lines { - width: 2.2 - color: 7224647 - priority: 330 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2953 - } - } -} -cont { - name: "highway-cycleway-permissive" - element { - scale: 13 - lines { - width: 1.0 - color: 7224647 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.2 - color: 7224647 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.4 - color: 7224647 - priority: 330 cap: BUTTCAP } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2953 @@ -22223,13 +22157,19 @@ cont { element { scale: 16 lines { - width: 1.6 + width: 4.8 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.9 color: 7224647 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22239,13 +22179,25 @@ cont { element { scale: 17 lines { - width: 1.8 + width: 7.6 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 6.6 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.3 color: 7224647 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22255,13 +22207,25 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 10.6 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 9.6 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.8 color: 7224647 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22271,13 +22235,25 @@ cont { element { scale: 19 lines { - width: 2.2 + width: 11.6 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 10.6 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.8 color: 7224647 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22287,13 +22263,25 @@ cont { element { scale: 20 lines { - width: 2.2 + width: 11.6 + color: 1297109072 + priority: 140 + cap: BUTTCAP + } + lines { + width: 10.6 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.8 color: 7224647 priority: 330 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22303,26 +22291,45 @@ cont { } cont { name: "highway-cycleway-tunnel" + element { + scale: 11 + lines { + width: 0.7 + color: 1718500679 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.8 + color: 1299070279 + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 13 lines { - width: 1.0 + width: 1.1 color: 7224647 priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } } element { scale: 14 - lines { - width: 1.2 - color: 7224647 - priority: 330 - cap: BUTTCAP - } - } - element { - scale: 15 lines { width: 1.4 color: 7224647 @@ -22331,8 +22338,25 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2953 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 7224647 + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2953 @@ -22341,13 +22365,13 @@ cont { element { scale: 16 lines { - width: 1.6 + width: 1.9 color: 7224647 priority: 330 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22357,18 +22381,18 @@ cont { element { scale: 17 lines { - width: 1.8 + width: 2.3 color: 7224647 priority: 330 } lines { - width: 5.6 + width: 6.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 7.6 color: 1297109072 dashdot { dd: 2.0 @@ -22379,7 +22403,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22389,18 +22413,18 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 2.8 color: 7224647 priority: 330 } lines { - width: 8.0 + width: 9.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 10.6 color: 1297109072 dashdot { dd: 2.0 @@ -22411,7 +22435,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22421,18 +22445,18 @@ cont { element { scale: 19 lines { - width: 2.2 + width: 2.8 color: 7224647 priority: 330 } lines { - width: 9.4 + width: 10.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 1297109072 dashdot { dd: 2.0 @@ -22443,7 +22467,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22453,18 +22477,18 @@ cont { element { scale: 20 lines { - width: 2.2 + width: 2.8 color: 7224647 priority: 330 } lines { - width: 9.4 + width: 10.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 11.6 color: 1297109072 dashdot { dd: 2.0 @@ -22475,7 +22499,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22517,21 +22541,91 @@ cont { cont { name: "highway-footway" element { - scale: 15 + scale: 11 lines { - width: 1.5 - color: 1078675011 + width: 1.0 + color: 1716209219 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 4933187 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2950 @@ -22540,17 +22634,17 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1078675011 + width: 2.6 + color: 4933187 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22560,17 +22654,17 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1078675011 + width: 3.3 + color: 4933187 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22580,17 +22674,17 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 4933187 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22600,17 +22694,17 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22620,17 +22714,17 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22680,6 +22774,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 14 @@ -22693,6 +22795,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 @@ -22708,8 +22818,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -22728,7 +22838,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22748,7 +22858,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22768,7 +22878,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22788,7 +22898,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22808,7 +22918,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22819,22 +22929,64 @@ cont { cont { name: "highway-footway-area" element { - scale: 14 - area { - color: 2499106 - priority: -1840 + scale: 11 + lines { + width: 1.0 + color: 1716209219 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP } } element { - scale: 15 + scale: 12 lines { - width: 1.5 - color: 1078675011 + width: 1.1 + color: 1296778819 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } area { @@ -22843,8 +22995,33 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 4933187 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + area { + color: 2499106 + priority: -1840 + } + path_text { + primary { + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2950 @@ -22853,11 +23030,11 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1078675011 + width: 2.6 + color: 4933187 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } @@ -22867,7 +23044,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22877,11 +23054,11 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1078675011 + width: 3.3 + color: 4933187 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -22891,7 +23068,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22901,11 +23078,11 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 4933187 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } @@ -22915,7 +23092,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22925,11 +23102,11 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -22939,7 +23116,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22949,11 +23126,11 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -22963,7 +23140,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -22974,34 +23151,77 @@ cont { cont { name: "highway-footway-bridge" element { - scale: 15 + scale: 11 lines { - width: 4.0 - color: 858532890 - priority: 150 + width: 1.0 + color: 1716209219 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN cap: BUTTCAP } + } + element { + scale: 12 lines { - width: 1.5 - color: 1078675011 + width: 1.1 + color: 1296778819 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2950 } } element { - scale: 16 + scale: 14 + lines { + width: 1.6 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 15 lines { width: 5.0 color: 858532890 @@ -23010,16 +23230,43 @@ cont { } lines { width: 2.0 - color: 1078675011 + color: 4933187 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 6.2 + color: 858532890 + priority: 150 + cap: BUTTCAP + } + lines { + width: 2.6 + color: 4933187 + dashdot { + dd: 6.0 + dd: 3.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23029,29 +23276,29 @@ cont { element { scale: 17 lines { - width: 6.8 + width: 8.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 5.8 + width: 7.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 - color: 1078675011 + width: 3.3 + color: 4933187 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23061,29 +23308,29 @@ cont { element { scale: 18 lines { - width: 8.4 + width: 10.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 7.4 + width: 9.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 3.2 + width: 4.0 color: 4933187 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23093,29 +23340,29 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 10.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 9.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23125,29 +23372,29 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 10.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 9.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23160,11 +23407,11 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1078675011 + width: 2.6 + color: 4933187 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23172,11 +23419,11 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1078675011 + width: 3.3 + color: 4933187 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 330 } @@ -23184,11 +23431,11 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 4933187 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 330 } @@ -23196,11 +23443,11 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 330 } @@ -23208,11 +23455,11 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 330 } @@ -23260,6 +23507,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 14 @@ -23273,6 +23528,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 @@ -23288,8 +23551,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -23308,7 +23571,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23328,7 +23591,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23348,7 +23611,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23368,7 +23631,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23388,7 +23651,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23438,6 +23701,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 14 @@ -23451,6 +23722,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 @@ -23466,8 +23745,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -23486,7 +23765,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23506,7 +23785,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23526,7 +23805,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23546,7 +23825,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23566,7 +23845,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23616,6 +23895,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 14 @@ -23629,6 +23916,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 @@ -23644,8 +23939,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -23664,7 +23959,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23684,7 +23979,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23704,7 +23999,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23724,7 +24019,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23744,7 +24039,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23794,6 +24089,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 14 @@ -23807,6 +24110,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 @@ -23822,8 +24133,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -23842,7 +24153,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23862,7 +24173,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23882,7 +24193,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23902,7 +24213,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23922,7 +24233,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -23972,6 +24283,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 14 @@ -23985,6 +24304,14 @@ cont { priority: 180 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2820 + } } element { scale: 15 @@ -24000,8 +24327,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -24020,7 +24347,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24040,7 +24367,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24060,7 +24387,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24080,7 +24407,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24100,7 +24427,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24113,11 +24440,11 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1078675011 + width: 2.6 + color: 4933187 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } @@ -24125,11 +24452,11 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1078675011 + width: 3.3 + color: 4933187 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -24137,11 +24464,11 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 4933187 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } @@ -24149,11 +24476,11 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -24161,11 +24488,11 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } @@ -24174,21 +24501,91 @@ cont { cont { name: "highway-footway-tunnel" element { - scale: 15 + scale: 11 lines { - width: 1.5 - color: 1078675011 + width: 1.0 + color: 1716209219 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 cap: BUTTCAP } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 4933187 + dashdot { + dd: 6.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2950 @@ -24197,17 +24594,17 @@ cont { element { scale: 16 lines { - width: 2.0 - color: 1078675011 + width: 2.6 + color: 4933187 dashdot { - dd: 5.0 - dd: 2.0 + dd: 6.0 + dd: 3.5 } priority: 180 } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24217,22 +24614,22 @@ cont { element { scale: 17 lines { - width: 2.4 - color: 1078675011 + width: 3.3 + color: 4933187 dashdot { - dd: 6.0 - dd: 2.5 + dd: 8.0 + dd: 4.5 } priority: 180 } lines { - width: 5.8 + width: 7.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 6.8 + width: 8.6 color: 1297109072 dashdot { dd: 2.0 @@ -24243,7 +24640,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24253,22 +24650,22 @@ cont { element { scale: 18 lines { - width: 3.2 + width: 4.0 color: 4933187 dashdot { dd: 8.0 - dd: 3.0 + dd: 4.5 } priority: 180 } lines { - width: 7.4 + width: 9.0 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 8.4 + width: 10.0 color: 1297109072 dashdot { dd: 2.0 @@ -24279,7 +24676,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24289,22 +24686,22 @@ cont { element { scale: 19 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } lines { - width: 9.4 + width: 9.0 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 10.0 color: 1297109072 dashdot { dd: 2.0 @@ -24315,7 +24712,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -24325,22 +24722,22 @@ cont { element { scale: 20 lines { - width: 4.2 + width: 4.0 color: 4933187 dashdot { - dd: 10.0 - dd: 3.5 + dd: 8.0 + dd: 4.5 } priority: 180 } lines { - width: 9.4 + width: 9.0 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 10.0 color: 1297109072 dashdot { dd: 2.0 @@ -24351,7 +24748,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27130,8 +27527,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27151,8 +27548,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27172,8 +27569,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27192,7 +27589,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27212,7 +27609,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27232,7 +27629,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27252,7 +27649,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27272,7 +27669,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27324,8 +27721,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27345,8 +27742,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27366,8 +27763,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27386,7 +27783,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27406,7 +27803,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27426,7 +27823,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27446,7 +27843,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27466,7 +27863,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27518,8 +27915,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27539,8 +27936,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27560,8 +27957,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27580,7 +27977,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27600,7 +27997,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27620,7 +28017,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27640,7 +28037,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27660,7 +28057,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27712,8 +28109,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27733,8 +28130,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27760,8 +28157,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27786,7 +28183,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27818,7 +28215,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27850,7 +28247,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27882,7 +28279,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27914,7 +28311,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -27966,8 +28363,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -27987,8 +28384,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28008,8 +28405,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28028,7 +28425,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28048,7 +28445,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28068,7 +28465,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28088,7 +28485,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28108,7 +28505,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28160,8 +28557,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28181,8 +28578,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28202,8 +28599,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28222,7 +28619,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28242,7 +28639,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28262,7 +28659,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28282,7 +28679,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28302,7 +28699,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28354,8 +28751,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28375,8 +28772,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28396,8 +28793,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28416,7 +28813,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28436,7 +28833,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28456,7 +28853,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28476,7 +28873,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28496,7 +28893,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28548,8 +28945,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28569,8 +28966,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28590,8 +28987,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28610,7 +29007,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28630,7 +29027,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28650,7 +29047,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28670,7 +29067,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28690,7 +29087,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28742,8 +29139,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28763,8 +29160,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28784,8 +29181,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28804,7 +29201,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28824,7 +29221,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28844,7 +29241,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28864,7 +29261,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28884,7 +29281,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -28936,8 +29333,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28957,8 +29354,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28978,8 +29375,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -28998,7 +29395,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29018,7 +29415,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29038,7 +29435,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29058,7 +29455,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29078,201 +29475,7 @@ cont { } path_text { primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } -} -cont { - name: "highway-path-permissive" - element { - scale: 11 - lines { - width: 1.0 - color: 1720994322 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.1 - color: 1301563922 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.3 - color: 9718290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 9718290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 15 - lines { - width: 2.0 - color: 9718290 - dashdot { - dd: 6.0 - dd: 3.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 16 - lines { - width: 2.6 - color: 9718290 - dashdot { - dd: 6.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 17 - lines { - width: 3.3 - color: 9718290 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 18 - lines { - width: 4.0 - color: 9718290 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 19 - lines { - width: 4.0 - color: 9718290 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } - element { - scale: 20 - lines { - width: 4.0 - color: 9718290 - dashdot { - dd: 8.0 - dd: 4.5 - } - priority: 180 - } - path_text { - primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29324,8 +29527,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -29345,8 +29548,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -29366,8 +29569,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2820 @@ -29386,7 +29589,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29422,7 +29625,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29458,7 +29661,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29494,7 +29697,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -29530,7 +29733,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -35886,11 +36089,67 @@ cont { } cont { name: "highway-steps" + element { + scale: 12 + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } + } element { scale: 15 lines { width: 2.4 - color: 659244611 + color: 4933187 dashdot { dd: 1.5 dd: 1.3 @@ -35898,12 +36157,20 @@ cont { priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } } element { scale: 16 lines { width: 4.0 - color: 659244611 + color: 4933187 dashdot { dd: 1.8 dd: 1.6 @@ -35912,7 +36179,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -35932,7 +36199,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -35952,7 +36219,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -35972,7 +36239,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -35992,7 +36259,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36002,6 +36269,62 @@ cont { } cont { name: "highway-steps-bridge" + element { + scale: 12 + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } + } element { scale: 15 lines { @@ -36012,7 +36335,7 @@ cont { } lines { width: 2.4 - color: 659244611 + color: 4933187 dashdot { dd: 1.5 dd: 1.3 @@ -36020,6 +36343,14 @@ cont { priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } } element { scale: 16 @@ -36031,7 +36362,7 @@ cont { } lines { width: 4.0 - color: 659244611 + color: 4933187 dashdot { dd: 1.8 dd: 1.6 @@ -36040,7 +36371,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36072,7 +36403,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36104,7 +36435,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36136,7 +36467,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36168,7 +36499,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36178,11 +36509,67 @@ cont { } cont { name: "highway-steps-tunnel" + element { + scale: 12 + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 330 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.3 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4933187 + dashdot { + dd: 4.0 + dd: 2.5 + } + priority: 330 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } + } element { scale: 15 lines { width: 2.4 - color: 659244611 + color: 4933187 dashdot { dd: 1.5 dd: 1.3 @@ -36190,12 +36577,20 @@ cont { priority: 330 cap: BUTTCAP } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2810 + } } element { scale: 16 lines { width: 4.0 - color: 659244611 + color: 4933187 dashdot { dd: 1.8 dd: 1.6 @@ -36204,7 +36599,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36240,7 +36635,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36276,7 +36671,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36312,7 +36707,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -36348,7 +36743,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37538,8 +37933,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37559,8 +37954,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37580,8 +37975,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37600,7 +37995,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37620,7 +38015,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37640,7 +38035,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37660,7 +38055,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37680,7 +38075,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37732,8 +38127,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37753,8 +38148,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37774,8 +38169,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37794,7 +38189,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37814,7 +38209,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37834,7 +38229,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37854,7 +38249,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37874,7 +38269,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -37926,8 +38321,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37947,8 +38342,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -37974,8 +38369,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38000,7 +38395,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38032,7 +38427,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38064,7 +38459,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38096,7 +38491,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38128,7 +38523,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38180,8 +38575,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38201,8 +38596,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38222,8 +38617,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38242,7 +38637,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38262,7 +38657,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38282,7 +38677,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38302,7 +38697,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38322,7 +38717,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38374,8 +38769,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38395,8 +38790,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38416,8 +38811,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38436,7 +38831,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38456,7 +38851,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38476,7 +38871,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38496,7 +38891,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38516,7 +38911,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38568,8 +38963,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38589,8 +38984,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38610,8 +39005,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38630,7 +39025,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38650,7 +39045,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38670,7 +39065,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38690,7 +39085,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38710,7 +39105,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38762,8 +39157,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38783,8 +39178,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38804,8 +39199,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38824,7 +39219,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38844,7 +39239,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38864,7 +39259,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38884,7 +39279,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38904,7 +39299,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -38956,8 +39351,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38977,8 +39372,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -38998,8 +39393,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -39018,7 +39413,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39038,7 +39433,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39058,7 +39453,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39078,7 +39473,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39098,7 +39493,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39150,8 +39545,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -39171,8 +39566,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -39192,8 +39587,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -39212,7 +39607,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39232,7 +39627,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39252,7 +39647,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39272,7 +39667,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39292,201 +39687,7 @@ cont { } path_text { primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } -} -cont { - name: "highway-track-permissive" - element { - scale: 11 - lines { - width: 1.1 - color: 1717523245 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 12 - lines { - width: 1.3 - color: 1298092845 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 180 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { - scale: 13 - lines { - width: 1.6 - color: 6247213 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 14 - lines { - width: 2.0 - color: 6247213 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 15 - lines { - width: 2.5 - color: 6247213 - dashdot { - dd: 9.0 - dd: 3.5 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 16 - lines { - width: 3.2 - color: 6247213 - dashdot { - dd: 9.0 - dd: 3.5 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 17 - lines { - width: 4.0 - color: 6247213 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 18 - lines { - width: 5.0 - color: 6247213 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 19 - lines { - width: 5.0 - color: 6247213 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2780 - } - } - element { - scale: 20 - lines { - width: 5.0 - color: 6247213 - dashdot { - dd: 12.0 - dd: 4.0 - } - priority: 180 - } - path_text { - primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39538,8 +39739,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 10 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -39559,8 +39760,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -39580,8 +39781,8 @@ cont { } path_text { primary { - height: 8 - color: 7829367 + height: 11 + color: 6710886 stroke_color: 856756480 } priority: 2780 @@ -39600,7 +39801,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39636,7 +39837,7 @@ cont { } path_text { primary { - height: 9 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39672,7 +39873,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39708,7 +39909,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } @@ -39744,7 +39945,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 7829367 stroke_color: 856756480 } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 61887e4997..bee81be44b 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index bd65ad2003..f14d46640a 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -8725,45 +8725,6 @@ cont { } } } -cont { - name: "highway-bridleway-permissive" - element { - scale: 18 - lines { - width: 0.9 - color: 1715287582 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 130 - } - } - element { - scale: 19 - lines { - width: 0.9 - color: 1715287582 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 130 - } - } - element { - scale: 20 - lines { - width: 0.9 - color: 1715287582 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 130 - } - } -} cont { name: "highway-construction" element { @@ -8920,33 +8881,6 @@ cont { } } } -cont { - name: "highway-cycleway-permissive" - element { - scale: 18 - lines { - width: 1.0 - color: 1728022445 - priority: 130 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1728022445 - priority: 130 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1728022445 - priority: 130 - } - } -} cont { name: "highway-footway" element { @@ -12664,57 +12598,6 @@ cont { } } } -cont { - name: "highway-path-permissive" - element { - scale: 17 - lines { - width: 0.9 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 130 - } - } - element { - scale: 18 - lines { - width: 1.1 - color: 1721782290 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 130 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 1721782290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 130 - } - } - element { - scale: 20 - lines { - width: 1.5 - color: 1721782290 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 130 - } - } -} cont { name: "highway-pedestrian" element { @@ -20573,69 +20456,6 @@ cont { } } } -cont { - name: "highway-track-permissive" - element { - scale: 16 - lines { - width: 1.1 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 130 - } - } - element { - scale: 17 - lines { - width: 1.4 - color: 1717786416 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 130 - } - } - element { - scale: 18 - lines { - width: 1.9 - color: 1717786416 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 130 - } - } - element { - scale: 19 - lines { - width: 2.5 - color: 1717786416 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 130 - } - } - element { - scale: 20 - lines { - width: 2.5 - color: 1717786416 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 130 - } - } -} cont { name: "highway-trunk" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 94d0d048f5..d1f53a84d8 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 36516eb91e..0eae60a97f 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -8725,45 +8725,6 @@ cont { } } } -cont { - name: "highway-bridleway-permissive" - element { - scale: 18 - lines { - width: 0.9 - color: 1714104359 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 130 - } - } - element { - scale: 19 - lines { - width: 0.9 - color: 1714104359 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 130 - } - } - element { - scale: 20 - lines { - width: 0.9 - color: 1714104359 - dashdot { - dd: 3.6 - dd: 1.8 - } - priority: 130 - } - } -} cont { name: "highway-construction" element { @@ -8920,33 +8881,6 @@ cont { } } } -cont { - name: "highway-cycleway-permissive" - 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 { @@ -12796,57 +12730,6 @@ cont { } } } -cont { - name: "highway-path-permissive" - element { - scale: 17 - lines { - width: 0.9 - color: 1720994322 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 130 - } - } - element { - scale: 18 - lines { - width: 1.1 - color: 1720994322 - dashdot { - dd: 3.5 - dd: 2.0 - } - priority: 130 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 1720994322 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 130 - } - } - element { - scale: 20 - lines { - width: 1.5 - color: 1720994322 - dashdot { - dd: 4.0 - dd: 2.5 - } - priority: 130 - } - } -} cont { name: "highway-pedestrian" element { @@ -20981,69 +20864,6 @@ cont { } } } -cont { - name: "highway-track-permissive" - element { - scale: 16 - lines { - width: 1.1 - color: 1717523245 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 130 - } - } - element { - scale: 17 - lines { - width: 1.4 - color: 1717523245 - dashdot { - dd: 6.0 - dd: 2.5 - } - priority: 130 - } - } - element { - scale: 18 - lines { - width: 1.9 - color: 1717523245 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 130 - } - } - element { - scale: 19 - lines { - width: 2.5 - color: 1717523245 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 130 - } - } - element { - scale: 20 - lines { - width: 2.5 - color: 1717523245 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 130 - } - } -} cont { name: "highway-trunk" element { diff --git a/data/patterns.txt b/data/patterns.txt index e45c61f6aa..f79fb71652 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -65,6 +65,10 @@ 16.0 16.0 2.7 2.7 4.95 4.95 +6.0 1.0 +7.0 1.2 +9.0 1.7 +12.0 2.2 12.0 4.0 6.0 8.5 12.0 2.3 1.0 50.0 diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index ca3a3f2639..1cb903d84e 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -56,7 +56,7 @@ landuse-cemetery-christian # area z14- (also has icon z highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) === 170 -highway-footway-area # area z14- (also has line z15-, pathtext z15-) +highway-footway-area # area z14- (also has line z11-, pathtext z13-) leisure-track-area # area z15- (also has caption z16-) === 160 diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 066cec4112..c906edbdee 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -45,13 +45,13 @@ power-line # line z15- (also has line:: power-line::dash # line::dash z15- (also has line z15-) === 340 -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-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +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-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-footway-crossing # line z16- -highway-steps # line z15- (also has pathtext z16-) -highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) -highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +highway-steps # line z12- (also has pathtext z13-) +highway-steps-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-steps-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) hwtag-oneway::arrows # line::arrows z15- waterway-weir # line z14- (also has pathtext z15-) === 330 @@ -260,20 +260,20 @@ highway-service-parking_aisle # line z15- (also has pathte highway-service-tunnel # line z13- (also has pathtext z16-) === 190 -highway-bridleway # line z14- (also has pathtext z15-) -highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) -highway-footway # line z15- (also has pathtext z15-) -highway-footway-alpine_hiking # line z11- (also has pathtext z15-) -highway-footway-area # line z15- and area z14- (also has pathtext z15-) -highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-footway-demanding_alpine_hiking # line z11- (also has pathtext z15-) -highway-footway-demanding_mountain_hiking # line z11- (also has pathtext z15-) -highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z15-) -highway-footway-hiking # line z11- (also has pathtext z15-) -highway-footway-mountain_hiking # line z11- (also has pathtext z15-) +highway-bridleway # line z11- (also has pathtext z13-) +highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +highway-footway # line z11- (also has pathtext z13-) +highway-footway-alpine_hiking # line z11- (also has pathtext z13-) +highway-footway-area # line z11- and area z14- (also has pathtext z13-) +highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-footway-demanding_alpine_hiking # line z11- (also has pathtext z13-) +highway-footway-demanding_mountain_hiking # line z11- (also has pathtext z13-) +highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z13-) +highway-footway-hiking # line z11- (also has pathtext z13-) +highway-footway-mountain_hiking # line z11- (also has pathtext z13-) highway-footway-sidewalk # line z16- -highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-footway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-path # line z11- (also has pathtext z13-) highway-path-alpine_hiking # line z11- (also has pathtext z13-) highway-path-bicycle # line z11- (also has pathtext z13-) @@ -310,9 +310,9 @@ railway-preserved-bridge # line z13- (also has line:: railway-preserved-tunnel # line z13- === 160 -highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) -highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) -highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) +highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) +highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) @@ -324,7 +324,7 @@ highway-road-bridge::bridgewhite # line::bridgewhite z16- (al highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z16-) highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-, pathtext z16-) -highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-) +highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) @@ -344,9 +344,9 @@ railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (al railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) === 150 -highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) -highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) -highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) +highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) +highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) @@ -358,7 +358,7 @@ highway-road-bridge::bridgeblack # line::bridgeblack z16- (al highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z16-) highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-, pathtext z16-) -highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-) +highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) @@ -427,20 +427,20 @@ isoline-step_500 # line z10- (also has pathte isoline-zero # line z15- (also has pathtext z15-) === 60 -highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) -highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) -highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-) +highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) === 50 -highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) -highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) -highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-) +highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) === 40 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index d70a21bfec..bb2a0476ff 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -651,16 +651,16 @@ highway-residential-bridge::shield # shield::shield z15- (also highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-) === 2955 -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-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-) +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-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2953 area:highway-footway # caption z15- (also has area z14-) -highway-footway # pathtext z15- (also has line z15-) -highway-footway-area # pathtext z15- (also has line z15-, area z14-) -highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-footway-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-footway # pathtext z13- (also has line z11-) +highway-footway-area # pathtext z13- (also has line z11-, area z14-) +highway-footway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-footway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-tertiary_link # pathtext z18- (also has line z15-) highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-) @@ -693,15 +693,15 @@ highway-ford # icon z14- and pathtext z16 natural-rock # icon z15- === 2850 -highway-bridleway # pathtext z15- (also has line z14-) -highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-footway-alpine_hiking # pathtext z15- (also has line z11-) -highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z11-) -highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z11-) -highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z11-) -highway-footway-hiking # pathtext z15- (also has line z11-) -highway-footway-mountain_hiking # pathtext z15- (also has line z11-) +highway-bridleway # pathtext z13- (also has line z11-) +highway-bridleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-bridleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-footway-alpine_hiking # pathtext z13- (also has line z11-) +highway-footway-demanding_alpine_hiking # pathtext z13- (also has line z11-) +highway-footway-demanding_mountain_hiking # pathtext z13- (also has line z11-) +highway-footway-difficult_alpine_hiking # pathtext z13- (also has line z11-) +highway-footway-hiking # pathtext z13- (also has line z11-) +highway-footway-mountain_hiking # pathtext z13- (also has line z11-) highway-path # pathtext z13- (also has line z11-) highway-path-alpine_hiking # pathtext z13- (also has line z11-) highway-path-bicycle # pathtext z13- (also has line z11-) @@ -715,9 +715,9 @@ highway-path-mountain_hiking # pathtext z13- (also has li highway-path-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2820 -highway-steps # pathtext z16- (also has line z15-) -highway-steps-bridge # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-steps-tunnel # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-steps # pathtext z13- (also has line z12-) +highway-steps-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-steps-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2810 highway-track # pathtext z13- (also has line z11-) diff --git a/data/types.txt b/data/types.txt index 9f66624a4a..3e6fa8b3ee 100644 --- a/data/types.txt +++ b/data/types.txt @@ -226,7 +226,7 @@ landuse|forest|deciduous *highway|service|area *highway|residential|area *amenity|bus_station -*highway|track|permissive +highway|track *waterway|drain|tunnel *landuse|cemetery|christian *highway|cycleway|tunnel @@ -237,7 +237,7 @@ landuse|forest|deciduous *amenity|recycling *highway|residential|tunnel *aeroway|helipad -*highway|path|permissive +highway|path *place|islet *sport|basketball *amenity|cinema @@ -350,7 +350,7 @@ amenity|parking|permissive *highway|path|alpine_hiking *tourism|zoo|petting *sport|scuba_diving -*highway|cycleway|permissive +highway|cycleway *highway|unclassified|area *natural|volcano *amenity|parking|underground|fee @@ -367,7 +367,7 @@ highway|service|driveway *railway|narrow_gauge|bridge *amenity|parking|lane *railway|rail|main|tunnel -*highway|bridleway|permissive +highway|bridleway *railway|construction *railway|rail|branch|bridge *landuse|greenhouse_horticulture diff --git a/data/visibility.txt b/data/visibility.txt index 88bad4616f..5bec84780c 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -403,7 +403,6 @@ world 000000000000000000000 + highway 000000000000000000000 + bridleway 000000000000000000111 + bridge 000000000000000000111 - - permissive 000000000000000000111 - tunnel 000000000000000000000 - {} bus_stop 000000000000000000000 - @@ -414,7 +413,6 @@ world 000000000000000000000 + construction 000000000000011111111 - cycleway 000000000000000000111 + bridge 000000000000000000111 - - permissive 000000000000000000111 - tunnel 000000000000000000000 - {} elevator 000000000000000000000 - @@ -455,7 +453,6 @@ world 000000000000000000000 + hiking 000000000000000001111 - horse 000000000000000001111 - mountain_hiking 000000000000000001111 - - permissive 000000000000000001111 - tunnel 000000000000000000000 - {} pedestrian 000000000000000000111 + @@ -520,7 +517,6 @@ world 000000000000000000000 + grade4 000000000000000011111 - grade5 000000000000000011111 - no-access 000000000000000011111 - - permissive 000000000000000011111 - tunnel 000000000000000000000 - {} traffic_signals 000000000000000000000 -