Changeset 33404 in osm for applications/editors/josm

Timestamp:

2017-06-16T19:01:54+02:00 (8 years ago)

Author:

giackserva

Message:

[pt_assistant] unit tests for #josm#14933

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java (modified) (7 diffs)
• test/data/roundabout.osm (added)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions (added)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java (added)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java

@@ -4 +4 @@
 
 import java.awt.event.ActionEvent;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -33 +36 @@
 
         private static final String actionName = "Split Roundabout";
-
         private static final long serialVersionUID = 8912249304286025356L;
 
@@ -42 +44 @@
         @Override
         public void actionPerformed(ActionEvent e) {
+
                 Way roundabout = (Way) getLayerManager().getEditDataSet().getSelected().iterator().next();
 
@@ -70 +73 @@
         {
                 //make the roundabout round, if requested
-                int result = JOptionPane.showOptionDialog(Main.parent,
+                if(Main.pref.getBoolean("pt_assistant.roundabout-splitter.alignalways") ||
+                                JOptionPane.YES_OPTION == JOptionPane.showOptionDialog(Main.parent,
                                 tr("Do you want to make the roundabout round?"), tr("Roundabout round"),
                                 JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,
-                                null, null, null);
-
-                if(result == JOptionPane.YES_OPTION) {
+                                null, null, null)) {
                         new AlignInCircleAction().actionPerformed(null);
                 }
@@ -86 +88 @@
                 getLayerManager().getEditDataSet().setSelected(splitNodes);
                 new SplitWayAction().actionPerformed(null);
-                Collection<OsmPrimitive> splitWays = getLayerManager().getEditDataSet().getSelected();
+                Collection<Way> splitWays = getLayerManager().getEditDataSet().getSelectedWays();
 
         //update the relations.
+                updateRelations(savedPositions, splitNodes, splitWays);
+        }
+
+        public void updateRelations(Map<Relation, Integer> savedPositions,
+                        List<Node> splitNodes, Collection<Way> splitWays) {
                 savedPositions.forEach((r, i) -> {
                         Way previous = r.getMember(i-1).getWay();
@@ -137 +144 @@
         //split only on the nodes which might be the
         //entry or exit point for some public transport route
-        private List<Node> getSplitNodes(Way roundabout) {
-                List<Node> splitNodes = roundabout.getNodes();
+        public List<Node> getSplitNodes(Way roundabout) {
+                Set<Node> noDuplicateSplitNodes = new HashSet<>(roundabout.getNodes());
+                List<Node> splitNodes = new ArrayList<>(noDuplicateSplitNodes);
+
                 splitNodes.removeIf(n -> {
                         List<Way> parents = n.getParentWays();
@@ -159 +168 @@
         //save the position of the roundabout inside each public transport route
         //it is contained in
-        private Map<Relation, Integer> getSavedPositions(Way roundabout) {
+        public Map<Relation, Integer> getSavedPositions(Way roundabout) {
 
                 Map<Relation, Integer> savedPositions = new HashMap<>();

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java

@@ -37 +37 @@
  public static final String PATH_TO_PLATFORM_AS_WAY = "test/data/route-with-platform-as-way.osm";
 
+ public static final String PATH_TO_ROUNDABOUT = "test/data/roundabout.osm";
  public static final String PATH_TO_ROUNDABOUT_ONEWAY = "test/data/duesseldorf_roundabout.osm";
 
@@ -55 +56 @@
  public static final String PATH_TO_STOP_AREA_MANY_PLATFORMS = "test/data/stop-area-many-platforms.osm";
 
-
  public static final String PATH_TO_SEGMENT_TEST = "test/data/segment-test.osm";