Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added text-repeat-distance for highway names #3318

Merged
merged 7 commits into from
Nov 6, 2018
Merged

Added text-repeat-distance for highway names #3318

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12bfc8a
Added text-repeat-distance for highway names
Penegal Jul 23, 2018
83ebe42
Merge branch 'master' of https://github.com/gravitystorm/openstreetma…
Penegal Jul 29, 2018
01fb69c
Fixed merge conflict; reverted highway=residential rendering
Penegal Jul 29, 2018
6c0eeab
New version following @kocio-pl advices
Penegal Aug 1, 2018
46e567a
Clarified text-repeat-distance variables names
Penegal Aug 1, 2018
e7dc6a7
Corrected higways text-repeat-distance according to @kocio-pl
Penegal Nov 4, 2018
86dfb70
Corrected living_street block
Penegal Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions roads.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@
@shield-font: @book-fonts;
@shield-clip: false;

@major-highway-text-repeat-distance: 500;
@minor-highway-text-repeat-distance: 100;

@railway-text-repeat-distance: 200;

#roads-casing, #bridges, #tunnels {
Expand Down Expand Up @@ -2812,10 +2815,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-highway-text-repeat-distance;
}
}
}
Expand All @@ -2835,6 +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-highway-text-repeat-distance;
[tunnel = 'no'] {
text-halo-radius: @standard-halo-radius;
[highway = 'motorway'] { text-halo-fill: @motorway-fill; }
Expand Down Expand Up @@ -2867,6 +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-highway-text-repeat-distance;
}
[zoom >= 14] {
text-size: 9;
Expand All @@ -2893,6 +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-highway-text-repeat-distance;
}
[zoom >= 17] {
text-size: 11;
Expand All @@ -2911,6 +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-highway-text-repeat-distance;

[zoom >= 17] {
text-size: 11;
Expand All @@ -2937,6 +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-highway-text-repeat-distance;
[highway = 'unclassified'] { text-repeat-distance: @major-highway-text-repeat-distance;}
}
[zoom >= 16] {
text-size: 9;
Expand Down Expand Up @@ -2966,6 +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-highway-text-repeat-distance;
}
[zoom >= 17] {
text-size: 11;
Expand All @@ -2984,9 +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; }
[highway = 'living_street'] { text-halo-fill: @living-street-fill; text-repeat-distance: @major-highway-text-repeat-distance;}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that text-repeat-distance for living street should be in separate line, so the brackets should create a small inner block.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you fix this remaining issue? Than it would ready to merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kocio-pl : done.

[highway = 'pedestrian'] { text-halo-fill: @pedestrian-fill; }
text-face-name: @book-fonts;
text-repeat-distance: @minor-highway-text-repeat-distance;
}
[zoom >= 16] {
text-size: 9;
Expand Down Expand Up @@ -3026,6 +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-highway-text-repeat-distance;
}
[zoom >= 16] {
text-size: 9;
Expand Down Expand Up @@ -3054,6 +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-highway-text-repeat-distance;
[highway = 'steps'] { text-repeat-distance: @minor-highway-text-repeat-distance; }
}
[zoom >= 17] {
text-size: 11;
Expand Down