diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSender.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSender.java index e194827..0ac424e 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSender.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSender.java @@ -68,7 +68,7 @@ public class DataConflationSender implements RunnableFuture { @Override public void run() { String url = MapWithAIConflationCategory.conflationUrlFor(category); - if (!Utils.isBlank(url) && !NetworkManager.isOffline(url)) { + if (!Utils.isStripEmpty(url) && !NetworkManager.isOffline(url)) { this.client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build(); try { final var form = new TreeMap(); diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java index 96a1edb..697b2cd 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java @@ -403,7 +403,7 @@ public class GetDataRunnable extends RecursiveTask { .map(entry -> new Pair<>(Tag.ofString(entry.getKey()), Tag.ofString(entry.getValue()))) .collect(Collectors.toMap(pair -> pair.a, pair -> pair.b)); MapWithAIPreferenceHelper.getReplacementTags().entrySet().stream() - .filter(entry -> !entry.getKey().equals(EQUALS) && Utils.isBlank(entry.getValue())) + .filter(entry -> !entry.getKey().equals(EQUALS) && Utils.isStripEmpty(entry.getValue())) .map(entry -> new Tag(entry.getKey(), null)).forEach(tag -> replaceTags.put(tag, tag)); replaceTags(dataSet, replaceTags); } @@ -417,7 +417,7 @@ public class GetDataRunnable extends RecursiveTask { public static void replaceTags(DataSet dataSet, Map replaceTags) { replaceTags.forEach((orig, replace) -> dataSet.allNonDeletedPrimitives().stream() .filter(prim -> prim.hasTag(orig.getKey(), orig.getValue()) - || (prim.hasKey(orig.getKey()) && Utils.isBlank(orig.getValue()))) + || (prim.hasKey(orig.getKey()) && Utils.isStripEmpty(orig.getValue()))) .forEach(prim -> prim.put(replace))); } diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java index f7ec2e3..c5977de 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java @@ -128,7 +128,7 @@ public final class MapWithAIDataUtils { realBounds.size() * urls.size()); for (var bound : realBounds) { for (var url : urls) { - if (url.getUrl() != null && !Utils.isBlank(url.getUrl())) { + if (url.getUrl() != null && !Utils.isStripEmpty(url.getUrl())) { final var ds = download(monitor, bound, url, maximumDimensions); downloadedDataSets.add(ds); MapWithAIDataUtils.getForkJoinPool().execute(ds);