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

Fix issue where downloaded bounds is expanded 

Also fix some lint issues, and remove last non-guarded reference to
ForkJoinPool.commonPool.

Signed-off-by: Taylor Smock <tsmock@fb.com>
pull/1/head
Taylor Smock 2021-12-02 13:44:09 -07:00
rodzic 0f8072833a
commit ca85a58cae
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
3 zmienionych plików z 56 dodań i 37 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -163,14 +163,14 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
}
private static synchronized void realCleanup(DataSet dataSet, Bounds bounds, MapWithAIInfo info) {
Bounds boundsToUse;
final Bounds boundsToUse;
if (bounds == null && !dataSet.getDataSourceBounds().isEmpty()) {
boundsToUse = dataSet.getDataSourceBounds().get(0);
boundsToUse = new Bounds(dataSet.getDataSourceBounds().get(0));
dataSet.getDataSourceBounds().forEach(boundsToUse::extend);
} else if (bounds == null) {
boundsToUse = new Bounds(0, 0, 0, 0);
} else {
boundsToUse = bounds;
boundsToUse = new Bounds(bounds);
}
replaceTags(dataSet);
removeCommonTags(dataSet);

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

@ -14,6 +14,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.TreeSet;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.locks.Lock;
@ -37,6 +38,7 @@ import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
import org.openstreetmap.josm.plugins.mapwithai.commands.MapWithAIAddCommand;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Utils;
@ -148,32 +150,7 @@ public final class MapWithAIDataUtils {
realBounds.parallelStream()
.forEach(bound -> new ArrayList<>(MapWithAIPreferenceHelper.getMapWithAIUrl())
.parallelStream().filter(i -> i.getUrl() != null && !i.getUrl().trim().isEmpty())
.forEach(i -> {
BoundingBoxMapWithAIDownloader downloader = new BoundingBoxMapWithAIDownloader(
bound, i, DetectTaskingManagerUtils.hasTaskingManagerLayer());
try {
DataSet ds = downloader.parseOsm(monitor.createSubTaskMonitor(1, false));
synchronized (MapWithAIDataUtils.class) {
dataSet.mergeFrom(ds);
}
} catch (OsmTransferException e) {
if (e.getCause() instanceof SocketTimeoutException
&& maximumDimensions > MAXIMUM_SIDE_DIMENSIONS / 10
&& maximumDimensions / 2f > 0.5) {
dataSet.mergeFrom(getData(bound, maximumDimensions / 2));
} else if (e.getCause() instanceof IllegalDataException) {
Logging.error(e);
Notification notification = new Notification();
notification.setContent(tr("MapWithAI servers may be down."));
GuiHelper.runInEDT(notification::show);
} else {
Logging.error(e);
Notification notification = new Notification();
notification.setContent(e.getLocalizedMessage());
GuiHelper.runInEDT(notification::show);
}
}
}));
.forEach(i -> download(monitor, dataSet, bound, i, maximumDimensions)));
} finally {
monitor.finishTask();
monitor.close();
@ -184,6 +161,7 @@ public final class MapWithAIDataUtils {
() -> MapWithAIPreferenceHelper.getMapWithAIUrl().isEmpty() ? new Notification(tr(
"There are no defined URLs. Attempting to add the appropriate servers.\nPlease try again."))
: new Notification(tr("No URLS are enabled")));
Objects.requireNonNull(noUrls);
noUrls.setDuration(Notification.TIME_DEFAULT);
noUrls.setIcon(JOptionPane.INFORMATION_MESSAGE);
noUrls.setHelpTopic(ht("Plugin/MapWithAI#Preferences"));
@ -197,6 +175,42 @@ public final class MapWithAIDataUtils {
return dataSet;
}
/**
* Download an area
*
* @param monitor The monitor to update
* @param dataSet The dataset to add to
* @param bound The bounds that are being downloading
* @param mapWithAIInfo The source of the data
* @param maximumDimensions The maximum dimensions to download
*/
private static void download(PleaseWaitProgressMonitor monitor, DataSet dataSet, Bounds bound,
MapWithAIInfo mapWithAIInfo, int maximumDimensions) {
BoundingBoxMapWithAIDownloader downloader = new BoundingBoxMapWithAIDownloader(bound, mapWithAIInfo,
DetectTaskingManagerUtils.hasTaskingManagerLayer());
try {
DataSet ds = downloader.parseOsm(monitor.createSubTaskMonitor(1, false));
synchronized (MapWithAIDataUtils.class) {
dataSet.mergeFrom(ds);
}
} catch (OsmTransferException e) {
if (e.getCause() instanceof SocketTimeoutException && maximumDimensions > MAXIMUM_SIDE_DIMENSIONS / 10
&& maximumDimensions / 2f > 0.5) {
dataSet.mergeFrom(getData(bound, maximumDimensions / 2));
} else if (e.getCause() instanceof IllegalDataException) {
Logging.error(e);
Notification notification = new Notification();
notification.setContent(tr("MapWithAI servers may be down."));
GuiHelper.runInEDT(notification::show);
} else {
Logging.error(e);
Notification notification = new Notification();
GuiHelper.runInEDT(() -> notification.setContent(e.getLocalizedMessage()));
GuiHelper.runInEDT(notification::show);
}
}
}
private static boolean confirmBigDownload(List<Bounds> realBounds) {
ConfirmBigDownload confirmation = new ConfirmBigDownload(realBounds);
GuiHelper.runInEDTAndWait(confirmation);
@ -460,9 +474,11 @@ public final class MapWithAIDataUtils {
* @return The number of objects added from the MapWithAI data layer
*/
public static Long getAddedObjects() {
return GuiHelper.runInEDTAndWaitAndReturn(() -> UndoRedoHandler.getInstance().getUndoCommands())
.parallelStream().filter(MapWithAIAddCommand.class::isInstance).map(MapWithAIAddCommand.class::cast)
.mapToLong(MapWithAIAddCommand::getAddedObjects).sum();
return Optional
.ofNullable(GuiHelper.runInEDTAndWaitAndReturn(() -> UndoRedoHandler.getInstance().getUndoCommands()))
.map(commands -> commands.parallelStream().filter(MapWithAIAddCommand.class::isInstance)
.map(MapWithAIAddCommand.class::cast).mapToLong(MapWithAIAddCommand::getAddedObjects).sum())
.orElse(0L);
}
/**
@ -471,8 +487,11 @@ public final class MapWithAIDataUtils {
* @return The source tags for Objects added from the MapWithAI data layer
*/
public static List<String> getAddedObjectsSource() {
return GuiHelper.runInEDTAndWaitAndReturn(() -> UndoRedoHandler.getInstance().getUndoCommands())
.parallelStream().filter(MapWithAIAddCommand.class::isInstance).map(MapWithAIAddCommand.class::cast)
.flatMap(com -> com.getSourceTags().stream()).distinct().collect(Collectors.toList());
return Optional
.ofNullable(GuiHelper.runInEDTAndWaitAndReturn(() -> UndoRedoHandler.getInstance().getUndoCommands()))
.map(commands -> commands.parallelStream().filter(MapWithAIAddCommand.class::isInstance)
.map(MapWithAIAddCommand.class::cast).flatMap(com -> com.getSourceTags().stream()).distinct()
.collect(Collectors.toList()))
.orElseGet(Collections::emptyList);
}
}

4
src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAILayerInfo.java
Wyświetl plik

@ -19,7 +19,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
@ -34,6 +33,7 @@ import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.io.NetworkManager;
import org.openstreetmap.josm.io.imagery.ImageryReader;
import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIDataUtils;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo.MapWithAIPreferenceEntry;
import org.openstreetmap.josm.plugins.mapwithai.io.mapwithai.ESRISourceReader;
import org.openstreetmap.josm.plugins.mapwithai.io.mapwithai.MapWithAISourceReader;
@ -191,7 +191,7 @@ public class MapWithAILayerInfo {
if (System.getSecurityManager() != null) {
Logging.trace("MapWithAI loaded: {0}", ESRISourceReader.SOURCE_CACHE.getClass());
}
loadDefaults(false, ForkJoinPool.commonPool(), fastFail, listener);
loadDefaults(false, MapWithAIDataUtils.getForkJoinPool(), fastFail, listener);
}
/**