GeoAlchemy2 0.14.6__py3-none-any.whl → 0.15.0__py3-none-any.whl

{GeoAlchemy2-0.14.6.dist-info → GeoAlchemy2-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.14.6
+Version: 0.15.0
 Summary: Using SQLAlchemy with Spatial Databases
 Home-page: https://geoalchemy-2.readthedocs.io/en/stable/
 Author: Eric Lemoine
@@ -43,6 +43,9 @@ GeoAlchemy 2
    :target: https://geoalchemy-2.readthedocs.io/en/latest/?badge=latest
    :alt: Documentation Status
 
+.. image:: https://zenodo.org/badge/5638538.svg
+  :target: https://zenodo.org/doi/10.5281/zenodo.10808783
+
 GeoAlchemy 2 is a Python toolkit for working with spatial databases. It is
 based on the gorgeous `SQLAlchemy <http://www.sqlalchemy.org/>`_.
 

GeoAlchemy2-0.15.0.dist-info/RECORD

@@ -0,0 +1,31 @@
+geoalchemy2/__init__.py,sha256=Wb5f11AM_hYn56yrxOAOjCT3z76TCtseqjFo2hKsob4,1971
+geoalchemy2/_functions.py,sha256=e8v584Fx_fmh8XnJvkuYEXrcyPDiWV95Mu2yw6L-LHY,62863
+geoalchemy2/_functions_helpers.py,sha256=hVM9DDTgf-oM27EZu6ycW1y2ENnSxUJixdINetWsu0E,2651
+geoalchemy2/alembic_helpers.py,sha256=WYjKiVVyHtlB4DI22z-G0-x8NnG8othAINUwmxBCMcs,27885
+geoalchemy2/comparator.py,sha256=WUDXn10doDlJVnYiWbVIAhhBu7N5AO9BI8sNf2mhpA4,8100
+geoalchemy2/elements.py,sha256=xgei9RuohTdWJdX37enLqsHMhwRqg6wrKntUUc96cEg,12999
+geoalchemy2/exc.py,sha256=Nn9bRKB_35skWDMkEf4_Y2GL6gvguPVycPZcbOfa69g,226
+geoalchemy2/functions.py,sha256=0he8hy_SAWpXAFPdfg32NMW5G0FaZP7yVl0jn0MRLBQ,10320
+geoalchemy2/functions.pyi,sha256=rKCKdDSVTgeUQHItkOKqJSEuyKmVJ30bpjLpCPwMI5g,108636
+geoalchemy2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geoalchemy2/shape.py,sha256=TZJIhCN4p4ZVwZMXidxYxTMeeyReAyoFzyYwspJRqSA,2792
+geoalchemy2/utils.py,sha256=OYWYnT64tjp4DWhPdq3KIxHbVti932xPMtGGxajtu-I,488
+geoalchemy2/admin/__init__.py,sha256=s8L5C9pYC5dTxhIp9j-JzWeg9kEJevXUW8Pq4_L4aZ8,3984
+geoalchemy2/admin/dialects/__init__.py,sha256=XodzuBbWKkkSQzM5EL3I33azuE-y_go0nVOlmIyJ13g,367
+geoalchemy2/admin/dialects/common.py,sha256=8OkGa7T2Gxz2vDVnC9nva8Ma0YqBwGxHWfBJoZF1cNQ,2936
+geoalchemy2/admin/dialects/geopackage.py,sha256=UaJignKtlo13oHxq92yescVJtXFEXkm4fy5WzR6sLT8,13469
+geoalchemy2/admin/dialects/mysql.py,sha256=z2gmkTGav60_myDCFxO1yeezDKBcNcMxFvcpH-OqVKw,6867
+geoalchemy2/admin/dialects/postgresql.py,sha256=VwB_h3TC8M5aQ6aKE3UYgxHfbEKav3eIHJeLx534Zzg,6191
+geoalchemy2/admin/dialects/sqlite.py,sha256=UYQuNDDy-1-lsvYlqyKy01UtHgLF4iEN42fE5D-9QQk,13597
+geoalchemy2/types/__init__.py,sha256=dD2-E8rr1nXr_d4CqyiEvRjO1H-dDRQnzr5B1g3_an8,14186
+geoalchemy2/types/dialects/__init__.py,sha256=sw__RqGAFVrUPGrICjsva9SPoYLBNfyAkBHmsJkT7k0,359
+geoalchemy2/types/dialects/common.py,sha256=gxKaRQhIODJhu_yBurlvFNAqGh3LfPNu_DcObEG1wlU,138
+geoalchemy2/types/dialects/geopackage.py,sha256=nRmN_PnF-CWMEHkWhKVdsybnw3SvXZIBXAHIHXJLTqw,147
+geoalchemy2/types/dialects/mysql.py,sha256=zMNi1920v0XlVaCJWSwtq0b0P5YQRn8y3X_rBxC5KEw,1790
+geoalchemy2/types/dialects/postgresql.py,sha256=7NBKEbDJXMwX8Sgs6o_N2bAUHgjUcjbrdmYOA7sDiRw,1117
+geoalchemy2/types/dialects/sqlite.py,sha256=HaRVLvIM9wsyzlSK4-kJJzg1wNrXFWTBkJkFB0Hga3U,1861
+GeoAlchemy2-0.15.0.dist-info/COPYING.rst,sha256=-bQKftq9uMOROzF7oN65kYBBIJKxTmBuDoftp27IC3I,1056
+GeoAlchemy2-0.15.0.dist-info/METADATA,sha256=QYBPH87pEDchUfLaF74jOHX4JKeMG1LnAfuUjKLMbXU,2087
+GeoAlchemy2-0.15.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+GeoAlchemy2-0.15.0.dist-info/top_level.txt,sha256=3kGUTcfBeXd61zFpof6-qiuw1peNF_HuZabgHQgrdis,12
+GeoAlchemy2-0.15.0.dist-info/RECORD,,

{GeoAlchemy2-0.14.6.dist-info → GeoAlchemy2-0.15.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

geoalchemy2/__init__.py

@@ -1,4 +1,5 @@
 """GeoAlchemy2 package."""
+
 from geoalchemy2 import admin
 from geoalchemy2 import elements  # noqa
 from geoalchemy2 import exc  # noqa

geoalchemy2/_functions_helpers.py

@@ -60,8 +60,8 @@ class TableRowElement(ColumnElement):
     """The cache is disabled for this class."""
 
     def __init__(self, selectable: bool) -> None: ...
-    @property
-    def _from_objects(self) -> List[bool]: ...  # type: ignore[override]
+    @property  # type: ignore[override]
+    def _from_objects(self) -> List[bool]: ...
 '''
     stub_file_parts = [header]
 

geoalchemy2/admin/__init__.py

@@ -1,4 +1,5 @@
 """This module defines the functions used for administration tasks."""
+
 from sqlalchemy import Column
 from sqlalchemy import Index
 from sqlalchemy import Table

geoalchemy2/admin/dialects/__init__.py

@@ -1,4 +1,5 @@
 """This module defines some dialect-specific functions used for administration tasks."""
+
 from geoalchemy2.admin.dialects import common  # noqa
 from geoalchemy2.admin.dialects import geopackage  # noqa
 from geoalchemy2.admin.dialects import mysql  # noqa

geoalchemy2/admin/dialects/common.py

@@ -1,4 +1,5 @@
 """This module defines functions used by several dialects."""
+
 import sqlalchemy
 from packaging import version
 from sqlalchemy import Column

geoalchemy2/admin/dialects/geopackage.py

@@ -2,6 +2,7 @@
 
 See GeoPackage specifications here: http://www.geopackage.org/spec/
 """
+
 import re
 
 from sqlalchemy import text

geoalchemy2/admin/dialects/mysql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for MySQL dialect."""
+
 from sqlalchemy import text
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql.sqltypes import NullType

geoalchemy2/admin/dialects/postgresql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for Postgresql dialect."""
+
 from sqlalchemy import Index
 from sqlalchemy import text
 from sqlalchemy.sql import func

geoalchemy2/admin/dialects/sqlite.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for SQLite dialect."""
+
 import os
 from typing import Optional
 

geoalchemy2/alembic_helpers.py

@@ -1,4 +1,5 @@
 """Some helpers to use with Alembic migration tool."""
+
 from alembic.autogenerate import renderers
 from alembic.autogenerate import rewriter
 from alembic.autogenerate.render import _add_column

geoalchemy2/comparator.py

@@ -36,6 +36,7 @@ Using the ORM::
 
     Session.query(Cls).order_by(Cls.geom.distance_box('POINT(0 0)')).limit(10)
 """
+
 from typing import Union
 
 from sqlalchemy import types as sqltypes

geoalchemy2/elements.py

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

geoalchemy2/functions.py

@@ -66,6 +66,7 @@ Reference
 ---------
 
 """
+
 import re
 from typing import List
 from typing import Type

geoalchemy2/functions.pyi

@@ -13,8 +13,8 @@ class TableRowElement(ColumnElement):
     """The cache is disabled for this class."""
 
     def __init__(self, selectable: bool) -> None: ...
-    @property
-    def _from_objects(self) -> List[bool]: ...  # type: ignore[override]
+    @property  # type: ignore[override]
+    def _from_objects(self) -> List[bool]: ...
 
 class ST_AsGeoJSON(GenericFunction):
     """

geoalchemy2/shape.py

@@ -5,6 +5,7 @@
     As GeoAlchemy 2 itself has no dependency on `Shapely`, applications using
     functions of this module have to ensure that `Shapely` is available.
 """
+
 from contextlib import contextmanager
 from typing import List
 from typing import Optional

geoalchemy2/types/__init__.py

@@ -4,6 +4,7 @@ The :class:`geoalchemy2.types.Geometry`, :class:`geoalchemy2.types.Geography`, a
 :class:`geoalchemy2.types.Raster` classes are used when defining geometry, geography and raster
 columns/properties in models.
 """
+
 import warnings
 from typing import Any
 from typing import Dict
@@ -114,14 +115,14 @@ class _GISType(UserDefinedType):
 
     def __init__(
         self,
-        geometry_type="GEOMETRY",
+        geometry_type: Optional[str] = "GEOMETRY",
         srid=-1,
         dimension=2,
         spatial_index=True,
         use_N_D_index=False,
-        use_typmod=None,
-        from_text=None,
-        name=None,
+        use_typmod: Optional[bool] = None,
+        from_text: Optional[str] = None,
+        name: Optional[str] = None,
         nullable=True,
         _spatial_index_reflected=None,
     ) -> None:

geoalchemy2/types/dialects/__init__.py

@@ -1,4 +1,5 @@
 """This module defines some dialect-specific functions used for Column types."""
+
 from geoalchemy2.types.dialects import common  # noqa
 from geoalchemy2.types.dialects import geopackage  # noqa
 from geoalchemy2.types.dialects import mysql  # noqa

geoalchemy2/types/dialects/geopackage.py

@@ -1,2 +1,3 @@
 """This module defines specific functions for GeoPackage dialect."""
+
 from geoalchemy2.types.dialects.sqlite import bind_processor_process  # noqa

geoalchemy2/types/dialects/mysql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for MySQL dialect."""
+
 from geoalchemy2.elements import WKBElement
 from geoalchemy2.elements import WKTElement
 from geoalchemy2.elements import _SpatialElement

geoalchemy2/types/dialects/postgresql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for Postgresql dialect."""
+
 from geoalchemy2.elements import RasterElement
 from geoalchemy2.elements import WKBElement
 from geoalchemy2.elements import WKTElement

geoalchemy2/types/dialects/sqlite.py

@@ -1,21 +1,50 @@
 """This module defines specific functions for SQLite dialect."""
+
+import re
+
 from geoalchemy2.elements import RasterElement
 from geoalchemy2.elements import WKBElement
 from geoalchemy2.elements import WKTElement
 from geoalchemy2.shape import to_shape
 
 
+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:
+        return wkt
+    _, srid, geom_type, coords = match.groups()
+    geom_type = geom_type.replace(" ", "")
+    if geom_type.endswith("ZM"):
+        geom_type = geom_type[:-2]
+    elif geom_type.endswith("Z"):
+        geom_type = geom_type[:-1]
+    if srid is None and default_srid is not None:
+        srid = f"SRID={default_srid}"
+    if srid is not None:
+        return "%s;%s%s" % (srid, geom_type, coords)
+    else:
+        return "%s%s" % (geom_type, coords)
+
+
 def bind_processor_process(spatial_type, bindvalue):
     if isinstance(bindvalue, WKTElement):
-        if bindvalue.extended:
-            return "%s" % (bindvalue.data)
-        else:
-            return "SRID=%d;%s" % (bindvalue.srid, bindvalue.data)
+        return format_geom_type(
+            bindvalue.data,
+            default_srid=bindvalue.srid if bindvalue.srid >= 0 else spatial_type.srid,
+        )
     elif isinstance(bindvalue, WKBElement):
         # With SpatiaLite we use Shapely to convert the WKBElement to an EWKT string
         shape = to_shape(bindvalue)
-        return "SRID=%d;%s" % (bindvalue.srid, shape.wkt)
+        # shapely.wkb.loads returns geom_type with a 'Z', for example, 'LINESTRING Z'
+        # which is a limitation with SpatiaLite. Hence, a temporary fix.
+        res = format_geom_type(
+            shape.wkt, default_srid=bindvalue.srid if bindvalue.srid >= 0 else spatial_type.srid
+        )
+        return res
     elif isinstance(bindvalue, RasterElement):
         return "%s" % (bindvalue.data)
+    elif isinstance(bindvalue, str):
+        return format_geom_type(bindvalue, default_srid=spatial_type.srid)
     else:
         return bindvalue

GeoAlchemy2-0.14.6.dist-info/RECORD

@@ -1,31 +0,0 @@
-geoalchemy2/__init__.py,sha256=N1HOMPNSrNa6oIpo7CBGnUOt-Fu5SzdqngDEoqyvmOo,1970
-geoalchemy2/_functions.py,sha256=e8v584Fx_fmh8XnJvkuYEXrcyPDiWV95Mu2yw6L-LHY,62863
-geoalchemy2/_functions_helpers.py,sha256=bINko9ivqpbG-mdwoYx2mQcSs8ygiiIWik3zs-RPmUQ,2651
-geoalchemy2/alembic_helpers.py,sha256=canBGpmeaTMMQR0u55C2xW-A31L1-CVVC2ZymRrew0A,27884
-geoalchemy2/comparator.py,sha256=ZWQyPJnT0IgiG3NvPLqBcEFqu2ae17QKRc5LZk1ozRU,8099
-geoalchemy2/elements.py,sha256=-FSSixQbAS_jO5TysMGxRDdbq5VZ9ZHQOk1YdHqs1nc,12914
-geoalchemy2/exc.py,sha256=Nn9bRKB_35skWDMkEf4_Y2GL6gvguPVycPZcbOfa69g,226
-geoalchemy2/functions.py,sha256=PvnwjZfmvDCRrbOxdje0xK5gZ0PJZcIyBaeIrXBPNP4,10319
-geoalchemy2/functions.pyi,sha256=sGnrJh5Oae2UuPnrom_pAfT-IWXvTnKwHi6N3cjnN1M,108636
-geoalchemy2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geoalchemy2/shape.py,sha256=1c6oVhAGJHKgFfYzHMpw9HcFicLjSV1Bb3JWol01TjM,2791
-geoalchemy2/utils.py,sha256=OYWYnT64tjp4DWhPdq3KIxHbVti932xPMtGGxajtu-I,488
-geoalchemy2/admin/__init__.py,sha256=QwqC-IaQRm_vXV4ZBOuPk3C2byeno65IGzkAdQ5URDc,3983
-geoalchemy2/admin/dialects/__init__.py,sha256=1QYO2ET6emC-uB30CC97_4_td-O6SOudoEPsJOfo4IE,366
-geoalchemy2/admin/dialects/common.py,sha256=bIAkd1TUnn24XEaJU6_OZ_eSHOOlMKthOEkBJ4p6Z4k,2935
-geoalchemy2/admin/dialects/geopackage.py,sha256=AX3Jq2-yJW5SzZJDLUytNGsqs05x4NwxHifPirO500o,13468
-geoalchemy2/admin/dialects/mysql.py,sha256=p4GSudDUMRDc2usyPCJ--JWQkyV08yuitxhrNKJPGXE,6866
-geoalchemy2/admin/dialects/postgresql.py,sha256=GTUoWKGEhkNiC0tVHkfIcXpNwd-JumY9kaqoBivKXLo,6190
-geoalchemy2/admin/dialects/sqlite.py,sha256=oAx6_XFVqAcL82IyUl19QM4XjMrt-Ofc-OmMsAbjfyI,13596
-geoalchemy2/types/__init__.py,sha256=xUVCOxk55Pjk_MfEwW0F1MGD5KicCazUOZ_J7J-938c,14116
-geoalchemy2/types/dialects/__init__.py,sha256=Z9GgQc7pEbOMnPglXnU0tBSY7DynB5uszCwfw2CGT_k,358
-geoalchemy2/types/dialects/common.py,sha256=gxKaRQhIODJhu_yBurlvFNAqGh3LfPNu_DcObEG1wlU,138
-geoalchemy2/types/dialects/geopackage.py,sha256=V7XFYNQrSukCj1mIaPIDYuMZRcXolj0CWMEy057t2VY,146
-geoalchemy2/types/dialects/mysql.py,sha256=I37iC1Gl78p9BF3f3RB-zBjmQcT64bN60RFXitvVsiI,1789
-geoalchemy2/types/dialects/postgresql.py,sha256=4B2IPoZfV99w7KUYkazSJs7c6LjF1cALVhFgB7atKCk,1116
-geoalchemy2/types/dialects/sqlite.py,sha256=e3gj-JuxVP7bHU9BjsKRjjYJK_6OYJlwGaFA3VumamM,835
-GeoAlchemy2-0.14.6.dist-info/COPYING.rst,sha256=-bQKftq9uMOROzF7oN65kYBBIJKxTmBuDoftp27IC3I,1056
-GeoAlchemy2-0.14.6.dist-info/METADATA,sha256=Ftgl89xSMZFX6US8QcCaZyaD4j1Oki2rUQ_yX1Qi4bQ,1980
-GeoAlchemy2-0.14.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-GeoAlchemy2-0.14.6.dist-info/top_level.txt,sha256=3kGUTcfBeXd61zFpof6-qiuw1peNF_HuZabgHQgrdis,12
-GeoAlchemy2-0.14.6.dist-info/RECORD,,