diff --git a/tiles/src/main/java/com/protomaps/basemap/Basemap.java b/tiles/src/main/java/com/protomaps/basemap/Basemap.java index d2d46a38..a5157915 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") 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 fb9c1ade..2d0a604f 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;