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

Only perform deduplication on highways, not buildings 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2020-05-29 09:25:40 -06:00
rodzic b7441fa7bd
commit 588508b73f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
2 zmienionych plików z 34 dodań i 17 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/GetDataRunnable.java
Wyświetl plik

@ -141,6 +141,12 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
}
private static synchronized void realCleanup(DataSet dataSet, Bounds bounds) {
if (bounds == null && !dataSet.getDataSourceBounds().isEmpty()) {
bounds = dataSet.getDataSourceBounds().get(0);
dataSet.getDataSourceBounds().forEach(bounds::extend);
} else if (bounds == null) {
bounds = new Bounds(0, 0, 0, 0);
}
replaceTags(dataSet);
removeCommonTags(dataSet);
removeEmptyTags(dataSet, bounds);
@ -148,9 +154,13 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
cleanupDataSet(dataSet);
mergeWays(dataSet);
removeAlreadyAddedData(dataSet);
new MergeDuplicateWays(dataSet).executeCommand();
(bounds == null ? dataSet.getWays() : dataSet.searchWays(bounds.toBBox())).parallelStream()
.filter(way -> !way.isDeleted()).forEach(GetDataRunnable::cleanupArtifacts);
List<Way> ways = dataSet.searchWays(bounds.toBBox()).stream().filter(w -> w.hasKey("highway"))
.collect(Collectors.toList());
if (!ways.isEmpty()) {
new MergeDuplicateWays(dataSet, ways).executeCommand();
}
(bounds.isCollapsed() || bounds.isOutOfTheWorld() ? dataSet.getWays() : dataSet.searchWays(bounds.toBBox()))
.parallelStream().filter(way -> !way.isDeleted()).forEach(GetDataRunnable::cleanupArtifacts);
}
/**

35
src/main/java/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWays.java
Wyświetl plik

@ -16,6 +16,7 @@ import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.Command;
@ -33,8 +34,7 @@ import org.openstreetmap.josm.tools.Pair;
public class MergeDuplicateWays extends Command {
public static final String ORIG_ID = "orig_id";
private final Way way1;
private final Way way2;
private final List<Way> ways;
private final List<Command> commands;
private Command command;
@ -58,26 +58,33 @@ public class MergeDuplicateWays extends Command {
}
public MergeDuplicateWays(DataSet data, Way way1, Way way2) {
this(data, Stream.of(way1, way2).filter(Objects::nonNull).collect(Collectors.toList()));
}
public MergeDuplicateWays(DataSet data, List<Way> ways) {
super(data);
this.way1 = way1;
this.way2 = way2;
commands = new ArrayList<>();
this.ways = ways;
this.commands = new ArrayList<>();
}
@Override
public boolean executeCommand() {
if (commands.isEmpty() || (command == null)) {
if ((way1 == null) && (way2 == null)) {
if (ways.isEmpty()) {
filterDataSet(getAffectedDataSet(), commands, bound);
} else if ((way1 != null) && (way2 == null)) {
checkForDuplicateWays(way1, commands);
} else if (way1 == null) {
checkForDuplicateWays(way2, commands);
} else if (ways.size() == 1) {
checkForDuplicateWays(ways.get(0), commands);
} else {
final Command tCommand = checkForDuplicateWays(way1, way2);
if (tCommand != null) {
commands.add(tCommand);
tCommand.executeCommand();
Iterator<Way> it = ways.iterator();
Way way1 = it.next();
while (it.hasNext()) {
Way way2 = it.next();
final Command tCommand = checkForDuplicateWays(way1, way2);
if (tCommand != null) {
commands.add(tCommand);
tCommand.executeCommand();
}
way1 = way2;
}
}
final List<Command> realCommands = commands.stream().filter(Objects::nonNull).distinct()