From 6ecb132b36a3f8b2c77c397338efbd5ca50a4092 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 29 Nov 2023 19:50:41 +0200 Subject: [PATCH 1/6] [generator] Pull route=hiking tag from relations Signed-off-by: Konstantin Pastbin --- generator/relation_tags.cpp | 9 +++++++++ generator/translator.cpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/generator/relation_tags.cpp b/generator/relation_tags.cpp index a83792ba52..e5ead468fb 100644 --- a/generator/relation_tags.cpp +++ b/generator/relation_tags.cpp @@ -144,7 +144,16 @@ void RelationTagsWay::Process(RelationElement const & e) if (route == "bicycle") Base::AddCustomTag({"bicycle", "yes"}); else if (route == "foot" || route == "hiking") + { Base::AddCustomTag({"foot", "yes"}); + + if (route == "hiking") + { + auto const hw = m_current->GetTag("highway"); + if (hw == "path" || hw == "track" || hw == "bridleway" || hw == "footway") + Base::AddCustomTag({"route", "hiking"}); + } + } } if (!fetchTags) diff --git a/generator/translator.cpp b/generator/translator.cpp index 6b36d088ab..f9e196ad76 100644 --- a/generator/translator.cpp +++ b/generator/translator.cpp @@ -46,7 +46,7 @@ void Translator::Emit(OsmElement const & src) if (!m_filter->IsAccepted(element)) return; - m_tagsEnricher(element); + m_tagsEnricher(element); // Pull necessary tags from relations. m_collector->Collect(element); m_featureMaker->Add(element); // A feature is created from OSM tags. feature::FeatureBuilder feature; -- 2.45.3 From cf614504c50f784496dd9db94f01b7b1a47d2590 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 29 Nov 2023 19:51:59 +0200 Subject: [PATCH 2/6] [classif] Add hiking routes subtypes Signed-off-by: Konstantin Pastbin --- data/mapcss-mapping.csv | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b210ff295d..44e32c6e9c 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -184,7 +184,7 @@ amenity|recycling|container;[amenity=recycling][recycling_type=container];;name; leisure|garden;110; landuse|commercial;111; railway|station;112; -highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113; +highway|path|hiking;[highway=path][sac_scale=hiking];;name;int_name;113; amenity|hospital;114; waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115; highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116; @@ -1679,3 +1679,7 @@ amenity|compressed_air;1592; leisure|hackerspace;1593; railway|station|subway|singapore;[railway=station][transport=subway][city=singapore],[railway=station][station=subway][city=singapore];;name;int_name;1594; railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;name;int_name;1595; +highway|path|hiking_route;[highway=path][route=hiking];;name;int_name;1596; +highway|track|hiking_route;[highway=track][route=hiking];;name;int_name;1597; +highway|footway|hiking_route;[highway=footway][route=hiking];;name;int_name;1598; +highway|bridleway|hiking_route;[highway=bridleway][route=hiking];;name;int_name;1599; \ No newline at end of file -- 2.45.3 From 293d60c7cad06cb3d4a9f8270d90e5063825e8da Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 6 Dec 2023 22:56:18 +0200 Subject: [PATCH 3/6] [styles] Outdoors: reduce visibility of waterway=stream/canal Signed-off-by: Konstantin Pastbin --- data/styles/outdoors/include/Basemap.mapcss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss index 61bfff1f8e..2a6ff9d676 100644 --- a/data/styles/outdoors/include/Basemap.mapcss +++ b/data/styles/outdoors/include/Basemap.mapcss @@ -6,9 +6,9 @@ line|z10-[waterway=river], line|z10-[waterway=riverbank], -line|z11-[waterway=stream], -line|z11-[waterway=canal], line|z11-[natural=strait], +line|z12-[waterway=canal], +line|z12-[waterway=stream], line|z13-[waterway=fish_pass], line|z15-[waterway=ditch], line|z15-[waterway=drain], @@ -19,8 +19,8 @@ line|z15-[waterway=drain], line|z10-[waterway=river], line|z10-[waterway=riverbank], line|z11-[natural=strait], -line|z11-[waterway=stream], -line|z11-[waterway=canal], +line|z12-[waterway=stream], +line|z12-[waterway=canal], line|z13-[waterway=fish_pass], {text-color: @water_label; text-halo-opacity: 0.5; text-halo-radius: 1; text-halo-color: @label_halo_light;} @@ -32,8 +32,8 @@ line|z11-12[waterway=river], line|z11-12[waterway=riverbank], line|z11-12[natural=strait], {width: 2;} -line|z11-12[waterway=stream], -line|z11-12[waterway=canal], +line|z12[waterway=stream], +line|z12[waterway=canal], {width: 1;} line|z13[waterway=river], @@ -45,7 +45,7 @@ line|z13[waterway=canal], line|z13[waterway=fish_pass], {width: 1.3;} line|z11-12[waterway=stream][intermittent], -{width: 0;} +{width: 0; text: none;} line|z13[waterway=stream][intermittent], {width: 1; dashes: 2.7,2.7;} -- 2.45.3 From f57de1cc95fdda1e486098b58bc50b775478430b Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 6 Dec 2023 22:58:00 +0200 Subject: [PATCH 4/6] [styles] Main: fix color of [highway=footway][sac_scale] to be same as path Signed-off-by: Konstantin Pastbin --- data/styles/clear/include/Roads.mapcss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index 0a1363b982..468a32c4ea 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -608,14 +608,14 @@ line|z14-[highway=raceway], {color: @track;opacity: 1;} line|z15-[leisure=track][!area], {color: @sport;opacity: 1;} -line|z14-[highway=path], -line|z14-[highway=footway][sac_scale], -{color: @path;opacity: 1;} line|z14-[highway=bridleway] {color: @bridleway;opacity: 1;} line|z15-[highway=footway], line|z15-[highway=steps] {color: @footway;opacity: 1;} +line|z14-[highway=path], +line|z14-[highway=footway][sac_scale], +{color: @path;opacity: 1;} line|z16-[highway=pedestrian][tunnel?] {color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;} line|z17-[highway=footway][tunnel?]::tunnelBackground, -- 2.45.3 From 305f5c47a55d5d1320aed6b17b1f5c554a61833d Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 6 Dec 2023 23:05:44 +0200 Subject: [PATCH 5/6] [styles] Outdoors: emphasize hiking routes, reduce vis of ordinary trails Signed-off-by: Konstantin Pastbin --- .../clear/include/priorities_3_FG.prio.txt | 6 ++ .../include/priorities_4_overlays.prio.txt | 6 ++ data/styles/outdoors/include/Roads.mapcss | 52 ++++++++++-- .../outdoors/include/priorities_3_FG.prio.txt | 80 ++++++++++--------- .../include/priorities_4_overlays.prio.txt | 68 +++++++++------- .../vehicle/include/priorities_3_FG.prio.txt | 6 ++ 6 files changed, 143 insertions(+), 75 deletions(-) diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index 746e1b45ec..9abf327333 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -260,6 +260,12 @@ highway-service-parking_aisle # line z15- (also has pathte highway-service-tunnel # line z15- (also has pathtext z16-) === 190 +highway-bridleway-hiking_route +highway-footway-hiking_route +highway-path-hiking_route +highway-track-hiking_route +=== 185 + highway-footway # line z15- (also has pathtext z15-) highway-footway-alpine_hiking # line z14- (also has pathtext z15-) highway-footway-area # line z15- and area z14- (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 61a3a574ac..3d99438ab5 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -694,6 +694,12 @@ highway-ford # icon z16- and pathtext z16 natural-rock # icon z15- === 2850 +highway-bridleway-hiking_route +highway-footway-hiking_route +highway-path-hiking_route +highway-track-hiking_route +=== 2830 + highway-footway-alpine_hiking # pathtext z15- (also has line z14-) highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z14-) highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z14-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index 0c58cd54b3..6d9a3c5193 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -51,8 +51,10 @@ line|z11-[highway=track], {color: @track;opacity: 1;} line|z11-[highway=path], +line|z11-[highway=bridleway][route], line|z11-[highway=footway][sac_scale], -{color: @path;opacity: 1;} +line|z11-[highway=footway][route], +{color: @path; opacity: 1;} /* 8.5 Construction & Proposed 13-22 ZOOM */ @@ -67,10 +69,8 @@ line|z11-12[highway=proposed] /* 8.6 Track & Path 14-22 ZOOM */ -line|z11[highway=track], -{width: 1.1; dashes: 6,2.5;} line|z12[highway=track], -{width: 1.3; dashes: 6,2.5;} +{width: 1.3; dashes: 5,2.5;} line|z13[highway=track], {width: 1.6; dashes: 7,3;} line|z14[highway=track], @@ -84,9 +84,23 @@ line|z17[highway=track], line|z18-[highway=track], {width: 5; dashes: 12,4;} -line|z11[highway=path], -line|z11[highway=footway][sac_scale], -{width: 1; dashes: 3.5,2;} +line|z11[highway=track][route], +{width: 1.6; dashes: 5,2.5;} +line|z12[highway=track][route], +{width: 2;} +line|z13[highway=track][route], +{width: 2.5;} +line|z14[highway=track][route], +{width: 3.2;} +line|z15[highway=track][route], +{width: 4;} +line|z16[highway=track][route], +{width: 5;} +line|z17[highway=track][route], +{width: 6.2;} +line|z18-[highway=track][route], +{width: 7.5;} + line|z12[highway=path], line|z12[highway=footway][sac_scale], {width: 1.1; dashes: 3.5,2;} @@ -109,6 +123,30 @@ line|z18-[highway=path], line|z18-[highway=footway][sac_scale], {width: 4; dashes: 8,4.5;} +line|z11[highway=path][route], +{width: 1.3; dashes: 3.5,2;} +line|z12[highway=path][route], +line|z12[highway=footway][route], +{width: 1.6;} +line|z13[highway=path][route], +line|z13[highway=footway][route], +{width: 2;} +line|z14[highway=path][route], +line|z14[highway=footway][route], +{width: 2.6;} +line|z15[highway=path][route], +line|z15[highway=footway][route], +{width: 3.3;} +line|z16[highway=path][route], +line|z16[highway=footway][route], +{width: 4;} +line|z17[highway=path][route], +line|z17[highway=footway][route], +{width: 5;} +line|z18-[highway=path][route], +line|z18-[highway=footway][route], +{width: 6;} + /* 9.RAIL 11-22 ZOOM */ line|z10-[railway=rail], diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 2fa0bd5e29..7bd3534069 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -260,41 +260,47 @@ highway-service-parking_aisle # line z15- (also has pathte highway-service-tunnel # line z13- (also has pathtext z16-) === 190 +highway-bridleway-hiking_route +highway-footway-hiking_route +highway-path-hiking_route +highway-track-hiking_route +=== 185 + highway-footway # line z15- (also has pathtext z15-) -highway-footway-alpine_hiking # line z11- (also has pathtext z15-) +highway-footway-alpine_hiking # line z12- (also has pathtext z15-) highway-footway-area # line z15- and area z14- (also has pathtext z15-) highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-footway-demanding_alpine_hiking # line z11- (also has pathtext z15-) -highway-footway-demanding_mountain_hiking # line z11- (also has pathtext z15-) -highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z15-) -highway-footway-hiking # line z11- (also has pathtext z15-) -highway-footway-mountain_hiking # line z11- (also has pathtext z15-) +highway-footway-demanding_alpine_hiking # line z12- (also has pathtext z15-) +highway-footway-demanding_mountain_hiking # line z12- (also has pathtext z15-) +highway-footway-difficult_alpine_hiking # line z12- (also has pathtext z15-) +highway-footway-hiking # line z12- (also has pathtext z15-) +highway-footway-mountain_hiking # line z12- (also has pathtext z15-) highway-footway-permissive # line z15- (also has pathtext z15-) highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) -highway-path # line z11- (also has pathtext z13-) -highway-path-alpine_hiking # line z11- (also has pathtext z13-) -highway-path-bicycle # line z11- (also has pathtext z13-) -highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-path-demanding_alpine_hiking # line z11- (also has pathtext z13-) -highway-path-demanding_mountain_hiking # line z11- (also has pathtext z13-) -highway-path-difficult_alpine_hiking # line z11- (also has pathtext z13-) -highway-path-hiking # line z11- (also has pathtext z13-) -highway-path-horse # line z11- (also has pathtext z13-) -highway-path-mountain_hiking # line z11- (also has pathtext z13-) -highway-path-permissive # line z11- (also has pathtext z13-) -highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +highway-path # line z12- (also has pathtext z13-) +highway-path-alpine_hiking # line z12- (also has pathtext z13-) +highway-path-bicycle # line z12- (also has pathtext z13-) +highway-path-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-path-demanding_alpine_hiking # line z12- (also has pathtext z13-) +highway-path-demanding_mountain_hiking # line z12- (also has pathtext z13-) +highway-path-difficult_alpine_hiking # line z12- (also has pathtext z13-) +highway-path-hiking # line z12- (also has pathtext z13-) +highway-path-horse # line z12- (also has pathtext z13-) +highway-path-mountain_hiking # line z12- (also has pathtext z13-) +highway-path-permissive # line z12- (also has pathtext z13-) +highway-path-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, 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-) -highway-track-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-track-grade1 # line z11- (also has pathtext z13-) -highway-track-grade2 # line z11- (also has pathtext z13-) -highway-track-grade3 # line z11- (also has pathtext z13-) -highway-track-grade4 # line z11- (also has pathtext z13-) -highway-track-grade5 # line z11- (also has pathtext z13-) -highway-track-no-access # line z11- (also has pathtext z13-) -highway-track-permissive # line z11- (also has pathtext z13-) -highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +highway-track # line z12- (also has pathtext z13-) +highway-track-area # line z12- (also has pathtext z13-) +highway-track-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-track-grade1 # line z12- (also has pathtext z13-) +highway-track-grade2 # line z12- (also has pathtext z13-) +highway-track-grade3 # line z12- (also has pathtext z13-) +highway-track-grade4 # line z12- (also has pathtext z13-) +highway-track-grade5 # line z12- (also has pathtext z13-) +highway-track-no-access # line z12- (also has pathtext z13-) +highway-track-permissive # line z12- (also has pathtext z13-) +highway-track-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) leisure-track # line z15- (also has caption z16-) === 180 @@ -320,7 +326,7 @@ highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (al highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) +highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-) highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) @@ -332,7 +338,7 @@ highway-service-bridge::bridgewhite # line::bridgewhite z16- (al highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z18-) -highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) +highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) @@ -354,7 +360,7 @@ highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (al highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) +highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-) highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) @@ -366,7 +372,7 @@ highway-service-bridge::bridgeblack # line::bridgeblack z16- (al highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z18-) -highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) +highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) @@ -435,18 +441,18 @@ isoline-zero # line z15- (also has pathte highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) -highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-) -highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) === 50 highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) -highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-) -highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) === 40 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 83c56f50b1..d6b1d19ad1 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -682,9 +682,9 @@ natural-water-drain # caption z17- (also has are natural-water-lock # caption z10- (also has area z1-) natural-water-moat # caption z17- (also has area z1-) natural-water-wastewater # caption z17- (also has area z12-) -waterway-canal # pathtext z13- (also has line z11-) +waterway-canal # pathtext z13- (also has line z12-) waterway-fish_pass # pathtext z13- (also has line z13-) -waterway-stream # pathtext z13- (also has line z11-) +waterway-stream # pathtext z13- (also has line z12-) waterway-stream-ephemeral # pathtext z13- (also has line z13-) waterway-stream-intermittent # pathtext z13- (also has line z13-) waterway-weir # pathtext z15- (also has line z14-) @@ -694,25 +694,31 @@ highway-ford # icon z14- and pathtext z16 natural-rock # icon z15- === 2850 -highway-footway-alpine_hiking # pathtext z15- (also has line z11-) -highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z11-) -highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z11-) -highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z11-) -highway-footway-hiking # pathtext z15- (also has line z11-) -highway-footway-mountain_hiking # pathtext z15- (also has line z11-) +highway-bridleway-hiking_route +highway-footway-hiking_route +highway-path-hiking_route +highway-track-hiking_route +=== 2830 + +highway-footway-alpine_hiking # pathtext z15- (also has line z12-) +highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z12-) +highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z12-) +highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z12-) +highway-footway-hiking # pathtext z15- (also has line z12-) +highway-footway-mountain_hiking # pathtext z15- (also has line z12-) highway-footway-permissive # pathtext z15- (also has line z15-) -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-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-) -highway-path-difficult_alpine_hiking # pathtext z13- (also has line z11-) -highway-path-hiking # pathtext z13- (also has line z11-) -highway-path-horse # pathtext z13- (also has line z11-) -highway-path-mountain_hiking # pathtext z13- (also has line z11-) -highway-path-permissive # pathtext z13- (also has line z11-) -highway-path-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-path # pathtext z13- (also has line z12-) +highway-path-alpine_hiking # pathtext z13- (also has line z12-) +highway-path-bicycle # pathtext z13- (also has line z12-) +highway-path-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-path-demanding_alpine_hiking # pathtext z13- (also has line z12-) +highway-path-demanding_mountain_hiking # pathtext z13- (also has line z12-) +highway-path-difficult_alpine_hiking # pathtext z13- (also has line z12-) +highway-path-hiking # pathtext z13- (also has line z12-) +highway-path-horse # pathtext z13- (also has line z12-) +highway-path-mountain_hiking # pathtext z13- (also has line z12-) +highway-path-permissive # pathtext z13- (also has line z12-) +highway-path-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2820 highway-steps # pathtext z16- (also has line z15-) @@ -726,17 +732,17 @@ highway-bridleway-permissive # pathtext z15- (also has li highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2790 -highway-track # pathtext z13- (also has line z11-) -highway-track-area # pathtext z13- (also has line z11-) -highway-track-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-track-grade1 # pathtext z13- (also has line z11-) -highway-track-grade2 # pathtext z13- (also has line z11-) -highway-track-grade3 # pathtext z13- (also has line z11-) -highway-track-grade4 # pathtext z13- (also has line z11-) -highway-track-grade5 # pathtext z13- (also has line z11-) -highway-track-no-access # pathtext z13- (also has line z11-) -highway-track-permissive # pathtext z13- (also has line z11-) -highway-track-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-track # pathtext z13- (also has line z12-) +highway-track-area # pathtext z13- (also has line z12-) +highway-track-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-track-grade1 # pathtext z13- (also has line z12-) +highway-track-grade2 # pathtext z13- (also has line z12-) +highway-track-grade3 # pathtext z13- (also has line z12-) +highway-track-grade4 # pathtext z13- (also has line z12-) +highway-track-grade5 # pathtext z13- (also has line z12-) +highway-track-no-access # pathtext z13- (also has line z12-) +highway-track-permissive # pathtext z13- (also has line z12-) +highway-track-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2780 highway-service # pathtext z16- (also has line z13-) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 93ca801596..ab52a3c144 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -235,6 +235,12 @@ highway-service-parking_aisle # line z14- (also has pathte highway-service-tunnel # line z14- (also has pathtext z16-) === 140 +highway-bridleway-hiking_route +highway-footway-hiking_route +highway-path-hiking_route +highway-track-hiking_route +=== 135 + highway-bridleway # line z18- highway-bridleway-bridge # line z18- highway-bridleway-permissive # line z18- -- 2.45.3 From 4d8a321de31089840f07ea1c577ab0aebf9e2c49 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 6 Dec 2023 23:09:47 +0200 Subject: [PATCH 6/6] [styles] Outdoors: raise visibility of cycle/bridle/foot-ways Signed-off-by: Konstantin Pastbin --- data/styles/outdoors/include/Roads.mapcss | 85 ++++++++++++++----- .../outdoors/include/Roads_label.mapcss | 16 ++-- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../outdoors/include/priorities_3_FG.prio.txt | 62 +++++++------- .../include/priorities_4_overlays.prio.txt | 24 +++--- 5 files changed, 120 insertions(+), 69 deletions(-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index 6d9a3c5193..e4f85d9ed5 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -47,17 +47,6 @@ line|z19-[highway=service][service=parking_aisle], /* 8.OTHERS ROADS 13-22 ZOOM */ -line|z11-[highway=track], -{color: @track;opacity: 1;} - -line|z11-[highway=path], -line|z11-[highway=bridleway][route], -line|z11-[highway=footway][sac_scale], -line|z11-[highway=footway][route], -{color: @path; opacity: 1;} - -/* 8.5 Construction & Proposed 13-22 ZOOM */ - line|z11-[highway=construction], line|z11-[highway=proposed] {color: @construction; opacity: 1;} @@ -67,7 +56,25 @@ line|z11-12[highway=proposed] {width: 1.2; dashes: 3.6,1.8;} /* see base style for other zooms */ -/* 8.6 Track & Path 14-22 ZOOM */ + +line|z12-[highway=footway], +{color: @footway; opacity: 1;} + +line|z11-[highway=track], +{color: @track;opacity: 1;} + +line|z11-[highway=path], +line|z11-[highway=footway][route], +line|z12-[highway=footway][sac_scale], +{color: @path; opacity: 1;} + +/* TODO: change color to be similar to cycleways. */ +line|z11-[highway=bridleway], +{color: @path; opacity: 1;} + +line|z12-[highway=cycleway] +{color: @cycleway; opacity: 1;} + line|z12[highway=track], {width: 1.3; dashes: 5,2.5;} @@ -102,51 +109,91 @@ line|z18-[highway=track][route], {width: 7.5;} line|z12[highway=path], -line|z12[highway=footway][sac_scale], +line|z12[highway=footway], {width: 1.1; dashes: 3.5,2;} line|z13[highway=path], -line|z13[highway=footway][sac_scale], +line|z13[highway=footway], {width: 1.3; dashes: 4,2.5;} line|z14[highway=path], -line|z14[highway=footway][sac_scale], +line|z14[highway=footway], {width: 1.6; dashes: 4,2.5;} line|z15[highway=path], -line|z15[highway=footway][sac_scale], +line|z15[highway=footway], {width: 2; dashes: 6,3.5;} line|z16[highway=path], -line|z16[highway=footway][sac_scale], +line|z16[highway=footway], {width: 2.6; dashes: 6,3.5;} line|z17[highway=path], -line|z17[highway=footway][sac_scale], +line|z17[highway=footway], {width: 3.3; dashes: 8,4.5;} line|z18-[highway=path], -line|z18-[highway=footway][sac_scale], +line|z18-[highway=footway], {width: 4; dashes: 8,4.5;} +line|z12[highway=bridleway], +{width: 1.1; dashes: 6,1;} +line|z13[highway=bridleway], +{width: 1.3; dashes: 7,1.2;} +line|z14[highway=bridleway], +{width: 1.6; dashes: 7,1.2;} +line|z15[highway=bridleway], +{width: 2; dashes: 9,1.7;} +line|z16[highway=bridleway], +{width: 2.6; dashes: 9,1.7;} +line|z17[highway=bridleway], +{width: 3.3; dashes: 12,2.2;} +line|z18-[highway=bridleway], +{width: 4; dashes: 12,2.2;} + line|z11[highway=path][route], +line|z11[highway=footway][route], +line|z11[highway=bridleway][route], {width: 1.3; dashes: 3.5,2;} line|z12[highway=path][route], line|z12[highway=footway][route], +line|z12[highway=bridleway][route], {width: 1.6;} line|z13[highway=path][route], line|z13[highway=footway][route], +line|z13[highway=bridleway][route], {width: 2;} line|z14[highway=path][route], line|z14[highway=footway][route], +line|z14[highway=bridleway][route], {width: 2.6;} line|z15[highway=path][route], line|z15[highway=footway][route], +line|z15[highway=bridleway][route], {width: 3.3;} line|z16[highway=path][route], line|z16[highway=footway][route], +line|z16[highway=bridleway][route], {width: 4;} line|z17[highway=path][route], line|z17[highway=footway][route], +line|z17[highway=bridleway][route], {width: 5;} line|z18-[highway=path][route], line|z18-[highway=footway][route], +line|z18-[highway=bridleway][route], {width: 6;} + +line|z12[highway=cycleway], +{width: 0.8;} +line|z13[highway=cycleway], +{width: 1.1;} +line|z14[highway=cycleway], +{width: 1.4;} +line|z15[highway=cycleway], +{width: 1.6;} +line|z16[highway=cycleway], +{width: 1.9;} +line|z17[highway=cycleway], +{width: 2.3;} +line|z18-[highway=cycleway], +{width: 2.8;} + /* 9.RAIL 11-22 ZOOM */ line|z10-[railway=rail], diff --git a/data/styles/outdoors/include/Roads_label.mapcss b/data/styles/outdoors/include/Roads_label.mapcss index c5a26109ca..a75c555bda 100644 --- a/data/styles/outdoors/include/Roads_label.mapcss +++ b/data/styles/outdoors/include/Roads_label.mapcss @@ -2,12 +2,16 @@ @import("../../clear/include/Roads_label.mapcss"); -/* 8.OTHERS ROADS 15-22 ZOOM */ - line|z13-[highway=track], line|z13-[highway=path], -{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;} +line|z13-[highway=footway], +line|z13-[highway=bridleway], +line|z13-[highway=cycleway], +{text: name; font-size: 10; text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;} -line|z13-15[highway=path], -line|z13-15[highway=track], -{font-size: 8;} +line|z16-[highway=path], +line|z16-[highway=track], +line|z16-[highway=footway], +line|z16-[highway=bridleway], +line|z16-[highway=cycleway], +{font-size: 12;} diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index ca3a3f2639..973ffb4df1 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -56,7 +56,7 @@ landuse-cemetery-christian # area z14- (also has icon z highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) === 170 -highway-footway-area # area z14- (also has line z15-, pathtext z15-) +highway-footway-area # area z14- (also has line z12-, pathtext z13-) leisure-track-area # area z15- (also has caption z16-) === 160 diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 7bd3534069..6b250be613 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -45,10 +45,10 @@ power-line # line z15- (also has line:: power-line::dash # line::dash z15- (also has line z15-) === 340 -highway-cycleway # line z13- (also has pathtext z15-) -highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-cycleway-permissive # line z13- (also has pathtext z15-) -highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-cycleway # line z12- (also has pathtext z13-) +highway-cycleway-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-cycleway-permissive # line z12- (also has pathtext z13-) +highway-cycleway-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-steps # line z15- (also has pathtext z16-) highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) @@ -266,17 +266,17 @@ highway-path-hiking_route highway-track-hiking_route === 185 -highway-footway # line z15- (also has pathtext z15-) -highway-footway-alpine_hiking # line z12- (also has pathtext z15-) -highway-footway-area # line z15- and area z14- (also has pathtext z15-) -highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-footway-demanding_alpine_hiking # line z12- (also has pathtext z15-) -highway-footway-demanding_mountain_hiking # line z12- (also has pathtext z15-) -highway-footway-difficult_alpine_hiking # line z12- (also has pathtext z15-) -highway-footway-hiking # line z12- (also has pathtext z15-) -highway-footway-mountain_hiking # line z12- (also has pathtext z15-) -highway-footway-permissive # line z15- (also has pathtext z15-) -highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-footway # line z12- (also has pathtext z13-) +highway-footway-alpine_hiking # line z12- (also has pathtext z13-) +highway-footway-area # line z12- and area z14- (also has pathtext z13-) +highway-footway-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-footway-demanding_alpine_hiking # line z12- (also has pathtext z13-) +highway-footway-demanding_mountain_hiking # line z12- (also has pathtext z13-) +highway-footway-difficult_alpine_hiking # line z12- (also has pathtext z13-) +highway-footway-hiking # line z12- (also has pathtext z13-) +highway-footway-mountain_hiking # line z12- (also has pathtext z13-) +highway-footway-permissive # line z12- (also has pathtext z13-) +highway-footway-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-path # line z12- (also has pathtext z13-) highway-path-alpine_hiking # line z12- (also has pathtext z13-) highway-path-bicycle # line z12- (also has pathtext z13-) @@ -304,10 +304,10 @@ highway-track-tunnel # line z12- (also has line:: leisure-track # line z15- (also has caption z16-) === 180 -highway-bridleway # line z14- (also has pathtext z15-) -highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-bridleway-permissive # line z14- (also has pathtext z15-) -highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-bridleway # line z12- (also has pathtext z13-) +highway-bridleway-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-bridleway-permissive # line z12- (also has pathtext z13-) +highway-bridleway-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) === 170 highway-construction # line z11- (also has pathtext z15-) @@ -321,9 +321,9 @@ railway-preserved-bridge # line z13- (also has line:: railway-preserved-tunnel # line z13- === 160 -highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) -highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) -highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) +highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) +highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) @@ -355,9 +355,9 @@ railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (al railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) === 150 -highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) -highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) -highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) +highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) +highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) @@ -438,18 +438,18 @@ isoline-step_500 # line z10- (also has pathte isoline-zero # line z15- (also has pathtext z15-) === 60 -highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) -highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) -highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) +highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) +highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-) highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) === 50 -highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) -highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) -highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) +highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) +highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-) highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index d6b1d19ad1..4529c700e6 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -651,17 +651,17 @@ highway-residential-bridge::shield # shield::shield z15- (also highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-) === 2955 -highway-cycleway # pathtext z15- (also has line z13-) -highway-cycleway-bridge # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-cycleway-permissive # pathtext z15- (also has line z13-) -highway-cycleway-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-cycleway # pathtext z13- (also has line z12-) +highway-cycleway-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-cycleway-permissive # pathtext z13- (also has line z12-) +highway-cycleway-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2953 area:highway-footway # caption z15- (also has area z14-) -highway-footway # pathtext z15- (also has line z15-) -highway-footway-area # pathtext z15- (also has line z15-, area z14-) -highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-footway-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-footway # pathtext z13- (also has line z12-) +highway-footway-area # pathtext z13- (also has line z12-, area z14-) +highway-footway-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-footway-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-tertiary_link # pathtext z18- (also has line z15-) highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-) @@ -726,10 +726,10 @@ highway-steps-bridge # pathtext z16- (also has li highway-steps-tunnel # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2810 -highway-bridleway # pathtext z15- (also has line z14-) -highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-bridleway-permissive # pathtext z15- (also has line z14-) -highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-bridleway # pathtext z13- (also has line z12-) +highway-bridleway-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-bridleway-permissive # pathtext z13- (also has line z12-) +highway-bridleway-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2790 highway-track # pathtext z13- (also has line z12-) -- 2.45.3