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

Timestamp:

2016-04-02T15:00:31+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm12714 - robustness against invalid SHP files

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java (modified) (4 diffs)
• test/data/regress/12714 (added)
• test/data/regress/12714/linhas.dbf (added)
• test/data/regress/12714/linhas.prj (added)
• test/data/regress/12714/linhas.qpj (added)
• test/data/regress/12714/linhas.shp (added)
• test/data/regress/12714/linhas.shx (added)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

@@ -101 +101 @@
 
     protected Node createOrGetNode(Point p, String ele) throws MismatchedDimensionException, TransformException {
+        if (!p.isValid()) {
+            throw new IllegalArgumentException("Invalid point: " + p);
+        }
         Point p2 = (Point) JTS.transform(p, transform);
         LatLon key = new LatLon(p2.getY(), p2.getX());
@@ -157 +160 @@
                 try {
                     tempWay.addNode(createOrGetNode(ls.getPointN(i)));
-                } catch (Exception e) {
-                    Main.error(e.getMessage());
+                } catch (TransformException | IllegalArgumentException e) {
+                    Main.error("Exception for " + ls + ": " + e.getClass().getName() + ": " + e.getMessage());
                 }
             }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java

@@ -241 +241 @@
                         }
                     }
-                } catch (Throwable e) {
-                    e.printStackTrace();
                 } finally {
                     iterator.close();
@@ -254 +252 @@
             e.printStackTrace();
             throw e;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new IOException(t);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new IOException(e);
         }
         return ds;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

@@ -10 +10 @@
 
 import javax.swing.Action;
-import javax.swing.Icon;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -20 +20 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.actions.OpenLinkAction;
@@ -28 +27 @@
 import org.openstreetmap.josm.plugins.opendata.core.licenses.License;
 import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 public class OdDataLayer extends OsmDataLayer implements OdLayer, LayerChangeListener {
@@ -43 +43 @@
         this.handler = handler;
         for (Node node : data.getNodes()) {
-            if (this.bounds == null) {
-                this.bounds = new Bounds(node.getCoor());
-            } else {
-                this.bounds.extend(node.getCoor());
+            LatLon ll = node.getCoor();
+            if (ll != null) {
+                if (this.bounds == null) {
+                    this.bounds = new Bounds(ll);
+                } else {
+                    this.bounds.extend(ll);
+                }
             }
         }

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.opendata.core.io.geographic;
+
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
@@ -14 +16 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests;
 
@@ -28 +31 @@
         JOSMFixture.createUnitTestFixture().init();
     }
-    
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12714">#12714/a>
+     * @throws IOException if an error occurs during reading
+     */
+    @Test
+    public void testTicket12714() throws IOException, XMLStreamException, FactoryConfigurationError {
+        File file = new File(TestUtils.getRegressionDataFile(12714, "linhas.shp"));
+        try (InputStream is = new FileInputStream(file)) {
+            for (Node n : ShpReader.parseDataSet(is, file, null, null).getNodes()) {
+                assertNotNull(n.toString(), n.getCoor());
+            }
+        }
+    }
+
     /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a>