Skip to content

Fix natural parks #490

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix natural parks #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58fc288
Fix natural parks
wipfli May 27, 2025
59fc7c0
Format
wipfli May 27, 2025
cfd5444
Add glacier render test
wipfli Jun 2, 2025
9f969fc
Update
wipfli Jun 2, 2025
f443364
Merge branch 'main' into fix-natural-parks
wipfli Jun 2, 2025
b43affc
Merge
wipfli Jun 2, 2025
6e19f1d
Merge branch 'main' into fix-natural-parks
wipfli Jun 2, 2025
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
Binary file added render-tests/tests/landuse/glacier/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added render-tests/tests/landuse/glacier/input.osm.pbf
View file
Open in desktop
Binary file not shown.
17 changes: 17 additions & 0 deletions render-tests/tests/landuse/glacier/style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 8,
"metadata": {
"test": {
"width": 256,
"height": 256,
"flavor": "light",
"lang": "en"
},
"link": "https://github.com/protomaps/basemaps/pull/490"
},
"center": [
8.2716,
46.59517
],
"zoom": 14
}
25 changes: 2 additions & 23 deletions styles/src/base_layers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,15 @@ export function nolabels_layers(
filter: [
"in",
"kind",
"national_park",
"park",
"cemetery",
"protected_area",
"nature_reserve",
"forest",
"golf_course",
"wood",
"nature_reserve",
"forest",
"scrub",
"grassland",
"grass",
"glacier",
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We forgot this one in the past. Now high-zoom glaciers are visible again. Maybe I should add a render test for this...

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I think the render test is most useful for this class of issue, but do we have enough data in the CI sample data?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Not yet but I an create a slice

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Added a render test for glaciers

"military",
"naval_base",
"airfield",
Expand All @@ -90,26 +86,9 @@ export function nolabels_layers(
[
"in",
["get", "kind"],
[
"literal",
[
"national_park",
"park",
"cemetery",
"protected_area",
"nature_reserve",
"forest",
"golf_course",
],
],
["literal", ["park", "cemetery", "golf_course", "wood", "forest"]],
],
t.park_b,
[
"in",
["get", "kind"],
["literal", ["wood", "nature_reserve", "forest"]],
],
t.wood_b,
Copy link

Choose a reason for hiding this comment

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

I just noticed that this removes the use of the wood color. Was that intentional? Seems like a useful distinction to me

["in", ["get", "kind"], ["literal", ["scrub", "grassland", "grass"]]],
t.scrub_b,
["in", ["get", "kind"], ["literal", ["glacier"]]],
Expand Down
Loading