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

Timestamp:

2016-09-12T01:51:38+02:00 (8 years ago)

Author:

darya

Message:

changed platform definition in StopUtils

Location:

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

Files:

• utils/StopUtils.java (modified) (7 diffs)
• validation/PTAssistantValidatorTest.java (modified) (2 diffs)
• validation/StopChecker.java (modified) (11 diffs)

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

@@ -7 +7 @@
  * Utils class for stop areas
  * 
- * @author 
+ * @author
  *
  */
@@ -16 +16 @@
         }
 
-        
         /**
          * Checks if a given relation is a stop_area.
@@ -35 +34 @@
                 return false;
         }
-        
+
         /**
          * Checks if a given object is a stop_position.
@@ -54 +53 @@
                 return false;
         }
-        
+
         /**
          * Checks if a given object is a platform.
@@ -68 +67 @@
                 }
 
-                if (rm.hasTag("public_transport", "platform")) {
+                if (rm.hasTag("public_transport", "platform") || rm.hasTag("highway", "bus_stop")
+                                || rm.hasTag("highway", "platform") || rm.hasTag("railway", "platform")) {
                         return true;
                 }
@@ -74 +74 @@
         }
 
-        
         /**
          * Checks if a given object is part of an stop area relation
@@ -89 +88 @@
                         }
                 }
-        return false;
+                return false;
         }
-        
+
 }

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

@@ -123 +123 @@
                 }
                 
+                
                 // Do some testing on stop area relations
                 if (Main.pref.getBoolean("pt_assistant.stop-area-tests", true) == true && StopUtils.isStopArea(r)) {
@@ -141 +142 @@
                         this.errors.addAll(stopChecker.getErrors());
                 }
+                
 
                 if (!RouteUtils.isTwoDirectionRoute(r)) {

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

@@ -18 +18 @@
  * Performs tests of the stop area relations
  * 
- * @author 
+ * @author
  *
  */
@@ -27 +27 @@
         protected StopChecker(Relation relation, Test test) {
                 super(relation, test);
-                
+
                 this.members = relation.getMemberPrimitives();
         }
-        
+
         /**
          * Checks if the given stop area relation has a stop position.
          */
         protected void performStopAreaStopPositionTest() {
-                
+
                 // No errors if there is a member tagged as stop position.
                 for (OsmPrimitive member : members) {
@@ -42 +42 @@
                         }
                 }
-                
+
                 // Throw error message
                 List<OsmPrimitive> primitives = new ArrayList<>(1);
@@ -51 +51 @@
         }
 
-        
         /**
          * Checks if the given stop area relation has a platform.
          */
         protected void performStopAreaPlatformTest() {
-                
+
                 // No errors if there is a member tagged as platform.
                 for (OsmPrimitive member : members) {
@@ -63 +62 @@
                         }
                 }
-                
+
                 // Throw error message
                 List<OsmPrimitive> primitives = new ArrayList<>(1);
@@ -70 +69 @@
                                 PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_NO_PLATFORM, primitives);
                 errors.add(e);
-                
+
         }
-        
 
         /**
-         * Checks if the stop_position(s) of an stop area belong to the same route relations as
-         * its related platform(s). 
+         * Checks if the stop_position(s) of an stop area belong to the same route
+         * relations as its related platform(s).
          * 
          * @param n
@@ -85 +83 @@
                 HashMap<Long, Long> platformRelationIds = new HashMap<>();
 
-
                 // Loop through all members
                 for (OsmPrimitive member : members) {
-                        
+
                         // For stop positions...
                         if (StopUtils.verifyStopAreaStopPosition(member)) {
-                                
+
                                 // Create a list of assigned route relations
                                 for (Relation referrer : OsmPrimitive.getFilteredList(member.getReferrers(), Relation.class)) {
@@ -99 +96 @@
                                 }
                         }
-                        
+
                         // For platforms...
                         else if (StopUtils.verifyStopAreaPlatform(member)) {
@@ -109 +106 @@
                                         }
                                 }
-                        }       
+                        }
                 }
-                
+
                 // Check if the stop_position has no referrers at all. If it has no
                 // referrers, then no error should be reported (changed on 11.08.2016 by
@@ -123 +120 @@
                         return;
                 }
-                
+
                 // Throw error message
                 List<OsmPrimitive> primitives = new ArrayList<>(1);
@@ -132 +129 @@
                 errors.add(e);
         }
-        
+
 }