Changeset 15696 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

Timestamp:

2020-01-13T00:11:29+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18020 - don't show way directions for boundary relations

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
@@ -30 +31 @@
      */
     public List<WayConnectionType> updateLinks(List<RelationMember> members) {
+        return updateLinks(null, members);
+    }
+
+    /**
+     * refresh the cache of member WayConnectionTypes
+     * @param r relation. Can be null, for plugins compatibility, but really shouldn't
+     * @param members relation members
+     * @return way connections
+     * @since 15696
+     */
+    public List<WayConnectionType> updateLinks(Relation r, List<RelationMember> members) {
         this.members = members;
         final List<WayConnectionType> con = new ArrayList<>();
@@ -46 +58 @@
         for (int i = 0; i < members.size(); ++i) {
             try {
-                lastWct = updateLinksFor(con, lastWct, i);
+                lastWct = updateLinksFor(r, con, lastWct, i);
             } catch (RuntimeException e) {
                 int index = i;
@@ -58 +70 @@
     }
 
-    private WayConnectionType updateLinksFor(final List<WayConnectionType> con, WayConnectionType lastWct, int i) {
+    private WayConnectionType updateLinksFor(Relation r, List<WayConnectionType> con, WayConnectionType lastWct, int i) {
         final RelationMember m = members.get(i);
         if (isNoHandleableWay(m)) {
@@ -67 +79 @@
             firstGroupIdx = i;
         } else {
-            WayConnectionType wct = computeNextWayConnection(con, lastWct, i, m);
+            WayConnectionType wct = computeNextWayConnection(r, con, lastWct, i, m);
 
             if (!wct.linkPrev) {
@@ -84 +96 @@
     }
 
-    private WayConnectionType computeNextWayConnection(final List<WayConnectionType> con, WayConnectionType lastWct, int i,
+    private WayConnectionType computeNextWayConnection(Relation r, List<WayConnectionType> con, WayConnectionType lastWct, int i,
             final RelationMember m) {
         WayConnectionType wct = new WayConnectionType(false);
         wct.linkPrev = i > 0 && con.get(i-1) != null && con.get(i-1).isValid();
         wct.direction = NONE;
-
-        if (RelationSortUtils.isOneway(m)) {
+        wct.ignoreOneway = isOnewayIgnored(r);
+
+        if (!wct.ignoreOneway && RelationSortUtils.isOneway(m)) {
             handleOneway(lastWct, i, wct);
         }
@@ -121 +134 @@
         }
 
+        if (!wct.ignoreOneway) {
+            handleOnewayFollows(lastWct, i, m, wct);
+        }
+        con.set(i, wct);
+        return wct;
+    }
+
+    private static boolean isOnewayIgnored(Relation r) {
+        return r != null && "boundary".equals(r.get("type"));
+    }
+
+    protected void handleOnewayFollows(WayConnectionType lastWct, int i, final RelationMember m,
+            WayConnectionType wct) {
         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)) {
@@ -135 +161 @@
             }
         }
-        con.set(i, wct);
-        return wct;
     }