diff --git a/data/classificator.txt b/data/classificator.txt index dc5a1fb967..349c71f9d1 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -415,6 +415,7 @@ world + elevator - footway + area - + bicycle - bridge - crossing - sidewalk - diff --git a/data/colors.txt b/data/colors.txt index 0eaf151082..2b14268c0f 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -128,6 +128,7 @@ 5286655 5378955 5395026 +5459435 5592405 5666134 5717555 @@ -291,7 +292,6 @@ 16742950 16746278 16746306 -16746413 16747109 16748864 16749632 @@ -314,10 +314,8 @@ 441199131 441925171 442905727 -443432263 451800027 452764770 -452954029 452968274 452984831 609045837 @@ -350,6 +348,8 @@ 860111940 860571203 860629531 +861097451 +861295871 861355571 861690961 861690972 @@ -357,6 +357,7 @@ 862076287 862148400 862348902 +862862663 863203947 863664762 863850275 @@ -419,6 +420,7 @@ 1296977469 1297041991 1297109072 +1297305067 1297438037 1297563187 1297691427 @@ -467,7 +469,6 @@ 1308586790 1308588582 1308591910 -1308592045 1308594496 1308595264 1308601687 @@ -494,6 +495,7 @@ 1715771835 1716276300 1716868437 +1716933887 1717328977 1717523245 1717714303 @@ -512,7 +514,6 @@ 1724368575 1724500155 1724896680 -1728022445 1728053247 1931024665 1943327690 @@ -538,10 +539,12 @@ 2152483916 2152615485 2153076053 +2153141503 2153536593 2153769774 2153921919 2153997148 +2154708295 2154984050 2155510394 2155695907 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 6a7d5ab1bb..451a23d004 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 4d522f0ad2..e62d187752 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -22594,8 +22594,8 @@ cont { element { scale: 11 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22603,8 +22603,8 @@ cont { element { scale: 12 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22612,8 +22612,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22621,8 +22621,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22630,8 +22630,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22647,8 +22647,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -22663,8 +22663,8 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -22679,8 +22679,8 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -22695,8 +22695,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22711,8 +22711,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22730,8 +22730,8 @@ cont { element { scale: 11 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22739,8 +22739,8 @@ cont { element { scale: 12 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22748,8 +22748,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22757,8 +22757,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22766,14 +22766,14 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 3.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22789,14 +22789,14 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -22811,20 +22811,20 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 5.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 5.6 + width: 4.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -22839,20 +22839,20 @@ cont { element { scale: 18 lines { - width: 9.0 + width: 8.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -22867,20 +22867,20 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22895,20 +22895,20 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22926,8 +22926,8 @@ cont { element { scale: 11 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22935,8 +22935,8 @@ cont { element { scale: 12 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22944,8 +22944,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22953,8 +22953,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22962,8 +22962,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22979,8 +22979,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -22995,18 +22995,18 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } lines { - width: 5.6 + width: 4.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 5.8 color: 1300267136 dashdot { dd: 2.0 @@ -23027,18 +23027,18 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } lines { - width: 8.0 + width: 7.2 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 8.2 color: 1300267136 dashdot { dd: 2.0 @@ -23059,18 +23059,18 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -23091,18 +23091,18 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -23536,6 +23536,237 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 11 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } + lines { + width: 2.0 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } + lines { + width: 2.4 + color: 16316664 + dashdot { + dd: 6.0 + dd: 4.2 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } + lines { + width: 3.2 + color: 16316664 + dashdot { + dd: 8.0 + dd: 5.5 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } +} cont { name: "highway-footway-bridge" element { @@ -23553,7 +23784,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23580,7 +23811,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23607,7 +23838,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23634,7 +23865,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23661,7 +23892,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23688,7 +23919,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -23720,7 +23951,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23752,7 +23983,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -23784,7 +24015,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23816,7 +24047,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23902,7 +24133,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } } element { @@ -23914,7 +24145,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } } element { @@ -23926,7 +24157,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } } element { @@ -23938,7 +24169,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -23950,7 +24181,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } } @@ -23965,7 +24196,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23986,7 +24217,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24007,7 +24238,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24028,7 +24259,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24049,7 +24280,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24070,7 +24301,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -24090,7 +24321,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.8 @@ -24126,7 +24357,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } lines { width: 7.4 @@ -24162,7 +24393,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -24198,7 +24429,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -27060,7 +27291,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27073,7 +27304,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27086,7 +27317,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27099,7 +27330,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27112,7 +27343,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27133,7 +27364,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27153,7 +27384,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27173,7 +27404,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27193,7 +27424,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27213,7 +27444,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27229,12 +27460,18 @@ cont { name: "highway-path-bicycle" element { scale: 11 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27242,12 +27479,18 @@ cont { } element { scale: 12 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27255,12 +27498,18 @@ cont { } element { scale: 13 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27268,12 +27517,18 @@ cont { } element { scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27281,12 +27536,18 @@ cont { } element { scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 1.1 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27302,12 +27563,17 @@ cont { } element { scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } lines { width: 1.5 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -27322,12 +27588,17 @@ cont { } element { scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } lines { width: 2.0 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -27342,12 +27613,17 @@ cont { } element { scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } lines { width: 2.8 color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.7 } priority: 180 } @@ -27362,12 +27638,17 @@ cont { } element { scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -27382,12 +27663,17 @@ cont { } element { scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -27412,7 +27698,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27425,7 +27711,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27438,7 +27724,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27451,7 +27737,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27470,7 +27756,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27497,7 +27783,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27529,7 +27815,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27561,7 +27847,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27593,7 +27879,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27625,7 +27911,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27648,7 +27934,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27661,7 +27947,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27674,7 +27960,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27687,7 +27973,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27700,7 +27986,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27721,7 +28007,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27741,7 +28027,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27761,7 +28047,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27781,7 +28067,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27801,7 +28087,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27824,7 +28110,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27837,7 +28123,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27850,7 +28136,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27863,7 +28149,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27876,7 +28162,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27897,7 +28183,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27917,7 +28203,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27937,7 +28223,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27957,7 +28243,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27977,7 +28263,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28000,7 +28286,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28013,7 +28299,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28026,7 +28312,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28039,7 +28325,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28052,7 +28338,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28073,7 +28359,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28093,7 +28379,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28113,7 +28399,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28133,7 +28419,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28153,7 +28439,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28176,7 +28462,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28189,7 +28475,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28202,7 +28488,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28215,7 +28501,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28228,7 +28514,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28249,7 +28535,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28269,7 +28555,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28289,7 +28575,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28309,7 +28595,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28329,7 +28615,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28352,7 +28638,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28365,7 +28651,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28378,7 +28664,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28391,7 +28677,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28404,7 +28690,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28425,7 +28711,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28445,7 +28731,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28465,7 +28751,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28485,7 +28771,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28505,7 +28791,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28528,7 +28814,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28541,7 +28827,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28554,7 +28840,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28567,7 +28853,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28580,7 +28866,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28601,7 +28887,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28621,7 +28907,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28641,7 +28927,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28661,7 +28947,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28681,7 +28967,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28704,7 +28990,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28717,7 +29003,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28730,7 +29016,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28743,7 +29029,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28756,7 +29042,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28777,7 +29063,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28797,7 +29083,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.0 @@ -28833,7 +29119,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 6.6 @@ -28869,7 +29155,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -28905,7 +29191,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -53967,7 +54253,7 @@ cont { lines { width: 1.5 color: 1305595303 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -53976,7 +54262,7 @@ cont { lines { width: 1.8 color: 1305595303 - priority: 180 + priority: 160 } caption { primary { @@ -53992,7 +54278,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54009,7 +54295,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54026,7 +54312,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54043,7 +54329,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index c405a640b0..5172840a03 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 8f8a5c1866..4355590aa5 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -21357,8 +21357,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21366,8 +21366,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21375,8 +21375,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21392,8 +21392,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -21408,8 +21408,8 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -21424,8 +21424,8 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -21440,8 +21440,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21456,8 +21456,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21475,8 +21475,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21484,8 +21484,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21493,14 +21493,14 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 3.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21516,14 +21516,14 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -21538,20 +21538,20 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 5.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 5.6 + width: 4.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -21566,20 +21566,20 @@ cont { element { scale: 18 lines { - width: 9.0 + width: 8.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -21594,20 +21594,20 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21622,20 +21622,20 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21653,8 +21653,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21662,8 +21662,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21671,8 +21671,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21688,8 +21688,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -21704,18 +21704,18 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } lines { - width: 5.6 + width: 4.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 5.8 color: 1300267136 dashdot { dd: 2.0 @@ -21736,18 +21736,18 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } lines { - width: 8.0 + width: 7.2 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 8.2 color: 1300267136 dashdot { dd: 2.0 @@ -21768,18 +21768,18 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -21800,18 +21800,18 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -22140,6 +22140,180 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } + lines { + width: 2.0 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } + lines { + width: 2.4 + color: 16316664 + dashdot { + dd: 6.0 + dd: 4.2 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } + lines { + width: 3.2 + color: 16316664 + dashdot { + dd: 8.0 + dd: 5.5 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } +} cont { name: "highway-footway-bridge" element { @@ -22157,7 +22331,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22184,7 +22358,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22216,7 +22390,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22248,7 +22422,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22280,7 +22454,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22312,7 +22486,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22398,7 +22572,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } } element { @@ -22410,7 +22584,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } } element { @@ -22422,7 +22596,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } } element { @@ -22434,7 +22608,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -22446,7 +22620,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } } @@ -22461,7 +22635,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22482,7 +22656,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22502,7 +22676,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.8 @@ -22538,7 +22712,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } lines { width: 7.4 @@ -22574,7 +22748,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -22610,7 +22784,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -25433,7 +25607,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25446,7 +25620,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25467,7 +25641,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25487,7 +25661,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25507,7 +25681,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25527,7 +25701,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25547,7 +25721,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25563,12 +25737,18 @@ cont { name: "highway-path-bicycle" element { scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25576,12 +25756,18 @@ cont { } element { scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 1.1 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25597,12 +25783,17 @@ cont { } element { scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } lines { width: 1.5 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25617,12 +25808,17 @@ cont { } element { scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } lines { width: 2.0 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25637,12 +25833,17 @@ cont { } element { scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } lines { width: 2.8 color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.7 } priority: 180 } @@ -25657,12 +25858,17 @@ cont { } element { scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25677,12 +25883,17 @@ cont { } element { scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25707,7 +25918,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25726,7 +25937,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25753,7 +25964,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25785,7 +25996,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25817,7 +26028,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25849,7 +26060,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25881,7 +26092,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25904,7 +26115,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25917,7 +26128,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25938,7 +26149,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25958,7 +26169,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25978,7 +26189,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25998,7 +26209,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26018,7 +26229,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26041,7 +26252,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26054,7 +26265,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26075,7 +26286,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26095,7 +26306,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26115,7 +26326,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26135,7 +26346,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26155,7 +26366,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26178,7 +26389,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26191,7 +26402,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26212,7 +26423,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26232,7 +26443,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26252,7 +26463,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26272,7 +26483,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26292,7 +26503,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26315,7 +26526,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26328,7 +26539,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26349,7 +26560,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26369,7 +26580,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26389,7 +26600,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26409,7 +26620,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26429,7 +26640,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26452,7 +26663,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26465,7 +26676,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26486,7 +26697,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26506,7 +26717,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26526,7 +26737,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26546,7 +26757,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26566,7 +26777,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26589,7 +26800,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26602,7 +26813,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26623,7 +26834,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26643,7 +26854,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26663,7 +26874,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26683,7 +26894,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26703,7 +26914,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26726,7 +26937,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26739,7 +26950,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26760,7 +26971,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26780,7 +26991,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.0 @@ -26816,7 +27027,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 6.6 @@ -26852,7 +27063,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -26888,7 +27099,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -51342,7 +51553,7 @@ cont { lines { width: 1.5 color: 1305595303 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -51351,7 +51562,7 @@ cont { lines { width: 1.8 color: 1305595303 - priority: 180 + priority: 160 } caption { primary { @@ -51367,7 +51578,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -51384,7 +51595,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -51401,7 +51612,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -51418,7 +51629,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index e192979ec8..600cc27347 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 194869f280..e864e69816 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -21357,8 +21357,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1299070279 + width: 0.9 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21366,8 +21366,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1299070279 + width: 1.1 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21375,8 +21375,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1299070279 + width: 1.2 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21392,8 +21392,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1299070279 + width: 1.3 + color: 1718500679 priority: 330 } path_text { @@ -21408,8 +21408,8 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1299070279 + width: 1.4 + color: 1718500679 priority: 330 } path_text { @@ -21424,8 +21424,8 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 443432263 + width: 1.6 + color: 862862663 priority: 330 } path_text { @@ -21440,8 +21440,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21456,8 +21456,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21475,8 +21475,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1299070279 + width: 0.9 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21484,8 +21484,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1299070279 + width: 1.1 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21493,14 +21493,14 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 3.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.4 - color: 1299070279 + width: 1.2 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21516,14 +21516,14 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 1299070279 + width: 1.3 + color: 1718500679 priority: 330 } path_text { @@ -21538,20 +21538,20 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 5.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 5.6 + width: 4.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 1299070279 + width: 1.4 + color: 1718500679 priority: 330 } path_text { @@ -21566,20 +21566,20 @@ cont { element { scale: 18 lines { - width: 9.0 + width: 8.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 7.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 443432263 + width: 1.6 + color: 862862663 priority: 330 } path_text { @@ -21594,20 +21594,20 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 9.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21622,20 +21622,20 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 9.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21653,8 +21653,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1299070279 + width: 0.9 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21662,8 +21662,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1299070279 + width: 1.1 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21671,8 +21671,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1299070279 + width: 1.2 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21688,8 +21688,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1299070279 + width: 1.3 + color: 1718500679 priority: 330 } path_text { @@ -21704,18 +21704,18 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1299070279 + width: 1.4 + color: 1718500679 priority: 330 } lines { - width: 5.6 + width: 4.8 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 5.8 color: 1297109072 dashdot { dd: 2.0 @@ -21736,18 +21736,18 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 443432263 + width: 1.6 + color: 862862663 priority: 330 } lines { - width: 8.0 + width: 7.2 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 8.2 color: 1297109072 dashdot { dd: 2.0 @@ -21768,18 +21768,18 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1297109072 dashdot { dd: 2.0 @@ -21800,18 +21800,18 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1297109072 dashdot { dd: 2.0 @@ -22140,6 +22140,180 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 14 + lines { + width: 1.1 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 659244611 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.3 + color: 1718500679 + priority: 170 + } + lines { + width: 2.0 + color: 659244611 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 1718500679 + priority: 170 + } + lines { + width: 2.4 + color: 4933187 + dashdot { + dd: 6.0 + dd: 4.2 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 1.6 + color: 862862663 + priority: 170 + } + lines { + width: 3.2 + color: 4933187 + dashdot { + dd: 8.0 + dd: 5.5 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } +} cont { name: "highway-footway-bridge" element { @@ -22157,7 +22331,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22184,7 +22358,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22216,7 +22390,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22248,7 +22422,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22280,7 +22454,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22312,7 +22486,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22398,7 +22572,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } } element { @@ -22410,7 +22584,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } } element { @@ -22422,7 +22596,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } } element { @@ -22434,7 +22608,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -22446,7 +22620,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } } @@ -22461,7 +22635,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22482,7 +22656,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22502,7 +22676,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.8 @@ -22538,7 +22712,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } lines { width: 7.4 @@ -22574,7 +22748,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -22610,7 +22784,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -25499,7 +25673,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25512,7 +25686,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25533,7 +25707,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25553,7 +25727,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25573,7 +25747,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25593,7 +25767,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25613,7 +25787,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25629,12 +25803,18 @@ cont { name: "highway-path-bicycle" element { scale: 14 + lines { + width: 1.1 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1720994322 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25642,12 +25822,18 @@ cont { } element { scale: 15 + lines { + width: 1.2 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } lines { width: 1.1 color: 1720994322 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25663,12 +25849,17 @@ cont { } element { scale: 16 + lines { + width: 1.3 + color: 1718500679 + priority: 170 + } lines { width: 1.5 color: 1720994322 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25683,12 +25874,17 @@ cont { } element { scale: 17 + lines { + width: 1.4 + color: 1718500679 + priority: 170 + } lines { width: 2.0 color: 1720994322 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25703,12 +25899,17 @@ cont { } element { scale: 18 + lines { + width: 1.6 + color: 862862663 + priority: 170 + } lines { width: 2.8 color: 865356306 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.7 } priority: 180 } @@ -25723,12 +25924,17 @@ cont { } element { scale: 19 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } lines { width: 3.7 color: 865356306 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25743,12 +25949,17 @@ cont { } element { scale: 20 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } lines { width: 3.7 color: 865356306 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25773,7 +25984,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25792,7 +26003,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25819,7 +26030,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25851,7 +26062,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25883,7 +26094,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25915,7 +26126,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25947,7 +26158,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25970,7 +26181,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25983,7 +26194,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26004,7 +26215,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26024,7 +26235,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26044,7 +26255,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26064,7 +26275,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26084,7 +26295,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26107,7 +26318,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26120,7 +26331,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26141,7 +26352,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26161,7 +26372,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26181,7 +26392,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26201,7 +26412,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26221,7 +26432,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26244,7 +26455,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26257,7 +26468,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26278,7 +26489,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26298,7 +26509,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26318,7 +26529,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26338,7 +26549,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26358,7 +26569,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26381,7 +26592,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26394,7 +26605,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26415,7 +26626,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26435,7 +26646,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26455,7 +26666,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26475,7 +26686,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26495,7 +26706,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26518,7 +26729,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26531,7 +26742,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26552,7 +26763,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26572,7 +26783,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26592,7 +26803,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26612,7 +26823,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26632,7 +26843,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26655,7 +26866,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26668,7 +26879,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26689,7 +26900,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26709,7 +26920,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26729,7 +26940,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26749,7 +26960,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26769,7 +26980,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26792,7 +27003,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26805,7 +27016,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26826,7 +27037,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26846,7 +27057,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.0 @@ -26882,7 +27093,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 6.6 @@ -26918,7 +27129,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -26954,7 +27165,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -51606,7 +51817,7 @@ cont { lines { width: 1.5 color: 1294016795 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -51615,7 +51826,7 @@ cont { lines { width: 1.8 color: 1294016795 - priority: 180 + priority: 160 } caption { primary { @@ -51631,7 +51842,7 @@ cont { lines { width: 3.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -51648,7 +51859,7 @@ cont { lines { width: 3.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -51665,7 +51876,7 @@ cont { lines { width: 4.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -51682,7 +51893,7 @@ cont { lines { width: 4.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index dbc8651c66..64366b1e55 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 a5bd3005b8..1b7ac43ba1 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -22148,8 +22148,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1728022445 + width: 0.9 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22158,8 +22158,8 @@ cont { element { scale: 12 lines { - width: 0.8 - color: 1308592045 + width: 1.0 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22169,7 +22169,7 @@ cont { scale: 13 lines { width: 1.1 - color: 16746413 + color: 861097451 priority: 330 cap: BUTTCAP } @@ -22185,8 +22185,8 @@ cont { element { scale: 14 lines { - width: 1.4 - color: 16746413 + width: 1.3 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22202,8 +22202,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 16746413 + width: 1.5 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22219,8 +22219,8 @@ cont { element { scale: 16 lines { - width: 1.9 - color: 16746413 + width: 1.7 + color: 5459435 priority: 330 } path_text { @@ -22235,8 +22235,8 @@ cont { element { scale: 17 lines { - width: 2.3 - color: 16746413 + width: 2.0 + color: 5459435 priority: 330 } path_text { @@ -22251,8 +22251,8 @@ cont { element { scale: 18 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22267,8 +22267,8 @@ cont { element { scale: 19 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22283,8 +22283,8 @@ cont { element { scale: 20 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22302,8 +22302,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1728022445 + width: 0.9 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22312,8 +22312,8 @@ cont { element { scale: 12 lines { - width: 0.8 - color: 1308592045 + width: 1.0 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22323,7 +22323,7 @@ cont { scale: 13 lines { width: 1.1 - color: 16746413 + color: 861097451 priority: 330 cap: BUTTCAP } @@ -22339,8 +22339,8 @@ cont { element { scale: 14 lines { - width: 1.4 - color: 16746413 + width: 1.3 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22356,14 +22356,14 @@ cont { element { scale: 15 lines { - width: 4.2 + width: 4.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 16746413 + width: 1.5 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22379,14 +22379,14 @@ cont { element { scale: 16 lines { - width: 4.8 + width: 4.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.9 - color: 16746413 + width: 1.7 + color: 5459435 priority: 330 } path_text { @@ -22401,20 +22401,20 @@ cont { element { scale: 17 lines { - width: 7.6 + width: 7.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.6 + width: 6.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.3 - color: 16746413 + width: 2.0 + color: 5459435 priority: 330 } path_text { @@ -22429,20 +22429,20 @@ cont { element { scale: 18 lines { - width: 10.6 + width: 9.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.6 + width: 8.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22457,20 +22457,20 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22485,20 +22485,20 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22516,8 +22516,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1728022445 + width: 0.9 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22526,8 +22526,8 @@ cont { element { scale: 12 lines { - width: 0.8 - color: 1308592045 + width: 1.0 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22537,7 +22537,7 @@ cont { scale: 13 lines { width: 1.1 - color: 16746413 + color: 861097451 priority: 330 cap: BUTTCAP } @@ -22553,8 +22553,8 @@ cont { element { scale: 14 lines { - width: 1.4 - color: 16746413 + width: 1.3 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22570,8 +22570,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 16746413 + width: 1.5 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22587,8 +22587,8 @@ cont { element { scale: 16 lines { - width: 1.9 - color: 16746413 + width: 1.7 + color: 5459435 priority: 330 } path_text { @@ -22603,18 +22603,18 @@ cont { element { scale: 17 lines { - width: 2.3 - color: 16746413 + width: 2.0 + color: 5459435 priority: 330 } lines { - width: 6.6 + width: 6.0 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 7.6 + width: 7.0 color: 1300267136 dashdot { dd: 2.0 @@ -22635,18 +22635,18 @@ cont { element { scale: 18 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } lines { - width: 9.6 + width: 8.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 1300267136 dashdot { dd: 2.0 @@ -22667,18 +22667,18 @@ cont { element { scale: 19 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } lines { - width: 10.6 + width: 9.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 11.6 + width: 10.8 color: 1300267136 dashdot { dd: 2.0 @@ -22699,18 +22699,18 @@ cont { element { scale: 20 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } lines { - width: 10.6 + width: 9.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 11.6 + width: 10.8 color: 1300267136 dashdot { dd: 2.0 @@ -23177,7 +23177,7 @@ cont { } } cont { - name: "highway-footway-bridge" + name: "highway-footway-bicycle" element { scale: 11 lines { @@ -23192,6 +23192,250 @@ cont { cap: BUTTCAP } } + element { + scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 170 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 3.5 + dd: 2.5 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 871954680 + dashdot { + dd: 4.0 + dd: 3.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 5459435 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.6 + color: 871954680 + dashdot { + dd: 4.0 + dd: 3.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 5459435 + priority: 170 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 871954680 + dashdot { + dd: 6.0 + dd: 4.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 5459435 + priority: 170 + } + lines { + width: 2.6 + color: 871954680 + dashdot { + dd: 6.0 + dd: 4.5 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 5459435 + priority: 170 + } + lines { + width: 3.3 + color: 871954680 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } + lines { + width: 4.0 + color: 16316664 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } + lines { + width: 4.0 + color: 16316664 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } + lines { + width: 4.0 + color: 16316664 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } +} +cont { + name: "highway-footway-bridge" + element { + scale: 11 + lines { + width: 1.0 + color: 16316664 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 155 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 12 lines { @@ -23201,7 +23445,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23215,7 +23459,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23236,7 +23480,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23263,7 +23507,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23290,7 +23534,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23322,7 +23566,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23354,7 +23598,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23386,7 +23630,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23418,7 +23662,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23504,7 +23748,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -23516,7 +23760,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23528,7 +23772,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23540,7 +23784,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23552,7 +23796,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } } @@ -23567,7 +23811,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23581,7 +23825,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23595,7 +23839,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23616,7 +23860,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23637,7 +23881,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23658,7 +23902,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23678,7 +23922,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 7.6 @@ -23714,7 +23958,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -23750,7 +23994,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -23786,7 +24030,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -26674,7 +26918,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -26688,7 +26932,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -26702,7 +26946,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26723,7 +26967,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26744,7 +26988,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26765,7 +27009,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26785,7 +27029,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26805,7 +27049,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26825,7 +27069,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26845,7 +27089,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26875,12 +27119,19 @@ cont { } element { scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 170 + join: BEVELJOIN + cap: BUTTCAP + } lines { width: 1.1 color: 1302351890 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.5 } priority: 180 join: BEVELJOIN @@ -26889,12 +27140,18 @@ cont { } element { scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 170 + cap: BUTTCAP + } lines { width: 1.3 - color: 10506258 + color: 866144274 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.0 } priority: 180 cap: BUTTCAP @@ -26910,12 +27167,18 @@ cont { } element { scale: 14 + lines { + width: 1.3 + color: 5459435 + priority: 170 + cap: BUTTCAP + } lines { width: 1.6 - color: 10506258 + color: 866144274 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.0 } priority: 180 cap: BUTTCAP @@ -26931,12 +27194,18 @@ cont { } element { scale: 15 + lines { + width: 1.5 + color: 5459435 + priority: 170 + cap: BUTTCAP + } lines { width: 2.0 - color: 10506258 + color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.5 } priority: 180 cap: BUTTCAP @@ -26952,12 +27221,17 @@ cont { } element { scale: 16 + lines { + width: 1.7 + color: 5459435 + priority: 170 + } lines { width: 2.6 - color: 10506258 + color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.5 } priority: 180 } @@ -26972,12 +27246,17 @@ cont { } element { scale: 17 + lines { + width: 2.0 + color: 5459435 + priority: 170 + } lines { width: 3.3 - color: 10506258 + color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -26992,12 +27271,17 @@ cont { } element { scale: 18 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } lines { width: 4.0 color: 10506258 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27012,12 +27296,17 @@ cont { } element { scale: 19 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } lines { width: 4.0 color: 10506258 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27032,12 +27321,17 @@ cont { } element { scale: 20 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } lines { width: 4.0 color: 10506258 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27062,7 +27356,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27076,7 +27370,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27090,7 +27384,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27111,7 +27405,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27138,7 +27432,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27165,7 +27459,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27197,7 +27491,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27229,7 +27523,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27261,7 +27555,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27293,7 +27587,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27316,7 +27610,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27330,7 +27624,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27344,7 +27638,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27365,7 +27659,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27386,7 +27680,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27407,7 +27701,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27427,7 +27721,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27447,7 +27741,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27467,7 +27761,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27487,7 +27781,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27510,7 +27804,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27524,7 +27818,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27538,7 +27832,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27559,7 +27853,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27580,7 +27874,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27601,7 +27895,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27621,7 +27915,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27641,7 +27935,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27661,7 +27955,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27681,7 +27975,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27704,7 +27998,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27718,7 +28012,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27732,7 +28026,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27753,7 +28047,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27774,7 +28068,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27795,7 +28089,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27815,7 +28109,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27835,7 +28129,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27855,7 +28149,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27875,7 +28169,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27898,7 +28192,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27912,7 +28206,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27926,7 +28220,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27947,7 +28241,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27968,7 +28262,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27989,7 +28283,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28009,7 +28303,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28029,7 +28323,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28049,7 +28343,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28069,7 +28363,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28092,7 +28386,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28106,7 +28400,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28120,7 +28414,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28141,7 +28435,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28162,7 +28456,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28183,7 +28477,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28203,7 +28497,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28223,7 +28517,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28243,7 +28537,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28263,7 +28557,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28286,7 +28580,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28300,7 +28594,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28314,7 +28608,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28335,7 +28629,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28356,7 +28650,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28377,7 +28671,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28397,7 +28691,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28417,7 +28711,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28437,7 +28731,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28457,7 +28751,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28480,7 +28774,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28494,7 +28788,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28508,7 +28802,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28529,7 +28823,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28550,7 +28844,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28571,7 +28865,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28591,7 +28885,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 7.6 @@ -28627,7 +28921,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -28663,7 +28957,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -28699,7 +28993,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -53926,7 +54220,7 @@ cont { lines { width: 1.5 color: 1305595303 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -53935,7 +54229,7 @@ cont { lines { width: 1.8 color: 1305595303 - priority: 180 + priority: 160 } caption { primary { @@ -53951,7 +54245,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -53968,7 +54262,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -53985,7 +54279,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54002,7 +54296,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index b228f6d43a..a3f607f97f 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 598173425f..2aad6acbd8 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -22148,8 +22148,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1718500679 + width: 0.9 + color: 1299070279 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22158,7 +22158,7 @@ cont { element { scale: 12 lines { - width: 0.8 + width: 1.0 color: 1299070279 priority: 330 join: BEVELJOIN @@ -22169,7 +22169,7 @@ cont { scale: 13 lines { width: 1.1 - color: 7224647 + color: 862862663 priority: 330 cap: BUTTCAP } @@ -22185,7 +22185,7 @@ cont { element { scale: 14 lines { - width: 1.4 + width: 1.3 color: 7224647 priority: 330 cap: BUTTCAP @@ -22202,7 +22202,7 @@ cont { element { scale: 15 lines { - width: 1.6 + width: 1.5 color: 7224647 priority: 330 cap: BUTTCAP @@ -22219,7 +22219,7 @@ cont { element { scale: 16 lines { - width: 1.9 + width: 1.7 color: 7224647 priority: 330 } @@ -22235,7 +22235,7 @@ cont { element { scale: 17 lines { - width: 2.3 + width: 2.0 color: 7224647 priority: 330 } @@ -22251,7 +22251,7 @@ cont { element { scale: 18 lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } @@ -22267,7 +22267,7 @@ cont { element { scale: 19 lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } @@ -22283,7 +22283,7 @@ cont { element { scale: 20 lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } @@ -22302,8 +22302,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1718500679 + width: 0.9 + color: 1299070279 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22312,7 +22312,7 @@ cont { element { scale: 12 lines { - width: 0.8 + width: 1.0 color: 1299070279 priority: 330 join: BEVELJOIN @@ -22323,7 +22323,7 @@ cont { scale: 13 lines { width: 1.1 - color: 7224647 + color: 862862663 priority: 330 cap: BUTTCAP } @@ -22339,7 +22339,7 @@ cont { element { scale: 14 lines { - width: 1.4 + width: 1.3 color: 7224647 priority: 330 cap: BUTTCAP @@ -22356,13 +22356,13 @@ cont { element { scale: 15 lines { - width: 4.2 + width: 4.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.6 + width: 1.5 color: 7224647 priority: 330 cap: BUTTCAP @@ -22379,13 +22379,13 @@ cont { element { scale: 16 lines { - width: 4.8 + width: 4.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.9 + width: 1.7 color: 7224647 priority: 330 } @@ -22401,19 +22401,19 @@ cont { element { scale: 17 lines { - width: 7.6 + width: 7.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.6 + width: 6.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.3 + width: 2.0 color: 7224647 priority: 330 } @@ -22429,19 +22429,19 @@ cont { element { scale: 18 lines { - width: 10.6 + width: 9.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.6 + width: 8.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } @@ -22457,19 +22457,19 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } @@ -22485,19 +22485,19 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 10.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } @@ -22516,8 +22516,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1718500679 + width: 0.9 + color: 1299070279 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22526,7 +22526,7 @@ cont { element { scale: 12 lines { - width: 0.8 + width: 1.0 color: 1299070279 priority: 330 join: BEVELJOIN @@ -22537,7 +22537,7 @@ cont { scale: 13 lines { width: 1.1 - color: 7224647 + color: 862862663 priority: 330 cap: BUTTCAP } @@ -22553,7 +22553,7 @@ cont { element { scale: 14 lines { - width: 1.4 + width: 1.3 color: 7224647 priority: 330 cap: BUTTCAP @@ -22570,7 +22570,7 @@ cont { element { scale: 15 lines { - width: 1.6 + width: 1.5 color: 7224647 priority: 330 cap: BUTTCAP @@ -22587,7 +22587,7 @@ cont { element { scale: 16 lines { - width: 1.9 + width: 1.7 color: 7224647 priority: 330 } @@ -22603,18 +22603,18 @@ cont { element { scale: 17 lines { - width: 2.3 + width: 2.0 color: 7224647 priority: 330 } lines { - width: 6.6 + width: 6.0 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 7.6 + width: 7.0 color: 1297109072 dashdot { dd: 2.0 @@ -22635,18 +22635,18 @@ cont { element { scale: 18 lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } lines { - width: 9.6 + width: 8.8 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 1297109072 dashdot { dd: 2.0 @@ -22667,18 +22667,18 @@ cont { element { scale: 19 lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } lines { - width: 10.6 + width: 9.8 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 11.6 + width: 10.8 color: 1297109072 dashdot { dd: 2.0 @@ -22699,18 +22699,18 @@ cont { element { scale: 20 lines { - width: 2.8 + width: 2.4 color: 7224647 priority: 330 } lines { - width: 10.6 + width: 9.8 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 11.6 + width: 10.8 color: 1297109072 dashdot { dd: 2.0 @@ -23177,7 +23177,7 @@ cont { } } cont { - name: "highway-footway-bridge" + name: "highway-footway-bicycle" element { scale: 11 lines { @@ -23192,6 +23192,250 @@ cont { cap: BUTTCAP } } + element { + scale: 12 + lines { + width: 1.0 + color: 1299070279 + priority: 170 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 3.5 + dd: 2.5 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 862862663 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 860571203 + dashdot { + dd: 4.0 + dd: 3.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 7224647 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.6 + color: 860571203 + dashdot { + dd: 4.0 + dd: 3.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 7224647 + priority: 170 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 860571203 + dashdot { + dd: 6.0 + dd: 4.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 6710886 + stroke_color: 856756480 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 7224647 + priority: 170 + } + lines { + width: 2.6 + color: 860571203 + dashdot { + dd: 6.0 + dd: 4.5 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 7224647 + priority: 170 + } + lines { + width: 3.3 + color: 860571203 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 7224647 + priority: 170 + } + lines { + width: 4.0 + color: 4933187 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 7224647 + priority: 170 + } + lines { + width: 4.0 + color: 4933187 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 7224647 + priority: 170 + } + lines { + width: 4.0 + color: 4933187 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } +} +cont { + name: "highway-footway-bridge" + element { + scale: 11 + lines { + width: 1.0 + color: 4933187 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 155 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 12 lines { @@ -23201,7 +23445,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23215,7 +23459,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23236,7 +23480,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23263,7 +23507,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23290,7 +23534,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23322,7 +23566,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23354,7 +23598,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23386,7 +23630,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23418,7 +23662,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23504,7 +23748,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -23516,7 +23760,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23528,7 +23772,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23540,7 +23784,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23552,7 +23796,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } } @@ -23567,7 +23811,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23581,7 +23825,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23595,7 +23839,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23616,7 +23860,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23637,7 +23881,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23658,7 +23902,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23678,7 +23922,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 7.6 @@ -23714,7 +23958,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -23750,7 +23994,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -23786,7 +24030,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -26740,7 +26984,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -26754,7 +26998,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -26768,7 +27012,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26789,7 +27033,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26810,7 +27054,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26831,7 +27075,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26851,7 +27095,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26871,7 +27115,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26891,7 +27135,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26911,7 +27155,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26941,12 +27185,19 @@ cont { } element { scale: 12 + lines { + width: 1.0 + color: 1299070279 + priority: 170 + join: BEVELJOIN + cap: BUTTCAP + } lines { width: 1.1 color: 1301563922 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.5 } priority: 180 join: BEVELJOIN @@ -26955,12 +27206,18 @@ cont { } element { scale: 13 + lines { + width: 1.1 + color: 862862663 + priority: 170 + cap: BUTTCAP + } lines { width: 1.3 - color: 9718290 + color: 865356306 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.0 } priority: 180 cap: BUTTCAP @@ -26976,12 +27233,18 @@ cont { } element { scale: 14 + lines { + width: 1.3 + color: 7224647 + priority: 170 + cap: BUTTCAP + } lines { width: 1.6 - color: 9718290 + color: 865356306 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.0 } priority: 180 cap: BUTTCAP @@ -26997,12 +27260,18 @@ cont { } element { scale: 15 + lines { + width: 1.5 + color: 7224647 + priority: 170 + cap: BUTTCAP + } lines { width: 2.0 - color: 9718290 + color: 865356306 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.5 } priority: 180 cap: BUTTCAP @@ -27018,12 +27287,17 @@ cont { } element { scale: 16 + lines { + width: 1.7 + color: 7224647 + priority: 170 + } lines { width: 2.6 - color: 9718290 + color: 865356306 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.5 } priority: 180 } @@ -27038,12 +27312,17 @@ cont { } element { scale: 17 + lines { + width: 2.0 + color: 7224647 + priority: 170 + } lines { width: 3.3 - color: 9718290 + color: 865356306 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27058,12 +27337,17 @@ cont { } element { scale: 18 + lines { + width: 2.4 + color: 7224647 + priority: 170 + } lines { width: 4.0 color: 9718290 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27078,12 +27362,17 @@ cont { } element { scale: 19 + lines { + width: 2.4 + color: 7224647 + priority: 170 + } lines { width: 4.0 color: 9718290 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27098,12 +27387,17 @@ cont { } element { scale: 20 + lines { + width: 2.4 + color: 7224647 + priority: 170 + } lines { width: 4.0 color: 9718290 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27128,7 +27422,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27142,7 +27436,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27156,7 +27450,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27177,7 +27471,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27204,7 +27498,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27231,7 +27525,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27263,7 +27557,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27295,7 +27589,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27327,7 +27621,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27359,7 +27653,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27382,7 +27676,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27396,7 +27690,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27410,7 +27704,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27431,7 +27725,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27452,7 +27746,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27473,7 +27767,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27493,7 +27787,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27513,7 +27807,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27533,7 +27827,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27553,7 +27847,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27576,7 +27870,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27590,7 +27884,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27604,7 +27898,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27625,7 +27919,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27646,7 +27940,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27667,7 +27961,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27687,7 +27981,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27707,7 +28001,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27727,7 +28021,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27747,7 +28041,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27770,7 +28064,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27784,7 +28078,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27798,7 +28092,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27819,7 +28113,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27840,7 +28134,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27861,7 +28155,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27881,7 +28175,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27901,7 +28195,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27921,7 +28215,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27941,7 +28235,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27964,7 +28258,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27978,7 +28272,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27992,7 +28286,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28013,7 +28307,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28034,7 +28328,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28055,7 +28349,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28075,7 +28369,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28095,7 +28389,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28115,7 +28409,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28135,7 +28429,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28158,7 +28452,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28172,7 +28466,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28186,7 +28480,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28207,7 +28501,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28228,7 +28522,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28249,7 +28543,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28269,7 +28563,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28289,7 +28583,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28309,7 +28603,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28329,7 +28623,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28352,7 +28646,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28366,7 +28660,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28380,7 +28674,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28401,7 +28695,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28422,7 +28716,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28443,7 +28737,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28463,7 +28757,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28483,7 +28777,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28503,7 +28797,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28523,7 +28817,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28546,7 +28840,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28560,7 +28854,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28574,7 +28868,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28595,7 +28889,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28616,7 +28910,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28637,7 +28931,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28657,7 +28951,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 7.6 @@ -28693,7 +28987,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -28729,7 +29023,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -28765,7 +29059,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -54190,7 +54484,7 @@ cont { lines { width: 1.5 color: 1294016795 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -54199,7 +54493,7 @@ cont { lines { width: 1.8 color: 1294016795 - priority: 180 + priority: 160 } caption { primary { @@ -54215,7 +54509,7 @@ cont { lines { width: 3.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -54232,7 +54526,7 @@ cont { lines { width: 3.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -54249,7 +54543,7 @@ cont { lines { width: 4.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -54266,7 +54560,7 @@ cont { lines { width: 4.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 284341a274..0769c44728 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 a903f700cf..d8ee2fd4d3 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -8916,7 +8916,7 @@ cont { scale: 18 lines { width: 1.0 - color: 1728022445 + color: 1716933887 priority: 130 } } @@ -8924,7 +8924,7 @@ cont { scale: 19 lines { width: 1.0 - color: 1728022445 + color: 1716933887 priority: 130 } } @@ -8932,7 +8932,7 @@ cont { scale: 20 lines { width: 1.0 - color: 1728022445 + color: 1716933887 priority: 130 } } @@ -8943,7 +8943,7 @@ cont { scale: 18 lines { width: 1.0 - color: 1728022445 + color: 1716933887 priority: 130 } } @@ -8951,7 +8951,7 @@ cont { scale: 19 lines { width: 1.0 - color: 1728022445 + color: 1716933887 priority: 130 } } @@ -8959,7 +8959,7 @@ cont { scale: 20 lines { width: 1.0 - color: 1728022445 + color: 1716933887 priority: 130 } } @@ -9042,6 +9042,45 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 18 + lines { + width: 1.5 + color: 1308425468 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 1308425468 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 1308425468 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 130 + } + } +} cont { name: "highway-footway-bridge" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 78b2d5204e..29dbdaf6bf 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 c5f25e337c..56b457e20a 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -9042,6 +9042,45 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 18 + lines { + width: 1.5 + color: 1294673959 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 130 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 1294673959 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 130 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 1294673959 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 130 + } + } +} cont { name: "highway-footway-bridge" element { diff --git a/data/patterns.txt b/data/patterns.txt index 3b4998ce73..633763d57e 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -28,6 +28,11 @@ 6.0 2.5 8.0 3.0 10.0 3.5 +4.0 3.2 +5.0 3.5 +6.0 4.2 +8.0 5.5 +10.0 6.7 2.0 1.0 3.6 1.6 5.0 2.2 @@ -40,6 +45,9 @@ 4.0 2.5 6.0 3.5 8.0 4.5 +3.5 2.7 +6.0 4.7 +8.0 6.2 1.5 1.3 1.8 1.6 2.5 2.2 @@ -70,6 +78,10 @@ 7.0 1.2 9.0 1.7 12.0 2.2 +3.5 2.5 +4.0 3.0 +6.0 4.5 +8.0 6.0 12.0 4.0 6.0 8.5 12.0 2.3 1.0 50.0 diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index 69096868e7..d74b224088 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -269,9 +269,9 @@ highway-bridleway-bridge # line z14- (also has line:: 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-area # line z15- and area z14- (also has pathtext z15-) -highway-footway-bicycle +highway-footway-bicycle # line z14- (also has line::cycleline z14-, pathtext z15-) highway-path # line z14- (also has pathtext z15-) -highway-path-bicycle # line z14- (also has pathtext z15-) +highway-path-bicycle # line z14- (also has line::cycleline z14-, pathtext z15-) highway-raceway # line z14- (also has pathtext z16-) highway-track # line z14- (also has pathtext z15-) highway-track-area # line z14- (also has pathtext z15-) @@ -280,8 +280,8 @@ highway-track-no-access # line z14- (also has pathte highway-track-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) === 180 -highway-footway-bicycle::cycleline -highway-path-bicycle::cycleline +highway-footway-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-) +highway-path-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-) === 170 highway-construction # line z13- (also has pathtext z15-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index a79a0b0d14..60b543ce9d 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -663,7 +663,7 @@ highway-cycleway-tunnel # pathtext z15- (also has li 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-bicycle +highway-footway-bicycle # pathtext z15- (also has line z14-, line::cycleline 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-tertiary_link # pathtext z18- (also has line z14-) @@ -694,7 +694,7 @@ highway-bridleway-bridge # pathtext z15- (also has li highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-path # pathtext z15- (also has line z14-) highway-path-alpine_hiking # pathtext z15- (also has line z14-) -highway-path-bicycle # pathtext z15- (also has line z14-) +highway-path-bicycle # pathtext z15- (also has line z14-, line::cycleline z14-) highway-path-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) highway-path-demanding_alpine_hiking # pathtext z15- (also has line z14-) highway-path-demanding_mountain_hiking # pathtext z15- (also has line z14-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index c210cccd57..ff217abcf6 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -269,9 +269,9 @@ highway-bridleway-bridge # line z11- (also has line:: 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-area # line z11- and area z14- (also has pathtext z13-) -highway-footway-bicycle +highway-footway-bicycle # line z11- (also has line::cycleline z12-, pathtext z13-) highway-path # line z11- (also has pathtext z13-) -highway-path-bicycle # line z11- (also has pathtext z13-) +highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z13-) highway-raceway # line z14- (also has pathtext z16-) highway-track # line z11- (also has pathtext z13-) highway-track-area # line z11- (also has pathtext z13-) @@ -280,8 +280,8 @@ highway-track-no-access # line z11- (also has pathte highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) === 180 -highway-footway-bicycle::cycleline -highway-path-bicycle::cycleline +highway-footway-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z13-) +highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z13-) === 170 highway-construction # line z11- (also has pathtext z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index bf755dce5f..767c4be6bf 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -663,7 +663,7 @@ highway-cycleway-tunnel # pathtext z13- (also has li area:highway-footway # caption z15- (also has area z14-) highway-footway # pathtext z13- (also has line z11-) highway-footway-area # pathtext z13- (also has line z11-, area z14-) -highway-footway-bicycle +highway-footway-bicycle # pathtext z13- (also has line z11-, line::cycleline z12-) 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 z14-) @@ -694,7 +694,7 @@ highway-bridleway-bridge # pathtext z13- (also has li highway-bridleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) 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-) +highway-path-bicycle # pathtext z13- (also has line z11-, line::cycleline z12-) highway-path-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) highway-path-demanding_alpine_hiking # pathtext z13- (also has line z11-) highway-path-demanding_mountain_hiking # pathtext z13- (also has line z11-) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 65f64d38b3..7698578ea9 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -248,7 +248,7 @@ highway-cycleway # line z18- highway-cycleway-bridge # line z18- highway-footway # line z18- highway-footway-area # line z18- -highway-footway-bicycle +highway-footway-bicycle # line z18- highway-footway-bridge # line z18- highway-footway-sidewalk # line z19- highway-path # line z17- diff --git a/data/types.txt b/data/types.txt index dae7de9d97..fd6c14c6a0 100644 --- a/data/types.txt +++ b/data/types.txt @@ -138,7 +138,7 @@ landuse|forest|mixed *amenity|fire_station *landuse|retail *leisure|nature_reserve -leisure|pitch +*highway|footway|bicycle *tourism|information *highway|motorway_link|bridge *railway|abandoned diff --git a/data/visibility.txt b/data/visibility.txt index e4cd8188f3..b6590b8964 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -415,6 +415,7 @@ world 000000000000000000000 + elevator 000000000000000000000 - footway 000000000000000000111 + area 000000000000000000111 - + bicycle 000000000000000000111 - bridge 000000000000000000111 - crossing 000000000000000000111 - sidewalk 000000000000000000011 -