diff --git a/flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java b/flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java index 32a152a4..2ddb43f2 100644 --- a/flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java +++ b/flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java @@ -94,12 +94,13 @@ public class ToiletsOverlay implements Profile { } static void run(Arguments args) throws Exception { + String area = args.getString("area", "geofabrik area to download", "monaco"); // FlatmapRunner is a convenience wrapper around the lower-level API for the most common use-cases. // See ToiletsOverlayLowLevelApi for an example using this same profile but the lower-level API FlatmapRunner.create(args) .setProfile(new ToiletsOverlay()) // override this default with osm_path="path/to/data.osm.pbf" - .addOsmSource("osm", Path.of("data", "sources", "input.pbf")) + .addOsmSource("osm", Path.of("data", "sources", area + ".osm.pbf"), "geofabrik:" + area) // override this default with mbtiles="path/to/output.mbtiles" .overwriteOutput("mbtiles", Path.of("data", "toilets.mbtiles")) .run(); diff --git a/scripts/test-release.sh b/scripts/test-release.sh index 89127f83..539879d7 100755 --- a/scripts/test-release.sh +++ b/scripts/test-release.sh @@ -20,7 +20,7 @@ java -jar flatmap-dist/target/*with-deps.jar --download --area=monaco --mbtiles= echo "::endgroup::" echo "::group::Example (java)" rm -f data/out.mbtiles -java -jar flatmap-dist/target/*with-deps.jar example-bikeroutes --download --area=monaco --mbtiles=data/out.mbtiles +java -jar flatmap-dist/target/*with-deps.jar example-toilets --download --area=monaco --mbtiles=data/out.mbtiles ./scripts/check-mbtiles.sh data/out.mbtiles echo "::endgroup::" @@ -32,6 +32,6 @@ docker run -v "$(pwd)/data":/data ghcr.io/onthegomap/flatmap:"${version}" --area echo "::endgroup::" echo "::group::Example (docker)" rm -f data/out.mbtiles -docker run -v "$(pwd)/data":/data ghcr.io/onthegomap/flatmap:"${version}" example-bikeroutes --area=monaco --mbtiles=data/out.mbtiles +docker run -v "$(pwd)/data":/data ghcr.io/onthegomap/flatmap:"${version}" example-toilets --area=monaco --mbtiles=data/out.mbtiles ./scripts/check-mbtiles.sh data/out.mbtiles echo "::endgroup::"