Changeset 33464 in osm

Timestamp:

2017-07-24T21:37:48+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] SegmentChecker refactoring

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentCheckerTest.java (modified) (2 diffs)

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

@@ -21 +21 @@
 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;
@@ -332 +333 @@
     private void proceedWithSorting(Relation r) {
 
+        PTRouteDataManager manager = new PTRouteDataManager(r);
+        StopToWayAssigner assigner = new StopToWayAssigner(manager.getPTWays());
+
+        for (RelationMember rm : manager.getFailedMembers()) {
+            List<Relation> primitives = new ArrayList<>(1);
+            primitives.add(r);
+            List<OsmPrimitive> highlighted = new ArrayList<>(1);
+            highlighted.add(rm.getMember());
+            Builder builder = TestError.builder(this, Severity.WARNING,
+                    ERROR_CODE_RELATION_MEMBER_ROLES);
+            builder.message(tr("PT: Relation member roles do not match tags"));
+            builder.primitives(primitives);
+            builder.highlight(highlighted);
+            TestError e = builder.build();
+            errors.add(e);
+        }
+
         // Check if the relation is correct, or only has a wrong sorting order:
         RouteChecker routeChecker = new RouteChecker(r, this);
@@ -338 +356 @@
 
         SegmentChecker segmentChecker = new SegmentChecker(r, this);
+        segmentChecker.setManager(manager);
+        segmentChecker.setAssigner(assigner);
         segmentChecker.performFirstStopTest();
         segmentChecker.performLastStopTest();

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

@@ -65 +65 @@
 
         super(relation, test);
-
-        this.setManager(new PTRouteDataManager(relation));
-
-        for (RelationMember rm : getManager().getFailedMembers()) {
-            List<Relation> primitives = new ArrayList<>(1);
-            primitives.add(relation);
-            List<OsmPrimitive> highlighted = new ArrayList<>(1);
-            highlighted.add(rm.getMember());
-            Builder builder = TestError.builder(this.test, Severity.WARNING,
-                    PTAssistantValidatorTest.ERROR_CODE_RELATION_MEMBER_ROLES);
-            builder.message(tr("PT: Relation member roles do not match tags"));
-            builder.primitives(primitives);
-            builder.highlight(highlighted);
-            TestError e = builder.build();
-            this.errors.add(e);
-        }
-
-        this.setAssigner(new StopToWayAssigner(getManager().getPTWays()));
-
     }
 

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

@@ -11 +11 @@
 import org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
 import org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
+import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteDataManager;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
+import org.openstreetmap.josm.plugins.pt_assistant.utils.StopToWayAssigner;
 
 public class SegmentCheckerTest extends AbstractTest {
@@ -31 +33 @@
 
         SegmentChecker segmentChecker = new SegmentChecker(route, test);
+        PTRouteDataManager manager = new PTRouteDataManager(route);
+        segmentChecker.setManager(manager);
+        segmentChecker.setAssigner(new StopToWayAssigner(manager.getPTWays()));
         segmentChecker.performStopByStopTest();
         //since 33425 storing correct segments only of continuous routes