Changeset 32871 in osm for applications/editors/josm/plugins/pt_assistant/src

Timestamp:

2016-08-23T03:38:46+02:00 (8 years ago)

Author:

darya

Message:

preference settings added

Location:

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

Files:

• PTAssistantPlugin.java (modified) (6 diffs)
• actions/IncompleteMembersDownloadThread.java (modified) (3 diffs)
• actions/RepeatLastFixAction.java (modified) (2 diffs)
• gui/IncompleteMembersDownloadDialog.java (modified) (1 diff)
• gui/ProceedDialog.java (modified) (3 diffs)
• validation/NodeChecker.java (modified) (1 diff)
• validation/PTAssistantValidatorTest.java (modified) (16 diffs)
• validation/SegmentChecker.java (modified) (4 diffs)

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

@@ -1 +1 @@
 //License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.swing.JMenuItem;
@@ -11 +9 @@
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -17 +15 @@
 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.gui.PTAssistantPreferenceSetting;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.PTAssistantValidatorTest;
 
@@ -68 +67 @@
                 }
         }
-        
+
+        /**
+         * Sets up the pt_assistant tab in JOSM Preferences
+         */
+        @Override
+        public PreferenceSetting getPreferenceSetting() {
+                return new PTAssistantPreferenceSetting();
+        }
+
         public static PTRouteSegment getLastFix() {
                 return lastFix;
@@ -81 +88 @@
         public static void setLastFix(PTRouteSegment segment) {
                 lastFix = segment;
-                
+
                 SwingUtilities.invokeLater(new Runnable() {
                         @Override
@@ -90 +97 @@
         }
 
+        /**
+         * Used in unit tests
+         * 
+         * @param segment
+         */
+        public static void setLastFixNoGui(PTRouteSegment segment) {
+                lastFix = segment;
+        }
+
 }

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

@@ -21 +21 @@
         }
 
-
         @Override
         public void run() {
@@ -30 +29 @@
                                 ArrayList<PrimitiveId> list = new ArrayList<>();
 
-                                // add all route relations that are of public_transport version
-                                // 2:
-                                Collection<Relation> allRelations = Main.getLayerManager().getEditDataSet().getRelations();
-                                for (Relation currentRelation : allRelations) {
-                                        if (RouteUtils.isTwoDirectionRoute(currentRelation)) {
-                                                list.add(currentRelation);
+                                // if there are selected routes, try adding them first:
+                                for (Relation currentSelectedRelation : Main.getLayerManager().getEditDataSet()
+                                                .getSelectedRelations()) {
+                                        if (RouteUtils.isTwoDirectionRoute(currentSelectedRelation)) {
+                                                list.add(currentSelectedRelation);
+                                        }
+                                }
+
+                                if (list.isEmpty()) {
+                                        // add all route relations that are of public_transport
+                                        // version 2:
+                                        Collection<Relation> allRelations = Main.getLayerManager().getEditDataSet().getRelations();
+                                        for (Relation currentRelation : allRelations) {
+                                                if (RouteUtils.isTwoDirectionRoute(currentRelation)) {
+                                                        list.add(currentRelation);
+                                                }
                                         }
                                 }
@@ -68 +77 @@
 
                 } catch (InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-
+                        // do nothing in case the download was interrupted
                 }
 

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

@@ -16 +16 @@
 
         private static final long serialVersionUID = 2681464946469047054L;
-        
+
         public RepeatLastFixAction() {
                 super(tr("Repeat last fix"), new ImageProvider("presets/transport", "bus.svg"), tr("Repeat last fix"),
@@ -26 +26 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-                
-                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/gui/IncompleteMembersDownloadDialog.java

@@ -13 +13 @@
         // indicates if the user needs to be asked before fetching incomplete
         // members of a relation.
-        private enum ASK_TO_FETCH {
+        public enum ASK_TO_FETCH {
                 DO_ASK, DONT_ASK_AND_FETCH, DONT_ASK_AND_DONT_FETCH
         };
 
         // by default, the user should be asked
-        private static ASK_TO_FETCH askToFetch = ASK_TO_FETCH.DO_ASK;
+        public static ASK_TO_FETCH askToFetch;
 
         String message;

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/ProceedDialog.java

@@ -19 +19 @@
         private static final long serialVersionUID = 2986537034076698693L;
 
-        private enum ASK_TO_PROCEED {
+        public enum ASK_TO_PROCEED {
                 DO_ASK, DONT_ASK_AND_FIX_AUTOMATICALLY, DONT_ASK_AND_FIX_MANUALLY, DONT_ASK_AND_DONT_FIX
         };
 
         // by default, the user should be asked
-        private static ASK_TO_PROCEED askToProceed = ASK_TO_PROCEED.DO_ASK;
+        public static ASK_TO_PROCEED askToProceed;
 
         private JRadioButton radioButtonFixAutomatically;
@@ -43 +43 @@
                 label1.setAlignmentX(Component.LEFT_ALIGNMENT);
 
-                if (numberOfDirectionErrors != 0) {
+                if (true) {
                         JLabel label2 = new JLabel("     " + trn("{0} direction error", "{0} direction errors", numberOfDirectionErrors, numberOfDirectionErrors));
                         panel.add(label2);
@@ -67 +67 @@
                 fixOptionButtonGroup.add(radioButtonDontFix);
                 panel.add(radioButtonFixAutomatically);
-                panel.add(radioButtonFixManually);
+//              panel.add(radioButtonFixManually);
                 panel.add(radioButtonDontFix);
                 radioButtonFixAutomatically.setAlignmentX(Component.LEFT_ALIGNMENT);

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

@@ -85 +85 @@
         /**
          * Checks if the given stop_position node belongs to any stop_area relation
-         * 
+         * @author xamanu
          * @param n
          */

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

@@ -11 +11 @@
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SelectCommand;
@@ -23 +24 @@
 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;
@@ -82 +82 @@
                         nodeChecker.performSolitaryStopPositionTest();
 
-                        // check if stop positions are in any stop_area relation:
-                        nodeChecker.performNodePartOfStopAreaTest();
+                        if (Main.pref.getBoolean("pt_assistant.stop-area-tests", true) == true) {
+                                // check if stop positions are in any stop_area relation:
+                                nodeChecker.performNodePartOfStopAreaTest();
+                        }
 
                 }
@@ -93 +95 @@
                         nodeChecker.performPlatformPartOfWayTest();
 
-                        // check if platforms are in any stop_area relation:
-                        nodeChecker.performNodePartOfStopAreaTest();
+                        if (Main.pref.getBoolean("pt_assistant.stop-area-tests", true) == true) {
+                                // check if platforms are in any stop_area relation:
+                                nodeChecker.performNodePartOfStopAreaTest();
+                        }
+
                 }
 
@@ -105 +110 @@
 
                 // Do some testing on stop area relations
-                if (StopUtils.isStopArea(r)) {
+                if (Main.pref.getBoolean("pt_assistant.stop-area-tests", true) == true && StopUtils.isStopArea(r)) {
 
                         StopChecker stopChecker = new StopChecker(r, this);
@@ -144 +149 @@
                 // type test:
                 WayChecker wayChecker = new WayChecker(r, this);
-                if (!r.hasIncompleteMembers()) {
-                        wayChecker.performDirectionTest();
-                        wayChecker.performRoadTypeTest();
-                }
+                wayChecker.performDirectionTest();
+                wayChecker.performRoadTypeTest();
                 this.errors.addAll(wayChecker.getErrors());
 
-                if (this.errors.isEmpty()) {
-                        proceedWithSorting(r);
-                } else {
-                        this.proceedAfterWayCheckerErrors(r);
-                }
+                proceedWithSorting(r);
+
+                // This allows to modify the route before the sorting and
+                // SegmentChecker are carried out:
+                // if (this.errors.isEmpty()) {
+                // proceedWithSorting(r);
+                // } else {
+                // this.proceedAfterWayCheckerErrors(r);
+                // }
 
         }
@@ -220 +227 @@
         private int showIncompleteMembersDownloadDialog() throws InterruptedException {
 
+                if (Main.pref.getBoolean("pt_assistant.download-incomplete", false) == true) {
+                        return JOptionPane.YES_OPTION;
+                }
+
+                if (Main.pref.getBoolean("pt_assistant.download-incomplete", false) == false) {
+                        return JOptionPane.NO_OPTION;
+                }
+
                 IncompleteMembersDownloadDialog incompleteMembersDownloadDialog = new IncompleteMembersDownloadDialog();
                 return incompleteMembersDownloadDialog.getUserSelection();
@@ -226 +241 @@
 
         /**
-         * Gets user input after errors were detected by WayChecker (direction
-         * errors and road type errors)
-         */
+         * Gets user input after errors were detected by WayChecker. Although this
+         * method is not used in the current implementation, it can be used to fix
+         * errors from the previous testing stage and modify the route before the
+         * second stage of testing is carried out.
+         */
+        @SuppressWarnings("unused")
         private void proceedAfterWayCheckerErrors(Relation r) {
 
@@ -258 +276 @@
                                         @Override
                                         public void run() {
-                                                userInput[0] = showProceedDialog(idParameter, roadTypeErrorParameter, roadTypeErrorParameter);
+                                                userInput[0] = showProceedDialog(idParameter, directionErrorParameter, roadTypeErrorParameter);
 
                                         }
                                 });
                         } catch (InvocationTargetException | InterruptedException e1) {
-                                // TODO Auto-generated catch block
                                 e1.printStackTrace();
                         }
@@ -276 +293 @@
 
                 if (userInput[0] == 1) {
-                        // TODO
                         JOptionPane.showMessageDialog(null, "This is not implemented yet!");
                         return;
@@ -282 +298 @@
 
                 if (userInput[0] == 2) {
-                        // TODO: should the errors be removed from the error list?
                         proceedWithSorting(r);
                 }
@@ -292 +307 @@
 
         private int showProceedDialog(long id, int numberOfDirectionErrors, int numberOfRoadTypeErrors) {
+
+                if (numberOfDirectionErrors == 0 && numberOfDirectionErrors == 0) {
+                        return 2;
+                }
+
+                if (Main.pref.getBoolean("pt_assistant.proceed-without-fix", true) == false) {
+                        return 0;
+                }
+
+                if (Main.pref.getBoolean("pt_assistant.proceed-without-fix", true) == true) {
+                        return 2;
+                }
 
                 ProceedDialog proceedDialog = new ProceedDialog(id, numberOfDirectionErrors, numberOfRoadTypeErrors);
@@ -322 +349 @@
                 if (!routeCheckerErrors.isEmpty()) {
                         // Variant 2
-                        // If there is only the sorting error, add it and stop testing.
+                        // If there is only the sorting error, add it
                         this.errors.addAll(routeChecker.getErrors());
-                        // return;
                 }
 
@@ -337 +363 @@
         }
 
+        /**
+         * Carries out the stop-by-stop testing which includes building the route
+         * data model.
+         * 
+         * @param r route relation
+         */
         private void proceedAfterSorting(Relation r) {
 
@@ -409 +441 @@
                 return false;
         }
-
+        
+        /**
+         * Fixes the given error
+         */
         @Override
         public Command fixError(TestError testError) {
@@ -425 +460 @@
 
                 if (testError.getCode() == ERROR_CODE_ROAD_TYPE || testError.getCode() == ERROR_CODE_CONSTRUCTION) {
-                        commands.add(WayChecker.fixErrorByRemovingWay(testError));
+                        commands.add(WayChecker.fixErrorByZooming(testError));
                 }
 

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

@@ -103 +103 @@
                 correctSegments.add(segment);
         }
+        
+        /**
+         * Used for unit tests
+         * @param error
+         * @return
+         */
+        protected static PTRouteSegment getWrongSegment(TestError error) {
+                return wrongSegments.get(error);
+        }
 
         public void performFirstStopTest() {
@@ -908 +917 @@
                 wrongSegment.setPTWays(fix);
                 addCorrectSegment(wrongSegment);
-                PTAssistantPlugin.setLastFix(wrongSegment);
+                PTAssistantPlugin.setLastFixNoGui(wrongSegment);
 
                 // get ways for the fix:
@@ -1014 +1023 @@
         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();
@@ -1049 +1054 @@
                 }
                 
-                System.out.println("wrong segments found: " + counter);
-                System.out.println();
-                
-                
-                
-                
+        }
+        
+        /**
+         * Resets the static list variables (used for unit testing)
+         */
+        protected static void reset() {
+                correctSegments.clear();
+                wrongSegments.clear();
         }