Changeset 17862 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java

Timestamp:

2021-05-06T17:39:27+02:00 (3 years ago)

Author:

simon04

Message:

fix #17177 - Add support for Mapbox Vector Tile (patch by taylor.smock)

Signed-off-by: Taylor Smock <tsmock@…>

File:

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

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.INode;
+import org.openstreetmap.josm.data.osm.IRelationMember;
+import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction;
 
@@ -25 +25 @@
      * @param member relation member
      * @return roundabout type
+     * @since xxx (generics)
      */
-    static Direction roundaboutType(RelationMember member) {
+    static Direction roundaboutType(IRelationMember<?> member) {
         if (member == null || !member.isWay()) return NONE;
-        return roundaboutType(member.getWay());
+        return roundaboutType((IWay<?>) member.getWay());
     }
 
-    static Direction roundaboutType(Way w) {
+    /**
+     * Check if a way is a roundabout type
+     * @param w The way to check
+     * @param <W> The way type
+     * @return The roundabout type
+     * @since xxx (generics)
+     */
+    static <W extends IWay<?>> Direction roundaboutType(W w) {
         if (w != null && w.hasTag("junction", "circular", "roundabout")) {
             int nodesCount = w.getNodesCount();
             if (nodesCount > 2 && nodesCount < 200) {
-                Node n1 = w.getNode(0);
-                Node n2 = w.getNode(1);
-                Node n3 = w.getNode(2);
+                INode n1 = w.getNode(0);
+                INode n2 = w.getNode(1);
+                INode n3 = w.getNode(2);
                 if (n1 != null && n2 != null && n3 != null && w.isClosed()) {
                     /** do some simple determinant / cross product test on the first 3 nodes
@@ -55 +63 @@
     }
 
-    static boolean isBackward(final RelationMember member) {
+    static boolean isBackward(final IRelationMember<?> member) {
         return "backward".equals(member.getRole());
     }
 
-    static boolean isForward(final RelationMember member) {
+    static boolean isForward(final IRelationMember<?> member) {
         return "forward".equals(member.getRole());
     }
 
-    static boolean isOneway(final RelationMember member) {
+    static boolean isOneway(final IRelationMember<?> member) {
         return isForward(member) || isBackward(member);
     }