Changeset 34991 in osm for applications/editors/josm/plugins/poly/src

Timestamp:

2019-04-29T11:36:17+02:00 (6 years ago)

Author:

gerdp

Message:

fix #17663: Ignore unusable data in PolyExporter

File:

• applications/editors/josm/plugins/poly/src/poly/PolyExporter.java (modified) (3 diffs)

applications/editors/josm/plugins/poly/src/poly/PolyExporter.java

@@ -40 +40 @@
     public void exportData(File file, Layer layer) throws IOException {
         if (layer instanceof OsmDataLayer) {
-            if (((OsmDataLayer) layer).getDataSet().getWays().stream().anyMatch(w -> !w.isClosed())) {
+            DataSet ds = ((OsmDataLayer) layer).getDataSet();
+            if (ds.getWays().stream().anyMatch(w -> w.isUsable() && !w.isClosed())) {
                 throw new IOException(tr("Data contains unclosed ways."));
             }
             try (PrintWriter writer = new PrintWriter(Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8))) {
-                DataSet ds = ((OsmDataLayer) layer).getDataSet();
                 HashSet<Way> written = new HashSet<>();
                 boolean firstFile = true;
@@ -54 +54 @@
 
                 for (Relation rel : ds.getRelations()) {
-                    if (rel.isMultipolygon()) {
+                    if (rel.isUsable() && rel.isMultipolygon()) {
                         if (!firstFile) {
                             writer.println();
@@ -68 +68 @@
                 int counter = 1;
                 for (Way w : ds.getWays()) {
-                    if (!written.contains(w)) {
+                    if (w.isUsable() && !written.contains(w)) {
                         writeWay(writer, w, counter);
                     }