Changeset 32783 in osm for applications/editors

Timestamp:

2016-08-08T18:48:10+02:00 (8 years ago)

Author:

xamanu

Message:

Stop area relation validation tests added

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• src/org/openstreetmap/josm/plugins/pt_assistant/gui/ProceedDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopUtils.java (added)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/StopChecker.java (added)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java (modified) (1 diff)
• test/data/stop-area-many-platforms.osm (added)
• test/data/stop-area-many-stops.osm (added)
• test/data/stop-area-members.osm (added)
• test/data/stop-area-no-platform.osm (added)
• test/data/stop-area-no-stops.osm (added)
• test/data/stop-area-relations.osm (added)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/StopCheckerTest.java (added)

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

@@ -60 +60 @@
 
                 radioButtonFixAutomatically = new JRadioButton("Fix all errors automatically and proceed");
-                radioButtonFixManually = new JRadioButton("I will fix the erros manually and click the button to proceed");
+                radioButtonFixManually = new JRadioButton("I will fix the errors manually and click the button to proceed");
                 radioButtonDontFix = new JRadioButton("Do not fix anything and proceed with further tests", true);
                 ButtonGroup fixOptionButtonGroup = new ButtonGroup();

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.LinkedList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Collections;
 
 import javax.swing.JOptionPane;
@@ -18 +23 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Way;
+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;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
+import org.openstreetmap.josm.plugins.pt_assistant.utils.StopUtils;
 
 public class NodeChecker extends Checker {
@@ -81 +89 @@
                 }
         }
+        
+        /**
+         * Checks if the given stop_position node belongs to any stop_area relation
+         * 
+         * @param n
+         */
+        protected void performNodePartOfStopAreaTest() {
+                                
+                if (!StopUtils.verifyIfMemberOfStopArea(node)) {
+                
+                        List<OsmPrimitive> primitives = new ArrayList<>(1);
+                        primitives.add(node);
+                        TestError e = new TestError(this.test, Severity.WARNING, tr("PT: Stop position or platform is not part of a stop area relation"),
+                                        PTAssistantValidatorTest.ERROR_CODE_NODE_PART_OF_STOP_AREA, primitives);
+                        errors.add(e);
+                }
+        }
+        
+        /**
+         * Checks if the given stop_position belongs to the same route relations as it's related platform(s).    * 
+         * @param n
+         */
+        protected void performStopPositionComparePlatformRelations() {
+
+                HashMap<Long, Long> stopPositionRelationIds = new HashMap<>();
+                HashMap<Long, Long> platformRelationIds = new HashMap<>();
+
+                // Loop through all referrer relations
+                for (Relation referrer : OsmPrimitive.getFilteredList(node.getReferrers(), Relation.class)) {
+
+                        // Create list of relations the stop position belongs to
+                        if (referrer.get("type") == "route") {
+                                stopPositionRelationIds.put(referrer.getId(), referrer.getId());
+                        }
+                        
+                        // Create list of relations the related platform(s) belongs to
+                        else if (referrer.get("public_transport") == "stop_area") {
+                                for (RelationMember stopAreaMember : referrer.getMembers()) {
+                                        Node stopAreaMemberFoo = stopAreaMember.getNode();
+                                        if (stopAreaMemberFoo.get("public_transport") == "platform") {
+                                                for (Relation stopAreaMemberReferrer : OsmPrimitive.getFilteredList(stopAreaMemberFoo.getReferrers(), Relation.class)) {
+                                                        if (stopAreaMemberReferrer.get("type") == "route") {
+                                                                platformRelationIds.put(stopAreaMemberReferrer.getId(), stopAreaMemberReferrer.getId());
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+
+                // Check if route relation lists are identical
+                if (stopPositionRelationIds.equals(platformRelationIds)) {
+                        return;
+                }
+                
+                List<OsmPrimitive> primitives = new ArrayList<>(1);
+                primitives.add(node);
+                TestError e = new TestError(this.test, Severity.WARNING, tr("PT: Stop position and it's related platform(s) have different route relations"),
+                                PTAssistantValidatorTest.ERROR_CODE_STOP_POSITION_COMPARE_RELATIONS, primitives);
+                errors.add(e);
+        }
+        
 
         /**

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.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
@@ -14 +17 @@
 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.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -29 +33 @@
 import org.openstreetmap.josm.plugins.pt_assistant.gui.ProceedDialog;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
+import org.openstreetmap.josm.plugins.pt_assistant.utils.StopUtils;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopToWayAssigner;
 
@@ -44 +49 @@
         public static final int ERROR_CODE_STOP_NOT_SERVED = 3753;
         public static final int ERROR_CODE_STOP_BY_STOP = 3754;
+        public static final int ERROR_CODE_STOP_POSITION_COMPARE_RELATIONS = 3755;
+        public static final int ERROR_CODE_NODE_PART_OF_STOP_AREA = 3761;
+        public static final int ERROR_CODE_STOP_AREA_MEMBERS_EXCESS = 3762;
+        public static final int ERROR_CODE_STOP_AREA_STOP_POSITION = 3763;
+        public static final int ERROR_CODE_STOP_AREA_PLATFORM = 3764;
+        public static final int ERROR_CODE_STOP_AREA_NO_STOPS = 3765;
+        public static final int ERROR_CODE_STOP_AREA_MANY_STOPS = 3765;
+        public static final int ERROR_CODE_STOP_AREA_NO_PLATFORM = 3766;
+        public static final int ERROR_CODE_STOP_AREA_MANY_PLATFORMS = 3767;
+        public static final int ERROR_CODE_STOP_AREA_MEMBERS_RELATIONS = 3768;
+
 
         private PTAssistantLayer layer;
@@ -65 +81 @@
                 NodeChecker nodeChecker = new NodeChecker(n, this);
 
-                // check for solitary stop positions:
+                // select only stop_positions
                 if (n.hasTag("public_transport", "stop_position")) {
+                        
+                        // check if stop positions are on a way:
                         nodeChecker.performSolitaryStopPositionTest();
-                }
-
-                // check that platforms are not part of any way:
+                        
+                        // check if stop positions are in any stop_area relation:
+                        nodeChecker.performNodePartOfStopAreaTest();
+                        
+                        // Check if stop positions belong the same route relation as related platform(s)
+                        nodeChecker.performStopPositionComparePlatformRelations();
+                }
+
+                // 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());
 
@@ -81 +110 @@
         @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. 
+                        stopChecker.performStopAreaStopPositionTest();
+                        
+                        // Check if stop area relation has more than one stop position. 
+                        stopChecker.performStopAreaMultiStopPositionTest();
+
+                        // Check if stop area relation has one platform. 
+                        stopChecker.performStopAreaPlatformTest();
+
+                        // Check if stop area relation has more than one platform. 
+                        stopChecker.performStopAreaMultiPlatformTest();
+
+                        // Attach thrown errors
+                        this.errors.addAll(stopChecker.getErrors());
+                }
 
                 if (!RouteUtils.isTwoDirectionRoute(r)) {

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

@@ -230 +230 @@
 
         /**
-         * Checks if the current way touches its neighboring was correctly
+         * Checks if the current way touches its neighbouring was correctly
          * 
          * @param prev

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

@@ -46 +46 @@
  
  public static final String PATH_TO_SOLITARY_STOP_POSITION = "test/data/solitary-stop-position.osm";
+
+ public static final String PATH_TO_STOP_AREA_MEMBERS = "test/data/stop-area-members.osm";
+ public static final String PATH_TO_STOP_AREA_RELATIONS = "test/data/stop-area-relations.osm";
+ public static final String PATH_TO_STOP_AREA_NO_STOPS = "test/data/stop-area-no-stops.osm";
+ public static final String PATH_TO_STOP_AREA_MANY_STOPS = "test/data/stop-area-many-stops.osm";
+ public static final String PATH_TO_STOP_AREA_NO_PLATFORMS = "test/data/stop-area-no-platform.osm";
+ public static final String PATH_TO_STOP_AREA_MANY_PLATFORMS = "test/data/stop-area-many-platforms.osm";
+
  
  public static final String PATH_TO_SEGMENT_TEST = "test/data/segment-test.osm";