Changeset 32567 in osm for applications/editors/josm/plugins/pt_assistant/src

Timestamp:

2016-07-05T00:28:27+02:00 (9 years ago)

Author:

darya

Message:

removed old classes, updated unit tests, added AddStopPositionAction

Location:

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

Files:

• PTAssistantPlugin.java (modified) (3 diffs)
• actions/AddStopPositionAction.java (added)
• gui/PTAssistantLayer.java (modified) (2 diffs)
• utils/RouteUtils.java (modified) (2 diffs)
• validation/PTAssistantValidatorTest.java (added)
• validation/RouteChecker.java (modified) (2 diffs)
• validation/SegmentChecker.java (modified) (4 diffs)
• validation/WayChecker.java (modified) (6 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.pt_assistant;
 
+import javax.swing.JMenuItem;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.validation.OsmValidator;
+import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.pt_assistant.validation.PTAssitantValidatorTest;
+import org.openstreetmap.josm.plugins.pt_assistant.actions.AddStopPositionAction;
+import org.openstreetmap.josm.plugins.pt_assistant.validation.PTAssistantValidatorTest;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -14 +21 @@
  */
 public class PTAssistantPlugin extends Plugin {
-        
+
+        private JMenuItem addStopPositionMenu;
+
         /**
          * Main constructor.
@@ -25 +34 @@
                 super(info);
 
-//              OsmValidator.addTest(PlatformsFirstTest.class);
-//              OsmValidator.addTest(RoadTypeTest.class);
-//              OsmValidator.addTest(DirectionTest.class);
-//              OsmValidator.addTest(GapTest.class);
+                OsmValidator.addTest(PTAssistantValidatorTest.class);
                 
-                OsmValidator.addTest(PTAssitantValidatorTest.class);
-                
+                AddStopPositionAction addStopPositionAction = new AddStopPositionAction();
+                addStopPositionMenu = MainMenu.add(Main.main.menu.toolsMenu, addStopPositionAction, false);
 
         }
+
+        /**
+         * Called when the JOSM map frame is created or destroyed.
+         */
+        @Override
+        public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+                if (oldFrame == null && newFrame != null) {
+                        addStopPositionMenu.setEnabled(true);
+                } else if (oldFrame != null && newFrame == null) {
+                        addStopPositionMenu.setEnabled(false);
+                }
+        }
         
-
-
-
+        /**
+         * Returns a ImageProvider for the given string or null if in headless mode.
+         *
+         * @param s
+         *            The name of the file where the picture is.
+         * @return A ImageProvider object for the given string or null if in
+         *         headless mode.
+         */
+        public static ImageProvider getProvider(String s) {
+                if (Main.main == null) {
+                        return null;
+                }
+                return new ImageProvider(s);
+        }
 
 }

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

@@ -176 +176 @@
                                         }
 
-                                        Main.map.repaint();
+                                        Main.map.mapView.repaint();
                                 }
 
@@ -200 +200 @@
 
                         this.primitives.clear();
-                        Main.map.repaint();
+                        Main.map.mapView.repaint();
                 }
 

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

@@ -4 +4 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
 
 /**
@@ -114 +113 @@
         }
 
-        /**
-         * 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.
-         * 
-         * TODO: this test is duplicated in WayChecker, remove it here when the old
-         * implementation is not needed anymore.
-         * 
-         * @deprecated
-         * 
-         * @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;
-                }
-
-                if (way.hasTag("highway", "pedestrian") && (way.hasTag("bus", "yes") || way.hasTag("psv", "yes")
-                                || way.hasTag("bus", "designated") || way.hasTag("psv", "designated"))) {
-                        return true;
-                }
-
-                return false;
-        }
-
-        public static boolean hasIncompleteMembers(Relation r) {
-                if (r == null) {
-                        return true;
-                }
-                for (RelationMember rm : r.getMembers()) {
-                        if ((rm.isNode() && rm.getNode().isIncomplete()) || (rm.isWay() && rm.getWay().isIncomplete())
-                                        || (rm.isRelation() && rm.getRelation().isIncomplete())) {
-                                return true;
-                        }
-                }
-
-                return false;
-        }
-
 }

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

@@ -65 +65 @@
                                 TestError e = new TestError(this.test, Severity.WARNING,
                                                 tr("PT: Route contains a gap that can be fixed by sorting"),
-                                                PTAssitantValidatorTest.ERROR_CODE_SORTING, relation);
+                                                PTAssistantValidatorTest.ERROR_CODE_SORTING, relation);
                                 this.errors.add(e);
 
@@ -112 +112 @@
         
         protected static Command fixSortingError(TestError testError) {
-                if (testError.getCode() != PTAssitantValidatorTest.ERROR_CODE_SORTING) {
+                if (testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_SORTING) {
                         return null;
                 }

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

@@ -52 +52 @@
                         highlighted.add(rm.getMember());
                         TestError e = new TestError(this.test, Severity.WARNING, tr("PT: Relation member roles do not match tags"),
-                                        PTAssitantValidatorTest.ERROR_CODE_RELAITON_MEMBER_ROLES, primitives, highlighted);
+                                        PTAssistantValidatorTest.ERROR_CODE_RELAITON_MEMBER_ROLES, primitives, highlighted);
                         this.errors.add(e);
                 }
@@ -112 +112 @@
                                 TestError e = new TestError(this.test, Severity.WARNING,
                                                 tr("PT: Route should start and end with a stop_position"),
-                                                PTAssitantValidatorTest.ERROR_CODE_END_STOP, primitives, highlighted);
+                                                PTAssistantValidatorTest.ERROR_CODE_END_STOP, primitives, highlighted);
                                 this.errors.add(e);
                                 return;
@@ -130 +130 @@
 
                                 TestError e = new TestError(this.test, Severity.WARNING, tr("PT: First or last way needs to be split"),
-                                                PTAssitantValidatorTest.ERROR_CODE_SPLIT_WAY, primitives, highlighted);
+                                                PTAssistantValidatorTest.ERROR_CODE_SPLIT_WAY, primitives, highlighted);
                                 this.errors.add(e);
                         }
@@ -146 +146 @@
                                 highlighted.add(endStop.getStopPosition());
                                 TestError e = new TestError(this.test, Severity.WARNING, tr("PT: First or last way needs to be split"),
-                                                PTAssitantValidatorTest.ERROR_CODE_SPLIT_WAY, primitives, highlighted);
+                                                PTAssistantValidatorTest.ERROR_CODE_SPLIT_WAY, primitives, highlighted);
                                 this.errors.add(e);
                         }

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

@@ -121 +121 @@
                                         TestError e = new TestError(this.test, Severity.WARNING,
                                                         tr("PT: Route type does not match the type of the road it passes on"),
-                                                        PTAssitantValidatorTest.ERROR_CODE_ROAD_TYPE, primitives, highlighted);
+                                                        PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE, primitives, highlighted);
                                         errors.add(e);
 
@@ -132 +132 @@
                                         highlighted.add(way);
                                         TestError e = new TestError(this.test, Severity.WARNING, tr("PT: Road is under construction"),
-                                                        PTAssitantValidatorTest.ERROR_CODE_CONSTRUCTION, primitives, highlighted);
+                                                        PTAssistantValidatorTest.ERROR_CODE_CONSTRUCTION, primitives, highlighted);
                                         errors.add(e);
                                 }
@@ -180 +180 @@
                                         TestError e = new TestError(this.test, Severity.WARNING,
                                                         tr("PT: Route passes a oneway road in the wrong direction"),
-                                                        PTAssitantValidatorTest.ERROR_CODE_DIRECTION, primitives, highlighted);
+                                                        PTAssistantValidatorTest.ERROR_CODE_DIRECTION, primitives, highlighted);
                                         this.errors.add(e);
                                         return;
@@ -221 +221 @@
         protected static Command fixErrorByRemovingWay(TestError testError) {
 
-                if (testError.getCode() != PTAssitantValidatorTest.ERROR_CODE_ROAD_TYPE
-                                && testError.getCode() != PTAssitantValidatorTest.ERROR_CODE_DIRECTION) {
+                if (testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE
+                                && testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
                         return null;
                 }
@@ -279 +279 @@
         protected static Command fixErrorByZooming(TestError testError) {
 
-                if (testError.getCode() != PTAssitantValidatorTest.ERROR_CODE_DIRECTION) {
+                if (testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
                         return null;
                 }
@@ -337 +337 @@
                 GenericRelationEditor editor = new GenericRelationEditor(layer, r, r.getMembersFor(primitives));
                 RelationDialogManager.getRelationDialogManager().register(layer, r, editor);
-                
-                
                 editor.setVisible(true);
-//              editor.requestFocus();
-//              editor.requestFocusInWindow();
-                
-//              editor.firePropertyChange("focusedWindow", editor, editor);
-//              editor.setRelation(r);
+
 
         }