Fix Conversion.toGeometryCollection for null first arg

locationtech · Apr 9, 2024 · 848a028 · 848a028
1 parent f568af7
commit 848a028
Showing 1 changed file with 3 additions and 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
@@ -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));
   }