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

Timestamp:

2016-06-27T00:49:06+02:00 (9 years ago)

Author:

darya

Message:

Extra layer added

Location:

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

Files:

• data/PTStop.java (modified) (2 diffs)
• gui/PTAssistantLayer.java (added)
• gui/PTAssistantPaintVisitor.java (added)
• utils/RouteUtils.java (modified) (4 diffs)
• validation/PTAssitantValidatorTest.java (modified) (9 diffs)
• validation/RoadTypeTest.java (modified) (3 diffs)
• validation/WayChecker.java (modified) (1 diff)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTStop.java

@@ -52 +52 @@
          *         already has an attribute with that role.
          */
-        public boolean addStopElement(RelationMember member) {
+        protected boolean addStopElement(RelationMember member) {
 
                 // each element is only allowed once per stop
@@ -97 +97 @@
         }
 
-        public String getName() {
+        protected String getName() {
                 return this.name;
         }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.pt_assistant.utils;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JCheckBox;
-import javax.swing.JOptionPane;
-
-import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -45 +34 @@
                                 || r.hasTag("route", "tram") || r.hasTag("route", "light_rail") || r.hasTag("route", "subway")
                                 || r.hasTag("route", "train")) {
-                        return true;
+                        
+                        if (!r.hasTag("bus", "on_demand")) {
+                                return true;
+                        }
+                        
                 }
                 return false;
@@ -60 +53 @@
         public static boolean isPTStop(RelationMember rm) {
 
-                if (rm.getType().equals(OsmPrimitiveType.NODE)) {
+                if (rm.hasRole("stop") || rm.hasRole("stop_entry_only") || rm.hasRole("stop_exit_only")
+                                || rm.hasRole("platform") || rm.hasRole("platform_entry_only") || rm.hasRole("platform_exit_only")) {
 
-                        if (rm.hasRole("stop") || rm.hasRole("stop_entry_only") || rm.hasRole("stop_exit_only")
-                                        || rm.hasRole("platform") || rm.hasRole("platform_entry_only")
-                                        || rm.hasRole("platform_exit_only")) {
+                        if (rm.getType().equals(OsmPrimitiveType.NODE)) {
 
                                 if (rm.getNode().hasTag("public_transport", "stop_position")
                                                 || rm.getNode().hasTag("highway", "bus_stop")
                                                 || rm.getNode().hasTag("public_transport", "platform")
-                                                || rm.getNode().hasTag("public_transport", "platform_entry_only")
-                                                || rm.getNode().hasTag("public_transport", "platform_exit_only")
-                                                || rm.getNode().hasTag("highway", "platform")
-                                                || rm.getNode().hasTag("highway", "platform_entry_only")
-                                                || rm.getNode().hasTag("highway", "platform_exit_only")
-                                                || rm.getNode().hasTag("railway", "platform")
-                                                || rm.getNode().hasTag("railway", "platform_entry_only")
-                                                || rm.getNode().hasTag("railway", "platform_exit_only")) {
+                                                || rm.getNode().hasTag("highway", "platform") || rm.getNode().hasTag("railway", "platform")) {
+                                        return true;
+
+                                }
+                        }
+
+                        if (rm.getType().equals(OsmPrimitiveType.WAY)) {
+                                if (rm.getWay().hasTag("public_transport", "platform") || rm.getWay().hasTag("highway", "platform")
+                                                || rm.getWay().hasTag("railway", "platform")) {
                                         return true;
                                 }
-                        }
-                }
-
-                if (rm.getType().equals(OsmPrimitiveType.WAY)) {
-                        if (rm.getWay().hasTag("public_transport", "platform")
-                                        || rm.getWay().hasTag("public_transport", "platform_entry_only")
-                                        || rm.getWay().hasTag("public_transport", "platform_exit_only")
-                                        || rm.getWay().hasTag("highway", "platform") || rm.getWay().hasTag("highway", "platform_entry_only")
-                                        || rm.getWay().hasTag("highway", "platform_exist_only") || rm.getWay().hasTag("railway", "platform")
-                                        || rm.getWay().hasTag("railway", "platform_entry_only")
-                                        || rm.getWay().hasTag("railway", "platform_exit_only")) {
-                                return true;
                         }
                 }
@@ -115 +96 @@
 
                 if (rm.getType().equals(OsmPrimitiveType.WAY)) {
+                        if (rm.getWay().hasTag("public_transport", "platform") || rm.getWay().hasTag("highway", "platform")
+                                        || rm.getWay().hasTag("railway", "platform")) {
+                                return false;
+                        }
                         return true;
                 }

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

@@ -7 +7 @@
 
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -24 +25 @@
 import org.openstreetmap.josm.plugins.pt_assistant.actions.IncompleteMembersDownloadThread;
 import org.openstreetmap.josm.plugins.pt_assistant.gui.IncompleteMembersDownloadDialog;
+import org.openstreetmap.josm.plugins.pt_assistant.gui.PTAssistantLayer;
 import org.openstreetmap.josm.plugins.pt_assistant.gui.ProceedDialog;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
@@ -31 +33 @@
         public static final int ERROR_CODE_SORTING = 3711;
         public static final int ERROR_CODE_ROAD_TYPE = 3721;
+        public static final int ERROR_CODE_CONSTRUCTION = 3722;
         public static final int ERROR_CODE_DIRECTION = 3731;
         public static final int ERROR_CODE_END_STOP = 3141;
@@ -36 +39 @@
         public static final int ERROR_CODE_RELAITON_MEMBER_ROLES = 3143;
 
+        private PTAssistantLayer layer;
+
         public PTAssitantValidatorTest() {
                 super(tr("Public Transport Assistant tests"),
                                 tr("Check if route relations are compatible with public transport version 2"));
+
+                layer = new PTAssistantLayer();
+                DataSet.addSelectionListener(layer);
 
         }
@@ -60 +68 @@
                         return;
                 }
+
+//              if (!Main.getLayerManager().containsLayer(layer)) {
+//                      Main.getLayerManager().addLayer(layer);
+//              }
+//              layer.clear();
+//              layer.addPrimitive(r);
 
                 // Check individual ways using the oneway direction test and the road
@@ -192 +206 @@
                 // Check if the creation of the route data model in the segment checker
                 // worked. If it did not, it means the roles in the route relation do
-                // not match the tags of the route members. 
+                // not match the tags of the route members.
                 if (!segmentChecker.getErrors().isEmpty()) {
                         this.errors.addAll(segmentChecker.getErrors());
@@ -202 +216 @@
                 // TODO: perform segment test
                 this.errors.addAll(segmentChecker.getErrors());
-//              performDummyTest(r);
+                // performDummyTest(r);
         }
 
@@ -211 +225 @@
         public boolean isFixable(TestError testError) {
                 if (testError.getCode() == ERROR_CODE_DIRECTION || testError.getCode() == ERROR_CODE_ROAD_TYPE
-                                || testError.getCode() == ERROR_CODE_SORTING) {
+                                || testError.getCode() == ERROR_CODE_CONSTRUCTION || testError.getCode() == ERROR_CODE_SORTING) {
                         return true;
                 }
@@ -222 +236 @@
                 List<Command> commands = new ArrayList<>();
 
-                if (testError.getCode() == ERROR_CODE_DIRECTION || testError.getCode() == ERROR_CODE_ROAD_TYPE) {
+                if (testError.getCode() == ERROR_CODE_DIRECTION || testError.getCode() == ERROR_CODE_ROAD_TYPE
+                                || testError.getCode() == ERROR_CODE_CONSTRUCTION) {
                         commands.add(fixErrorByRemovingWay(testError));
                 }

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

@@ -22 +22 @@
 
         public static final int ERROR_CODE_ROAD_TYPE = 3721;
+        public static final int ERROR_CODE_CONSTRUCTION = 3722;
 
         public RoadTypeTest() {
@@ -87 +88 @@
                                                         tr("PT: Route type does not match the type of the road it passes on"), ERROR_CODE_ROAD_TYPE,
                                                         primitives, highlighted));
+                                }
+                                
+                                if ((way.hasTag("highway", "construction") || way.hasTag("railway", "construction")) && way.hasKey("construction")) {
+                                        List<Relation> primitives = new ArrayList<>(1);
+                                        primitives.add(r);
+                                        List<Way> highlighted = new ArrayList<>(1);
+                                        highlighted.add(way);
+                                        TestError e = new TestError(this, Severity.WARNING,
+                                                        tr("PT: Road is under construction"),
+                                                        PTAssitantValidatorTest.ERROR_CODE_CONSTRUCTION, primitives, highlighted);
+                                        errors.add(e);
                                 }
 
@@ -168 +180 @@
         @Override
         public boolean isFixable(TestError testError) {
-                if (testError.getCode() == ERROR_CODE_ROAD_TYPE) {
+                if (testError.getCode() == ERROR_CODE_ROAD_TYPE || testError.getCode() == ERROR_CODE_CONSTRUCTION) {
                         return true;
                 }

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

@@ -95 +95 @@
 
                                 }
+                                
+                                if ((way.hasTag("highway", "construction") || way.hasTag("railway", "construction")) && way.hasKey("construction")) {
+                                        List<Relation> primitives = new ArrayList<>(1);
+                                        primitives.add(relation);
+                                        List<Way> highlighted = new ArrayList<>(1);
+                                        highlighted.add(way);
+                                        TestError e = new TestError(this.test, Severity.WARNING,
+                                                        tr("PT: Road is under construction"),
+                                                        PTAssitantValidatorTest.ERROR_CODE_CONSTRUCTION, primitives, highlighted);
+                                        errors.add(e);
+                                }
                         }
                 }