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

Move leisure=track #5021

Closed
wants to merge 2 commits into from
Closed

Move leisure=track #5021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4fe6ba
Move leisure=track
dch0ph Oct 12, 2024
f6cd168
[fixup]
dch0ph Oct 12, 2024
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
22 changes: 14 additions & 8 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,17 @@ Layer:
<<: *osm2pgsql
table: |-
(SELECT
way
way,
COALESCE(
'leisure_' || CASE WHEN leisure = 'track' THEN 'track' END,
'attraction_' || CASE WHEN tags @> 'attraction=>water_slide' THEN 'water_slide' END,
'man_made_' || CASE WHEN man_made = 'cutline' THEN 'cutline' END
) AS feature
FROM planet_osm_line
WHERE man_made = 'cutline'
WHERE leisure = 'track'
OR tags @> 'attraction=>water_slide'
OR man_made = 'cutline'
ORDER BY COALESCE(layer,0)
) AS landcover_line
properties:
minzoom: 14
Expand Down Expand Up @@ -1772,15 +1780,13 @@ Layer:
(SELECT
way,
COALESCE(
'highway_' || CASE WHEN tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones' THEN 'ford' END,
'leisure_' || CASE WHEN leisure IN ('slipway', 'track') THEN leisure END,
'attraction_' || CASE WHEN tags @> 'attraction=>water_slide' THEN 'water_slide' END
'highway_' || CASE WHEN tags -> 'ford' IN ('yes', 'stepping_stones') THEN 'ford' END,
'leisure_' || CASE WHEN leisure IN ('slipway') THEN leisure END
) AS feature
FROM planet_osm_line
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
WHERE tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones'
OR leisure IN ('slipway', 'track')
OR tags @> 'attraction=>water_slide'
WHERE tags -> 'ford' IN ('yes', 'stepping_stones')
OR leisure = 'slipway'
ORDER BY COALESCE(layer,0)
) AS amenity_line
properties:
Expand Down
36 changes: 0 additions & 36 deletions style/amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3006,42 +3006,6 @@
marker-file: url('symbols/leisure/slipway.svg');
marker-fill: @transportation-icon;
}

[feature = 'leisure_track'] {
[zoom >= 16] {
[zoom >= 17] {
bridgecasing/line-color: saturate(darken(@pitch, 30%), 20%);
bridgecasing/line-join: round;
bridgecasing/line-width: 1.25;
[zoom >= 18] { bridgecasing/line-width: 2.5; }
[zoom >= 19] { bridgecasing/line-width: 5; }
}
line-color: @pitch;
line-join: round;
line-cap: round;
line-width: 1;
[zoom >= 18] { line-width: 2; }
[zoom >= 19] { line-width: 4; }
}
}

[feature = 'attraction_water_slide'] {
[zoom >= 16] {
[zoom >= 17] {
bridgecasing/line-color: black;
bridgecasing/line-join: round;
bridgecasing/line-width: 1.25;
[zoom >= 18] { bridgecasing/line-width: 2.5; }
[zoom >= 19] { bridgecasing/line-width: 5; }
}
line-color: @pitch;
line-join: round;
line-cap: round;
line-width: 1;
[zoom >= 18] { line-width: 2; }
[zoom >= 19] { line-width: 4; }
}
}
}

#text-line {
Expand Down
55 changes: 46 additions & 9 deletions style/landcover.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,18 +724,55 @@
}
}

/* man_made=cutline */
#landcover-line {
[zoom >= 14] {
line-width: 3;
line-join: round;
line-cap: square;
line-color: @grass;
[feature = 'man_made_cutline'] {
[zoom >= 14] {
line-width: 3;
line-join: round;
line-cap: square;
line-color: @grass;
[zoom >= 16] {
line-width: 6;
[zoom >= 18] {
line-width: 12;
}
}
}
}

[feature = 'leisure_track'] {
[zoom >= 16] {
[zoom >= 17] {
bridgecasing/line-color: saturate(darken(@pitch, 30%), 20%);
bridgecasing/line-join: round;
bridgecasing/line-width: 1.25;
[zoom >= 18] { bridgecasing/line-width: 2.5; }
[zoom >= 19] { bridgecasing/line-width: 5; }
}
line-color: @pitch;
line-join: round;
line-cap: round;
line-width: 1;
[zoom >= 18] { line-width: 2; }
[zoom >= 19] { line-width: 4; }
}
}

[feature = 'attraction_water_slide'] {
[zoom >= 16] {
line-width: 6;
[zoom >= 18] {
line-width: 12;
[zoom >= 17] {
bridgecasing/line-color: black;
bridgecasing/line-join: round;
bridgecasing/line-width: 1.25;
[zoom >= 18] { bridgecasing/line-width: 2.5; }
[zoom >= 19] { bridgecasing/line-width: 5; }
}
line-color: @pitch;
line-join: round;
line-cap: round;
line-width: 1;
[zoom >= 18] { line-width: 2; }
[zoom >= 19] { line-width: 4; }
}
}
}
Expand Down
Loading