omit() feature collector api and --refresh-sources arg

onthegomap · Jan 30, 2024 · aa28d25 · aa28d25
1 parent 4d52507
commit aa28d25
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java
@@ -797,6 +797,12 @@ public Feature setNumPointsAttr(String numPointsAttr) {
       return this;
     }
 
+    /** Omit this feature from the output */
+    public Feature omit() {
+      output.remove(this);
+      return this;
+    }
+
     @Override
     public String toString() {
       return "Feature{" +

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/Planetiler.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/Planetiler.java
@@ -83,6 +83,7 @@ public class Planetiler {
   private final Path multipolygonPath;
   private final Path featureDbPath;
   private final boolean downloadSources;
+  private final boolean refreshSources;
   private final boolean onlyDownloadSources;
   private final boolean parseNodeBounds;
   private Profile profile = null;
@@ -117,6 +118,8 @@ private Planetiler(Arguments arguments) {
     tmpDir = config.tmpDir();
     onlyDownloadSources = arguments.getBoolean("only_download", "download source data then exit", false);
     downloadSources = onlyDownloadSources || arguments.getBoolean("download", "download sources", false);
+    refreshSources =
+      arguments.getBoolean("refresh_sources", "download new version of source files if they have changed", false);
     fetchOsmTileStats =
       arguments.getBoolean("download_osm_tile_weights", "download OSM tile weights file", downloadSources);
     nodeDbPath = arguments.file("temp_nodes", "temp node db location", tmpDir.resolve("node.db"));
@@ -891,11 +894,13 @@ private RunnableThatThrows ifSourceUsed(String name, RunnableThatThrows task) {
 
   private Path getPath(String name, String type, Path defaultPath, String defaultUrl) {
     Path path = arguments.file(name + "_path", name + " " + type + " path", defaultPath);
+    boolean refresh =
+      arguments.getBoolean("refresh_" + name, "Download new version of " + name + " if changed", refreshSources);
     boolean freeAfterReading = arguments.getBoolean("free_" + name + "_after_read",
       "delete " + name + " input file after reading to make space for output (reduces peak disk usage)", false);
-    if (downloadSources) {
+    if (downloadSources || refresh) {
       String url = arguments.getString(name + "_url", name + " " + type + " url", defaultUrl);
-      if (!Files.exists(path) && url != null) {
+      if ((!Files.exists(path) || refresh) && url != null) {
         toDownload.add(new ToDownload(name, url, path));
       }
     }

diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/FeatureCollectorTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/FeatureCollectorTest.java
@@ -85,6 +85,17 @@ void testPoint() {
 
   }
 
+  @Test
+  void testOmit() {
+    var collector = factory.get(newReaderFeature(newPoint(0, 0), Map.of(
+      "key", "val"
+    )));
+    var point = collector.point("layername");
+    assertFeatures(14, List.of(Map.of("_layer", "layername")), collector);
+    point.omit();
+    assertFeatures(14, List.of(), collector);
+  }
+
   @Test
   void testAttrWithMinzoom() {
     var collector = factory.get(newReaderFeature(newPoint(0, 0), Map.of(