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

Don't redownload bboxes that have been downloaded already 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head v0.1.8
Taylor Smock 2019-10-29 07:05:23 -06:00
rodzic 1a45514acd
commit 832448a8c0
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 53 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
import org.openstreetmap.josm.plugins.mapwithai.commands.MapWithAIAddCommand;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Utils;
/**
@ -205,9 +206,9 @@ public final class MapWithAIDataUtils {
final List<BBox> editSetBBoxes = bboxes.stream()
.filter(bbox -> mapWithAIBounds.stream().noneMatch(tBBox -> tBBox.bounds(bbox)))
.collect(Collectors.toList());
final List<BBox> toDownload = reduceBBox(mapWithAIBounds, editSetBBoxes);
getForkJoinPool().execute(() -> {
layer.getDataSet().clear();
final DataSet newData = getData(editSetBBoxes);
final DataSet newData = getData(toDownload);
final Lock lock = layer.getLock();
lock.lock();
try {
@ -218,6 +219,56 @@ public final class MapWithAIDataUtils {
});
}
private static List<BBox> reduceBBox(List<BBox> alreadyDownloaded, List<BBox> wantToDownload) {
List<BBox> alreadyDownloadedReduced = new ArrayList<>(alreadyDownloaded);
int aDRSize = -1;
do {
aDRSize = alreadyDownloadedReduced.size();
for (int i = 0; i < alreadyDownloadedReduced.size(); i++) {
BBox bbox1 = alreadyDownloadedReduced.get(i);
for (int j = 0; j < alreadyDownloadedReduced.size(); j++) {
BBox bbox2 = alreadyDownloadedReduced.get(j);
if (bbox1 != bbox2 && bboxesShareSide(bbox1, bbox2)) {
bbox1.add(bbox2);
alreadyDownloadedReduced.remove(bbox2);
}
}
}
} while (aDRSize != alreadyDownloadedReduced.size());
for (BBox bbox : wantToDownload) {
for (BBox downloaded : alreadyDownloaded) {
if (bboxesAreFunctionallyEqual(bbox, downloaded, null)) {
Logging.debug("YEP");
}
}
}
return wantToDownload.parallelStream()
.filter(bbox1 -> alreadyDownloadedReduced.parallelStream()
.noneMatch(bbox2 -> bboxesAreFunctionallyEqual(bbox1, bbox2, 0.00002)))
.collect(Collectors.toList());
}
private static boolean bboxesAreFunctionallyEqual(BBox bbox1, BBox bbox2, Double maxDifference) {
if (maxDifference == null) {
maxDifference = LatLon.MAX_SERVER_PRECISION;
}
return (bbox1 != null && bbox2 != null)
&& (Math.abs(bbox1.getBottomRightLat() - bbox2.getBottomRightLat()) < maxDifference
&& Math.abs(bbox1.getBottomRightLon() - bbox2.getBottomRightLon()) < maxDifference
&& Math.abs(bbox1.getTopLeftLat() - bbox2.getTopLeftLat()) < maxDifference
&& Math.abs(bbox1.getTopLeftLon() - bbox2.getTopLeftLon()) < maxDifference);
}
private static boolean bboxesShareSide(BBox bbox1, BBox bbox2) {
List<Double> bbox1Lons = Arrays.asList(bbox1.getTopLeftLon(), bbox1.getBottomRightLon());
List<Double> bbox1Lats = Arrays.asList(bbox1.getTopLeftLat(), bbox1.getBottomRightLat());
List<Double> bbox2Lons = Arrays.asList(bbox2.getTopLeftLon(), bbox2.getBottomRightLon());
List<Double> bbox2Lats = Arrays.asList(bbox2.getTopLeftLat(), bbox2.getBottomRightLat());
Long lonDupeCount = bbox1Lons.parallelStream().filter(lon -> bbox2Lons.parallelStream().anyMatch(lon2 -> Double.compare(lon, lon2) == 0)).count();
Long latDupeCount = bbox1Lats.parallelStream().filter(lat -> bbox2Lats.parallelStream().anyMatch(lat2 -> Double.compare(lat, lat2) == 0)).count();
return (lonDupeCount + latDupeCount) > 1;
}
/**
* Get the data for MapWithAI
*