Changeset 2500 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-22T16:25:26+01:00 (15 years ago)

Author:

jttt

Message:

Added Dataset consistency test that can be invoked on osm layer or in bug report handler

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (3 diffs)
• data/osm/BBox.java (modified) (1 diff)
• data/osm/DatasetConsistencyTest.java (added)
• gui/layer/OsmDataLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.Dimension;
@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -59 +61 @@
         text.append("Java version: " + System.getProperty("java.version"));
         text.append("\n\n");
+        DataSet dataset = Main.main.getCurrentDataSet();
+        if (dataset != null) {
+            text.append("Dataset consistency test:\n");
+            String result = DatasetConsistencyTest.runTests(dataset);
+            if (result.length() == 0) {
+                text.append("No problems found\n");
+            } else {
+                text.append(result);
+            }
+            text.append("\n");
+        }
+        text.append("\n");
         text.append(PluginHandler.getBugReportText());
-        text.append("\n\n");
+        text.append("\n");
+
         return text.toString();
     }

trunk/src/org/openstreetmap/josm/data/osm/BBox.java

@@ -102 +102 @@
 
     public boolean inside(BBox b) {
-        if (xmin >= b.xmax)
+        if (xmin > b.xmax)
             return false;
-        if (xmax <= b.xmin)
+        if (xmax < b.xmin)
             return false;
-        if (ymin >= b.ymax)
+        if (ymin > b.ymax)
             return false;
-        if (ymax <= b.ymin)
+        if (ymax < b.ymin)
             return false;
         return true;

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -34 +34 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
+import javax.swing.JTextArea;
 
 import org.openstreetmap.josm.Main;
@@ -51 +53 @@
 import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -232 +235 @@
 
             // paint remainder
-            ((Graphics2D)g).setPaint(hatched);
-            ((Graphics2D)g).fill(a);
+            g.setPaint(hatched);
+            g.fill(a);
         }
 
@@ -536 +539 @@
                 new JSeparator(),
                 new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
+                new JMenuItem(new ConsistencyTestAction()),
                 new JSeparator(),
                 new JMenuItem(new LayerListPopup.InfoAction(this))};
@@ -550 +554 @@
                 new JSeparator(),
                 new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
+                new JMenuItem(new ConsistencyTestAction()),
                 new JSeparator(),
                 new JMenuItem(new LayerListPopup.InfoAction(this))};
@@ -614 +619 @@
                 wpt.attr.put("name", name);
             }
-            ;
         }
         return gpxData;
@@ -714 +718 @@
         // keep requiresSaveToDisk unchanged
     }
+
+    private class ConsistencyTestAction extends AbstractAction {
+
+        public ConsistencyTestAction() {
+            super(tr("Dataset consistency test"));
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            String result = DatasetConsistencyTest.runTests(data);
+            if (result.length() == 0) {
+                JOptionPane.showMessageDialog(Main.parent, tr("No problems found"));
+            } else {
+                JPanel p = new JPanel(new GridBagLayout());
+                p.add(new JLabel(tr("Following problems found:")), GBC.eol());
+                JTextArea info = new JTextArea(result, 20, 60);
+                info.setCaretPosition(0);
+                info.setEditable(false);
+                p.add(new JScrollPane(info), GBC.eop());
+
+                JOptionPane.showMessageDialog(Main.parent, p, tr("Warning"), JOptionPane.WARNING_MESSAGE);
+            }
+        }
+
+    }
 }