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

Timestamp:

2019-03-06T22:18:45+01:00 (6 years ago)

Author:

donvip

Message:

see #josm13843 - fix 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/13843 (moved) (moved from applications/editors/josm/plugins/opendata/test/data/regress/12843 )
• 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

@@ -44 +44 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -162 +163 @@
                         r = createMultipolygon();
                     }
+                    Way w = createOrGetWay(p.getExteriorRing());
                     if (r != null) {
-                        addWayToMp(r, "outer", createOrGetWay(p.getExteriorRing()));
+                        addWayToMp(r, "outer", w);
                         for (int j = 0; j < p.getNumInteriorRing(); j++) {
                             addWayToMp(r, "inner", createOrGetWay(p.getInteriorRingN(j)));

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

@@ -90 +90 @@
 
     /**
-     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12843">#12843</a>
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/13843">#13843</a>
      * @throws Exception if an error occurs during reading
      */
     @Test
-    public void testTicket12843() throws Exception {
-        File file = new File(TestUtils.getRegressionDataFile(12843, "test.shp"));
+    public void testTicket13843() throws Exception {
+        File file = new File(TestUtils.getRegressionDataFile(13843, "test.shp"));
         try (InputStream is = new FileInputStream(file)) {
             Collection<Way> ways = ShpReader.parseDataSet(is, file, null, null).getWays();