Skip to content

fix: switch from addNaturalEarthSource to addGeoPackageSource #474

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 3 commits into
base: main
Choose a base branch
from
Open

fix: switch from addNaturalEarthSource to addGeoPackageSource #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb74ba9
fix: switch from addNaturalEarthSource to addGeoPackageSource
mxzinke Apr 28, 2025
9a3177e
Merge branch 'main' into fix-deprecated-natural-earth-source
wipfli May 13, 2025
0a8e074
Avoid null in switch
wipfli May 13, 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
6 changes: 3 additions & 3 deletions tiles/src/main/java/com/protomaps/basemap/Basemap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tiles/src/main/java/com/protomaps/basemap/layers/Boundaries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading