Changeset 32299 in osm for applications/editors/josm/plugins/pt_assistant/src/org

Timestamp:

2016-06-17T19:05:12+02:00 (9 years ago)

Author:

darya

Message:

Data model added

Location:

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

Files:

• data (added)
• data/PTRouteDataManager.java (added)
• data/PTRouteSegment.java (added)
• data/PTStop.java (added)
• data/PTWay.java (added)
• utils/RouteUtils.java (modified) (1 diff)
• utils/StopToWayAssigner.java (modified) (3 diffs)
• validation/Checker.java (added)
• validation/RouteChecker.java (modified) (4 diffs)
• validation/SegmentChecker.java (added)
• validation/WayChecker.java (modified) (2 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java

@@ -66 +66 @@
                 if (rm.getType().equals(OsmPrimitiveType.RELATION)) {
                         if (rm.getRole().equals("stop_area")) {
+                                return true;
+                        } else if (rm.getRole().equals("platform") || rm.getRole().equals("platform_entry_only") || rm.getRole().equals("platform_exit_only")){
                                 return true;
                         } else {

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+/**
+ * Assigns stops to ways in following steps: (1) checks if the stop is in the
+ * list of already assigned stops, (2) checks if the stop has a stop position,
+ * (3) calculates it using proximity / growing bounding boxes
+ * 
+ * @author darya
+ *
+ */
 public final class StopToWayAssigner {
 
@@ -23 +31 @@
                         return stopToWay.get(stop.getId());
                 }
-                
 
-                
-                
                 if (stop.getType().equals(OsmPrimitiveType.NODE)) {
                         List<OsmPrimitive> referrers = stop.getReferrers();
                         List<Way> referredWays = new ArrayList<>();
-                        for (OsmPrimitive referrer: referrers) {
+                        for (OsmPrimitive referrer : referrers) {
                                 if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
-                                        referredWays.add((Way)referrer);
+                                        referredWays.add((Way) referrer);
                                 }
                         }
@@ -45 +50 @@
                 return null;
         }
-        
+
         /**
          * Remove a map entry
+         * 
          * @param stopId
          */

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

@@ -19 +19 @@
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
-public class RouteChecker {
+/**
+ * Performs tests of a route at the level of the whole route: sorting test
+ * 
+ * @author darya
+ *
+ */
+public class RouteChecker extends Checker {
 
-        // test which created this WayChecker:
-        private final Test test;
-
-        // relation that is checked:
-        private Relation relation;
-
-        // stores all found errors (on way level):
-        private ArrayList<TestError> errors = new ArrayList<>();
-        
         private boolean hasGap;
 
         List<RelationMember> sortedMembers;
 
-        public RouteChecker(Relation r, Test t) {
+        public RouteChecker(Relation relation, Test test) {
 
-                this.test = t;
-                this.relation = r;
-                
+                super(relation, test);
+
                 this.hasGap = false;
 
@@ -60 +56 @@
 
                 if (hasGap(waysToCheck)) {
-                        
+
                         this.hasGap = true;
-                        
+
                         RelationSorter sorter = new RelationSorter();
                         sortedMembers = sorter.sortMembers(waysToCheck);
@@ -103 +99 @@
         }
 
-        /**
-         * Returns errors
-         */
-        public List<TestError> getErrors() {
-
-                return errors;
-        }
-
         public List<RelationMember> getSortedMembers() {
 
@@ -116 +104 @@
 
         }
-        
+
         public boolean getHasGap() {
-                
+
                 return this.hasGap;
-                
+
         }
 

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

@@ -19 +19 @@
 
 /**
- * Performs the DirectionTest and RoadTypeTest at the level of single ways
+ * Performs tests of a route at the level of single ways: DirectionTest and RoadTypeTest
  * 
  * @author darya
  *
  */
-public class WayChecker {
+public class WayChecker extends Checker {
 
-        // test which created this WayChecker:
-        private final Test test;
+        public WayChecker(Relation relation, Test test) {
 
-        // relation that is checked:
-        private Relation relation;
-
-        // stores all found errors (on way level):
-        private ArrayList<TestError> errors = new ArrayList<>();
-
-        // stores all ways that were found wrong and need to be removed:
-        private ArrayList<Way> wrongWays = new ArrayList<>();
-
-        public WayChecker(Relation r, Test test) {
-
-                this.test = test;
-                this.relation = r;
+                super(relation, test);
 
                 this.performDirectionTest();
@@ -160 +147 @@
         }
 
-        public List<TestError> getErrors() {
-
-                return errors;
-        }
-
         /**
          * Checks if the type of the way is suitable for buses to go on it. The