Ticket #9584: 9584_v2.patch

src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -149 +149 @@
 
     private static final StringSwitcher[] stringSwitchers = new StringSwitcher[] {
         new StringSwitcher("left", "right"),
-        new StringSwitcher("forwards", "backwards"),
+        new StringSwitcher("forward", "backward"),
         new StringSwitcher("east", "west"),
         new StringSwitcher("north", "south"),
         FORWARD_BACKWARD, UP_DOWN

src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -55 +55 @@
     }
 
     public static boolean isDirection(String part) {
-        return "forward".equals(part) || "backward".equals(part);
+        return "forward".equals(part) || "backward".equals(part) ||
+                (part != null && (part.startsWith("north") || part.startsWith("south") ||
+                        part.startsWith("east") || part.startsWith("west")));
     }
 
     public boolean isKeyValid(String key) {

src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -283 +283 @@
 
         private boolean hasGap() {
             WayConnectionType connectionType = getConnectionType();
-            return connectionTypesOfInterest.contains(connectionType.direction)
+            return connectionTypesOfInterest.contains(connectionType.direction.interpretation())
                     && !(connectionType.linkNext && connectionType.linkPrev);
         }
 
@@ -292 +292 @@
             WayConnectionType connectionType = getConnectionType();
             Way way = (Way) getMemberTableModel().getReferredPrimitive(getSelectedRows()[0]);
             if (!connectionType.linkPrev) {
-                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD.equals(connectionType.direction)
+                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD.equals(connectionType.direction.interpretation())
                         ? way.firstNode() : way.lastNode());
                 AutoScaleAction.autoScale("selection");
             } else if (!connectionType.linkNext) {
-                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD.equals(connectionType.direction)
+                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD.equals(connectionType.direction.interpretation())
                         ? way.lastNode() : way.firstNode());
                 AutoScaleAction.autoScale("selection");
             }

src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java

@@ -161 +161 @@
         /* special icons */
         Image arrow = null;
         switch (value.direction) {
+        case NORTH:
+        case EAST:
         case FORWARD:
             arrow = arrowDown;
             break;
+        case SOUTH:
+        case WEST:
         case BACKWARD:
             arrow = arrowUp;
             break;

src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java

@@ -49 +49 @@
     }
 
     static boolean isBackward(final RelationMember member){
-        return member.getRole().equals("backward");
+        return member.getRole().equals("backward") || member.getRole().startsWith("south") || member.getRole().startsWith("west");
     }
 
     static boolean isForward(final RelationMember member){
-        return member.getRole().equals("forward");
+        return member.getRole().equals("forward") || member.getRole().startsWith("north") || member.getRole().startsWith("east");
     }
 
     static boolean isOneway(final RelationMember member){

src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java

@@ -25 +25 @@
     public Direction direction;
 
     public enum Direction {
-        FORWARD, BACKWARD, ROUNDABOUT_LEFT, ROUNDABOUT_RIGHT, NONE;
+        FORWARD {
+            @Override
+            public Direction interpretation() {
+                return FORWARD;
+            }
+        },
+        BACKWARD {
+            @Override
+            public Direction interpretation() {
+                return BACKWARD;
+            }
+        },
+        ROUNDABOUT_LEFT {
+            @Override
+            public Direction interpretation() {
+                return FORWARD;
+            }
+        },
+        ROUNDABOUT_RIGHT {
+            @Override
+            public Direction interpretation() {
+                return BACKWARD;
+            }
+        },
+        NONE {
+            @Override
+            public Direction interpretation() {
+                return FORWARD;
+            }
+        },
+        NORTH {
+            @Override
+            public Direction interpretation() {
+                return FORWARD;
+            }
+        },
+        SOUTH {
+            @Override
+            public Direction interpretation() {
+                return BACKWARD;
+            }
+        },
+        EAST {
+            @Override
+            public Direction interpretation() {
+                return FORWARD;
+            }
+        },
+        WEST {
+            @Override
+            public Direction interpretation() {
+                return BACKWARD;
+            }
+        };
+
+        public abstract Direction interpretation();
 
         public boolean isRoundabout() {
             return this == ROUNDABOUT_RIGHT || this == ROUNDABOUT_LEFT;

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

@@ -248 +248 @@
         List<Node> refNodes= new ArrayList<Node>();
 
         switch (ref_direction) {
+        case NORTH:
+        case EAST:
         case FORWARD:
             refNodes.add(way_ref.lastNode());
             break;
+        case SOUTH:
+        case WEST:
         case BACKWARD:
             refNodes.add(way_ref.firstNode());
             break;

src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -172 +172 @@
         public boolean required = false;
         public long count = 0;
         
+        @Override
+        public String toString() {
+            return "[Role key = " + key + ", text = " + text + "]";
+        }
+
         public void setType(String types) throws SAXException {
             this.types = getType(types);
         }