Changeset 32855 in osm for applications/editors

Timestamp:

2016-08-20T18:26:00+02:00 (8 years ago)

Author:

darya

Message:

fix #13388 and Repeat last fix function

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant

Files:

• PTAssistantPlugin.java (modified) (5 diffs)
• actions/AddStopPositionAction.java (modified) (1 diff)
• actions/RepeatLastFixAction.java (modified) (1 diff)
• data/PTRouteSegment.java (modified) (4 diffs)
• validation/NodeChecker.java (modified) (5 diffs)
• validation/PTAssistantValidatorTest.java (modified) (12 diffs)
• validation/SegmentChecker.java (modified) (14 diffs)
• validation/StopChecker.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.pt_assistant;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -8 +11 @@
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.AddStopPositionAction;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.RepeatLastFixAction;
+import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.PTAssistantValidatorTest;
 
@@ -22 +27 @@
 public class PTAssistantPlugin extends Plugin {
 
+        /*
+         * last fix that was can be re-applied to all similar route segments, can be
+         * null if unavailable
+         */
+        private static PTRouteSegment lastFix;
+
         private JMenuItem addStopPositionMenu;
-        private JMenuItem repeatLastFixMenu;
+        private static JMenuItem repeatLastFixMenu;
 
         /**
@@ -36 +47 @@
 
                 OsmValidator.addTest(PTAssistantValidatorTest.class);
-                
+
                 AddStopPositionAction addStopPositionAction = new AddStopPositionAction();
                 addStopPositionMenu = MainMenu.add(Main.main.menu.toolsMenu, addStopPositionAction, false);
                 RepeatLastFixAction repeatLastFixAction = new RepeatLastFixAction();
                 repeatLastFixMenu = MainMenu.add(Main.main.menu.toolsMenu, repeatLastFixAction, false);
-                
+
         }
 
@@ -51 +62 @@
                 if (oldFrame == null && newFrame != null) {
                         addStopPositionMenu.setEnabled(true);
+                        repeatLastFixMenu.setEnabled(false);
                 } else if (oldFrame != null && newFrame == null) {
                         addStopPositionMenu.setEnabled(false);
+                        repeatLastFixMenu.setEnabled(false);
                 }
+        }
+        
+        public static PTRouteSegment getLastFix() {
+                return lastFix;
+        }
+
+        /**
+         * Remembers the last fix and enables/disables the Repeat last fix menu
+         * 
+         * @param segment
+         *            The last fix, call be null to disable the Repeat last fix menu
+         */
+        public static void setLastFix(PTRouteSegment segment) {
+                lastFix = segment;
+                
+                SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                                repeatLastFixMenu.setEnabled(segment != null);
+                        }
+                });
         }
 

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

@@ -37 +37 @@
                                 false, "addStopPosition", false);
 
-                this.setEnabled(true);
         }
 

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.pt_assistant.actions;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
+import org.openstreetmap.josm.plugins.pt_assistant.validation.SegmentChecker;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 
 public class RepeatLastFixAction extends JosmAction {
 
         private static final long serialVersionUID = 2681464946469047054L;
+        
+        public RepeatLastFixAction() {
+                super(tr("Repeat last fix"), new ImageProvider("presets/transport", "bus.svg"), tr("Repeat last fix"),
+                                Shortcut.registerShortcut("Repeat last fix", tr("Repeat last fix"), KeyEvent.VK_E, Shortcut.NONE),
+                                false, "repeatLastFix", false);
+
+        }
 
         @Override
         public void actionPerformed(ActionEvent e) {
-                // TODO Auto-generated method stub
+                
+                System.out.println("in actionPerformed");
+                
+                if (!isEnabled() || !Main.isDisplayingMapView()) {
+                        return;
+                }
+                
+                System.out.println("performing action");
+                
+                SegmentChecker.carryOutRepeatLastFix(PTAssistantPlugin.getLastFix());
+                
+                PTAssistantPlugin.setLastFix(null);
                 
         }

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

@@ -4 +4 @@
 import java.util.List;
 
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 
@@ -22 +23 @@
         private List<PTWay> ptways;
         private List<List<PTWay>> fixVariants;
+        private Relation relation;
 
-        public PTRouteSegment(PTStop firstStop, PTStop lastStop, List<PTWay> ways) {
+        public PTRouteSegment(PTStop firstStop, PTStop lastStop, List<PTWay> ways, Relation relation) {
                 this.firstStop = firstStop;
                 this.lastStop = lastStop;
@@ -29 +31 @@
                 ptways.addAll(ways);
                 fixVariants = new ArrayList<>();
+                this.relation = relation;
         }
 
@@ -114 +117 @@
                 return this.fixVariants;
         }
+        
+        public Relation getRelation() {
+                return this.relation;
+        }
 
         /**

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

@@ -5 +5 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -10 +11 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SelectCommand;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -103 +101 @@
         }
 
-
         /**
          * Fixes errors: solitary stop position and platform which is part of a way.
@@ -119 +116 @@
 
                 Node problematicNode = (Node) testError.getPrimitives().iterator().next();
-                ArrayList<OsmPrimitive> primitivesToSelect = new ArrayList<>(1);
-                primitivesToSelect.add(problematicNode);
-                SelectCommand selectCommand = new SelectCommand(primitivesToSelect);
-                selectCommand.executeCommand();
 
                 final int[] userSelection = { JOptionPane.YES_OPTION };
@@ -165 +158 @@
         private static int showFixNodeTagDialog(TestError e) {
                 Node problematicNode = (Node) e.getPrimitives().iterator().next();
-                Main.map.mapView.zoomTo(problematicNode.getCoor());
+                // Main.map.mapView.zoomTo(problematicNode.getCoor());
+                // zoom to problem:
+                Collection<OsmPrimitive> primitives = new ArrayList<>(1);
+                primitives.add(problematicNode);
+                AutoScaleAction.zoomTo(primitives);
 
                 String[] options = { tr("Yes"), tr("No") };

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

@@ -5 +5 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -11 +12 @@
 
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SelectCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -20 +23 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.FixTask;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.IncompleteMembersDownloadThread;
@@ -51 +56 @@
         public static final int ERROR_CODE_STOP_AREA_COMPARE_RELATIONS = 3764;
 
-
-
         private PTAssistantLayer layer;
 
@@ -75 +78 @@
                 // select only stop_positions
                 if (n.hasTag("public_transport", "stop_position")) {
-                        
+
                         // check if stop positions are on a way:
                         nodeChecker.performSolitaryStopPositionTest();
-                        
+
                         // check if stop positions are in any stop_area relation:
                         nodeChecker.performNodePartOfStopAreaTest();
@@ -86 +89 @@
                 // select only platforms
                 if (n.hasTag("public_transport", "platform")) {
-                        
+
                         // check that platforms are not part of any way:
                         nodeChecker.performPlatformPartOfWayTest();
-                        
+
                         // check if platforms are in any stop_area relation:
                         nodeChecker.performNodePartOfStopAreaTest();
                 }
-                
+
                 this.errors.addAll(nodeChecker.getErrors());
 
@@ -100 +103 @@
         @Override
         public void visit(Relation r) {
-                                
+
                 // Do some testing on stop area relations
                 if (StopUtils.isStopArea(r)) {
 
                         StopChecker stopChecker = new StopChecker(r, this);
-                        
-                        // Check if stop area relation has one stop position. 
+
+                        // Check if stop area relation has one stop position.
                         stopChecker.performStopAreaStopPositionTest();
 
-                        // Check if stop area relation has one platform. 
+                        // Check if stop area relation has one platform.
                         stopChecker.performStopAreaPlatformTest();
-                        
-                        // Check if stop position(s) belong the same route relation as related platform(s)
+
+                        // Check if stop position(s) belong the same route relation as
+                        // related platform(s)
                         stopChecker.performStopAreaRelationsTest();
 
@@ -381 +385 @@
                                 Way segmentEndWay = assigner.get(segmentEndStop);
                                 List<PTWay> waysBetweenStops = manager.getPTWaysBetween(segmentStartWay, segmentEndWay);
-                                PTRouteSegment routeSegment = new PTRouteSegment(segmentStartStop, segmentEndStop, waysBetweenStops);
+                                PTRouteSegment routeSegment = new PTRouteSegment(segmentStartStop, segmentEndStop, waysBetweenStops, r);
                                 SegmentChecker.addCorrectSegment(routeSegment);
                         }
@@ -408 +412 @@
         @Override
         public Command fixError(TestError testError) {
-                
+
                 // repaint the relation in the pt_assistant layer:
                 if (testError.getPrimitives().iterator().next().getType().equals(OsmPrimitiveType.RELATION)) {
@@ -415 +419 @@
                 }
 
+                // reset the last fix:
+                PTAssistantPlugin.setLastFix(null);
+
                 List<Command> commands = new ArrayList<>();
 
@@ -437 +444 @@
                 if (testError.getCode() == ERROR_CODE_STOP_BY_STOP) {
                         commands.add(SegmentChecker.fixError(testError));
+                        // make sure the primitives of this testError are selected:
+                        Collection<OsmPrimitive> primitivesToSelect = new ArrayList<>();
+                        for (Object obj : testError.getPrimitives()) {
+                                primitivesToSelect.add((OsmPrimitive) obj);
+                        }
+                        SelectCommand selectCommand = new SelectCommand(primitivesToSelect);
+                        SwingUtilities.invokeLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                        selectCommand.executeCommand();
+                                }
+                        });
                 }
 
@@ -474 +493 @@
 
         }
-        
+
         public void addFixVariants(List<List<PTWay>> fixVariants) {
                 layer.addFixVariants(fixVariants);
         }
-        
+
         public void clearFixVariants() {
                 layer.clearFixVariants();
         }
-        
+
         public List<PTWay> getFixVariant(Character c) {
                 return layer.getFixVariant(c);

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

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteDataManager;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
@@ -57 +58 @@
         private StopToWayAssigner assigner;
 
-        private List<PTWay> unusedWays = new ArrayList<>();
-
-        private HashMap<TestError, PTWay> erroneousPTWays = new HashMap<>();
-
-        private HashMap<TestError, Node> firstNodeOfErroneousPTWay = new HashMap<>();
-
         public SegmentChecker(Relation relation, Test test) {
 
@@ -80 +75 @@
 
                 this.assigner = new StopToWayAssigner(manager.getPTWays());
-
-                unusedWays.addAll(manager.getPTWays());
 
         }
@@ -284 +277 @@
                                                         PTAssistantValidatorTest.ERROR_CODE_STOP_BY_STOP, primitives, highlighted);
                                         this.errors.add(e);
-                                        PTRouteSegment routeSegment = new PTRouteSegment(startStop, endStop, segmentWays);
+                                        PTRouteSegment routeSegment = new PTRouteSegment(startStop, endStop, segmentWays, relation);
                                         wrongSegments.put(e, routeSegment);
-                                        erroneousPTWays.put(e, manager.getPTWay(startWay));
-                                        firstNodeOfErroneousPTWay.put(e, null);
                                 }
                                 continue;
@@ -295 +286 @@
                                         segmentWays.get(segmentWays.size() - 1));
                         if (sortingCorrect) {
-                                PTRouteSegment routeSegment = new PTRouteSegment(startStop, endStop, segmentWays);
+                                PTRouteSegment routeSegment = new PTRouteSegment(startStop, endStop, segmentWays, relation);
                                 addCorrectSegment(routeSegment);
-                                unusedWays.removeAll(segmentWays);
                         } else {
-                                PTRouteSegment routeSegment = new PTRouteSegment(startStop, endStop, segmentWays);
+                                PTRouteSegment routeSegment = new PTRouteSegment(startStop, endStop, segmentWays, relation);
                                 TestError error = this.errors.get(this.errors.size() - 1);
                                 wrongSegments.put(error, routeSegment);
@@ -452 +442 @@
                                                         PTAssistantValidatorTest.ERROR_CODE_STOP_BY_STOP, primitives, highlighted);
                                         this.errors.add(e);
-                                        erroneousPTWays.put(e, current);
                                         return false;
                                 }
@@ -649 +638 @@
                         } else {
                                 error.setMessage("PT: Problem in the route segment with several automatic fixes");
-                        }
+                        } 
                 }
 
@@ -789 +778 @@
                         }
 
+                        PTAssistantPlugin.setLastFix(correctSegmentsForThisError.get(0));
                         return carryOutSingleFix(testError, correctSegmentsForThisError.get(0).getPTWays());
 
@@ -799 +789 @@
                         }
 
+                        PTAssistantPlugin.setLastFix(new PTRouteSegment(wrongSegment.getFirstStop(),
+                                        wrongSegment.getLastStop(), wrongSegment.getFixVariants().get(0), (Relation) testError.getPrimitives().iterator().next()));
                         return carryOutSingleFix(testError, wrongSegment.getFixVariants().get(0));
                 }
@@ -904 +896 @@
          *            the fix variant to be adopted
          */
-        private static void carryOutSelectedFix(TestError testError, List<PTWay> fix) {
+        private static void carryOutSelectedFix(TestError testError, List<PTWay> fix){
                 // modify the route:
-                Relation route = (Relation) testError.getPrimitives().iterator().next();
-                route.setMembers(getModifiedRelationMembers(testError, fix));
+                Relation originalRelation = (Relation) testError.getPrimitives().iterator().next();
+                Relation modifiedRelation = new Relation(originalRelation);
+                modifiedRelation.setMembers(getModifiedRelationMembers(testError, fix));
+                ChangeCommand changeCommand = new ChangeCommand(originalRelation, modifiedRelation);
+                Main.main.undoRedo.addNoRedraw(changeCommand);
+                Main.main.undoRedo.afterAdd();
                 PTRouteSegment wrongSegment = wrongSegments.get(testError);
                 wrongSegments.remove(testError);
                 wrongSegment.setPTWays(fix);
                 addCorrectSegment(wrongSegment);
+                PTAssistantPlugin.setLastFix(wrongSegment);
 
                 // get ways for the fix:
@@ -923 +920 @@
                 List<OsmDataLayer> listOfLayers = Main.getLayerManager().getLayersOfType(OsmDataLayer.class);
                 for (OsmDataLayer osmDataLayer : listOfLayers) {
-                        if (osmDataLayer.data == route.getDataSet()) {
+                        if (osmDataLayer.data == originalRelation.getDataSet()) {
                                 layer = osmDataLayer;
                                 break;
@@ -930 +927 @@
 
                 // create editor:
-                GenericRelationEditor editor = (GenericRelationEditor) RelationEditor.getEditor(layer, route,
-                                route.getMembersFor(primitives));
+                GenericRelationEditor editor = (GenericRelationEditor) RelationEditor.getEditor(layer, originalRelation,
+                                originalRelation.getMembersFor(primitives));
 
                 // open editor:
@@ -977 +974 @@
                 modifiedRelation.setMembers(getModifiedRelationMembers(testError, fix));
                 wrongSegments.remove(testError);
-                return new ChangeCommand(originalRelation, modifiedRelation);
-
+                ChangeCommand changeCommand = new ChangeCommand(originalRelation, modifiedRelation);
+                return changeCommand;
         }
 
@@ -1014 +1011 @@
                 return modifiedRelationMembers;
         }
+        
+        public static void carryOutRepeatLastFix(PTRouteSegment segment) {
+                
+                System.out.println("last fix relation: " + segment.getRelation().getId());
+                List<TestError> wrongSegmentsToRemove = new ArrayList<>();
+                
+                int counter = 0;
+                // find all wrong ways that have the same segment:
+                for (TestError testError: wrongSegments.keySet()) {
+                        PTRouteSegment wrongSegment = wrongSegments.get(testError);
+                        if (wrongSegment.getFirstWay() == segment.getFirstWay() && wrongSegment.getLastWay() == segment.getLastWay()) {
+                                counter++;
+                                System.out.println("wrong segment: " + wrongSegment.getRelation().getId());
+                                // modify the route:
+                                Relation originalRelation = wrongSegment.getRelation();
+                                Relation modifiedRelation = new Relation(originalRelation);
+                                modifiedRelation.setMembers(getModifiedRelationMembers(testError, segment.getPTWays())); 
+                                ChangeCommand changeCommand = new ChangeCommand(originalRelation, modifiedRelation);
+                                Main.main.undoRedo.addNoRedraw(changeCommand);
+                                Main.main.undoRedo.afterAdd();
+                                wrongSegmentsToRemove.add(testError);
+                        }
+                }
+                
+                // update the errors displayed in the validator dialog:
+                List<TestError> modifiedValidatorTestErrors = new ArrayList<>();
+                for (TestError validatorTestError: Main.map.validatorDialog.tree.getErrors()) {
+                        if (!wrongSegmentsToRemove.contains(validatorTestError)) {
+                                modifiedValidatorTestErrors.add(validatorTestError);
+                        }
+                }
+                Main.map.validatorDialog.tree.setErrors(modifiedValidatorTestErrors);
+                
+                // update wrong segments:
+                for (TestError testError: wrongSegmentsToRemove) {
+                        wrongSegments.remove(testError);
+                }
+                
+                System.out.println("wrong segments found: " + counter);
+                System.out.println();
+                
+                
+                
+                
+        }
 
 }

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

@@ -4 +4 @@
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
-import java.util.HashMap;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -129 +128 @@
                 primitives.add(relation);
                 TestError e = new TestError(this.test, Severity.WARNING,
-                                tr("PT: Route relations of stop position(s) and platform(s) of stop area memebrs diverge"),
+                                tr("PT: Route relations of stop position(s) and platform(s) of stop area members diverge"),
                                 PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_COMPARE_RELATIONS, primitives);
                 errors.add(e);