From 12bfc8a62f8af4fb533c4e6676371c45465d339a Mon Sep 17 00:00:00 2001 From: Penegal Date: Mon, 23 Jul 2018 16:01:06 +0200 Subject: [PATCH 1/6] Added text-repeat-distance for highway names --- roads.mss | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/roads.mss b/roads.mss index 3aef956d25..2302a78752 100644 --- a/roads.mss +++ b/roads.mss @@ -286,6 +286,9 @@ @shield-font: @book-fonts; @shield-clip: false; +@major-highways-text-repeat-distance: 50; +@minor-highways-text-repeat-distance: 200; + #roads-casing, #bridges, #tunnels { ::casing { [zoom >= 12] { @@ -2793,11 +2796,11 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-fill: #000; text-face-name: @book-fonts; - text-min-distance: 40; text-halo-radius: 2; text-halo-fill: @standard-halo-fill; text-spacing: 760; text-clip: false; + text-repeat-distance: @minor-highways-text-repeat-distance; } } @@ -2810,10 +2813,10 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-spacing: 750; text-clip: false; text-placement: line; - text-min-distance: 18; text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; + text-repeat-distance: @minor-highways-text-repeat-distance; } } } @@ -2833,6 +2836,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-clip: false; text-placement: line; text-face-name: @book-fonts; + text-repeat-distance: @major-highways-text-repeat-distance; [tunnel = 'no'] { text-halo-radius: @standard-halo-radius; [highway = 'motorway'] { text-halo-fill: @motorway-fill; } @@ -2865,6 +2869,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @secondary-fill; + text-repeat-distance: @major-highways-text-repeat-distance; } [zoom >= 14] { text-size: 9; @@ -2891,6 +2896,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @tertiary-fill; + text-repeat-distance: @major-highways-text-repeat-distance; } [zoom >= 17] { text-size: 11; @@ -2909,6 +2915,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; text-face-name: @book-fonts; + text-repeat-distance: @major-highways-text-repeat-distance; [zoom >= 17] { text-size: 11; @@ -2935,6 +2942,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-halo-radius: @standard-halo-radius; text-halo-fill: @residential-fill; text-face-name: @book-fonts; + text-repeat-distance: @minor-highways-text-repeat-distance; } [zoom >= 16] { text-size: 9; @@ -2964,6 +2972,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [highway = 'raceway'] { text-halo-fill: @raceway-fill; } [highway = 'service'] { text-halo-fill: @service-fill; } text-face-name: @book-fonts; + text-repeat-distance: @minor-highways-text-repeat-distance; } [zoom >= 17] { text-size: 11; @@ -2985,6 +2994,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [highway = 'living_street'] { text-halo-fill: @living-street-fill; } [highway = 'pedestrian'] { text-halo-fill: @pedestrian-fill; } text-face-name: @book-fonts; + text-repeat-distance: @minor-highways-text-repeat-distance; } [zoom >= 16] { text-size: 9; @@ -3024,6 +3034,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-vertical-alignment: middle; text-dy: 5; + text-repeat-distance: @minor-highways-text-repeat-distance; } [zoom >= 16] { text-size: 9; @@ -3052,6 +3063,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-vertical-alignment: middle; text-dy: 7; + text-repeat-distance: @minor-highways-text-repeat-distance; } [zoom >= 17] { text-size: 11; From 01fb69c49d0649dfaf9cb1cfab7772b495e72492 Mon Sep 17 00:00:00 2001 From: Penegal Date: Sun, 29 Jul 2018 07:53:13 +0200 Subject: [PATCH 2/6] Fixed merge conflict; reverted highway=residential rendering --- roads.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roads.mss b/roads.mss index ce365c3fd5..c5207f3c58 100644 --- a/roads.mss +++ b/roads.mss @@ -2798,11 +2798,11 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-fill: #000; text-face-name: @book-fonts; + text-min-distance: 40; text-halo-radius: 2; text-halo-fill: @standard-halo-fill; text-spacing: 760; text-clip: false; - text-repeat-distance: @minor-highways-text-repeat-distance; } } From 6c0eeab1e9eb21e6abe3b92e1de72e63bee5621c Mon Sep 17 00:00:00 2001 From: Penegal Date: Wed, 1 Aug 2018 11:08:19 +0200 Subject: [PATCH 3/6] New version following @kocio-pl advices --- roads.mss | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/roads.mss b/roads.mss index c5207f3c58..0aae358cb3 100644 --- a/roads.mss +++ b/roads.mss @@ -286,8 +286,8 @@ @shield-font: @book-fonts; @shield-clip: false; -@major-highways-text-repeat-distance: 50; -@minor-highways-text-repeat-distance: 200; +@major-highways-text-repeat-distance: 500; +@minor-highways-text-repeat-distance: 100; @railway-text-repeat-distance: 200; @@ -2945,6 +2945,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-halo-fill: @residential-fill; text-face-name: @book-fonts; text-repeat-distance: @minor-highways-text-repeat-distance; + [highway = 'unclassified'] { text-repeat-distance: @major-highways-text-repeat-distance;} } [zoom >= 16] { text-size: 9; @@ -2974,7 +2975,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [highway = 'raceway'] { text-halo-fill: @raceway-fill; } [highway = 'service'] { text-halo-fill: @service-fill; } text-face-name: @book-fonts; - text-repeat-distance: @minor-highways-text-repeat-distance; + text-repeat-distance: @major-highways-text-repeat-distance; } [zoom >= 17] { text-size: 11; @@ -2993,7 +2994,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-clip: false; text-placement: line; text-halo-radius: @standard-halo-radius; - [highway = 'living_street'] { text-halo-fill: @living-street-fill; } + [highway = 'living_street'] { text-halo-fill: @living-street-fill; text-repeat-distance: @major-highways-text-repeat-distance;} [highway = 'pedestrian'] { text-halo-fill: @pedestrian-fill; } text-face-name: @book-fonts; text-repeat-distance: @minor-highways-text-repeat-distance; @@ -3036,7 +3037,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-vertical-alignment: middle; text-dy: 5; - text-repeat-distance: @minor-highways-text-repeat-distance; + text-repeat-distance: @major-highways-text-repeat-distance; } [zoom >= 16] { text-size: 9; @@ -3065,7 +3066,8 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-vertical-alignment: middle; text-dy: 7; - text-repeat-distance: @minor-highways-text-repeat-distance; + text-repeat-distance: @major-highways-text-repeat-distance; + [highway = 'steps'] { text-repeat-distance: @minor-highways-text-repeat-distance; } } [zoom >= 17] { text-size: 11; From 46e567ae788e82e7007055a1d6809769aedf148d Mon Sep 17 00:00:00 2001 From: Penegal Date: Wed, 1 Aug 2018 14:46:54 +0200 Subject: [PATCH 4/6] Clarified text-repeat-distance variables names --- roads.mss | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/roads.mss b/roads.mss index 0aae358cb3..1c9ef8dbd3 100644 --- a/roads.mss +++ b/roads.mss @@ -286,8 +286,8 @@ @shield-font: @book-fonts; @shield-clip: false; -@major-highways-text-repeat-distance: 500; -@minor-highways-text-repeat-distance: 100; +@major-highway-text-repeat-distance: 500; +@minor-highway-text-repeat-distance: 100; @railway-text-repeat-distance: 200; @@ -2818,7 +2818,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; - text-repeat-distance: @minor-highways-text-repeat-distance; + text-repeat-distance: @minor-highway-text-repeat-distance; } } } @@ -2838,7 +2838,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-clip: false; text-placement: line; text-face-name: @book-fonts; - text-repeat-distance: @major-highways-text-repeat-distance; + text-repeat-distance: @major-highway-text-repeat-distance; [tunnel = 'no'] { text-halo-radius: @standard-halo-radius; [highway = 'motorway'] { text-halo-fill: @motorway-fill; } @@ -2871,7 +2871,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @secondary-fill; - text-repeat-distance: @major-highways-text-repeat-distance; + text-repeat-distance: @major-highway-text-repeat-distance; } [zoom >= 14] { text-size: 9; @@ -2898,7 +2898,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-halo-radius: @standard-halo-radius; text-halo-fill: @tertiary-fill; - text-repeat-distance: @major-highways-text-repeat-distance; + text-repeat-distance: @major-highway-text-repeat-distance; } [zoom >= 17] { text-size: 11; @@ -2917,7 +2917,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; text-face-name: @book-fonts; - text-repeat-distance: @major-highways-text-repeat-distance; + text-repeat-distance: @major-highway-text-repeat-distance; [zoom >= 17] { text-size: 11; @@ -2944,8 +2944,8 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-halo-radius: @standard-halo-radius; text-halo-fill: @residential-fill; text-face-name: @book-fonts; - text-repeat-distance: @minor-highways-text-repeat-distance; - [highway = 'unclassified'] { text-repeat-distance: @major-highways-text-repeat-distance;} + text-repeat-distance: @minor-highway-text-repeat-distance; + [highway = 'unclassified'] { text-repeat-distance: @major-highway-text-repeat-distance;} } [zoom >= 16] { text-size: 9; @@ -2975,7 +2975,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [highway = 'raceway'] { text-halo-fill: @raceway-fill; } [highway = 'service'] { text-halo-fill: @service-fill; } text-face-name: @book-fonts; - text-repeat-distance: @major-highways-text-repeat-distance; + text-repeat-distance: @major-highway-text-repeat-distance; } [zoom >= 17] { text-size: 11; @@ -2994,10 +2994,10 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-clip: false; text-placement: line; text-halo-radius: @standard-halo-radius; - [highway = 'living_street'] { text-halo-fill: @living-street-fill; text-repeat-distance: @major-highways-text-repeat-distance;} + [highway = 'living_street'] { text-halo-fill: @living-street-fill; text-repeat-distance: @major-highway-text-repeat-distance;} [highway = 'pedestrian'] { text-halo-fill: @pedestrian-fill; } text-face-name: @book-fonts; - text-repeat-distance: @minor-highways-text-repeat-distance; + text-repeat-distance: @minor-highway-text-repeat-distance; } [zoom >= 16] { text-size: 9; @@ -3037,7 +3037,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-vertical-alignment: middle; text-dy: 5; - text-repeat-distance: @major-highways-text-repeat-distance; + text-repeat-distance: @major-highway-text-repeat-distance; } [zoom >= 16] { text-size: 9; @@ -3066,8 +3066,8 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-face-name: @book-fonts; text-vertical-alignment: middle; text-dy: 7; - text-repeat-distance: @major-highways-text-repeat-distance; - [highway = 'steps'] { text-repeat-distance: @minor-highways-text-repeat-distance; } + text-repeat-distance: @major-highway-text-repeat-distance; + [highway = 'steps'] { text-repeat-distance: @minor-highway-text-repeat-distance; } } [zoom >= 17] { text-size: 11; From e7dc6a72e6ddee6a783a55c91b1dde6c77b4a26e Mon Sep 17 00:00:00 2001 From: Penegal Date: Sun, 4 Nov 2018 11:03:42 +0100 Subject: [PATCH 5/6] Corrected higways text-repeat-distance according to @kocio-pl --- roads.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roads.mss b/roads.mss index 1c9ef8dbd3..b86ec952f2 100644 --- a/roads.mss +++ b/roads.mss @@ -286,8 +286,8 @@ @shield-font: @book-fonts; @shield-clip: false; -@major-highway-text-repeat-distance: 500; -@minor-highway-text-repeat-distance: 100; +@major-highway-text-repeat-distance: 50; +@minor-highway-text-repeat-distance: 10; @railway-text-repeat-distance: 200; From 86dfb701c26cb0240a8ce1fb64fb0f620e02a31b Mon Sep 17 00:00:00 2001 From: Penegal Date: Tue, 6 Nov 2018 15:14:13 +0100 Subject: [PATCH 6/6] Corrected living_street block --- roads.mss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roads.mss b/roads.mss index b86ec952f2..1ad33243b6 100644 --- a/roads.mss +++ b/roads.mss @@ -2994,7 +2994,10 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ text-clip: false; text-placement: line; text-halo-radius: @standard-halo-radius; - [highway = 'living_street'] { text-halo-fill: @living-street-fill; text-repeat-distance: @major-highway-text-repeat-distance;} + [highway = 'living_street'] { + text-halo-fill: @living-street-fill; + text-repeat-distance: @major-highway-text-repeat-distance; + } [highway = 'pedestrian'] { text-halo-fill: @pedestrian-fill; } text-face-name: @book-fonts; text-repeat-distance: @minor-highway-text-repeat-distance;