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 dog park rendering #4384

Closed
wants to merge 2 commits into from
Closed

Update dog park rendering #4384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f1993
Update dog park rendering
ZeLonewolf Apr 23, 2021
ffc1c61
Merge branch 'gravitystorm:master' into dogpark
ZeLonewolf Sep 12, 2021
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
20 changes: 8 additions & 12 deletions style/amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,14 +1226,14 @@
}
}

[feature = 'leisure_dog_park'][zoom >= 17] {
marker-file: url('symbols/shop/pet.svg');
marker-fill: @leisure-green;
marker-clip: false;
}

[feature = 'leisure_dog_park'][zoom >= 17],
[feature = 'leisure_playground'][zoom >= 17] {
marker-file: url('symbols/leisure/playground.svg');
[feature = 'leisure_playground'] {
marker-file: url('symbols/leisure/playground.svg');
}
[feature = 'leisure_dog_park'] {
marker-file: url('symbols/shop/pet.svg');
}
Comment on lines -1228 to +1235
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change unifies the dog_park and playground styling.

marker-fill: @leisure-green;
marker-clip: false;
[access != ''][access != 'permissive'][access != 'yes'] {
Expand Down Expand Up @@ -2210,6 +2210,7 @@
text-fill: @wetland-text;
}
[feature = 'leisure_park'],
[feature = 'leisure_dog_park'],
[feature = 'leisure_recreation_ground'],
[feature = 'landuse_recreation_ground'],
[feature = 'landuse_village_green'],
Expand Down Expand Up @@ -2307,11 +2308,6 @@
text-halo-radius: 0;
}
}
[feature = 'leisure_dog_park'] {
text-fill: @leisure-green;
text-halo-radius: @standard-halo-radius * 1.5; /* Extra halo needed to stand out from paw pattern. */
text-halo-fill: @standard-halo-fill;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This removes pattern fill styling and replaces it with the simple fill used by park/village green/recreation_ground

[feature = 'leisure_track'] {
text-fill: darken(@track, 40%);
}
Expand Down
15 changes: 1 addition & 14 deletions style/landcover.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@

[feature = 'leisure_recreation_ground'][zoom >= 10],
[feature = 'landuse_recreation_ground'][zoom >= 10],
[feature = 'leisure_dog_park'][zoom >= 13],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adds casing to dog_parks to match playgrounds.

[feature = 'leisure_playground'][zoom >= 13],
[feature = 'leisure_fitness_station'][zoom >= 13] {
polygon-fill: @leisure;
Expand Down Expand Up @@ -261,20 +262,6 @@
}
}

[feature = 'leisure_dog_park'] {
[zoom >= 10] {
polygon-fill: @leisure;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
[zoom >= 16] {
polygon-pattern-file: url('symbols/dog_park.png');
polygon-pattern-alignment: global;
[way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
[way_pixels >= 64] { polygon-pattern-gamma: 0.3; }
}
}

Comment on lines -266 to -279
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removes pattern fill from dog parks. Polygon fill is already handled elsewhere.

[feature = 'leisure_golf_course'][zoom >= 10],
[feature = 'leisure_miniature_golf'][zoom >= 15] {
polygon-fill: @golf_course;
Expand Down
Binary file removed symbols/dog_park.png
View file
Open in desktop
Binary file not shown.