From bb74ba9b3a147db2226ae460aa8a454df316925c Mon Sep 17 00:00:00 2001 From: "Maximilian P." Date: Mon, 28 Apr 2025 11:00:22 +0200 Subject: [PATCH 1/2] fix: switch from addNaturalEarthSource to addGeoPackageSource addNaturalEarthSource() is deprecated by planetiler and its now recommended to use addGeoPackageSource(). To make this work we need to adjust of this source to the natural_earth_vector.gpkg.zip file from natural earth. --- tiles/src/main/java/com/protomaps/basemap/Basemap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tiles/src/main/java/com/protomaps/basemap/Basemap.java b/tiles/src/main/java/com/protomaps/basemap/Basemap.java index 07209e5d1..9c862dd32 100644 --- a/tiles/src/main/java/com/protomaps/basemap/Basemap.java +++ b/tiles/src/main/java/com/protomaps/basemap/Basemap.java @@ -159,15 +159,15 @@ static void run(Arguments args) throws IOException { Path dataDir = Path.of("data"); Path sourcesDir = dataDir.resolve("sources"); - Path nePath = sourcesDir.resolve("natural_earth_vector.sqlite.zip"); - String neUrl = "https://naciscdn.org/naturalearth/packages/natural_earth_vector.sqlite.zip"; + Path nePath = sourcesDir.resolve("natural_earth_vector.gpkg.zip"); + String neUrl = "https://naciscdn.org/naturalearth/packages/natural_earth_vector.gpkg.zip"; var countryCoder = CountryCoder.fromJarResource(); String area = args.getString("area", "geofabrik area to download", "monaco"); var planetiler = Planetiler.create(args) - .addNaturalEarthSource("ne", nePath, neUrl) + .addGeoPackageSource("ne", nePath, neUrl) .addOsmSource("osm", Path.of("data", "sources", area + ".osm.pbf"), "geofabrik:" + area) .addShapefileSource("osm_water", sourcesDir.resolve("water-polygons-split-3857.zip"), "https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip") From 0a8e07443e14aef7c1f9a63d5c28144e40031a17 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Tue, 13 May 2025 10:59:13 +0200 Subject: [PATCH 2/2] Avoid null in switch --- .../src/main/java/com/protomaps/basemap/layers/Boundaries.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiles/src/main/java/com/protomaps/basemap/layers/Boundaries.java b/tiles/src/main/java/com/protomaps/basemap/layers/Boundaries.java index fb9c1ade2..2d0a604f0 100644 --- a/tiles/src/main/java/com/protomaps/basemap/layers/Boundaries.java +++ b/tiles/src/main/java/com/protomaps/basemap/layers/Boundaries.java @@ -43,7 +43,7 @@ public void processNe(SourceFeature sf, FeatureCollector features) { } if (!kind.isEmpty()) { - switch (sf.getString("featurecla")) { + switch (sf.getString("featurecla", "")) { case "Disputed (please verify)" -> { kind = "country"; disputed = true;