From f992584a5d4daa60f6a0c5a34c51190bf29ac10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lena=20Br=C3=BCder?= Date: Sun, 14 Jan 2024 09:51:18 +0100 Subject: [PATCH] adds landuse=village_green and landuse=allotments (#206) --- .../com/protomaps/basemap/layers/Landuse.java | 6 ++++- .../protomaps/basemap/layers/LanduseTest.java | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/tiles/src/main/java/com/protomaps/basemap/layers/Landuse.java b/tiles/src/main/java/com/protomaps/basemap/layers/Landuse.java index 5f446bf7..243e2963 100644 --- a/tiles/src/main/java/com/protomaps/basemap/layers/Landuse.java +++ b/tiles/src/main/java/com/protomaps/basemap/layers/Landuse.java @@ -19,7 +19,7 @@ public void processFeature(SourceFeature sf, FeatureCollector features) { sf.hasTag("amenity", "hospital", "school", "kindergarten", "university", "college") || sf.hasTag("boundary", "national_park", "protected_area") || sf.hasTag("landuse", "recreation_ground", "industrial", "brownfield", "railway", "cemetery", "commercial", - "grass", "orchard", "farmland", "farmyard", "residential", "military") || + "grass", "orchard", "farmland", "farmyard", "residential", "military", "village_green", "allotments") || sf.hasTag("leisure", "park", "garden", "golf_course", "dog_park", "playground", "pitch", "nature_reserve") || sf.hasTag("man_made", "pier", "bridge") || sf.hasTag("natural", "beach") || @@ -45,6 +45,10 @@ public void processFeature(SourceFeature sf, FeatureCollector features) { kind = "farmland"; } else if (sf.hasTag("landuse", "residential")) { kind = "residential"; + } else if (sf.hasTag("landuse", "village_green")) { + kind = "village_green"; + } else if (sf.hasTag("landuse", "allotments")) { + kind = "allotments"; } else if (sf.hasTag("landuse", "industrial", "brownfield")) { kind = "industrial"; } else if (sf.hasTag("landuse", "military")) { diff --git a/tiles/src/test/java/com/protomaps/basemap/layers/LanduseTest.java b/tiles/src/test/java/com/protomaps/basemap/layers/LanduseTest.java index 8c57b33a..3a38a725 100644 --- a/tiles/src/test/java/com/protomaps/basemap/layers/LanduseTest.java +++ b/tiles/src/test/java/com/protomaps/basemap/layers/LanduseTest.java @@ -21,4 +21,30 @@ void simple() { 0 ))); } + + @Test + void landuseVillageGreen() { + assertFeatures(15, + List.of(Map.of("pmap:kind", "village_green")), + process(SimpleFeature.create( + newPolygon(0, 0, 0, 1, 1, 1, 0, 0), + new HashMap<>(Map.of("landuse", "village_green")), + "osm", + null, + 0 + ))); + } + + @Test + void landuseAllotments() { + assertFeatures(15, + List.of(Map.of("pmap:kind", "allotments")), + process(SimpleFeature.create( + newPolygon(0, 0, 0, 1, 1, 1, 0, 0), + new HashMap<>(Map.of("landuse", "allotments")), + "osm", + null, + 0 + ))); + } }