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

Allow the download to be cancelled (it takes some time) 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head v0.1.12
Taylor Smock 2019-11-06 08:58:42 -07:00
rodzic 801db956b5
commit c146267bfa
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
2 zmienionych plików z 61 dodań i 35 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.io.InputStream;
import java.net.SocketException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@ -27,6 +28,7 @@ import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.osm.UploadPolicy;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
import org.openstreetmap.josm.plugins.mapwithai.commands.MergeDuplicateWays;
@ -40,9 +42,10 @@ import org.openstreetmap.josm.tools.Pair;
*
* @author Taylor Smock
*/
public class GetDataRunnable extends RecursiveTask<DataSet> {
public class GetDataRunnable extends RecursiveTask<DataSet> implements CancelListener {
private static final long serialVersionUID = 258423685658089715L;
private final transient List<BBox> bbox;
private static HttpClient client;
private final transient DataSet dataSet;
private final transient ProgressMonitor monitor;
@ -72,38 +75,47 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
this.bbox = new ArrayList<>(bbox);
this.dataSet = dataSet;
this.monitor = Optional.ofNullable(monitor).orElse(NullProgressMonitor.INSTANCE);
this.monitor.addCancelListener(this);
}
@Override
public DataSet compute() {
final List<BBox> bboxes = MapWithAIDataUtils.reduceBBoxSize(bbox);
monitor.beginTask(tr("Downloading {0} data", MapWithAIPlugin.NAME), bboxes.size() - 1);
if (bboxes.size() == MAX_NUMBER_OF_BBOXES_TO_PROCESS) {
final DataSet temporaryDataSet = getDataReal(bboxes.get(0));
synchronized (GetDataRunnable.class) {
dataSet.mergeFrom(temporaryDataSet);
monitor.beginTask(tr("Downloading {0} data ({1} total downloads)", MapWithAIPlugin.NAME, bboxes.size()),
bboxes.size() - 1);
if (!monitor.isCanceled()) {
if (bboxes.size() == MAX_NUMBER_OF_BBOXES_TO_PROCESS) {
final DataSet temporaryDataSet = getDataReal(bboxes.get(0), monitor);
synchronized (GetDataRunnable.class) {
dataSet.mergeFrom(temporaryDataSet);
}
} else {
final Collection<GetDataRunnable> tasks = bboxes.parallelStream()
.map(tBbox -> new GetDataRunnable(tBbox, dataSet, monitor.createSubTaskMonitor(0, true)))
.collect(Collectors.toList());
tasks.forEach(GetDataRunnable::fork);
tasks.parallelStream().forEach(runnable -> {
runnable.join();
monitor.worked(1);
});
}
}
// This can technically be included in the above block, but it is here so that
// cancellation is a little faster
if (!monitor.isCanceled()) {
synchronized (LOCK) {
/* Microsoft buildings don't have a source, so we add one */
MapWithAIDataUtils.addSourceTags(dataSet, "building", "microsoft");
replaceTags(dataSet);
removeCommonTags(dataSet);
mergeNodes(dataSet);
cleanupDataSet(dataSet);
for (int i = 0; i < 5; i++) {
new MergeDuplicateWays(dataSet).executeCommand();
}
}
} else {
final Collection<GetDataRunnable> tasks = bboxes.parallelStream()
.map(tBbox -> new GetDataRunnable(tBbox, dataSet, monitor.createSubTaskMonitor(1, true)))
.collect(Collectors.toList());
tasks.forEach(GetDataRunnable::fork);
tasks.forEach(GetDataRunnable::join);
}
monitor.finishTask();
synchronized (LOCK) {
/* Microsoft buildings don't have a source, so we add one */
MapWithAIDataUtils.addSourceTags(dataSet, "building", "microsoft");
replaceTags(dataSet);
removeCommonTags(dataSet);
mergeNodes(dataSet);
// filterDataSet(dataSet);
cleanupDataSet(dataSet);
for (int i = 0; i < 5; i++) {
new MergeDuplicateWays(dataSet).executeCommand();
}
}
return dataSet;
}
@ -165,6 +177,7 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
bbox.addPrimitive(n1, 0.001);
final List<Node> nearbyNodes = dataSet.searchNodes(bbox).parallelStream()
.filter(node -> !node.isDeleted() && !node.equals(n1)
&& n1.getKeys().equals(node.getKeys())
&& n1.getCoor().greatCircleDistance(node.getCoor()) < MapWithAIPreferenceHelper
.getMaxNodeDistance())
.collect(Collectors.toList());
@ -179,10 +192,11 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
/**
* Actually get the data
*
* @param bbox The bbox to get the data from
* @param bbox The bbox to get the data from
* @param monitor Use to determine if the operation has been cancelled
* @return A dataset with the data from the bbox
*/
private static DataSet getDataReal(BBox bbox) {
private static DataSet getDataReal(BBox bbox, ProgressMonitor monitor) {
InputStream inputStream = null;
final DataSet dataSet = new DataSet();
String urlString = MapWithAIPreferenceHelper.getMapWithAIUrl();
@ -195,7 +209,7 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
try {
final URL url = new URL(urlString.replace("{bbox}", bbox.toStringCSV(",")).replace("{crop_bbox}",
DetectTaskingManagerUtils.getTaskingManagerBBox().toStringCSV(",")));
final HttpClient client = HttpClient.create(url);
client = HttpClient.create(url);
final StringBuilder defaultUserAgent = new StringBuilder();
defaultUserAgent.append(client.getHeaders().get("User-Agent"));
if (defaultUserAgent.toString().trim().length() == 0) {
@ -203,12 +217,18 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
}
defaultUserAgent.append(tr("/ {0} {1}", MapWithAIPlugin.NAME, MapWithAIPlugin.getVersionInfo()));
client.setHeader("User-Agent", defaultUserAgent.toString());
Logging.debug("{0}: Getting {1}", MapWithAIPlugin.NAME, client.getURL().toString());
final Response response = client.connect();
inputStream = response.getContent();
final DataSet mergeData = OsmReaderCustom.parseDataSet(inputStream, null, true);
dataSet.mergeFrom(mergeData);
response.disconnect();
if (!monitor.isCanceled()) {
Logging.debug("{0}: Getting {1}", MapWithAIPlugin.NAME, client.getURL().toString());
final Response response = client.connect();
inputStream = response.getContent();
final DataSet mergeData = OsmReaderCustom.parseDataSet(inputStream, null, true);
dataSet.mergeFrom(mergeData);
response.disconnect();
}
} catch (SocketException e) {
if (!monitor.isCanceled()) {
Logging.debug(e);
}
} catch (UnsupportedOperationException | IllegalDataException | IOException e) {
Logging.debug(e);
} finally {
@ -223,4 +243,11 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
}
return dataSet;
}
@Override
public void operationCanceled() {
if (client != null) {
client.disconnect();
}
}
}

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

@ -146,7 +146,6 @@ public final class MapWithAIDataUtils {
final DataSet dataSet = new DataSet();
final List<BBox> realBBoxes = bbox.stream().filter(BBox::isValid).distinct().collect(Collectors.toList());
final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor();
monitor.setCancelable(Boolean.FALSE);
getForkJoinPool().invoke(new GetDataRunnable(realBBoxes, dataSet, monitor));
monitor.finishTask();
monitor.close();