GeoAlchemy2 0.15.0__tar.gz → 0.15.2__tar.gz

{geoalchemy2-0.15.0 → geoalchemy2-0.15.2}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3.8
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -17,11 +17,11 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 24.4.2
     hooks:
       - id: black
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
   - repo: https://github.com/PyCQA/pydocstyle
@@ -31,7 +31,7 @@ repos:
         additional_dependencies: ["tomli"]
         exclude: "tests"
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.0
     hooks:
       - id: flake8
 ci:

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

@@ -1,6 +1,17 @@
 GeoAlchemy 2 Changelog
 ======================
 
+0.15.2
+------
+
+* Fix: Can handle negative coordinates with Spatialite @adrien-berchet (#517)
+
+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.2/GeoAlchemy2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.15.0
+Version: 0.15.2
 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.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.15.0
+Version: 0.15.2
 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.2}/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.2}/geoalchemy2/types/dialects/sqlite.py

@@ -1,6 +1,7 @@
 """This module defines specific functions for SQLite dialect."""
 
 import re
+import warnings
 
 from geoalchemy2.elements import RasterElement
 from geoalchemy2.elements import WKBElement
@@ -12,6 +13,10 @@ def format_geom_type(wkt, default_srid=None):
     """Format the Geometry type for SQLite."""
     match = re.match(WKTElement.SPLIT_WKT_PATTERN, wkt)
     if match is None:
+        warnings.warn(
+            "The given WKT could not be parsed by GeoAlchemy2, this could lead to undefined "
+            f"behavior with Z, M or ZM geometries or with incorrect SRID. The WKT string is: {wkt}"
+        )
         return wkt
     _, srid, geom_type, coords = match.groups()
     geom_type = geom_type.replace(" ", "")

{geoalchemy2-0.15.0 → geoalchemy2-0.15.2}/tests/__init__.py

@@ -5,8 +5,7 @@ import shutil
 import sys
 
 import pytest
-from packaging import version
-from pkg_resources import parse_version
+from packaging.version import parse as parse_version
 from sqlalchemy import __version__ as SA_VERSION
 from sqlalchemy import create_engine
 from sqlalchemy import select as raw_select
@@ -30,9 +29,9 @@ class test_only_with_dialects:
 
 def get_postgis_major_version(bind):
     try:
-        return version.parse(bind.execute(func.postgis_lib_version()).scalar()).major
+        return parse_version(bind.execute(func.postgis_lib_version()).scalar()).major
     except OperationalError:
-        return version.parse("0").major
+        return parse_version("0").major
 
 
 def get_postgres_major_version(bind):
@@ -81,7 +80,7 @@ def skip_pypy(msg=None):
 
 
 def select(args):
-    if version.parse(SA_VERSION) < version.parse("1.4"):
+    if parse_version(SA_VERSION) < parse_version("1.4"):
         return raw_select(args)
     else:
         return raw_select(*args)

{geoalchemy2-0.15.0 → geoalchemy2-0.15.2}/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.2}/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
@@ -433,6 +445,32 @@ class TestInsertionCore:
             assert srid == 4326
             assert row[1] == from_shape(Point(1, 1), srid=4326, extended=True)
 
+    def test_insert_negative_coords(self, conn, Poi, setup_tables, dialect_name):
+        conn.execute(
+            Poi.__table__.insert(),
+            [
+                {"geom": "SRID=4326;POINT(-1 1)"},
+                {"geom": WKTElement("POINT(-1 1)", srid=4326)},
+                {"geom": WKTElement("SRID=4326;POINT(-1 1)", extended=True)},
+                {"geom": from_shape(Point(-1, 1), srid=4326)},
+                {"geom": from_shape(Point(-1, 1), srid=4326, extended=True)},
+            ],
+        )
+
+        results = conn.execute(Poi.__table__.select())
+        rows = results.fetchall()
+
+        for row in rows:
+            assert isinstance(row[1], WKBElement)
+            wkt = conn.execute(row[1].ST_AsText()).scalar()
+            assert format_wkt(wkt) == "POINT(-1 1)"
+            srid = conn.execute(row[1].ST_SRID()).scalar()
+            assert srid == 4326
+            if dialect_name == "mysql":
+                assert row[1] == from_shape(Point(-1, 1), srid=4326)
+            else:
+                assert row[1] == from_shape(Point(-1, 1), srid=4326, extended=True)
+
 
 class TestSelectBindParam:
     @pytest.fixture

{geoalchemy2-0.15.0 → geoalchemy2-0.15.2}/tests/test_functional_sqlite.py

@@ -1,7 +1,9 @@
 import re
 
 import pytest
+from shapely.geometry import GeometryCollection
 from shapely.geometry import LineString
+from shapely.geometry import Point
 from sqlalchemy import CheckConstraint
 from sqlalchemy import Column
 from sqlalchemy import Integer
@@ -22,6 +24,7 @@ from geoalchemy2.elements import WKTElement
 from geoalchemy2.shape import from_shape
 from geoalchemy2.shape import to_shape
 
+from . import format_wkt
 from . import select
 from . import skip_case_insensitivity
 from . import skip_pypy
@@ -310,6 +313,51 @@ class TestMiscellaneous:
             load_spatialite(conn.connection.dbapi_connection)
 
 
+class TestInsertionCore:
+    @pytest.fixture
+    def GeomObject(self, base):
+        class GeomObject(base):
+            __tablename__ = "any_geom_object"
+            id = Column(Integer, primary_key=True)
+            geom = Column(Geometry(srid=4326))
+
+        return GeomObject
+
+    def test_insert_unparsable_WKT(self, conn, GeomObject, setup_tables, dialect_name):
+        with pytest.warns(
+            UserWarning,
+            match=(
+                "The given WKT could not be parsed by GeoAlchemy2, this could lead to undefined "
+                "behavior"
+            ),
+        ):
+            conn.execute(
+                GeomObject.__table__.insert(),
+                [
+                    {"geom": "SRID=4326;GeometryCollection(POINT (-1 1),LINESTRING (2 2, 3 3))"},
+                ],
+            )
+
+        results = conn.execute(GeomObject.__table__.select())
+        rows = results.fetchall()
+
+        for row in rows:
+            assert isinstance(row[1], WKBElement)
+            wkt = conn.execute(row[1].ST_AsText()).scalar()
+            assert format_wkt(wkt) == "GEOMETRYCOLLECTION(POINT(-1 1),LINESTRING(2 2,3 3))"
+            srid = conn.execute(row[1].ST_SRID()).scalar()
+            assert srid == 4326
+            if dialect_name == "mysql":
+                extended = None
+            else:
+                extended = True
+            assert row[1] == from_shape(
+                GeometryCollection([Point(-1, 1), LineString([[2, 2], [3, 3]])]),
+                srid=4326,
+                extended=extended,
+            )
+
+
 class TestInsertionORM:
     @pytest.fixture
     def LocalPoint(self, base):