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

Refactor create commands to make it more understandable, and to (hopefully) get primitives not in the dataset 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2019-10-02 14:27:37 -06:00
rodzic 7df3c1a1c7
commit 092e26f7b6
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 31 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

54
src/main/java/org/openstreetmap/josm/plugins/rapid/commands/CreateConnectionsCommand.java
Wyświetl plik

@ -63,31 +63,10 @@ public class CreateConnectionsCommand extends Command {
List<Command> changedKeyList = new ArrayList<>();
for (Node node : nodes) {
if (node.hasKey(CONN_KEY)) {
// Currently w<way id>,n<node1>,n<node2>
OsmPrimitive[] primitiveConnections = getPrimitives(dataSet, node.get(CONN_KEY));
for (int i = 0; i < primitiveConnections.length / 3; i++) {
if (primitiveConnections[i] instanceof Way && primitiveConnections[i + 1] instanceof Node
&& primitiveConnections[i + 2] instanceof Node) {
Command addNodesToWayCommand = addNodesToWay(node, (Way) primitiveConnections[i],
(Node) primitiveConnections[i + 1], (Node) primitiveConnections[i + 2]);
if (addNodesToWayCommand != null) {
changedKeyList.add(addNodesToWayCommand);
}
} else {
Logging.error("{0}: {1}, {2}: {3}, {4}: {5}", i, primitiveConnections[i].getClass(), i + 1,
primitiveConnections[i + 1].getClass(), i + 2, primitiveConnections[i + 2].getClass());
}
}
Logging.debug("RapiD: Removing conn from {0} in {1}", node, dataSet.getName());
changedKeyList.add(new ChangePropertyCommand(node, CONN_KEY, null));
changedKeyList.addAll(connectedCommand(dataSet, node));
}
if (node.hasKey(DUPE_KEY)) {
OsmPrimitive[] primitiveConnections = getPrimitives(dataSet, node.get(DUPE_KEY));
if (primitiveConnections.length != 1) {
Logging.error("RapiD: dupe connection connected to more than one node? (dupe={0})",
node.get(DUPE_KEY));
}
Command replaceCommand = replaceNode(node, (Node) primitiveConnections[0]);
Command replaceCommand = duplicateNode(dataSet, node);
if (replaceCommand != null) {
changedKeyList.add(replaceCommand);
}
@ -98,6 +77,35 @@ public class CreateConnectionsCommand extends Command {
return null;
}
private List<Command> connectedCommand(DataSet dataSet, Node node) {
List<Command> commands = new ArrayList<>();
OsmPrimitive[] primitiveConnections = getPrimitives(dataSet, node.get(CONN_KEY));
for (int i = 0; i < primitiveConnections.length / 3; i++) {
if (primitiveConnections[i] instanceof Way && primitiveConnections[i + 1] instanceof Node
&& primitiveConnections[i + 2] instanceof Node) {
Command addNodesToWayCommand = addNodesToWay(node, (Way) primitiveConnections[i],
(Node) primitiveConnections[i + 1], (Node) primitiveConnections[i + 2]);
if (addNodesToWayCommand != null) {
commands.add(addNodesToWayCommand);
}
} else {
Logging.error("{0}: {1}, {2}: {3}, {4}: {5}", i, primitiveConnections[i].getClass(), i + 1,
primitiveConnections[i + 1].getClass(), i + 2, primitiveConnections[i + 2].getClass());
}
}
Logging.debug("RapiD: Removing conn from {0} in {1}", node, dataSet.getName());
commands.add(new ChangePropertyCommand(node, CONN_KEY, null));
return commands;
}
private Command duplicateNode(DataSet dataSet, Node node) {
OsmPrimitive[] primitiveConnections = getPrimitives(dataSet, node.get(DUPE_KEY));
if (primitiveConnections.length != 1) {
Logging.error("RapiD: dupe connection connected to more than one node? (dupe={0})", node.get(DUPE_KEY));
}
return replaceNode(node, (Node) primitiveConnections[0]);
}
/**
* Get the primitives from a dataset with specified ids
*