Changeset 32622 in osm for applications/editors/josm

Timestamp:

2016-07-10T22:20:44+02:00 (8 years ago)

Author:

darya

Message:

platform test corrected

Location:

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

Files:

• gui/PTAssistantPaintVisitor.java (modified) (1 diff)
• utils/RouteUtils.java (modified) (1 diff)
• validation/NodeChecker.java (modified) (2 diffs)
• validation/WayChecker.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.util.HashMap;
 import java.util.List;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.data.osm.Node;

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

@@ -202 +202 @@
                 return false;
         }
+        
+        public static boolean isWaySuitableForPublicTransport(Way way) {
+                
+                if (isWaySuitableForBuses(way) || way.hasTag("railway", "tram")
+                                || way.hasTag("railway", "subway") || way.hasTag("raiilway", "subway")
+                                || way.hasTag("railway", "light_rail")
+                                || way.hasTag("railway", "train")) {
+                        return true;
+                }
+                
+                return false;
+                
+        }
 
 }

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

@@ -34 +34 @@
                         if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
                                 Way referrerWay = (Way) referrer;
-                                if (RouteUtils.isWaySuitableForBuses(referrerWay) || referrerWay.hasTag("railway", "tram")
-                                                || referrerWay.hasTag("railway", "subway") || referrerWay.hasTag("raiilway", "subway")
-                                                || referrerWay.hasTag("railway", "light_rail")
-                                                || referrerWay.hasTag("railway", "construction")) {
+                                if (RouteUtils.isWaySuitableForPublicTransport(referrerWay)) {
                                         return;
                                 }
@@ -65 +62 @@
                         primitives.add(node);
                         if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
-                                TestError e = new TestError(this.test, Severity.WARNING,
-                                                tr("PT: Platform should not be part of a way"),
-                                                PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY, primitives);
-                                errors.add(e);
-                                return;
+                                Way referringWay = (Way) referrer;
+                                if (RouteUtils.isWaySuitableForPublicTransport(referringWay)) {
+                                        TestError e = new TestError(this.test, Severity.WARNING,
+                                                        tr("PT: Platform should not be part of a way"),
+                                                        PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY, primitives);
+                                        errors.add(e);
+                                        return;
+                                }
                         }
                 }

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

@@ -201 +201 @@
                         // highlighted.add(problematicWay);
                         Set<Way> adjacentWays = checkAdjacentWays(problematicWay, new HashSet<Way>());
-                        adjacentWays.removeAll(problematicWays);        
+                        adjacentWays.removeAll(problematicWays);
                         highlighted.add(problematicWay);
                         highlighted.addAll(adjacentWays);
@@ -209 +209 @@
                         this.errors.add(e);
                 }
+
+//              Set<Way> primitivesToReport = new HashSet<>();
+//              primitivesToReport.addAll(problematicWays);
+//              for (Way problematicWay : problematicWays) {
+//                      Set<Way> adjacentWays = checkAdjacentWays(problematicWay, new HashSet<Way>());
+//                      primitivesToReport.addAll(adjacentWays);
+//              }
+//
+//              List<Relation> primitives = new ArrayList<>(1);
+//              primitives.add(relation);
+//              TestError e = new TestError(this.test, Severity.WARNING,
+//                              tr("PT: Route passes a oneway road in the wrong direction"),
+//                              PTAssistantValidatorTest.ERROR_CODE_DIRECTION, primitives, primitivesToReport);
+//              this.errors.add(e);
 
         }