Index: data_nodist/relation_sort.osm
===================================================================
--- data_nodist/relation_sort.osm (revision 15056)
+++ data_nodist/relation_sort.osm (working copy)
@@ -1,185 +1,245 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 15056)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (working copy)
@@ -66,7 +66,11 @@
int y2;
if (value.linkPrev) {
- g.setColor(Color.black);
+ if (value.onewayFollowsPrevious) {
+ g.setColor(Color.black);
+ } else {
+ g.setColor(Color.lightGray);
+ }
if (value.isOnewayHead) {
g.fillRect(xoff - 1, 0, 3, 1);
} else {
@@ -92,7 +96,11 @@
}
if (value.linkNext) {
- g.setColor(Color.black);
+ if (value.onewayFollowsNext) {
+ g.setColor(Color.black);
+ } else {
+ g.setColor(Color.lightGray);
+ }
if (value.isOnewayTail) {
g.fillRect(xoff - 1, ymax, 3, 1);
} else {
@@ -119,7 +127,11 @@
}
/* vertical lines */
- g.setColor(Color.black);
+ if (value.onewayFollowsNext && value.onewayFollowsPrevious) {
+ g.setColor(Color.black);
+ } else {
+ g.setColor(Color.lightGray);
+ }
if (value.isLoop) {
g.drawLine(xoff+xloop, y1, xoff+xloop, y2);
}
Index: src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java (revision 15056)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java (working copy)
@@ -21,6 +21,10 @@
* direction is FORWARD if the first node of this way is connected to the previous way
* and / or the last node of this way is connected to the next way.
* direction is BACKWARD if it is the other way around.
+ * direction has a ONEWAY value, if it is tagged as such and it is connected
+ * to the previous / next member.
+ * ONEWAY_FORWARD == the first node of the oneway is the last node of the previous way
+ * ONEWAY_BACKWARD == the last node of the oneway is the last node of the previous way
* direction has a ROUNDABOUT value, if it is tagged as such and it is somehow
* connected to the previous / next member.
* If there is no connection to the previous or next member, then
@@ -44,6 +48,11 @@
public boolean isOnewayHead;
public boolean isOnewayTail;
+ /** False, if the way is oneway and it doesn't follow the flow of the previous member */
+ public boolean onewayFollowsPrevious = true;
+ /** True, if the way is oneway and it doesn't follow the flow of the next member */
+ public boolean onewayFollowsNext = true;
+
public WayConnectionType(boolean linkPrev, boolean linkNext, Direction direction) {
this.linkPrev = linkPrev;
this.linkNext = linkNext;
@@ -82,14 +91,21 @@
* @since 10248
*/
public String getTooltip() {
+ boolean onewayGood = onewayFollowsPrevious && onewayFollowsNext;
if (!isValid())
return "";
- else if (linkPrev && linkNext)
+ else if (linkPrev && linkNext && onewayGood)
return tr("way is connected");
- else if (linkPrev)
+ else if (linkPrev && linkNext && !onewayGood)
+ return tr("way is connected but has a wrong oneway direction");
+ else if (linkPrev && onewayGood)
return tr("way is connected to previous relation member");
- else if (linkNext)
+ else if (linkPrev && !onewayGood)
+ return tr("way is connected to previous relation member but has a wrong oneway direction");
+ else if (linkNext && onewayGood)
return tr("way is connected to next relation member");
+ else if (linkNext && !onewayGood)
+ return tr("way is connected to next relation member but has a wrong oneway direction");
else
return tr("way is not connected to previous or next relation member");
}
Index: src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 15056)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (working copy)
@@ -119,6 +119,18 @@
if (lastWct != null) {
lastWct.linkNext = wct.linkPrev;
}
+
+ if (lastWct != null && i > 0 && m.getMember() instanceof Way && members.get(i - 1).getMember() instanceof Way
+ && (m.getWay().isOneway() != 0 || members.get(i - 1).getWay().isOneway() != 0)) {
+ Way way = m.getWay();
+ Way previousWay = members.get(i - 1).getWay();
+ if (way.isOneway() != 0 && previousWay.isOneway() != 0 &&
+ (way.firstNode(true) != previousWay.lastNode(true) &&
+ way.lastNode(true) != previousWay.firstNode(true))) {
+ wct.onewayFollowsPrevious = false;
+ lastWct.onewayFollowsNext = false;
+ }
+ }
con.set(i, wct);
return wct;
}
Index: test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
===================================================================
--- test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (revision 15056)
+++ test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (working copy)
@@ -7,6 +7,8 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import org.junit.Assert;
@@ -14,7 +16,10 @@
import org.junit.Rule;
import org.junit.Test;
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.Relation;
+import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmReader;
@@ -130,4 +135,117 @@
actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
Assert.assertEquals("[BACKWARD, BACKWARD, BACKWARD, FPH FORWARD, FPH FORWARD, FPH FORWARD, FPH FORWARD]", actual);
}
+
+ private void reverseWay(Way way) {
+ List nodes = way.getNodes();
+ Collections.reverse(nodes);
+ way.removeNodes(new HashSet<>(nodes));
+ for (Node node : nodes) {
+ way.addNode(node);
+ }
+ }
+
+ /**
+ * Test directional {@link WayConnectionTypeCalculator#computeNextWayConnection}
+ */
+ @Test
+ public void testDirectionsOnewaysOnly() {
+ Relation relation = getRelation("direction");
+
+ // Check with only one wrong oneway
+ List returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
+ for (int i = 0; i < 4; i++) {
+ Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
+ Assert.assertTrue(returned.get(i).onewayFollowsNext);
+ }
+
+ Assert.assertTrue(returned.get(4).onewayFollowsPrevious);
+ Assert.assertFalse(returned.get(4).onewayFollowsNext);
+
+ Assert.assertFalse(returned.get(5).onewayFollowsPrevious);
+ Assert.assertFalse(returned.get(5).onewayFollowsNext);
+
+ Assert.assertFalse(returned.get(6).onewayFollowsPrevious);
+ Assert.assertTrue(returned.get(6).onewayFollowsNext);
+
+ // Reverse the last oneway
+ OsmPrimitive way7 = relation.getMemberPrimitivesList().get(6);
+ if (way7 instanceof Way) {
+ Way way = (Way) way7;
+ reverseWay(way);
+ returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
+ for (int i = 0; i < 4; i++) {
+ Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
+ Assert.assertTrue(returned.get(i).onewayFollowsNext);
+ }
+
+ Assert.assertTrue(returned.get(4).onewayFollowsPrevious);
+ Assert.assertFalse(returned.get(4).onewayFollowsNext);
+
+ Assert.assertFalse(returned.get(5).onewayFollowsPrevious);
+ Assert.assertTrue(returned.get(5).onewayFollowsNext);
+
+ Assert.assertTrue(returned.get(6).onewayFollowsPrevious);
+ Assert.assertTrue(returned.get(6).onewayFollowsNext);
+ reverseWay(way);
+ }
+
+ // Reverse the wrong oneway
+ OsmPrimitive way6 = relation.getMemberPrimitivesList().get(5);
+ if (way6 instanceof Way) {
+ Way way = (Way) way6;
+ reverseWay(way);
+ returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
+ for (int i = 0; i < 7; i++) {
+ Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
+ Assert.assertTrue(returned.get(i).onewayFollowsNext);
+ }
+ }
+
+ // Reverse everything
+ for (Way way : relation.getMemberPrimitives(Way.class)) {
+ reverseWay(way);
+ }
+ returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
+ for (int i = 0; i < 7; i++) {
+ Assert.assertTrue(returned.get(i).onewayFollowsPrevious);
+ Assert.assertTrue(returned.get(i).onewayFollowsNext);
+ }
+ }
+
+ /**
+ * Test directional {@link WayConnectionTypeCalculator#computeNextWayConnection}
+ */
+ @Test
+ public void testDirectionsOnewayMix() {
+ Relation relation = getRelation("direction");
+
+ // Remove the oneway in the wrong direction
+ OsmPrimitive osm = relation.getMemberPrimitivesList().get(5);
+ osm.remove("oneway");
+ List returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
+ for (WayConnectionType type : returned) {
+ Assert.assertTrue(type.onewayFollowsNext);
+ Assert.assertTrue(type.onewayFollowsPrevious);
+ }
+
+ // Check with a oneway=-1 tag without reversing the way
+ osm.put("oneway", "-1");
+ returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
+ for (WayConnectionType type : returned) {
+ Assert.assertTrue(type.onewayFollowsNext);
+ Assert.assertTrue(type.onewayFollowsPrevious);
+ }
+
+ // Check with oneways that converge onto a two-way
+ // TODO figure out a way to find this situation?
+ osm.remove("oneway");
+ OsmPrimitive way7 = relation.getMemberPrimitivesList().get(6);
+ way7.put("oneway", "-1");
+ returned = wayConnectionTypeCalculator.updateLinks(relation.getMembers());
+ for (WayConnectionType type : returned) {
+ Assert.assertTrue(type.onewayFollowsNext);
+ Assert.assertTrue(type.onewayFollowsPrevious);
+ }
+ }
}