Changeset 36076 in osm for applications/editors/josm

Timestamp:

2023-04-20T15:14:44+02:00 (15 months ago)

Author:

taylor.smock

Message:

GeotoolsConverter: Continue parsing layers even if a previous layer could not be parsed

This is mostly useful when JTS (the underlying WKB parser) does not understand
the geometry type for a layer.

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeotoolsConverter.java (modified) (2 diffs)

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

@@ -27 +27 @@
 import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.io.ParseException;
 import org.opengis.feature.Feature;
 import org.opengis.feature.GeometryAttribute;
@@ -82 +83 @@
                 FeatureSource<?, ?> featureSource = dataStore.getFeatureSource(typeName);
                 FeatureCollection<?, ?> collection = featureSource.getFeatures();
-                parseFeatures(progressMonitor != null ? progressMonitor.createSubTaskMonitor(1, false) : null, collection);
+                try {
+                    parseFeatures(progressMonitor != null ? progressMonitor.createSubTaskMonitor(1, false) : null, collection);
+                    // Geotools wraps an IOException in a RuntimeException. We want to keep parsing layers, even if we could not understand
+                    // a previous layer.
+                } catch (RuntimeException runtimeException) {
+                    if (runtimeException.getCause() instanceof IOException && runtimeException.getCause().getCause() instanceof ParseException) {
+                        Logging.error(runtimeException);
+                    } else {
+                        throw runtimeException;
+                    }
+                }
             }
         } finally {