Changeset 32221 in osm for applications/editors/josm/plugins

Timestamp:

2016-06-06T16:59:05+02:00 (8 years ago)

Author:

darya

Message:

RoadTypeTest added with a fix

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• build/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.class (modified) ( previous)
• build/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.class (modified) ( previous)
• src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTest.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTest.java (added)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java

@@ -7 +7 @@
 import org.openstreetmap.josm.plugins.pt_assistant.validation.GapTest;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.PlatformsFirstTest;
+import org.openstreetmap.josm.plugins.pt_assistant.validation.RoadTypeTest;
 
 /**
@@ -27 +28 @@
 
                 OsmValidator.addTest(PlatformsFirstTest.class);
+                OsmValidator.addTest(RoadTypeTest.class);
                 OsmValidator.addTest(GapTest.class);
 

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

@@ -58 +58 @@
          * can be modeled with ways.
          * 
-         * @param rm relation member to be checked
-         * @return true if the relation member refers to a way in a public transport route, false otherwise.
+         * @param rm
+         *            relation member to be checked
+         * @return true if the relation member refers to a way in a public transport
+         *         route, false otherwise.
          */
         public static boolean isPTWay(RelationMember rm) {
@@ -74 +76 @@
         }
 
+        /**
+         * Checks if the type of the way is suitable for buses to go on it. The
+         * direction of the way (i.e. one-way roads) is irrelevant for this test.
+         * 
+         * @param way
+         *            to be checked
+         * @return true if the way is suitable for buses, false otherwise.
+         */
+        public static boolean isWaySuitableForBuses(Way way) {
+                if (way.hasTag("highway", "motorway") || way.hasTag("highway", "trunk") || way.hasTag("highway", "primary")
+                                || way.hasTag("highway", "secondary") || way.hasTag("highway", "tertiary")
+                                || way.hasTag("highway", "unclassified") || way.hasTag("highway", "road")
+                                || way.hasTag("highway", "residential") || way.hasTag("highway", "service")
+                                || way.hasTag("highway", "motorway_link") || way.hasTag("highway", "trunk_link")
+                                || way.hasTag("highway", "primary_link") || way.hasTag("highway", "secondary_link")
+                                || way.hasTag("highway", "tertiary_link") || way.hasTag("highway", "living_street")
+                                || way.hasTag("highway", "bus_guideway") || way.hasTag("highway", "road")
+                                || way.hasTag("cycleway", "share_busway") || way.hasTag("cycleway", "shared_lane")) {
+                        return true;
+                }
+
+                return false;
+        }
+
+
 }

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

@@ -177 +177 @@
                                         final List<RelationMember> ways = new ArrayList<>();
                                         for (RelationMember member : members) {
-                                                if (member.hasRole("") && OsmPrimitiveType.WAY.equals(member.getType())) {
+                                                if (member.hasRole("") && OsmPrimitiveType.WAY.equals(member.getType())) { // FIXME
                                                         ways.add(member);
                                                 } else { // stops (and if the relation has anything