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

Move node onto way, not way onto node 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2020-01-20 14:44:14 -07:00
rodzic 31c9e4d890
commit 292556f52e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
2 zmienionych plików z 29 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/commands/conflation/ConnectedCommand.java
Wyświetl plik

@ -7,7 +7,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
@ -15,6 +17,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.projection.ProjectionRegistry;
import org.openstreetmap.josm.plugins.mapwithai.commands.AddNodeToWayCommand;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Logging;
@ -39,18 +42,28 @@ public class ConnectedCommand extends AbstractConflationCommand {
* @param first The first node in a waysegment (the node is between this and
* the second node)
* @param second The second node in a waysegment
* @return Command to add a node to a way, or null if it won't be done
* @return Commands to add a node to a way, or null if it won't be done
*/
public static Command addNodesToWay(Node toAddNode, Way way, Node first, Node second) {
Command tCommand = null;
public static List<Command> addNodesToWay(Node toAddNode, Way way, Node first, Node second) {
List<Command> tCommands = new ArrayList<>();
final Way tWay = new Way();
final List<Way> ways = toAddNode.getReferrers().stream().filter(w -> !w.equals(way))
.filter(Way.class::isInstance).map(Way.class::cast).collect(Collectors.toList());
tWay.addNode(first);
tWay.addNode(second);
final double distance = Geometry.getDistanceWayNode(tWay, toAddNode);
if (distance < 5) {
tCommand = new AddNodeToWayCommand(toAddNode, way, first, second);
if (!ways.isEmpty()) {
int index = ways.get(0).getNodes().indexOf(toAddNode);
final Node node4 = index == 0 ? ways.get(0).getNode(1) : ways.get(0).getNode(index - 1);
final Node tNode = new Node(toAddNode);
tNode.setCoor(ProjectionRegistry.getProjection().eastNorth2latlon(Geometry.getLineLineIntersection(
first.getEastNorth(), second.getEastNorth(), toAddNode.getEastNorth(), node4.getEastNorth())));
tCommands.add(new ChangeCommand(toAddNode, tNode));
}
tCommands.add(new AddNodeToWayCommand(toAddNode, way, first, second));
}
return tCommand;
return tCommands;
}
private static List<Command> connectedCommand(DataSet dataSet, Node node) {
@ -59,11 +72,9 @@ public class ConnectedCommand extends AbstractConflationCommand {
for (int i = 0; i < primitiveConnections.length / 3; i++) {
if (primitiveConnections[i] instanceof Way && primitiveConnections[i + 1] instanceof Node
&& primitiveConnections[i + 2] instanceof Node) {
final Command addNodesToWayCommand = addNodesToWay(node, (Way) primitiveConnections[i],
final List<Command> addNodesToWayCommand = addNodesToWay(node, (Way) primitiveConnections[i],
(Node) primitiveConnections[i + 1], (Node) primitiveConnections[i + 2]);
if (addNodesToWayCommand != null) {
commands.add(addNodesToWayCommand);
}
commands.addAll(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());

15
test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/CreateConnectionsCommandTest.java
Wyświetl plik

@ -18,6 +18,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
@ -126,7 +127,8 @@ public class CreateConnectionsCommandTest {
final Node toAddNode = new Node(new LatLon(0.5, 0));
final Way way = TestUtils.newWay("highway=residential", wayNode1, wayNode2);
new DataSet(wayNode1, wayNode2, toAddNode, way);
Command addNodeToWayCommand = ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2);
Command addNodeToWayCommand = new SequenceCommand("",
ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2));
assertEquals(2, way.getNodesCount(), "The way should still have 2 nodes");
addNodeToWayCommand.executeCommand();
assertEquals(3, way.getNodesCount(), "The way should now have 3 nodes");
@ -134,15 +136,16 @@ public class CreateConnectionsCommandTest {
assertEquals(2, way.getNodesCount(), "The way should be back to having 2 nodes");
wayNode2.setCoor(new LatLon(1, 0.1));
addNodeToWayCommand = ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2);
assertNull(addNodeToWayCommand, "There shouldn't be a command to for a node that is a fair distance away");
assertTrue(ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2).isEmpty(),
"There shouldn't be a command to for a node that is a fair distance away");
wayNode2.setCoor(new LatLon(1, 0.01));
addNodeToWayCommand = ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2);
assertNull(addNodeToWayCommand, "There shouldn't be a command to for a node that is a fair distance away");
assertTrue(ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2).isEmpty(),
"There shouldn't be a command to for a node that is a fair distance away");
wayNode2.setCoor(new LatLon(1, 0.00008));
addNodeToWayCommand = ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2);
addNodeToWayCommand = new SequenceCommand("",
ConnectedCommand.addNodesToWay(toAddNode, way, wayNode1, wayNode2));
addNodeToWayCommand.executeCommand();
assertEquals(3, way.getNodesCount(), "The way should have 3 nodes now");
addNodeToWayCommand.undoCommand();