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

Update with latest commits #1

Merged
merged 3 commits into from
Jan 28, 2019
Merged

Update with latest commits #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8e6bc2
Fix layering order for "construction=*" highway categories (#3646)
jeisenbe Jan 24, 2019
3e751b4
Add rendering for ref of track roads (#3654)
jeisenbe Jan 24, 2019
d9f5fdf
Improve rendering of text labels on admin and nature-reserve borders …
jeisenbe Jan 27, 2019
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
8 changes: 8 additions & 0 deletions admin.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,11 @@ overlapping borders correctly.
text-fill: @admin-boundaries;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-largest-bbox-only: false;
text-placement: line;
text-spacing: 750;
text-repeat-distance: 250;
text-margin: 10;
text-clip: true;
text-vertical-alignment: middle;
text-dy: -10;
Expand All @@ -222,7 +226,11 @@ overlapping borders correctly.
text-fill: green;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-largest-bbox-only: false;
text-placement: line;
text-spacing: 750;
text-repeat-distance: 250;
text-margin: 10;
text-clip: true;
text-vertical-alignment: middle;
text-dy: -10;
Expand Down
10 changes: 7 additions & 3 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,7 @@ Layer:
ELSE 'no'
END AS link,
COALESCE(layer,0) AS layernotnull,
osm_id,
z_order
FROM planet_osm_line
WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage'))
Expand Down Expand Up @@ -897,6 +898,7 @@ Layer:
ELSE 'INT-normal'::text END AS service,
'no' AS link,
COALESCE(layer,0) AS layernotnull,
osm_id,
z_order
FROM planet_osm_line
WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage'))
Expand All @@ -910,7 +912,8 @@ Layer:
CASE WHEN substring(feature for 8) = 'railway_' THEN 2 ELSE 1 END,
CASE WHEN feature IN ('railway_INT-preserved-ssy', 'railway_INT-spur-siding-yard', 'railway_tram-service') THEN 0 ELSE 1 END,
CASE WHEN access IN ('no', 'private') THEN 0 WHEN access IN ('destination') THEN 1 ELSE 2 END,
CASE WHEN int_surface IN ('unpaved') THEN 0 ELSE 2 END
CASE WHEN int_surface IN ('unpaved') THEN 0 ELSE 2 END,
osm_id
) AS roads_fill
properties:
minzoom: 10
Expand Down Expand Up @@ -1885,12 +1888,12 @@ Layer:
osm_id,
way,
COALESCE(
CASE WHEN highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') THEN highway ELSE NULL END,
CASE WHEN highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential', 'track') THEN highway ELSE NULL END,
CASE WHEN aeroway IN ('runway', 'taxiway') THEN aeroway ELSE NULL END
) AS highway,
string_to_array(ref, ';') AS refs
FROM planet_osm_line
WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') OR aeroway IN ('runway', 'taxiway'))
WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential', 'track') OR aeroway IN ('runway', 'taxiway'))
AND ref IS NOT NULL
) AS p) AS q
WHERE height <= 4 AND width <= 11
Expand All @@ -1903,6 +1906,7 @@ Layer:
WHEN highway = 'tertiary' THEN 34
WHEN highway = 'unclassified' THEN 33
WHEN highway = 'residential' THEN 32
WHEN highway = 'track' THEN 30
WHEN highway = 'runway' THEN 6
WHEN highway = 'taxiway' THEN 5
ELSE NULL
Expand Down
28 changes: 28 additions & 0 deletions roads.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3028,6 +3028,34 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
}
}

[highway = 'track'] {
[zoom >= 15] {
text-name: "[refs]";
text-size: 8;
text-dy: 5;

[zoom >= 16] {
text-size: 9;
text-dy: 7;
}
[zoom >= 17] {
text-size: 11;
text-dy: 9;
}

text-clip: false;
text-fill: #222;
text-face-name: @book-fonts;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-margin: 10;
text-placement: line;
text-spacing: 760;
text-repeat-distance: @major-highway-text-repeat-distance;
text-vertical-alignment: middle;
}
}

[highway = 'runway'],
[highway = 'taxiway'] {
[zoom >= 15] {
Expand Down