From 119211c5e10c6cbeafebea93e0a15d9fd01e7a35 Mon Sep 17 00:00:00 2001 From: Mike Barry Date: Thu, 21 Sep 2023 21:17:23 -0400 Subject: [PATCH] fix isEmpty --- .../main/java/com/onthegomap/planetiler/util/TileWeights.java | 2 +- .../java/com/onthegomap/planetiler/util/TileWeightsTest.java | 4 ++++ 2 files changed, 5 insertions(+), 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 index 400c03b4..e6f0c1ab 100644 --- 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 class TileWeights { } 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 index 26c90a0c..78aa7bed 100644 --- 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 @@ class TileWeightsTest { 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)));