Fix: Default SRID is bypassed when using floating point coordinates (#…

…509)

* Update elements.py

* Add test

---------

Co-authored-by: Adrien Berchet <adrien.berchet@gmail.com>

geoalchemy2/elements.py

@@ -117,7 +117,7 @@ class WKTElement(_SpatialElement):
     """
 
     _REMOVE_SRID = re.compile("(SRID=([0-9]+); ?)?(.*)")
-    SPLIT_WKT_PATTERN = re.compile(r"((SRID=\d+) *; *)?([\w ]+) *(\([\d ,\(\)]+\))")
+    SPLIT_WKT_PATTERN = re.compile(r"((SRID=\d+) *; *)?([\w ]+) *(\([\d\. ,\(\)]+\))")
 
     geom_from: str = "ST_GeomFromText"
     geom_from_extended_version: str = "ST_GeomFromEWKT"

tests/test_functional.py

@@ -335,7 +335,16 @@ def test_insert(self, conn, Lake, setup_tables):
             ),
         ],
     )
-    def test_insert_all_geom_types(self, dialect_name, base, conn, metadata, geom_type, wkt):
+    @pytest.mark.parametrize(
+        "use_floating_point",
+        [
+            pytest.param(True, id="Use floating point"),
+            pytest.param(False, id="Do not use floating point"),
+        ],
+    )
+    def test_insert_all_geom_types(
+        self, dialect_name, base, conn, metadata, geom_type, wkt, use_floating_point
+    ):
         """Test insertion and selection of all geometry types."""
         ndims = 2
         if "Z" in geom_type[-2:]:
@@ -358,6 +367,9 @@ class GeomTypeTable(base):
         metadata.drop_all(bind=conn, checkfirst=True)
         metadata.create_all(bind=conn)
 
+        if use_floating_point:
+            wkt = wkt.replace("1 2", "1.5 2.5")
+
         inserted_wkt = f"{geom_type}{wkt}"
 
         # Use the DB to generate the corresponding raw WKB
@@ -401,7 +413,7 @@ class GeomTypeTable(base):
             if "MULTIPOINT" in geom_type:
                 # Some dialects return MULTIPOINT geometries with nested parenthesis and others
                 # do not so we remove them before checking the results
-                checked_wkt = re.sub(r"\(([0-9]+)\)", "\\1", checked_wkt)
+                checked_wkt = re.sub(r"\(([0-9\.]+)\)", "\\1", checked_wkt)
             if row_id >= 5 and dialect_name in ["geopackage"] and has_m:
                 # Currently Shapely does not support geometry types with M dimension
                 assert checked_wkt != expected_wkt