Changeset 32266 in osm

Timestamp:

2016-06-15T17:43:50+02:00 (9 years ago)

Author:

darya

Message:

Clarification

Location:

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

Files:

• DirectionTest.java (modified) (2 diffs)
• PTAssitantValidatorTest.java (modified) (1 diff)
• RoadTypeTest.java (modified) (1 diff)
• WayChecker.java (modified) (2 diffs)

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

@@ -47 +47 @@
                 }
 
+                if (!r.hasTag("route", "bus") && !r.hasTag("route", "trolleybus") && !r.hasTag("route", "share_taxi")) {
+                        return;
+                }
+                
                 List<RelationMember> waysToCheck = new ArrayList<>();
 
@@ -58 +62 @@
                         return;
                 }
+                
+                
 
                 WayConnectionTypeCalculator connectionTypeCalculator = new WayConnectionTypeCalculator();

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

@@ -11 +11 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;

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

@@ -56 +56 @@
                                                 isCorrectRoadType = false;
                                         }
-                                } else if (r.hasTag("route", "tram") && !way.hasTag("railway", "tram")) {
-                                        if (!r.hasTag("railway", "tram")) {
+                                } else if (r.hasTag("route", "tram")) {
+                                        if (!way.hasTag("railway", "tram")) {
                                                 isCorrectRoadType = false;
                                         }

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

@@ -49 +49 @@
 
         private void performRoadTypeTest() {
+                
+                if (!relation.hasTag("route", "bus") && !relation.hasTag("route", "trolleybus") && !relation.hasTag("route", "share_taxi")) {
+                        return;
+                }
 
                 for (RelationMember rm : relation.getMembers()) {
@@ -67 +71 @@
                                         }
                                 } else if (relation.hasTag("route", "tram")) {
-                                        if (!relation.hasTag("railway", "tram") && !way.hasTag("railway", "tram")) {
+                                        if (!way.hasTag("railway", "tram")) {
                                                 isCorrectRoadType = false;
                                         }