mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

drop deprecated isBlank usage

master v838
Dirk Stöcker 2025-04-02 17:44:19 +02:00
rodzic 3bca38d512
commit cdb1889864
3 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSender.java
Wyświetl plik

@ -68,7 +68,7 @@ public class DataConflationSender implements RunnableFuture<DataSet> {
@Override @Override
public void run() { public void run() {
String url = MapWithAIConflationCategory.conflationUrlFor(category); 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(); this.client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
try { try {
final var form = new TreeMap<String, String>(); final var form = new TreeMap<String, String>();

4
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
Wyświetl plik

@ -403,7 +403,7 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
.map(entry -> new Pair<>(Tag.ofString(entry.getKey()), Tag.ofString(entry.getValue()))) .map(entry -> new Pair<>(Tag.ofString(entry.getKey()), Tag.ofString(entry.getValue())))
.collect(Collectors.toMap(pair -> pair.a, pair -> pair.b)); .collect(Collectors.toMap(pair -> pair.a, pair -> pair.b));
MapWithAIPreferenceHelper.getReplacementTags().entrySet().stream() 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)); .map(entry -> new Tag(entry.getKey(), null)).forEach(tag -> replaceTags.put(tag, tag));
replaceTags(dataSet, replaceTags); replaceTags(dataSet, replaceTags);
} }
@ -417,7 +417,7 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
public static void replaceTags(DataSet dataSet, Map<Tag, Tag> replaceTags) { public static void replaceTags(DataSet dataSet, Map<Tag, Tag> replaceTags) {
replaceTags.forEach((orig, replace) -> dataSet.allNonDeletedPrimitives().stream() replaceTags.forEach((orig, replace) -> dataSet.allNonDeletedPrimitives().stream()
.filter(prim -> prim.hasTag(orig.getKey(), orig.getValue()) .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))); .forEach(prim -> prim.put(replace)));
} }

2
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java
Wyświetl plik

@ -128,7 +128,7 @@ public final class MapWithAIDataUtils {
realBounds.size() * urls.size()); realBounds.size() * urls.size());
for (var bound : realBounds) { for (var bound : realBounds) {
for (var url : urls) { 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); final var ds = download(monitor, bound, url, maximumDimensions);
downloadedDataSets.add(ds); downloadedDataSets.add(ds);
MapWithAIDataUtils.getForkJoinPool().execute(ds); MapWithAIDataUtils.getForkJoinPool().execute(ds);