fix isEmpty

onthegomap · Sep 22, 2023 · 119211c · 119211c
1 parent 080045b
commit 119211c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileWeights.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/TileWeights.java
@@ -108,7 +108,7 @@ public static TileWeights readFromFile(Path path) {
   }
 
   public boolean isEmpty() {
-    return byZoom.entrySet().stream().anyMatch(e -> e.getValue() > 0);
+    return byZoom.values().stream().noneMatch(e -> e > 0);
   }
 
   @JsonPropertyOrder({"z", "x", "y", "loads"})

diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/util/TileWeightsTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/util/TileWeightsTest.java
@@ -1,6 +1,8 @@
 package com.onthegomap.planetiler.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.onthegomap.planetiler.geo.TileCoord;
 import java.io.IOException;
@@ -20,12 +22,14 @@ void test() {
     assertEquals(0, weights.getWeight(TileCoord.ofXYZ(0, 0, 1)));
     assertEquals(0, weights.getWeight(TileCoord.ofXYZ(1, 0, 1)));
     assertEquals(0, weights.getZoomWeight(1));
+    assertTrue(weights.isEmpty());
 
     weights.put(TileCoord.ofXYZ(0, 0, 0), 1);
     weights.put(TileCoord.ofXYZ(0, 0, 0), 2);
     weights.put(TileCoord.ofXYZ(0, 0, 1), 3);
     weights.put(TileCoord.ofXYZ(1, 0, 1), 4);
 
+    assertFalse(weights.isEmpty());
     assertEquals(3, weights.getWeight(TileCoord.ofXYZ(0, 0, 0)));
     assertEquals(3, weights.getZoomWeight(0));
     assertEquals(3, weights.getWeight(TileCoord.ofXYZ(0, 0, 1)));