Fix Conversion.toGeometryCollection for null first arg

dr-jts · dr-jts · commit 848a02832ca4 · 2024-04-09T10:46:23.000-07:00
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));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ public static Geometry toMultiPolygon(Geometry g1, Geometry g2)`
`73`	`73`	`.createMultiPolygon( GeometryFactory.toPolygonArray(polys));`
`74`	`74`	`}`
`75`	`75`
`76`		`- public static Geometry toGeometryCollection(Geometry g, Geometry g2)`
	`76`	`+ public static Geometry toGeometryCollection(Geometry g1, Geometry g2)`
`77`	`77`	`{`
`78`	`78`	`List atomicGeoms = new ArrayList();`
`79`		`- if (g != null) addComponents(g, atomicGeoms);`
	`79`	`+ if (g1 != null) addComponents(g1, atomicGeoms);`
`80`	`80`	`if (g2 != null) addComponents(g2, atomicGeoms);`
`81`		`- return g.getFactory().createGeometryCollection(`
	`81`	`+ return FunctionsUtil.getFactoryOrDefault(g1, g2).createGeometryCollection(`
`82`	`82`	`GeometryFactory.toGeometryArray(atomicGeoms));`
`83`	`83`	`}`
`84`	`84`