From 01919dcc744764e712c57dc58a44f5a6ef083943 Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Sat, 3 Feb 2024 00:53:07 +0800 Subject: [PATCH 1/2] Tiles 3.4.0; Styles 2.0.0-alpha.5 * add landuse_urban_green layer to styles for village_green, allotments, playgrounds --- CHANGELOG.md | 5 +++++ app/src/examples.json | 7 +++++++ styles/package-lock.json | 4 ++-- styles/package.json | 2 +- styles/src/base_layers.ts | 20 +++++++++++++++++++ .../java/com/protomaps/basemap/Basemap.java | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5465e3ff..b5fc901d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +Tiles v3.4.0, Styles v2.0.0-alpha.5 +------ +- Add `village_green`, `landuse`, `allotments` to POI layer via @lenalebt [#204] +- Add to styles via `landuse_urban_green` layer + Tiles v3.3.0 ------ - Improve water generalization detail by doing area filtering post-merge [#198] diff --git a/app/src/examples.json b/app/src/examples.json index 40c79903..ff8d84b8 100644 --- a/app/src/examples.json +++ b/app/src/examples.json @@ -61,5 +61,12 @@ "tags": ["water"], "center": [-0.3, 51.4], "zoom": 8.9 + }, + { + "name": "landuse-urban-green", + "description": "show village_green, allotments, playgrounds", + "center": [7.3217, 51.50406], + "tags": [], + "zoom": 15 } ] diff --git a/styles/package-lock.json b/styles/package-lock.json index 2437fc3c..23cbc38e 100644 --- a/styles/package-lock.json +++ b/styles/package-lock.json @@ -1,12 +1,12 @@ { "name": "protomaps-themes-base", - "version": "2.0.0-alpha.4", + "version": "2.0.0-alpha.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "protomaps-themes-base", - "version": "2.0.0-alpha.4", + "version": "2.0.0-alpha.5", "license": "BSD-3-Clause", "devDependencies": { "@biomejs/biome": "^1.5.3", diff --git a/styles/package.json b/styles/package.json index 478c9ff3..0121ebe8 100644 --- a/styles/package.json +++ b/styles/package.json @@ -1,6 +1,6 @@ { "name": "protomaps-themes-base", - "version": "2.0.0-alpha.4", + "version": "2.0.0-alpha.5", "description": "Protomaps basemap themes for MapLibre GL JS", "main": "dist/index.cjs", "module": "dist/index.mjs", diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts index abbf3ccb..98d6146e 100644 --- a/styles/src/base_layers.ts +++ b/styles/src/base_layers.ts @@ -53,6 +53,26 @@ export function nolabels_layers( ], }, }, + { + id: "landuse_urban_green", + type: "fill", + source: source, + "source-layer": "landuse", + filter: [ + "any", + [ + "in", + "pmap:kind", + "allotments", + "village_green", + "playground" + ], + ], + paint: { + "fill-color": t.park_b, + "fill-opacity": 0.7 + }, + }, { id: "landuse_hospital", type: "fill", diff --git a/tiles/src/main/java/com/protomaps/basemap/Basemap.java b/tiles/src/main/java/com/protomaps/basemap/Basemap.java index 9f330935..b083c7d1 100644 --- a/tiles/src/main/java/com/protomaps/basemap/Basemap.java +++ b/tiles/src/main/java/com/protomaps/basemap/Basemap.java @@ -92,7 +92,7 @@ public String description() { @Override public String version() { - return "3.3.0"; + return "3.4.0"; } @Override From 2a5bb5a6d309a4c2f5dc1b8cac7dce484e00fa6b Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Sat, 3 Feb 2024 01:00:08 +0800 Subject: [PATCH 2/2] formatting --- styles/src/base_layers.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts index 98d6146e..77288886 100644 --- a/styles/src/base_layers.ts +++ b/styles/src/base_layers.ts @@ -60,17 +60,11 @@ export function nolabels_layers( "source-layer": "landuse", filter: [ "any", - [ - "in", - "pmap:kind", - "allotments", - "village_green", - "playground" - ], + ["in", "pmap:kind", "allotments", "village_green", "playground"], ], paint: { "fill-color": t.park_b, - "fill-opacity": 0.7 + "fill-opacity": 0.7, }, }, {