diff --git a/data/classificator.txt b/data/classificator.txt index f4cee2114e..bf8c3aa5e9 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -422,12 +422,13 @@ world + alpine_hiking - area - bridge - + crossing - demanding_alpine_hiking - demanding_mountain_hiking - difficult_alpine_hiking - hiking - mountain_hiking - - permissive - + sidewalk - tunnel - {} ford - @@ -757,7 +758,6 @@ world + scrub - spring - strait - - tree - tree_row - volcano - water + @@ -857,7 +857,6 @@ world + solar - wind - {} - pole - station - substation - tower - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 44cc509bb7..3fbdd56407 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 0bf3027cc4..d88df50914 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -23182,6 +23182,69 @@ cont { } } } +cont { + name: "highway-footway-crossing" + element { + scale: 16 + lines { + width: 2.0 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 330 + } + } + element { + scale: 17 + lines { + width: 2.4 + color: 1090058488 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 330 + } + } + element { + scale: 18 + lines { + width: 3.2 + color: 16316664 + dashdot { + dd: 8.0 + dd: 3.0 + } + priority: 330 + } + } + element { + scale: 19 + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } + element { + scale: 20 + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } +} cont { name: "highway-footway-demanding_alpine_hiking" element { @@ -24063,28 +24126,7 @@ cont { } } cont { - name: "highway-footway-permissive" - element { - scale: 15 - lines { - width: 1.5 - color: 1090058488 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } + name: "highway-footway-sidewalk" element { scale: 16 lines { @@ -24096,14 +24138,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 17 @@ -24116,14 +24150,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 18 @@ -24136,14 +24162,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 19 @@ -24156,14 +24174,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 20 @@ -24176,14 +24186,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } } cont { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 067f4d96eb..b64b34ee5a 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 5792aa0531..a8cf0894b0 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -22732,6 +22732,69 @@ cont { } } } +cont { + name: "highway-footway-crossing" + element { + scale: 16 + lines { + width: 2.0 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 330 + } + } + element { + scale: 17 + lines { + width: 2.4 + color: 1090058488 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 330 + } + } + element { + scale: 18 + lines { + width: 3.2 + color: 16316664 + dashdot { + dd: 8.0 + dd: 3.0 + } + priority: 330 + } + } + element { + scale: 19 + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } + element { + scale: 20 + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } +} cont { name: "highway-footway-demanding_alpine_hiking" element { @@ -23418,28 +23481,7 @@ cont { } } cont { - name: "highway-footway-permissive" - element { - scale: 15 - lines { - width: 1.5 - color: 1090058488 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } + name: "highway-footway-sidewalk" element { scale: 16 lines { @@ -23451,14 +23493,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 17 @@ -23471,14 +23505,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 18 @@ -23491,14 +23517,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 19 @@ -23511,14 +23529,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 20 @@ -23531,14 +23541,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } } cont { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index ee36108fa0..ad09598d6c 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 40ccf003f1..38e841bb80 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -22732,6 +22732,69 @@ cont { } } } +cont { + name: "highway-footway-crossing" + element { + scale: 16 + lines { + width: 2.0 + color: 1078675011 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 330 + } + } + element { + scale: 17 + lines { + width: 2.4 + color: 1078675011 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 330 + } + } + element { + scale: 18 + lines { + width: 3.2 + color: 4933187 + dashdot { + dd: 8.0 + dd: 3.0 + } + priority: 330 + } + } + element { + scale: 19 + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } + element { + scale: 20 + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } +} cont { name: "highway-footway-demanding_alpine_hiking" element { @@ -23418,28 +23481,7 @@ cont { } } cont { - name: "highway-footway-permissive" - element { - scale: 15 - lines { - width: 1.5 - color: 1078675011 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } + name: "highway-footway-sidewalk" element { scale: 16 lines { @@ -23451,14 +23493,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 17 @@ -23471,14 +23505,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 18 @@ -23491,14 +23517,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 19 @@ -23511,14 +23529,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 20 @@ -23531,14 +23541,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } } cont { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 25598d37dd..8a9188216a 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 71c6946210..0a7df9e5d7 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -23155,6 +23155,69 @@ cont { } } } +cont { + name: "highway-footway-crossing" + element { + scale: 16 + lines { + width: 2.0 + color: 1090058488 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 330 + } + } + element { + scale: 17 + lines { + width: 2.4 + color: 1090058488 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 330 + } + } + element { + scale: 18 + lines { + width: 3.2 + color: 16316664 + dashdot { + dd: 8.0 + dd: 3.0 + } + priority: 330 + } + } + element { + scale: 19 + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } + element { + scale: 20 + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } +} cont { name: "highway-footway-demanding_alpine_hiking" element { @@ -24046,28 +24109,7 @@ cont { } } cont { - name: "highway-footway-permissive" - element { - scale: 15 - lines { - width: 1.5 - color: 1090058488 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } - } + name: "highway-footway-sidewalk" element { scale: 16 lines { @@ -24079,14 +24121,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 17 @@ -24099,14 +24133,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 18 @@ -24119,14 +24145,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 19 @@ -24139,14 +24157,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } element { scale: 20 @@ -24159,14 +24169,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 3355443 - stroke_color: 872415231 - } - priority: 2820 - } } } cont { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 794f2eea3c..b99da7591a 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 05df43632b..6fba8e96b4 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -23155,6 +23155,69 @@ cont { } } } +cont { + name: "highway-footway-crossing" + element { + scale: 16 + lines { + width: 2.0 + color: 1078675011 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 330 + } + } + element { + scale: 17 + lines { + width: 2.4 + color: 1078675011 + dashdot { + dd: 6.0 + dd: 2.5 + } + priority: 330 + } + } + element { + scale: 18 + lines { + width: 3.2 + color: 4933187 + dashdot { + dd: 8.0 + dd: 3.0 + } + priority: 330 + } + } + element { + scale: 19 + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } + element { + scale: 20 + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 3.5 + } + priority: 330 + } + } +} cont { name: "highway-footway-demanding_alpine_hiking" element { @@ -24046,28 +24109,7 @@ cont { } } cont { - name: "highway-footway-permissive" - element { - scale: 15 - lines { - width: 1.5 - color: 1078675011 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 180 - cap: BUTTCAP - } - path_text { - primary { - height: 8 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } - } + name: "highway-footway-sidewalk" element { scale: 16 lines { @@ -24079,14 +24121,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 17 @@ -24099,14 +24133,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 9 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 18 @@ -24119,14 +24145,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 19 @@ -24139,14 +24157,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } element { scale: 20 @@ -24159,14 +24169,6 @@ cont { } priority: 180 } - path_text { - primary { - height: 10 - color: 7829367 - stroke_color: 856756480 - } - priority: 2820 - } } } cont { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index f3fdc0d637..61887e4997 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 97863ea45d..bd65ad2003 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -9003,10 +9003,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1308425468 + width: 1.1 + color: 1721782290 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9016,10 +9016,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9028,10 +9028,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9115,6 +9115,45 @@ cont { } } } +cont { + name: "highway-footway-crossing" + element { + scale: 18 + lines { + width: 1.5 + color: 1308425468 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 245 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 1308425468 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 245 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 1308425468 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 245 + } + } +} cont { name: "highway-footway-demanding_alpine_hiking" element { @@ -9132,10 +9171,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1308425468 + width: 1.1 + color: 1721782290 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9145,10 +9184,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9157,10 +9196,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9183,10 +9222,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1308425468 + width: 1.1 + color: 1721782290 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9196,10 +9235,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9208,10 +9247,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9234,10 +9273,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1308425468 + width: 1.1 + color: 1721782290 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9247,10 +9286,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9259,10 +9298,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9285,10 +9324,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1308425468 + width: 1.1 + color: 1721782290 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9298,10 +9337,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9310,10 +9349,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9336,10 +9375,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1308425468 + width: 1.1 + color: 1721782290 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9349,10 +9388,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9361,29 +9400,17 @@ cont { scale: 20 lines { width: 1.5 - color: 1308425468 + color: 1721782290 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } } } cont { - name: "highway-footway-permissive" - element { - scale: 18 - lines { - width: 1.5 - color: 1308425468 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 130 - } - } + name: "highway-footway-sidewalk" element { scale: 19 lines { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index ef4f90eb5b..94d0d048f5 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 2d05d17929..36516eb91e 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -9003,10 +9003,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1294673959 + width: 1.1 + color: 1720994322 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9016,10 +9016,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9028,10 +9028,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9115,6 +9115,45 @@ cont { } } } +cont { + name: "highway-footway-crossing" + element { + scale: 18 + lines { + width: 1.5 + color: 1294673959 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 245 + } + } + element { + scale: 19 + lines { + width: 1.5 + color: 1294673959 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 245 + } + } + element { + scale: 20 + lines { + width: 1.5 + color: 1294673959 + dashdot { + dd: 5.0 + dd: 2.0 + } + priority: 245 + } + } +} cont { name: "highway-footway-demanding_alpine_hiking" element { @@ -9132,10 +9171,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1294673959 + width: 1.1 + color: 1720994322 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9145,10 +9184,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9157,10 +9196,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9183,10 +9222,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1294673959 + width: 1.1 + color: 1720994322 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9196,10 +9235,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9208,10 +9247,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9234,10 +9273,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1294673959 + width: 1.1 + color: 1720994322 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9247,10 +9286,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9259,10 +9298,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9285,10 +9324,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1294673959 + width: 1.1 + color: 1720994322 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9298,10 +9337,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9310,10 +9349,10 @@ cont { scale: 20 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9336,10 +9375,10 @@ cont { element { scale: 18 lines { - width: 1.5 - color: 1294673959 + width: 1.1 + color: 1720994322 dashdot { - dd: 5.0 + dd: 3.5 dd: 2.0 } priority: 130 @@ -9349,10 +9388,10 @@ cont { scale: 19 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } @@ -9361,29 +9400,17 @@ cont { scale: 20 lines { width: 1.5 - color: 1294673959 + color: 1720994322 dashdot { - dd: 5.0 - dd: 2.0 + dd: 4.0 + dd: 2.5 } priority: 130 } } } cont { - name: "highway-footway-permissive" - element { - scale: 18 - lines { - width: 1.5 - color: 1294673959 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 130 - } - } + name: "highway-footway-sidewalk" element { scale: 19 lines { diff --git a/data/types.txt b/data/types.txt index 5ccbca1812..9f66624a4a 100644 --- a/data/types.txt +++ b/data/types.txt @@ -15,7 +15,7 @@ *landuse|residential *highway|path *highway|bus_stop -*natural|tree +*highway|footway|sidewalk *place|locality *natural|coastline *place|village @@ -48,7 +48,7 @@ *landuse|farmland *barrier|fence *natural|water|lake -*power|pole +*highway|footway|crossing *waterway|riverbank *highway|path|bicycle *landuse|meadow @@ -150,7 +150,7 @@ leisure|pitch *railway|tram *amenity|toilets *natural|water|basin -*highway|footway|permissive +highway|footway *leisure|picnic_table *landuse|construction *tourism|viewpoint diff --git a/data/visibility.txt b/data/visibility.txt index bb2e6a4eee..88bad4616f 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -422,12 +422,13 @@ world 000000000000000000000 + alpine_hiking 000000000000000001111 - area 000000000000000000111 - bridge 000000000000000000111 - + crossing 000000000000000000111 - demanding_alpine_hiking 000000000000000001111 - demanding_mountain_hiking 000000000000000001111 - difficult_alpine_hiking 000000000000000001111 - hiking 000000000000000001111 - mountain_hiking 000000000000000001111 - - permissive 000000000000000000111 - + sidewalk 000000000000000000011 - tunnel 000000000000000000000 - {} ford 000000000000001111111 - @@ -757,7 +758,6 @@ world 000000000000000000000 + scrub 000000000000001111111 - spring 000000000000000000000 - strait 000000000000000000000 - - tree 000000000000000000000 - tree_row 000000000000000000000 - volcano 000000000000000000000 - water 111111111111111111111 + @@ -857,7 +857,6 @@ world 000000000000000000000 + solar 000000000000000000000 - wind 000000000000000000000 - {} - pole 000000000000000000000 - station 000000000000000000000 - substation 000000000000000000000 - tower 000000000000000000000 -