Skip to content

Overture source: allow hive-partitioned directory input #591

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
bdon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Overture source: allow hive-partitioned directory input #591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 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 @@ -6,6 +6,7 @@
import com.onthegomap.planetiler.config.Arguments;
import com.onthegomap.planetiler.reader.parquet.GeoParquetMetadata;
import com.onthegomap.planetiler.util.Downloader;
import com.onthegomap.planetiler.util.Glob;
import com.protomaps.basemap.feature.CountryCoder;
import com.protomaps.basemap.feature.QrankDb;
import com.protomaps.basemap.layers.Boundaries;
Expand Down Expand Up @@ -261,7 +262,7 @@
var countryCoder = CountryCoder.fromJarResource();

String area = args.getString("area", "Geofabrik area name to download, or filename in data/sources/", "");
String overtureFile = args.getString("overture", "Path to Overture Maps Parquet file", "");
String overtureFile = args.getString("overture", "Path to Overture Maps directory or .parquet file", "");

Check failure on line 265 in tiles/src/main/java/com/protomaps/basemap/Basemap.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "overture" 3 times. 


See more on https://sonarcloud.io/project/issues?id=protomaps_basemaps&issues=AZ1uokOuDjjzH7gRO1Wk&open=AZ1uokOuDjjzH7gRO1Wk&pullRequest=591

if (!area.isEmpty() && !overtureFile.isEmpty()) {
LOGGER.error("Error: Cannot specify both --area and --overture");
Expand All @@ -287,10 +288,17 @@
"https://naciscdn.org/naturalearth/packages/natural_earth_vector.sqlite.zip");

if (!overtureFile.isEmpty()) {
Path base = args.inputFile("overture", "overture base directory", Path.of("data", "overture"));
var hivePartitoning = false;
var inputPaths = List.of(Path.of(overtureFile));
if (!overtureFile.endsWith(".parquet")) {

Check failure on line 294 in tiles/src/main/java/com/protomaps/basemap/Basemap.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal ".parquet" 3 times. 


See more on https://sonarcloud.io/project/issues?id=protomaps_basemaps&issues=AZ1uokOuDjjzH7gRO1Wj&open=AZ1uokOuDjjzH7gRO1Wj&pullRequest=591
inputPaths = Glob.of(base).resolve("**", "*.parquet").find();
hivePartitoning = true;
}
// Add Overture Parquet source
planetiler.addParquetSource("pm:overture",
List.of(Path.of(overtureFile)),
false, // not Hive partitioned dirname, just a single file
inputPaths,
hivePartitoning,
fields -> fields.get("id"),
fields -> fields.get("type") // source layer
);
Expand Down
Loading