Changeset 32806 in osm for applications/editors

Timestamp:

2016-08-13T04:10:03+02:00 (8 years ago)

Author:

darya

Message:

3 error messages for stop-by-stop test

File:

• applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java (modified) (9 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteDataManager;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
@@ -565 +568 @@
 
                 /*-
-                 * When is an error fixable?
+                 * When is an error fixable (outdated)?
                  * - if there is a correct segment
                  * - if it can be fixed by sorting
@@ -584 +587 @@
                 PTRouteSegment wrongSegment = wrongSegments.get(testError);
                 PTRouteSegment correctSegment = null;
-                // TODO: now just the first correctSegment is taken over. Change
-                // that the segment is selected.
                 for (PTRouteSegment segment : correctSegments) {
                         if (wrongSegment.getFirstStop().equalsStop(segment.getFirstStop())
@@ -606 +607 @@
         }
 
+        /**
+         * Finds fixes using sorting and removal. Modifies the messages in the test
+         * error according to the availability of automatic fixes.
+         */
         protected void findFixes() {
+
                 for (TestError error : wrongSegments.keySet()) {
+                        // look for fixes using sorting and removing:
                         findFix(error);
-                }
+
+                        // change the error code based on the availability of fixes:
+                        PTRouteSegment wrongSegment = wrongSegments.get(error);
+                        List<PTRouteSegment> correctSegmentsForThisError = new ArrayList<>();
+                        for (PTRouteSegment segment : correctSegments) {
+                                if (wrongSegment.getFirstWay().getId() == segment.getFirstWay().getId()
+                                                && wrongSegment.getLastWay().getId() == segment.getLastWay().getId()) {
+                                        correctSegmentsForThisError.add(segment);
+                                }
+                        }
+
+                        int numberOfFixes = correctSegmentsForThisError.size();
+
+                        if (numberOfFixes == 0) {
+                                numberOfFixes = wrongSegment.getFixVariants().size();
+                        }
+                        if (numberOfFixes == 0) {
+                                for (PTRouteSegment segment : correctSegments) {
+                                        if (wrongSegment.getFirstStop().equalsStop(segment.getFirstStop())
+                                                        && wrongSegment.getLastStop().equalsStop(segment.getLastStop())) {
+                                                correctSegmentsForThisError.add(segment);
+                                        }
+                                }
+                                numberOfFixes = correctSegmentsForThisError.size();
+                        }
+
+                        // change the error code:
+                        if (numberOfFixes == 0) {
+                                error.setMessage(tr("PT: Problem in the route segment with no automatic fix"));
+                        } else if (numberOfFixes == 1) {
+                                error.setMessage(tr("PT: Problem in the route segment with one automatic fix"));
+                        } else {
+                                error.setMessage("PT: Problem in the route segment with several automatic fixes");
+                        }
+                }
+
         }
 
@@ -627 +669 @@
                 Node previousNode = findFirstNodeOfRouteSegmentInDirectionOfTravel(startPTWay);
                 if (previousNode == null) {
-                        // TODO: sort route ways
                         return;
                 }
@@ -697 +738 @@
                 // layer, clear them:
                 ((PTAssistantValidatorTest) testError.getTester()).clearFixVariants();
-                
+
                 PTRouteSegment wrongSegment = wrongSegments.get(testError);
 
@@ -709 +750 @@
                 }
 
-                // if no correct segment found, apply less strict criteria to look for one:
+                // if no correct segment found, apply less strict criteria to look for
+                // one:
                 if (correctSegmentsForThisError.isEmpty() && wrongSegment.getFixVariants().isEmpty()) {
                         for (PTRouteSegment segment : correctSegments) {
@@ -863 +905 @@
          */
         private static void carryOutSelectedFix(TestError testError, List<PTWay> fix) {
+                // modify the route:
                 Relation route = (Relation) testError.getPrimitives().iterator().next();
                 route.setMembers(getModifiedRelationMembers(testError, fix));
@@ -869 +912 @@
                 wrongSegment.setPTWays(fix);
                 addCorrectSegment(wrongSegment);
+
+                // get ways for the fix:
+                List<Way> primitives = new ArrayList<>();
+                for (PTWay ptway : fix) {
+                        primitives.addAll(ptway.getWays());
+                }
+
+                // get layer:
+                OsmDataLayer layer = null;
+                List<OsmDataLayer> listOfLayers = Main.getLayerManager().getLayersOfType(OsmDataLayer.class);
+                for (OsmDataLayer osmDataLayer : listOfLayers) {
+                        if (osmDataLayer.data == route.getDataSet()) {
+                                layer = osmDataLayer;
+                                break;
+                        }
+                }
+
+                // create editor:
+                GenericRelationEditor editor = (GenericRelationEditor) RelationEditor.getEditor(layer, route,
+                                route.getMembersFor(primitives));
+
+                // open editor:
+                editor.setVisible(true);
+
         }