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

Run the layer add in the EDT thread 

This fixes #52, since there was a condition where two threads were
waiting on the other to release a lock.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2020-01-13 07:21:23 -07:00
rodzic 1667a35b2c
commit b6ca8bac33
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 14 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -4,6 +4,7 @@ package org.openstreetmap.josm.plugins.mapwithai.backend;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr; import static org.openstreetmap.josm.tools.I18n.tr;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -50,7 +51,7 @@ import org.openstreetmap.josm.tools.Utils;
public final class MapWithAIDataUtils { public final class MapWithAIDataUtils {
/** THe maximum dimensions for MapWithAI data (in kilometers) */ /** THe maximum dimensions for MapWithAI data (in kilometers) */
public static final int MAXIMUM_SIDE_DIMENSIONS = 5_000; // RapiD is about 1km, max is 10km, but 10km causes public static final int MAXIMUM_SIDE_DIMENSIONS = 5_000; // RapiD is about 1km, max is 10km, but 10km causes
// timeouts // timeouts
private static final int TOO_MANY_BBOXES = 4; private static final int TOO_MANY_BBOXES = 4;
private static ForkJoinPool forkJoinPool; private static ForkJoinPool forkJoinPool;
static final Object LAYER_LOCK = new Object(); static final Object LAYER_LOCK = new Object();
@ -271,11 +272,22 @@ public final class MapWithAIDataUtils {
synchronized (LAYER_LOCK) { synchronized (LAYER_LOCK) {
if (mapWithAILayers.isEmpty() && create) { if (mapWithAILayers.isEmpty() && create) {
layer = new MapWithAILayer(new DataSet(), MapWithAIPlugin.NAME, null); layer = new MapWithAILayer(new DataSet(), MapWithAIPlugin.NAME, null);
MainApplication.getLayerManager().addLayer(layer);
} else if (!mapWithAILayers.isEmpty()) { } else if (!mapWithAILayers.isEmpty()) {
layer = mapWithAILayers.get(0); layer = mapWithAILayers.get(0);
} }
} }
final MapWithAILayer tLayer = layer;
if (SwingUtilities.isEventDispatchThread() && create) {
MainApplication.getLayerManager().addLayer(tLayer);
} else if (create) {
try {
SwingUtilities.invokeAndWait(() -> MainApplication.getLayerManager().addLayer(tLayer));
} catch (InvocationTargetException | InterruptedException e) {
Logging.error(e);
}
}
return layer; return layer;
} }