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

Timestamp:

2017-08-17T11:56:02+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm15088 - applying the fix

Location:

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

Files:

• PTAssistantValidatorTest.java (modified) (2 diffs)
• RouteChecker.java (modified) (2 diffs)

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

@@ -458 +458 @@
                 || testError.getCode() == ERROR_CODE_SORTING
                 || testError.getCode() == ERROR_CODE_PARTIAL_SORTING
+                || testError.getCode() == ERROR_CODE_TRIVIAL_FIX
                 || testError.getCode() == ERROR_CODE_END_STOP
                 || testError.getCode() == ERROR_CODE_PLATFORM_PART_OF_HIGHWAY) {
@@ -492 +493 @@
                 || testError.getCode() == ERROR_CODE_END_STOP) {
             commands.add(WayChecker.fixErrorByZooming(testError));
+        }
+
+        if (testError.getCode() == ERROR_CODE_TRIVIAL_FIX) {
+            commands.add(RouteChecker.fixTrivialError(testError));
         }
 

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

@@ -110 +110 @@
                         Builder builder = TestError.builder(this.test, Severity.WARNING, PTAssistantValidatorTest.ERROR_CODE_TRIVIAL_FIX);
                         builder.message(tr("PT: Route gap can be closed by adding a single way"));
-                        builder.primitives(relation, before, after, fix);
+                        builder.primitives(relation, before, fix, after);
                         TestError e = builder.build();
                         this.errors.add(e);
@@ -372 +372 @@
     }
 
+    //the trivial fix simply adds the right way (the one found during the
+    //detection phase) in the gap in order to close it
+    protected static Command fixTrivialError(TestError testError) {
+
+        if (testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_TRIVIAL_FIX) {
+            return null;
+        }
+
+        List<OsmPrimitive> primitives = new ArrayList<>(testError.getPrimitives());
+        Relation originalRelation = (Relation) primitives.get(0);
+        Way before = (Way) primitives.get(1);
+        Way fix = (Way) primitives.get(2);
+
+        int index = 0;
+        List<RelationMember> members = originalRelation.getMembers();
+        for (index = 0; index < members.size(); index++) {
+            if (members.get(index).getMember().equals(before)) {
+                break;
+            }
+        }
+
+        Relation fixedRelation = new Relation(originalRelation);
+        fixedRelation.addMember(index + 1, new RelationMember(null, fix));
+
+        return new ChangeCommand(originalRelation, fixedRelation);
+    }
+
     public PTRouteDataManager getManager() {
         return manager;