From f9d4a347247c75a7f821d886065f690ab90167cb Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 12 Sep 2019 23:58:36 +0900 Subject: [PATCH 01/10] Add rendering of man_made=pipeline ways Select pipelines with location Also select pipelines with bridge Adjust pipeline width by zoom level --- project.mml | 9 ++++++ style/aerialways.mss | 74 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/project.mml b/project.mml index 29eb0dc955..0a6c03e090 100644 --- a/project.mml +++ b/project.mml @@ -844,9 +844,18 @@ Layer: (SELECT way, aerialway, + man_made, name FROM planet_osm_line WHERE aerialway IS NOT NULL + OR (man_made = 'pipeline' + AND tags-> 'location' IN ('overground', 'overhead', 'surface', 'outdoor', 'platform') + OR bridge IN ('yes', 'aqueduct', 'boardwalk', 'cantilever', 'covered', 'trestle', 'viaduct')) + ORDER BY + CASE + WHEN man_made = 'pipeline' THEN 1 + WHEN aerialway IS NOT NULL THEN 2 + END ) AS aerialways properties: minzoom: 12 diff --git a/style/aerialways.mss b/style/aerialways.mss index 478c6a5320..8a33e2918d 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -22,7 +22,8 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-min-distance: 18; + text-repeat-distance: 100; + text-margin: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -54,7 +55,8 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-min-distance: 18; + text-repeat-distance: 100; + text-margin: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -92,7 +94,8 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-min-distance: 18; + text-repeat-distance: 100; + text-margin: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -103,4 +106,69 @@ } } } + + [man_made = 'pipeline'] { + [zoom >= 12] { + line/line-width: 0.5; + line/line-join: round; + line/line-color: #707070; + line/line-dasharray: 0,1,16,1; + line/line-clip: false; + dash/line-width: 1.5; + dash/line-join: round; + dash/line-color: #707070; + dash/line-dasharray: 0,1,0.5,15,0.5,1; + [zoom >= 14] { + line/line-width: 0.7; + line/line-dasharray: 0,1,20,1; + dash/line-width: 2; + dash/line-dasharray: 0,1,0.7,18.6,0.7,1; + } + [zoom >= 15] { + line/line-width: 1; + line/line-dasharray: 0,1,20,1; + dash/line-width: 3; + dash/line-dasharray: 0,1,1,18,1,1; + } + [zoom >= 17] { + line/line-width: 1.5; + line/line-dasharray: 0,1,24,1; + dash/line-width: 4; + dash/line-dasharray: 0,1,1,22,1,1; + text-name: "[name]"; + text-fill: #666666; + text-size: 10; + text-dy: 4; + text-spacing: 900; + text-clip: false; + text-placement: line; + text-repeat-distance: 200; + text-margin: 18; + text-face-name: @book-fonts; + text-halo-radius: @standard-halo-radius; + text-halo-fill: @standard-halo-fill; + } + [zoom >= 18] { + line/line-width: 3; + line/line-dasharray: 0,1,30,1; + line/line-join: round; + line/line-color: #707070; + dash/line-join: round; + dash/line-color: #707070; + dash/line-width: 6; + dash/line-dasharray: 0,1,1,28,1,1; + center/line-color: @land-color; + center/line-width: 1; + center/line-dasharray: 0,2,28,2; + center/line-join: round; + } + [zoom >= 19] { + text-size: 11; + text-dy: 5; + line/line-width: 4; + dash/line-width: 8; + center/line-width: 2; + } + } + } } From 93142581a8e64be734a4b7450536da2c53ec3679 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 25 Oct 2019 21:47:49 +0900 Subject: [PATCH 02/10] Adjust pipeline rendering by substance, layer by bridge Adjust pipeline width Wider especially at lower zoom levels, but outer dash not as wide Change substance=water pipeline center to river-color --- project.mml | 5 ++++- style/aerialways.mss | 49 ++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/project.mml b/project.mml index 0a6c03e090..01f8b08eca 100644 --- a/project.mml +++ b/project.mml @@ -845,6 +845,8 @@ Layer: way, aerialway, man_made, + tags->'substance' AS substance, + tags->'type' AS type, name FROM planet_osm_line WHERE aerialway IS NOT NULL @@ -854,7 +856,8 @@ Layer: ORDER BY CASE WHEN man_made = 'pipeline' THEN 1 - WHEN aerialway IS NOT NULL THEN 2 + WHEN bridge IS NOT NULL THEN 2 + WHEN aerialway IS NOT NULL THEN 3 END ) AS aerialways properties: diff --git a/style/aerialways.mss b/style/aerialways.mss index 8a33e2918d..e4e8d461be 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -108,33 +108,37 @@ } [man_made = 'pipeline'] { - [zoom >= 12] { - line/line-width: 0.5; + [zoom >= 14] { + line/line-width: 1; line/line-join: round; line/line-color: #707070; line/line-dasharray: 0,1,16,1; - line/line-clip: false; - dash/line-width: 1.5; + line/line-cap: square + dash/line-width: 3; dash/line-join: round; dash/line-color: #707070; - dash/line-dasharray: 0,1,0.5,15,0.5,1; - [zoom >= 14] { - line/line-width: 0.7; - line/line-dasharray: 0,1,20,1; - dash/line-width: 2; - dash/line-dasharray: 0,1,0.7,18.6,0.7,1; - } - [zoom >= 15] { - line/line-width: 1; + dash/line-dasharray: 0,1,1,14,1,1; + [zoom >= 16] { + line/line-width: 1.5; line/line-dasharray: 0,1,20,1; - dash/line-width: 3; + dash/line-width: 3.5; dash/line-dasharray: 0,1,1,18,1,1; + center/line-color: @land-color; + center/line-width: 0.5; + center/line-dasharray: 0,2,18,2; + center/line-join: round; + center/line-cap: square + [substance = 'water'], [type = 'water'] { center/line-color: @river-color; } + [substance = 'gas'], [type = 'gas'] { center/line-color: white; } + [substance = 'oil'], [type = 'oil'] { center/line-color: #888; } } [zoom >= 17] { - line/line-width: 1.5; + line/line-width: 2; line/line-dasharray: 0,1,24,1; dash/line-width: 4; dash/line-dasharray: 0,1,1,22,1,1; + center/line-width: 1; + center/line-dasharray: 0,2,22,2; text-name: "[name]"; text-fill: #666666; text-size: 10; @@ -151,22 +155,19 @@ [zoom >= 18] { line/line-width: 3; line/line-dasharray: 0,1,30,1; - line/line-join: round; - line/line-color: #707070; - dash/line-join: round; - dash/line-color: #707070; - dash/line-width: 6; + dash/line-width: 5; dash/line-dasharray: 0,1,1,28,1,1; - center/line-color: @land-color; - center/line-width: 1; + center/line-width: 1.5; center/line-dasharray: 0,2,28,2; - center/line-join: round; + [substance = 'water'] { center/line-color: @water-color; } + [substance = 'gas'] { center/line-color: white; } + [substance = 'oil'] { center/line-color: #888; } } [zoom >= 19] { text-size: 11; text-dy: 5; line/line-width: 4; - dash/line-width: 8; + dash/line-width: 6; center/line-width: 2; } } From 202078439bed7287aff56caa14a0c50d12fe935f Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Tue, 29 Oct 2019 13:28:58 +0900 Subject: [PATCH 03/10] Adjust substance colors Also remove line-cap: square which does not work --- project.mml | 10 +++++----- style/aerialways.mss | 16 ++++++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/project.mml b/project.mml index 01f8b08eca..2feb422128 100644 --- a/project.mml +++ b/project.mml @@ -846,18 +846,18 @@ Layer: aerialway, man_made, tags->'substance' AS substance, - tags->'type' AS type, name FROM planet_osm_line WHERE aerialway IS NOT NULL OR (man_made = 'pipeline' - AND tags-> 'location' IN ('overground', 'overhead', 'surface', 'outdoor', 'platform') - OR bridge IN ('yes', 'aqueduct', 'boardwalk', 'cantilever', 'covered', 'trestle', 'viaduct')) + AND tags-> 'location' IN ('overground', 'overhead', 'surface', 'outdoor') + OR bridge IN ('yes', 'aqueduct', 'cantilever', 'covered', 'trestle', 'viaduct')) ORDER BY CASE WHEN man_made = 'pipeline' THEN 1 - WHEN bridge IS NOT NULL THEN 2 - WHEN aerialway IS NOT NULL THEN 3 + WHEN tags-> 'location' = 'overhead' THEN 2 + WHEN bridge IS NOT NULL THEN 3 + WHEN aerialway IS NOT NULL THEN 4 END ) AS aerialways properties: diff --git a/style/aerialways.mss b/style/aerialways.mss index e4e8d461be..568dbccff4 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -113,7 +113,6 @@ line/line-join: round; line/line-color: #707070; line/line-dasharray: 0,1,16,1; - line/line-cap: square dash/line-width: 3; dash/line-join: round; dash/line-color: #707070; @@ -127,10 +126,9 @@ center/line-width: 0.5; center/line-dasharray: 0,2,18,2; center/line-join: round; - center/line-cap: square - [substance = 'water'], [type = 'water'] { center/line-color: @river-color; } - [substance = 'gas'], [type = 'gas'] { center/line-color: white; } - [substance = 'oil'], [type = 'oil'] { center/line-color: #888; } + [substance = 'water'] { center/line-color: @water-color; } + [substance = 'gas'] { center/line-color: #d0d0d0; } + [substance = 'oil'] { center/line-color: #999; } } [zoom >= 17] { line/line-width: 2; @@ -142,7 +140,7 @@ text-name: "[name]"; text-fill: #666666; text-size: 10; - text-dy: 4; + text-dy: 6; text-spacing: 900; text-clip: false; text-placement: line; @@ -153,19 +151,17 @@ text-halo-fill: @standard-halo-fill; } [zoom >= 18] { + text-dy: 7; line/line-width: 3; line/line-dasharray: 0,1,30,1; dash/line-width: 5; dash/line-dasharray: 0,1,1,28,1,1; center/line-width: 1.5; center/line-dasharray: 0,2,28,2; - [substance = 'water'] { center/line-color: @water-color; } - [substance = 'gas'] { center/line-color: white; } - [substance = 'oil'] { center/line-color: #888; } } [zoom >= 19] { text-size: 11; - text-dy: 5; + text-dy: 8; line/line-width: 4; dash/line-width: 6; center/line-width: 2; From 0881ec13901a24a954ddc117ef725d09ff62a67c Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 31 Oct 2019 21:41:31 +0900 Subject: [PATCH 04/10] gas #c1c1c1 Lch(78,0,0) oil #d7bd93 Lch(78,25,83) --- style/aerialways.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style/aerialways.mss b/style/aerialways.mss index 568dbccff4..96d3ca5229 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -127,8 +127,8 @@ center/line-dasharray: 0,2,18,2; center/line-join: round; [substance = 'water'] { center/line-color: @water-color; } - [substance = 'gas'] { center/line-color: #d0d0d0; } - [substance = 'oil'] { center/line-color: #999; } + [substance = 'gas'] { center/line-color: #c1c1c1; } + [substance = 'oil'] { center/line-color: #d7bd93; } } [zoom >= 17] { line/line-width: 2; From 265e7a89c05eb5fecd85a97ee7ef647a46ef3719 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Mon, 4 Nov 2019 13:10:53 +0900 Subject: [PATCH 05/10] Change oil color to cfbfa5 Lch78,15,83 --- style/aerialways.mss | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/style/aerialways.mss b/style/aerialways.mss index 96d3ca5229..0d39625b08 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -22,8 +22,7 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-repeat-distance: 100; - text-margin: 18; + text-min-distance: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -55,8 +54,7 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-repeat-distance: 100; - text-margin: 18; + text-min-distance: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -94,8 +92,7 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-repeat-distance: 100; - text-margin: 18; + text-min-distance: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -127,8 +124,8 @@ center/line-dasharray: 0,2,18,2; center/line-join: round; [substance = 'water'] { center/line-color: @water-color; } - [substance = 'gas'] { center/line-color: #c1c1c1; } - [substance = 'oil'] { center/line-color: #d7bd93; } + [substance = 'gas'] { center/line-color: #c1c1c1; } // Lch(78,0,0) + [substance = 'oil'] { center/line-color: #cfbfa5; } // Lch(78,15,83) } [zoom >= 17] { line/line-width: 2; From f8a4b149cc42b4978dbe89b583538a5969bec928 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Tue, 10 Mar 2020 16:00:53 +0900 Subject: [PATCH 06/10] change aerialway minimum-distance to margin and repeat-distance The property minimum-distance is deprecated and cannot be used with the new properties margin and repeat-distance --- style/aerialways.mss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/style/aerialways.mss b/style/aerialways.mss index 0d39625b08..65377148ef 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -22,7 +22,8 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-min-distance: 18; + text-repeat-distance: 200; + text-margin: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -54,7 +55,8 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-min-distance: 18; + text-repeat-distance: 200; + text-margin: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; @@ -92,7 +94,8 @@ text-spacing: 900; text-clip: false; text-placement: line; - text-min-distance: 18; + text-repeat-distance: 200; + text-margin: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; From ea5d2e8d6406b71cef0502d6563ebba545273d62 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Tue, 10 Mar 2020 19:00:26 +0900 Subject: [PATCH 07/10] Widen pipeline center color, thinner outline Also thinner line at z14 --- style/aerialways.mss | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/style/aerialways.mss b/style/aerialways.mss index 65377148ef..ac9c1bcaf7 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -109,14 +109,24 @@ [man_made = 'pipeline'] { [zoom >= 14] { - line/line-width: 1; + line/line-width: .67; line/line-join: round; line/line-color: #707070; - line/line-dasharray: 0,1,16,1; - dash/line-width: 3; + line/line-dasharray: 0,1,14,1; + dash/line-width: 1.5; dash/line-join: round; dash/line-color: #707070; - dash/line-dasharray: 0,1,1,14,1,1; + dash/line-dasharray: 0,1,1,12,1,1; + [zoom >= 15] { + line/line-width: 1; + line/line-join: round; + line/line-color: #707070; + line/line-dasharray: 0,1,16,1; + dash/line-width: 2.5; + dash/line-join: round; + dash/line-color: #707070; + dash/line-dasharray: 0,1,1,14,1,1; + } [zoom >= 16] { line/line-width: 1.5; line/line-dasharray: 0,1,20,1; @@ -156,7 +166,7 @@ line/line-dasharray: 0,1,30,1; dash/line-width: 5; dash/line-dasharray: 0,1,1,28,1,1; - center/line-width: 1.5; + center/line-width: 2; center/line-dasharray: 0,2,28,2; } [zoom >= 19] { @@ -164,7 +174,7 @@ text-dy: 8; line/line-width: 4; dash/line-width: 6; - center/line-width: 2; + center/line-width: 3; } } } From c06e6f78574e3444532d5f8a48a669d414d868cf Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 12 Mar 2020 23:36:52 +0900 Subject: [PATCH 08/10] Thinner end caps and shorter gaps in pipelines --- style/aerialways.mss | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/style/aerialways.mss b/style/aerialways.mss index ac9c1bcaf7..eaed6a63e5 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -112,29 +112,29 @@ line/line-width: .67; line/line-join: round; line/line-color: #707070; - line/line-dasharray: 0,1,14,1; + line/line-dasharray: 0,0.5,14,0.5; dash/line-width: 1.5; dash/line-join: round; dash/line-color: #707070; - dash/line-dasharray: 0,1,1,12,1,1; + dash/line-dasharray: 0,0.5,0.5,12,0.5,0.5; [zoom >= 15] { line/line-width: 1; line/line-join: round; line/line-color: #707070; - line/line-dasharray: 0,1,16,1; + line/line-dasharray: 0,0.5,16,0.5; dash/line-width: 2.5; dash/line-join: round; dash/line-color: #707070; - dash/line-dasharray: 0,1,1,14,1,1; + dash/line-dasharray: 0,0.5,0.5,14,0.5,0.5; } [zoom >= 16] { line/line-width: 1.5; - line/line-dasharray: 0,1,20,1; + line/line-dasharray: 0,0.5,20,0.5; dash/line-width: 3.5; - dash/line-dasharray: 0,1,1,18,1,1; + dash/line-dasharray: 0,0.5,0.5,18,0.5,0.5; center/line-color: @land-color; - center/line-width: 0.5; - center/line-dasharray: 0,2,18,2; + center/line-width: 1; + center/line-dasharray: 0,1,18,1; center/line-join: round; [substance = 'water'] { center/line-color: @water-color; } [substance = 'gas'] { center/line-color: #c1c1c1; } // Lch(78,0,0) @@ -142,11 +142,11 @@ } [zoom >= 17] { line/line-width: 2; - line/line-dasharray: 0,1,24,1; + line/line-dasharray: 0,0.5,24,0.5; dash/line-width: 4; - dash/line-dasharray: 0,1,1,22,1,1; + dash/line-dasharray: 0,0.5,0.5,22,0.5,0.5; center/line-width: 1; - center/line-dasharray: 0,2,22,2; + center/line-dasharray: 0,1,22,1; text-name: "[name]"; text-fill: #666666; text-size: 10; @@ -163,11 +163,11 @@ [zoom >= 18] { text-dy: 7; line/line-width: 3; - line/line-dasharray: 0,1,30,1; + line/line-dasharray: 0,0.5,30,0.5; dash/line-width: 5; - dash/line-dasharray: 0,1,1,28,1,1; + dash/line-dasharray: 0,0.5,0.5,28,0.5,0.5; center/line-width: 2; - center/line-dasharray: 0,2,28,2; + center/line-dasharray: 0,1,28,1; } [zoom >= 19] { text-size: 11; From cb56283e8bb76755b51f35481063f85198b0d121 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 13 Mar 2020 13:13:41 +0900 Subject: [PATCH 09/10] Adjust pipeline color to lighter gray, slightly larger gaps --- style/aerialways.mss | 56 +++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/style/aerialways.mss b/style/aerialways.mss index eaed6a63e5..c80ea60262 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -111,42 +111,37 @@ [zoom >= 14] { line/line-width: .67; line/line-join: round; - line/line-color: #707070; - line/line-dasharray: 0,0.5,14,0.5; - dash/line-width: 1.5; + line/line-color: #909090; + line/line-dasharray: 0,.67,14,.67; + dash/line-width: 2; dash/line-join: round; - dash/line-color: #707070; - dash/line-dasharray: 0,0.5,0.5,12,0.5,0.5; + dash/line-color: #909090; + dash/line-dasharray: 0,.67,.5,13,.5,.67; [zoom >= 15] { + line/line-width: .67; + line/line-dasharray: 0,.67,16,.67; + dash/line-width: 2; + dash/line-dasharray: 0,.67,.5,15,.5,.67; + } + [zoom >= 16] { line/line-width: 1; - line/line-join: round; - line/line-color: #707070; - line/line-dasharray: 0,0.5,16,0.5; + line/line-dasharray: 0,1,20,1; dash/line-width: 2.5; - dash/line-join: round; - dash/line-color: #707070; - dash/line-dasharray: 0,0.5,0.5,14,0.5,0.5; + dash/line-dasharray: 0,1,1,18,1,1; + } - [zoom >= 16] { - line/line-width: 1.5; - line/line-dasharray: 0,0.5,20,0.5; - dash/line-width: 3.5; - dash/line-dasharray: 0,0.5,0.5,18,0.5,0.5; - center/line-color: @land-color; + [zoom >= 17] { + line/line-width: 2; + line/line-dasharray: 0,1,24,1; + dash/line-width: 4; + dash/line-dasharray: 0,1,1,22,1,1; center/line-width: 1; - center/line-dasharray: 0,1,18,1; + center/line-dasharray: 0,2,22,2; + center/line-color: @land-color; center/line-join: round; [substance = 'water'] { center/line-color: @water-color; } [substance = 'gas'] { center/line-color: #c1c1c1; } // Lch(78,0,0) [substance = 'oil'] { center/line-color: #cfbfa5; } // Lch(78,15,83) - } - [zoom >= 17] { - line/line-width: 2; - line/line-dasharray: 0,0.5,24,0.5; - dash/line-width: 4; - dash/line-dasharray: 0,0.5,0.5,22,0.5,0.5; - center/line-width: 1; - center/line-dasharray: 0,1,22,1; text-name: "[name]"; text-fill: #666666; text-size: 10; @@ -163,18 +158,21 @@ [zoom >= 18] { text-dy: 7; line/line-width: 3; - line/line-dasharray: 0,0.5,30,0.5; + line/line-dasharray: 0,1,30,1; dash/line-width: 5; - dash/line-dasharray: 0,0.5,0.5,28,0.5,0.5; + dash/line-dasharray: 0,1,1,28,1,1; center/line-width: 2; - center/line-dasharray: 0,1,28,1; + center/line-dasharray: 0,2,28,2; } [zoom >= 19] { text-size: 11; text-dy: 8; line/line-width: 4; + line/line-dasharray: 0,1,36,1; dash/line-width: 6; + dash/line-dasharray: 0,1,1,34,1,1; center/line-width: 3; + center/line-dasharray: 0,2,34,2; } } } From 02d7c92d15697ad1538ecd08194921ff65115d7d Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Sat, 14 Mar 2020 10:07:32 +0900 Subject: [PATCH 10/10] Wider end dashes/gaps for z14-15 pipelines, wider z16 line --- style/aerialways.mss | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/style/aerialways.mss b/style/aerialways.mss index c80ea60262..5bec1b9574 100644 --- a/style/aerialways.mss +++ b/style/aerialways.mss @@ -109,26 +109,25 @@ [man_made = 'pipeline'] { [zoom >= 14] { - line/line-width: .67; + line/line-width: .7; line/line-join: round; line/line-color: #909090; - line/line-dasharray: 0,.67,14,.67; + line/line-dasharray: 0,.7,14,.7; dash/line-width: 2; dash/line-join: round; dash/line-color: #909090; - dash/line-dasharray: 0,.67,.5,13,.5,.67; + dash/line-dasharray: 0,.7,.7,12.6,.7,.7; [zoom >= 15] { - line/line-width: .67; - line/line-dasharray: 0,.67,16,.67; - dash/line-width: 2; - dash/line-dasharray: 0,.67,.5,15,.5,.67; + line/line-width: 1; + line/line-dasharray: 0,.7,16,.7; + dash/line-width: 2.5; + dash/line-dasharray: 0,.7,.7,14.6,.7,.7; } [zoom >= 16] { - line/line-width: 1; + line/line-width: 1.5; line/line-dasharray: 0,1,20,1; - dash/line-width: 2.5; + dash/line-width: 3; dash/line-dasharray: 0,1,1,18,1,1; - } [zoom >= 17] { line/line-width: 2;