GeoAlchemy2 0.15.0__tar.gz → 0.15.1__tar.gz

{geoalchemy2-0.15.0 → geoalchemy2-0.15.1}/CHANGES.txt

@@ -1,6 +1,12 @@
 GeoAlchemy 2 Changelog
 ======================
 
+0.15.1
+------
+
+* Fix: Default SRID is bypassed when using floating point coordinates @aballet (#509)
+* Test: Dispose of the connection pools of the test engines @adrien-berchet (#511)
+
 0.15.0
 ------
 

{geoalchemy2-0.15.0 → geoalchemy2-0.15.1/GeoAlchemy2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.15.0
+Version: 0.15.1
 Summary: Using SQLAlchemy with Spatial Databases
 Home-page: https://geoalchemy-2.readthedocs.io/en/stable/
 Author: Eric Lemoine

{geoalchemy2-0.15.0/GeoAlchemy2.egg-info → geoalchemy2-0.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.15.0
+Version: 0.15.1
 Summary: Using SQLAlchemy with Spatial Databases
 Home-page: https://geoalchemy-2.readthedocs.io/en/stable/
 Author: Eric Lemoine

{geoalchemy2-0.15.0 → geoalchemy2-0.15.1}/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"

{geoalchemy2-0.15.0 → geoalchemy2-0.15.1}/tests/conftest.py

@@ -161,18 +161,23 @@ def engine(tmpdir, db_url, _engine_echo):
         # Copy the input SQLite DB to a temporary file and return an engine to it
         input_url = str(db_url)[10:]
         output_file = "test_spatial_db.sqlite"
-        return copy_and_connect_sqlite_db(input_url, tmpdir / output_file, _engine_echo, "sqlite")
-
-    if db_url.startswith("gpkg:///"):
+        current_engine = copy_and_connect_sqlite_db(
+            input_url, tmpdir / output_file, _engine_echo, "sqlite"
+        )
+    elif db_url.startswith("gpkg:///"):
         # Copy the input SQLite DB to a temporary file and return an engine to it
         input_url = str(db_url)[8:]
         output_file = "test_spatial_db.gpkg"
-        return copy_and_connect_sqlite_db(input_url, tmpdir / output_file, _engine_echo, "gpkg")
+        current_engine = copy_and_connect_sqlite_db(
+            input_url, tmpdir / output_file, _engine_echo, "gpkg"
+        )
+    else:
+        # For other dialects the engine is directly returned
+        current_engine = create_engine(db_url, echo=_engine_echo)
+        current_engine.update_execution_options(search_path=["gis", "public"])
 
-    # For other dialects the engine is directly returned
-    engine = create_engine(db_url, echo=_engine_echo)
-    engine.update_execution_options(search_path=["gis", "public"])
-    return engine
+    yield current_engine
+    current_engine.dispose()
 
 
 @pytest.fixture

{geoalchemy2-0.15.0 → geoalchemy2-0.15.1}/tests/test_functional.py

@@ -335,7 +335,16 @@ class TestInsertionCore:
             ),
         ],
     )
-    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 TestInsertionCore:
         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 TestInsertionCore:
             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