fix GeometryCollection initialization

Author: timgraham

django_mongodb_backend_gis/adapter.py

@@ -6,7 +6,16 @@ def __init__(self, obj, geography=False):
         """
         Initialize on the spatial object.
         """
-        self.data = {
+        if obj.__class__.__name__ == "GeometryCollection":
+            self.data = {
+                "type": obj.__class__.__name__,
+                "geometries": [self.get_data(x) for x in obj],
+            }
+        else:
+            self.data = self.get_data(obj)
+
+    def get_data(self, obj):
+        return {
             "type": obj.__class__.__name__,
             "coordinates": obj.coords[0] if obj.__class__.__name__ == "Polygon" else obj.coords,
         }

django_mongodb_backend_gis/features.py

@@ -25,8 +25,6 @@ def django_test_expected_failures(self):
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_geometry_field_option",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_serialization_base",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_srid_option",
-                # Crash initializing GeometryCollection: 'tuple' object is not callable
-                "gis_tests.geoapp.tests.GeoModelTest.test_geometryfield",
                 # KeyError: 'within' connection.ops.gis_operators[self.lookup_name]
                 "gis_tests.geoapp.tests.GeoModelTest.test_gis_query_as_string",
                 # No lookups are supported (yet?)

django_mongodb_backend_gis/operations.py

@@ -72,10 +72,17 @@ def converter(value, expression, connection):  # noqa: ARG001
             if value is None:
                 return None
             geom_class = getattr(geos, value["type"])
+            if geom_class.__name__ == "GeometryCollection":
+                return geom_class(
+                    [getattr(geos, v["type"])(v["coordinates"]) for v in value["geometries"]],
+                    srid=4326,
+                )
             if issubclass(geom_class, geos.GeometryCollection):
                 # TODO: confirm this is correct.
                 return geom_class(
                     [
+                        # TODO: For MultiLineString, geom_class._allowed is a
+                        # tuple so this will crash.
                         geom_class._allowed(value["coordinates"][x][0])
                         for x in range(len(value["coordinates"]))
                     ],