From 848a02832ca437a5a485860d6b3d1223403ec871 Mon Sep 17 00:00:00 2001 From: Martin Davis Date: Tue, 9 Apr 2024 10:46:23 -0700 Subject: [PATCH] Fix Conversion.toGeometryCollection for null first arg --- .../locationtech/jtstest/function/ConversionFunctions.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/ConversionFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/ConversionFunctions.java index 61915b749a..3986d0bf94 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/function/ConversionFunctions.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/function/ConversionFunctions.java @@ -73,12 +73,12 @@ public static Geometry toMultiPolygon(Geometry g1, Geometry g2) .createMultiPolygon( GeometryFactory.toPolygonArray(polys)); } - public static Geometry toGeometryCollection(Geometry g, Geometry g2) + public static Geometry toGeometryCollection(Geometry g1, Geometry g2) { List atomicGeoms = new ArrayList(); - if (g != null) addComponents(g, atomicGeoms); + if (g1 != null) addComponents(g1, atomicGeoms); if (g2 != null) addComponents(g2, atomicGeoms); - return g.getFactory().createGeometryCollection( + return FunctionsUtil.getFactoryOrDefault(g1, g2).createGeometryCollection( GeometryFactory.toGeometryArray(atomicGeoms)); }