Changeset 32277 in osm for applications/editors/josm

Timestamp:

2016-06-16T00:39:07+02:00 (8 years ago)

Author:

darya

Message:

Clarification

Location:

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

Files:

• actions/IncompleteMembersDownloadThread.java (modified) (1 diff)
• gui/IncompleteMembersDownloadDialog.java (modified) (1 diff)
• gui/ProceedDialog.java (modified) (8 diffs)
• utils/RouteUtils.java (modified) (1 diff)
• validation/DirectionTest.java (modified) (2 diffs)
• validation/PTAssitantValidatorTest.java (modified) (3 diffs)
• validation/WayChecker.java (modified) (3 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/IncompleteMembersDownloadThread.java

@@ -14 +14 @@
                 super();
                 relation = r;
+        }
+        
+        private void realRun() {
+                
         }
 

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

@@ -31 +31 @@
                 message = tr("The relation (id=" + id
                                 + ") has incomplete members.\nThey need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?");
-                checkbox = new JCheckBox(tr("Remember my choice and don''t ask me again in this session"));
+                checkbox = new JCheckBox(tr("Remember my choice and don't ask me again in this session"));
                 options = new String[2];
                 options[0] = tr("Yes");

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Component;
 
@@ -13 +12 @@
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
+import javax.swing.SwingUtilities;
 
 public class ProceedDialog extends JPanel {
@@ -37 +37 @@
                 panel = new JPanel();
                 panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-                
+
                 JLabel label1 = new JLabel(tr("PT_Assistant plugin found that this relation (id=" + id + ") has errors:"));
                 panel.add(label1);
                 label1.setAlignmentX(Component.LEFT_ALIGNMENT);
-                
+
                 if (numberOfDirectionErrors != 0) {
                         JLabel label2 = new JLabel("     " + numberOfDirectionErrors + tr(" direction errors"));
@@ -47 +47 @@
                         label2.setAlignmentX(Component.LEFT_ALIGNMENT);
                 }
-                
+
                 if (numberOfRoadTypeErrors != 0) {
                         JLabel label3 = new JLabel("     " + numberOfRoadTypeErrors + tr(" road type errors"));
@@ -53 +53 @@
                         label3.setAlignmentX(Component.LEFT_ALIGNMENT);
                 }
-                
+
                 JLabel label4 = new JLabel(tr("How do you want to proceed?"));
                 panel.add(label4);
                 label4.setAlignmentX(Component.LEFT_ALIGNMENT);
 
-                radioButtonFixAutomatically = new JRadioButton("Fix all errors automatically and proceed",
-                                true);
-                radioButtonFixManually = new JRadioButton(
-                                "I will fix the erros manually and click the button to proceed");
+                radioButtonFixAutomatically = new JRadioButton("Fix all errors automatically and proceed", true);
+                radioButtonFixManually = new JRadioButton("I will fix the erros manually and click the button to proceed");
                 radioButtonDontFix = new JRadioButton("Do not fix anything and proceed with further tests");
                 ButtonGroup fixOptionButtonGroup = new ButtonGroup();
@@ -73 +71 @@
                 radioButtonFixManually.setAlignmentX(Component.LEFT_ALIGNMENT);
                 radioButtonDontFix.setAlignmentX(Component.LEFT_ALIGNMENT);
-                
 
-                checkbox = new JCheckBox(tr("Remember my choice and don''t ask me again in this session"));
+                checkbox = new JCheckBox(tr("Remember my choice and don't ask me again in this session"));
                 panel.add(checkbox);
                 checkbox.setAlignmentX(Component.LEFT_ALIGNMENT);
-                
+
                 options = new String[2];
                 options[0] = "OK";
@@ -107 +104 @@
                 }
 
-                // FIXME: change to avoid EDT errors
+                // showDialog(); FIXME
                 selectedOption = JOptionPane.showOptionDialog(this, panel, tr("PT_Assistant Proceed Request"),
                                 JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, 0);
-                
-                
 
-                
                 if (selectedOption == 0) {
                         if (radioButtonFixAutomatically.isSelected()) {
@@ -138 +132 @@
         }
 
+        /**
+         * 
+         */
+        private void showDialog() {
+
+                if (!SwingUtilities.isEventDispatchThread()) {
+                        selectedOption = JOptionPane.showOptionDialog(this, panel, tr("PT_Assistant Proceed Request"),
+                                        JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, 0);
+                } else {
+
+                        SwingUtilities.invokeLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                        showDialog();
+                                }
+                        });
+
+                }
+
+        }
+
 }

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

@@ -127 +127 @@
                 }
 
+                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;
         }

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

@@ -6 +6 @@
 import java.util.List;
 
-import javax.swing.JOptionPane;
-
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -79 +76 @@
 
                                 if (!waysToCheck.get(i).getWay().hasTag("busway", "lane")
+                                                && !waysToCheck.get(i).getWay().hasTag("busway:left", "lane")
+                                                && !waysToCheck.get(i).getWay().hasTag("busway:right", "lane")
                                                 && !waysToCheck.get(i).getWay().hasTag("oneway:bus", "no")
                                                 && !waysToCheck.get(i).getWay().hasTag("busway", "opposite_lane")

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.command.ChangeCommand;
@@ -113 +114 @@
                 }
 
+
                 ProceedDialog proceedDialog = new ProceedDialog(r.getId(), numberOfDirectionErrors, numberOfRoadTypeErrors);
-
                 int userInput = proceedDialog.getUserSelection();
 
@@ -138 +139 @@
 
         }
+        
 
         /**

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

@@ -42 +42 @@
                 this.test = test;
                 this.relation = r;
-                
+
                 this.performDirectionTest();
                 this.performRoadTypeTest();
-                
+
         }
 
         private void performRoadTypeTest() {
-                
-                if (!relation.hasTag("route", "bus") && !relation.hasTag("route", "trolleybus") && !relation.hasTag("route", "share_taxi")) {
+
+                if (!relation.hasTag("route", "bus") && !relation.hasTag("route", "trolleybus")
+                                && !relation.hasTag("route", "share_taxi")) {
                         return;
                 }
@@ -137 +138 @@
 
                                 if (!waysToCheck.get(i).getWay().hasTag("busway", "lane")
+                                                && !waysToCheck.get(i).getWay().hasTag("busway:left", "lane")
+                                                && !waysToCheck.get(i).getWay().hasTag("busway:right", "lane")
                                                 && !waysToCheck.get(i).getWay().hasTag("oneway:bus", "no")
                                                 && !waysToCheck.get(i).getWay().hasTag("busway", "opposite_lane")
@@ -183 +186 @@
                 }
 
+                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;
         }