Changeset 34997 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2019-05-05T20:27:25+02:00 (6 years ago)

Author:

donvip

Message:

fix #josm17529 - fix shapefile reading regression (patch by openbrian)

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (modified) (2 diffs)
• test/data/regress/17529 (added)
• test/data/regress/17529/west_webmerc.dbf (added)
• test/data/regress/17529/west_webmerc.prj (added)
• test/data/regress/17529/west_webmerc.shp (added)
• test/data/regress/17529/west_webmerc.shx (added)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (modified) (1 diff)

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

@@ -155 +155 @@
                 Geometry g = gc.getGeometryN(i);
                 if (g instanceof Polygon) {
+                    // TODO: Split this section between Polygon and MultiPolygon.
                     Relation r = (Relation) op;
                     Polygon p = (Polygon) g;
@@ -170 +171 @@
                         }
                     }
+                    op = r != null ? r : w;
                 } else if (g instanceof LineString) {
                     op = createOrGetWay((LineString) g);

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

@@ -104 +104 @@
         }
     }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/17529">#17529</a>
+     * @throws Exception if an error occurs during reading
+     */
+    @Test
+    public void testTicket17529() throws Exception {
+        // There is only 1 feature in this data set.
+        File file = new File(TestUtils.getRegressionDataFile(17529, "west_webmerc.shp"));
+        try (InputStream is = new FileInputStream(file)) {
+            Collection<Way> ways = ShpReader.parseDataSet(is, file, null, null).getWays();
+            assertFalse(ways.isEmpty());
+            Way way = ways.iterator().next();
+            assertEquals("Westminster city", way.get("NAMELSAD"));
+        }
+    }
 }