diff --git a/data/drules_proto.bin b/data/drules_proto.bin index c424685b6f..48891f3478 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 f0f2956a41..c355d8baca 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -22848,38 +22848,14 @@ cont { } cont { name: "highway-pedestrian-area" - element { - scale: 13 - lines { - width: 1.0 - color: 16777215 - dashdot { - dd: 2.0 - dd: 1.0 - } - priority: 200 - cap: BUTTCAP - } - } element { scale: 14 - lines { - width: 1.6 - color: 16777215 - dashdot { - dd: 3.6 - dd: 1.6 - } - priority: 200 - cap: BUTTCAP - } area { color: 15591638 priority: -1830 } path_text { primary { - height: 10 color: 3355443 stroke_color: 871230427 } @@ -22888,23 +22864,12 @@ cont { } element { scale: 15 - lines { - width: 2.0 - color: 16777215 - dashdot { - dd: 5.0 - dd: 2.2 - } - priority: 200 - cap: BUTTCAP - } area { color: 15591638 priority: -1830 } path_text { primary { - height: 11 color: 3355443 stroke_color: 871230427 } @@ -22913,22 +22878,12 @@ cont { } element { scale: 16 - lines { - width: 2.4 - color: 16777215 - dashdot { - dd: 5.4 - dd: 2.7 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 10 color: 3355443 stroke_color: 872415231 } @@ -22937,22 +22892,12 @@ cont { } element { scale: 17 - lines { - width: 3.0 - color: 16777215 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 10 color: 3355443 stroke_color: 872415231 } @@ -22961,22 +22906,12 @@ cont { } element { scale: 18 - lines { - width: 4.0 - color: 16777215 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 12 color: 3355443 stroke_color: 16777215 } @@ -22985,22 +22920,12 @@ cont { } element { scale: 19 - lines { - width: 5.0 - color: 16777215 - dashdot { - dd: 16.2 - dd: 8.1 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 12 color: 3355443 stroke_color: 16777215 } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index e67886c7b0..2a42977018 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 6d50f33e79..8afc5e9dce 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -22706,38 +22706,14 @@ cont { } cont { name: "highway-pedestrian-area" - element { - scale: 13 - lines { - width: 1.0 - color: 16777215 - dashdot { - dd: 2.0 - dd: 1.0 - } - priority: 200 - cap: BUTTCAP - } - } element { scale: 14 - lines { - width: 1.6 - color: 16777215 - dashdot { - dd: 3.6 - dd: 1.6 - } - priority: 200 - cap: BUTTCAP - } area { color: 15591638 priority: -1830 } path_text { primary { - height: 10 color: 3355443 stroke_color: 871230427 } @@ -22746,23 +22722,12 @@ cont { } element { scale: 15 - lines { - width: 2.0 - color: 16777215 - dashdot { - dd: 5.0 - dd: 2.2 - } - priority: 200 - cap: BUTTCAP - } area { color: 15591638 priority: -1830 } path_text { primary { - height: 11 color: 3355443 stroke_color: 871230427 } @@ -22771,22 +22736,12 @@ cont { } element { scale: 16 - lines { - width: 2.4 - color: 16777215 - dashdot { - dd: 5.4 - dd: 2.7 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 10 color: 3355443 stroke_color: 872415231 } @@ -22795,22 +22750,12 @@ cont { } element { scale: 17 - lines { - width: 3.0 - color: 16777215 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 10 color: 3355443 stroke_color: 872415231 } @@ -22819,22 +22764,12 @@ cont { } element { scale: 18 - lines { - width: 4.0 - color: 16777215 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 12 color: 3355443 stroke_color: 16777215 } @@ -22843,22 +22778,12 @@ cont { } element { scale: 19 - lines { - width: 5.0 - color: 16777215 - dashdot { - dd: 16.2 - dd: 8.1 - } - priority: 200 - } area { color: 15920858 priority: -1830 } path_text { primary { - height: 12 color: 3355443 stroke_color: 16777215 } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index f01dd71a97..a2371a7597 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 9d2b9d319f..de39f70cf5 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -22746,38 +22746,14 @@ cont { } cont { name: "highway-pedestrian-area" - element { - scale: 13 - lines { - width: 1.0 - color: 5064516 - dashdot { - dd: 2.0 - dd: 1.0 - } - priority: 200 - cap: BUTTCAP - } - } element { scale: 14 - lines { - width: 1.6 - color: 5064516 - dashdot { - dd: 3.6 - dd: 1.6 - } - priority: 200 - cap: BUTTCAP - } area { color: 2499106 priority: -1830 } path_text { primary { - height: 10 color: 7829367 stroke_color: 856756480 } @@ -22786,23 +22762,12 @@ cont { } element { scale: 15 - lines { - width: 2.0 - color: 5064516 - dashdot { - dd: 5.0 - dd: 2.2 - } - priority: 200 - cap: BUTTCAP - } area { color: 2499106 priority: -1830 } path_text { primary { - height: 11 color: 7829367 stroke_color: 856756480 } @@ -22811,22 +22776,12 @@ cont { } element { scale: 16 - lines { - width: 2.4 - color: 5064516 - dashdot { - dd: 5.4 - dd: 2.7 - } - priority: 200 - } area { color: 2499106 priority: -1830 } path_text { primary { - height: 10 color: 7829367 stroke_color: 856756480 } @@ -22835,22 +22790,12 @@ cont { } element { scale: 17 - lines { - width: 3.0 - color: 5064516 - dashdot { - dd: 5.0 - dd: 2.0 - } - priority: 200 - } area { color: 2499106 priority: -1830 } path_text { primary { - height: 10 color: 7829367 stroke_color: 856756480 } @@ -22859,22 +22804,12 @@ cont { } element { scale: 18 - lines { - width: 4.0 - color: 5064516 - dashdot { - dd: 7.0 - dd: 3.0 - } - priority: 200 - } area { color: 2499106 priority: -1830 } path_text { primary { - height: 12 color: 7829367 stroke_color: 1118464 } @@ -22883,22 +22818,12 @@ cont { } element { scale: 19 - lines { - width: 5.0 - color: 5064516 - dashdot { - dd: 16.2 - dd: 8.1 - } - priority: 200 - } area { color: 2499106 priority: -1830 } path_text { primary { - height: 12 color: 7829367 stroke_color: 1118464 } diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index 4308841560..09999f4a4c 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -673,6 +673,9 @@ line|z19-[highway=pedestrian], line|z19-[highway=ford] {width: 5;dashes: 16.2,8.1;} +line|z13-[highway=pedestrian][area?], +{width: 0;} + /* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */ line|z16-[highway=pedestrian][tunnel?] diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss index 2814614fd5..8e3755e19a 100644 --- a/data/styles/clear/include/Roads_label.mapcss +++ b/data/styles/clear/include/Roads_label.mapcss @@ -286,6 +286,9 @@ line|z18-[highway=busway], line|z18-[highway=road], {font-size: 12;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +line|z14-[highway=pedestrian][area?], +{font-size: 0;} + /* 8.OTHERS ROADS 15-22 ZOOM */ line|z15-[highway=cycleway], diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt index de98571a70..8df538051f 100644 --- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt @@ -52,7 +52,7 @@ landuse-cemetery # area z14- (also has icon z landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-) === 180 -highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) +highway-pedestrian-area # area z14- (also has pathtext z14-) === 170 highway-footway-area # area z14- (also has line z15-, pathtext z15-) diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index 03bf7e90d4..1b3892f1fe 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -241,7 +241,7 @@ railway-subway-bridge # line z13- (also has line:: highway-ford # line z13- (also has icon z16-, pathtext z16-) highway-pedestrian # line z13- (also has pathtext z14-) -highway-pedestrian-area # line z13- and area z14- (also has pathtext z14-) +highway-pedestrian-area # area z14- (also has pathtext z14-) highway-pedestrian-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) highway-pedestrian-tunnel # line z13- (also has line(casing) z16-, pathtext z14-) === 200 diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index bdf9ed9986..5e7f18a3de 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -627,7 +627,7 @@ highway-bus_stop # icon z16- (also has captio amenity-pharmacy # icon z16- (also has caption(optional) z17-) highway-pedestrian # pathtext z14- (also has line z13-) -highway-pedestrian-area # pathtext z14- (also has line z13-, area z14-) +highway-pedestrian-area # pathtext z14- (also has area z14-) highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-) highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line(casing) z16-) highway-tertiary # pathtext z12- and shield z15- (also has line z11-)