fix polygon initialization, use serialized type for geom_class

Author: timgraham

django_mongodb_backend_gis/adapter.py

@@ -8,5 +8,5 @@ def __init__(self, obj, geography=False):
         """
         self.data = {
             "type": obj.__class__.__name__,
-            "coordinates": obj.coords,
+            "coordinates": obj.coords[0] if obj.__class__.__name__ == "Polygon" else obj.coords,
         }

django_mongodb_backend_gis/features.py

@@ -13,26 +13,26 @@ def django_test_expected_failures(self):
         expected_failures = super().django_test_expected_failures
         expected_failures.update(
             {
-                # SRIDs aren't supported.
-                "gis_tests.geogapp.tests.GeographyTest.test05_geography_layermapping",
+                # SRIDs aren't populated: AssertionError: 4326 != None
+                # self.assertEqual(4326, nullcity.point.srid)
                 "gis_tests.geoapp.tests.GeoModelTest.test_proxy",
                 # GEOSException: Calling transform() with no SRID set is not supported
                 "gis_tests.relatedapp.tests.RelatedGeoModelTest.test06_f_expressions",
                 # 'Adapter' object has no attribute 'srid'
                 "gis_tests.geoapp.test_expressions.GeoExpressionsTests.test_geometry_value_annotation",
                 # Object of type ObjectId is not JSON serializable
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_fields_option",
-                # LinearRing requires at least 4 points, got 1.
-                "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_geometry_field_option",
-                "gis_tests.geoapp.tests.GeoLookupTest.test_null_geometries",
                 # source and target must be of type SpatialReference
+                "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_geometry_field_option",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_id_field_option",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_serialization_base",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_srid_option",
-                # GeometryField is not supported (the type of Geometry isn't
-                # stored so that it can be initialized by the database converter).
-                # Error in database converter: issubclass() arg 1 must be a class
+                # GeometryCollection not supported
                 "gis_tests.geoapp.tests.GeoModelTest.test_geometryfield",
+                "gis_tests.geogapp.tests.GeographyTest.test05_geography_layermapping",
+                "gis_tests.layermap.tests.LayerMapTest.test_layermap_unique_multigeometry_fk",
+                "gis_tests.layermap.tests.LayerMapTest.test_null_geom_with_unique",
+                "gis_tests.layermap.tests.LayerMapTest.test_test_fid_range_step",
                 # KeyError: 'within' connection.ops.gis_operators[self.lookup_name]
                 "gis_tests.geoapp.tests.GeoModelTest.test_gis_query_as_string",
                 # Point object != Point object

django_mongodb_backend_gis/operations.py

@@ -68,18 +68,18 @@ def geo_db_type(self, f):
         return "object"
 
     def get_geometry_converter(self, expression):
-        geom_class = expression.output_field.geom_class
-
         def converter(value, expression, connection):  # noqa: ARG001
             if value is None:
                 return None
+            geom_class = getattr(geos, value["type"])
             if issubclass(geom_class, geos.GeometryCollection):
-                init_val = [
-                    geom_class._allowed(value["coordinates"][x][0])
-                    for x in range(len(value["coordinates"]))
-                ]
-            else:
-                init_val = value["coordinates"]
-            return geom_class(init_val)
+                from django.db import NotSupportedError
+
+                raise NotSupportedError("GeometryCollection not supported")
+                # init_val = [
+                #     geom_class._allowed(value["coordinates"][x][0])
+                #     for x in range(len(value["coordinates"]))
+                # ]
+            return geom_class(value["coordinates"])
 
         return converter