Changeset 33432 in osm for applications/editors/josm/plugins/pt_assistant

Timestamp:

2017-07-07T23:47:58+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] implemented #josm14977

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• images/icons/sortptstops.png (added)
• src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsAction.java (added)
• src/org/openstreetmap/josm/plugins/pt_assistant/data/PTStop.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java (modified) (1 diff)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java

@@ -21 +21 @@
 import org.openstreetmap.josm.plugins.pt_assistant.actions.EditHighlightedRelationsAction;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.RepeatLastFixAction;
+import org.openstreetmap.josm.plugins.pt_assistant.actions.SortPTStopsAction;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.SplitRoundaboutAction;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
@@ -66 +67 @@
         editHighlightedRelationsMenu = MainMenu.add(Main.main.menu.toolsMenu, editHighlightedRelationsAction);
         MainMenu.add(Main.main.menu.toolsMenu, new SplitRoundaboutAction());
+        MainMenu.add(Main.main.menu.toolsMenu, new SortPTStopsAction());
     }
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTStop.java

@@ -27 +27 @@
     private OsmPrimitive platform = null;
 
+    private RelationMember stopPositionRM = null;
+
+    private RelationMember platformRM = null;
+
     /* the name of this stop */
     private String name = "";
@@ -50 +54 @@
             this.stopPosition = other.getNode();
             this.name = stopPosition.get("name");
-
+            setStopPositionRM(other);
             // } else if (other.getRole().equals("platform") ||
             // other.getRole().equals("platform_entry_only")
@@ -60 +64 @@
             this.platform = other.getMember();
             this.name = platform.get("name");
+            setPlatformRM(other);
 
         } else {
@@ -78 +83 @@
      *         already has an attribute with that role.
      */
-    protected boolean addStopElement(RelationMember member) {
+    public boolean addStopElement(RelationMember member) {
 
         // each element is only allowed once per stop
@@ -88 +93 @@
             if (member.getType().equals(OsmPrimitiveType.NODE) && stopPosition == null) {
                 this.stopPosition = member.getNode();
+                stopPositionRM = member;
                 return true;
             }
@@ -102 +108 @@
             if (platform == null) {
                 platform = member.getMember();
+                platformRM = member;
                 return true;
             }
@@ -211 +218 @@
     }
 
+    public RelationMember getPlatformRM() {
+        return platformRM;
+    }
+
+    public void setPlatformRM(RelationMember platformRM) {
+        this.platformRM = platformRM;
+    }
+
+    public RelationMember getStopPositionRM() {
+        return stopPositionRM;
+    }
+
+    public void setStopPositionRM(RelationMember stopPositionRM) {
+        this.stopPositionRM = stopPositionRM;
+    }
+
 }

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java

@@ -19 +19 @@
 public final class RouteUtils {
 
-    private static final String ptVersionTag = "public_transport:version";
+    private static final String PT_VERSION_TAG = "public_transport:version";
     private RouteUtils() {
         // private constructor for util classes
@@ -39 +39 @@
         }
 
-        if (!r.hasTag(ptVersionTag, "2")) {
+        if (!r.hasTag(PT_VERSION_TAG, "2")) {
             return false;
         }
@@ -52 +52 @@
         }
 
-        if (r.get(ptVersionTag) == null) {
+        if (r.get(PT_VERSION_TAG) == null) {
             return true;
         }
 
-        return r.hasTag(ptVersionTag, "1");
+        return r.hasTag(PT_VERSION_TAG, "1");
     }
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java

@@ -7 +7 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
@@ -32 +33 @@
 
     /* contains assigned stops */
-    public static HashMap<PTStop, List<Way>> stopToWay = new HashMap<>();
+    public static Map<PTStop, List<Way>> stopToWay = new HashMap<>();
 
     /*
@@ -39 +40 @@
      */
     private HashSet<Way> ways;
-
-    /* route relation for which this StopToWayAssigner was created */
 
     public StopToWayAssigner(List<PTWay> ptways) {
@@ -47 +46 @@
             ways.addAll(ptway.getWays());
         }
+    }
+
+    public StopToWayAssigner(Collection<Way> ways) {
+        this.ways = new HashSet<>();
+        this.ways.addAll(ways);
     }
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java

@@ -82 +82 @@
             }
         }
+    }
+
+    public boolean hasGaps(List<RelationMember> waysToCheck) {
+        return countGaps(waysToCheck) > 0;
     }