improve the robustness in shapefile reading while testing geom validity

gama-platform · Sep 9, 2021 · fe73001 · fe73001
1 parent 03a68d4
commit fe73001
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/msi.gama.core/src/msi/gama/util/file/GamaShapeFile.java b/msi.gama.core/src/msi/gama/util/file/GamaShapeFile.java
@@ -345,7 +345,12 @@ protected final void readShapes(final IScope scope) {
 			collection.accepts(feature -> {
 				Geometry g = (Geometry) feature.getDefaultGeometryProperty().getValue();
 				if (g != null && !g.isEmpty() /* Fix for Issue 725 && 677 */ ) {
-					if (!with3D && !g.isValid()) { g = GeometryUtils.cleanGeometry(g); }
+					if (!with3D && g.getNumPoints() > 2)
+						try {
+							if (!g.isValid()) { g = GeometryUtils.cleanGeometry(g); }
+						} catch(Exception e) {
+							g = GeometryUtils.cleanGeometry(g); 
+						}
 					g = gis.transform(g);
 					if (!with3D) {
 						g.apply(ZERO_Z);