Add support for the the general Geometry type (#709)

* Add Geometry type

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Refactor isinstance statement to test multiple types

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Remove RELEASE.md file

* Refactor Geometry scalar

* fix typing issues

---------

Co-authored-by: Evan Moon <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Thiago Bellini Ribeiro <[email protected]>

Author: 4 people

poetry.lock

@@ -282,6 +282,7 @@ def __hash__(self):
     MultiPoint = None
     MultilineString = None
     MultiPolygon = None
+    Geometry = None
 else:
     Point = strawberry.scalar(
         NewType("Point", tuple[float, float, Optional[float]]),
@@ -344,6 +345,16 @@ def __hash__(self):
         description="A geographical object that contains multiple polygons.",
     )
 
+    Geometry = strawberry.scalar(
+        NewType("Geometry", geos.GEOSGeometry),
+        serialize=lambda v: v.tuple if isinstance(v, geos.GEOSGeometry) else v,  # type: ignore
+        parse_value=lambda v: geos.GeometryCollection,
+        description=(
+            "An arbitrary geographical object. One of Point, "
+            "LineString, LinearRing, Polygon, MultiPoint, MultiLineString, MultiPolygon."
+        ),
+    )
+
     field_type_map.update(
         {
             geos_fields.PointField: Point,
@@ -352,6 +363,7 @@ def __hash__(self):
             geos_fields.MultiPointField: MultiPoint,
             geos_fields.MultiLineStringField: MultiLineString,
             geos_fields.MultiPolygonField: MultiPolygon,
+            geos_fields.GeometryField: Geometry,
         },
     )
 

strawberry_django/fields/types.py

@@ -387,6 +387,7 @@ class GeoFieldType:
         multi_point: auto
         multi_line_string: auto
         multi_polygon: auto
+        geometry: auto
 
     object_definition = get_object_definition(GeoFieldType, strict=True)
     assert [
@@ -399,6 +400,7 @@ class GeoFieldType:
         ("multi_point", types.MultiPoint),
         ("multi_line_string", types.MultiLineString),
         ("multi_polygon", types.MultiPolygon),
+        ("geometry", types.Geometry),
     ]
 
 

tests/fields/test_types.py

@@ -133,6 +133,7 @@ class GeosFieldsModel(models.Model):
         multi_point = geos_fields.MultiPointField(null=True, blank=True)
         multi_line_string = geos_fields.MultiLineStringField(null=True, blank=True)
         multi_polygon = geos_fields.MultiPolygonField(null=True, blank=True)
+        geometry = geos_fields.GeometryField(null=True, blank=True)
 
 except ImproperlyConfigured:
     GEOS_IMPORTED = False