fixing polygon issue (#178)

maxwellflitton · web-flow · commit 045a72d55ab3 · 2025-04-16T15:35:05.000+01:00
diff --git a/src/surrealdb/connections/utils_mixin.py b/src/surrealdb/connections/utils_mixin.py
@@ -3,7 +3,7 @@ class UtilsMixin:
     @staticmethod
     def check_response_for_error(response: dict, process: str) -> None:
         if response.get("error") is not None:
-            raise Exception(response.get('error'))
+            raise Exception(response.get("error"))
 
     @staticmethod
     def check_response_for_result(response: dict, process: str) -> None:
diff --git a/src/surrealdb/data/cbor.py b/src/surrealdb/data/cbor.py
@@ -22,26 +22,26 @@
 
 @shareable_encoder
 def default_encoder(encoder, obj):
-    if isinstance(obj, GeometryPoint):
-        tagged = CBORTag(constants.TAG_GEOMETRY_POINT, obj.get_coordinates())
-
     if obj is None:
         tagged = CBORTag(constants.TAG_NONE, None)
 
+    elif isinstance(obj, GeometryPoint):
+        tagged = CBORTag(constants.TAG_GEOMETRY_POINT, obj.get_coordinates())
+
     elif isinstance(obj, GeometryLine):
-        tagged = CBORTag(constants.TAG_GEOMETRY_LINE, obj.get_coordinates())
+        tagged = CBORTag(constants.TAG_GEOMETRY_LINE, obj.geometry_points)
 
     elif isinstance(obj, GeometryPolygon):
-        tagged = CBORTag(constants.TAG_GEOMETRY_POLYGON, obj.get_coordinates())
+        tagged = CBORTag(constants.TAG_GEOMETRY_POLYGON, obj.geometry_lines)
 
     elif isinstance(obj, GeometryMultiLine):
-        tagged = CBORTag(constants.TAG_GEOMETRY_MULTI_LINE, obj.get_coordinates())
+        tagged = CBORTag(constants.TAG_GEOMETRY_MULTI_LINE, obj.geometry_lines)
 
     elif isinstance(obj, GeometryMultiPoint):
-        tagged = CBORTag(constants.TAG_GEOMETRY_MULTI_POINT, obj.get_coordinates())
+        tagged = CBORTag(constants.TAG_GEOMETRY_MULTI_POINT, obj.geometry_points)
 
     elif isinstance(obj, GeometryMultiPolygon):
-        tagged = CBORTag(constants.TAG_GEOMETRY_MULTI_POLYGON, obj.get_coordinates())
+        tagged = CBORTag(constants.TAG_GEOMETRY_MULTI_POLYGON, obj.geometry_polygons)
 
     elif isinstance(obj, GeometryCollection):
         tagged = CBORTag(constants.TAG_GEOMETRY_COLLECTION, obj.geometries)
@@ -69,6 +69,7 @@ def default_encoder(encoder, obj):
 
     elif isinstance(obj, IsoDateTimeWrapper):
         tagged = CBORTag(constants.TAG_DATETIME, obj.dt)
+
     else:
         raise BufferError("no encoder for type ", type(obj))
 
@@ -80,19 +81,19 @@ def tag_decoder(decoder, tag, shareable_index=None):
         return GeometryPoint.parse_coordinates(tag.value)
 
     elif tag.tag == constants.TAG_GEOMETRY_LINE:
-        return GeometryLine.parse_coordinates(tag.value)
+        return GeometryLine(*tag.value)
 
     elif tag.tag == constants.TAG_GEOMETRY_POLYGON:
-        return GeometryPolygon.parse_coordinates(tag.value)
+        return GeometryPolygon(*tag.value)
 
     elif tag.tag == constants.TAG_GEOMETRY_MULTI_POINT:
-        return GeometryMultiPoint.parse_coordinates(tag.value)
+        return GeometryMultiPoint(*tag.value)
 
     elif tag.tag == constants.TAG_GEOMETRY_MULTI_LINE:
-        return GeometryMultiLine.parse_coordinates(tag.value)
+        return GeometryMultiLine(*tag.value)
 
     elif tag.tag == constants.TAG_GEOMETRY_MULTI_POLYGON:
-        return GeometryMultiPolygon.parse_coordinates(tag.value)
+        return GeometryMultiPolygon(*tag.value)
 
     elif tag.tag == constants.TAG_GEOMETRY_COLLECTION:
         return GeometryCollection(*tag.value)
diff --git a/tests/unit_tests/data_types/test_geometry.py b/tests/unit_tests/data_types/test_geometry.py
