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

Don't overwrite the mapwithai:source if it is already present. 

Also, MapWithAI no longer returns source as an attribute, so I can
remove the deduplication code for source tags.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2020-02-20 15:40:08 -07:00
rodzic c87f0cc6f1
commit cdf42b0a88
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 8 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -143,7 +143,6 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
}
private static synchronized void realCleanup(DataSet dataSet, Bounds bounds) {
removeRedundantSource(dataSet);
replaceTags(dataSet);
removeCommonTags(dataSet);
mergeNodes(dataSet);
@ -155,25 +154,6 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
.filter(way -> !way.isDeleted()).forEach(GetDataRunnable::cleanupArtifacts);
}
/**
* Remove redudant sources from objects (if source on way and source on node,
* and node doesn't have any other tags, then node doesn't need the source)
*
* @param dataSet The dataset with potential duplicate source tags
*/
public static void removeRedundantSource(DataSet dataSet) {
synchronized (GetDataRunnable.class) {
dataSet.getNodes().stream().filter(node -> !node.getReferrers().isEmpty())
.filter(node -> node.getKeys().entrySet().parallelStream().map(Entry::getKey)
.allMatch(key -> key.contains("source"))
&& node.getKeys().entrySet().parallelStream()
.allMatch(entry -> node.getReferrers().parallelStream()
.anyMatch(parent -> parent.hasTag(entry.getKey(), entry.getValue()))))
.forEach(node -> node.getKeys().entrySet().stream().map(Entry::getKey)
.filter(key -> key.contains("source")).forEach(node::remove));
}
}
/**
* Remove ways that have already been added to an OSM layer
*
@ -486,15 +466,20 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
* @return The dataset for easy chaining
*/
public static DataSet addMapWithAISourceTag(DataSet dataSet, String source) {
dataSet.getNodes().parallelStream().filter(node -> !node.isDeleted() && node.getReferrers().isEmpty())
dataSet.getNodes().parallelStream().filter(GetDataRunnable::checkIfMapWithAISourceShouldBeAdded)
.filter(node -> node.getReferrers().isEmpty())
.forEach(node -> node.put(MAPWITHAI_SOURCE_TAG_KEY, source));
dataSet.getWays().parallelStream().filter(way -> !way.isDeleted())
dataSet.getWays().parallelStream().filter(GetDataRunnable::checkIfMapWithAISourceShouldBeAdded)
.forEach(way -> way.put(MAPWITHAI_SOURCE_TAG_KEY, source));
dataSet.getRelations().parallelStream().filter(rel -> !rel.isDeleted())
dataSet.getRelations().parallelStream().filter(GetDataRunnable::checkIfMapWithAISourceShouldBeAdded)
.forEach(rel -> rel.put(MAPWITHAI_SOURCE_TAG_KEY, source));
return dataSet;
}
private static boolean checkIfMapWithAISourceShouldBeAdded(OsmPrimitive prim) {
return !prim.isDeleted() && !prim.hasTag(MAPWITHAI_SOURCE_TAG_KEY);
}
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
}