dggrid4py 0.5.0.dev0__tar.gz → 0.5.1.dev0__tar.gz

{dggrid4py-0.5.0.dev0 → dggrid4py-0.5.1.dev0}/PKG-INFO

@@ -1,37 +1,30 @@
 Metadata-Version: 2.4
 Name: dggrid4py
-Version: 0.5.0.dev0
+Version: 0.5.1.dev0
 Summary: a Python library to run highlevel functions of DGGRIDv7 and v8
-License: AGPL-3.0-or-later
+License-Expression: AGPL-3.0-or-later
 License-File: LICENSE
-Keywords: python,GIS,DGGS,DGGRID,hexagons,grids,spatial statistics
+Keywords: python,GIS,DGGS,DGGRID,hexagons,grids,spatial statistics,IGEO7
 Author: Alexander Kmoch
 Author-email: alexander.kmoch@ut.ee
-Requires-Python: >=3.9,<4.0.0
+Requires-Python: >=3.9, <4.0.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
-Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: Unix
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
+Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Dist: fiona (>=1.8.0,<2.0.0)
 Requires-Dist: geopandas (>=0.9.0,<=1.1.0)
 Requires-Dist: numpy (>=1.22.0,<=2.3.0)
 Requires-Dist: pandas (>=1.4.0,<2.4.0)
+Requires-Dist: pygeodesy (==25.10.10)
 Requires-Dist: shapely (>=1.8.0,<=2.1.0)
-Project-URL: Homepage, https://github.com/allixender/dggrid4py
-Project-URL: Repository, https://github.com/allixender/dggrid4py
 Description-Content-Type: text/markdown
 
 # dggrid4py - a Python library to run highlevel functions of DGGRID

{dggrid4py-0.5.0.dev0 → dggrid4py-0.5.1.dev0}/dggrid4py/__init__.py

@@ -11,5 +11,6 @@
 from .dggrid_runner import DGGRIDv7, DGGRIDv8, Dggs, dgselect, dggs_types
 import dggrid4py.igeo7 as igeo7
 import dggrid4py.tool as tool
+from .auxlat import geoseries_to_authalic, geoseries_to_geodetic, geodetic_to_authalic, authalic_to_geodetic
 
-__version__ = "0.5.0-dev"
+__version__ = "0.5.1-dev"

dggrid4py-0.5.1.dev0/dggrid4py/auxlat.py

@@ -0,0 +1,37 @@
+from pygeodesy.ellipsoids import Ellipsoids
+from shapely.geometry import Point, Polygon
+
+wgs84 = Ellipsoids.WGS84
+
+def authalic_to_geodetic(lat_authalic):
+    return wgs84.auxAuthalic(lat_authalic, inverse=True)
+
+def geodetic_to_authalic(lat_geodetic):
+    return wgs84.auxAuthalic(lat_geodetic, inverse=False)
+
+def _apply_to_simple_shapely_polygon(polygon, func):
+    # cannot be a complex polygon, e.g. with holes, just a simple one like the hexagons or bbox
+    # multigeometries should be treated separately
+    # it is assumed that coordinates are in lat/lon (either on authalic sphere or ellipsoid/wgs84)
+    return Polygon([ (lon, func(lat)) for (lon, lat) in polygon.exterior.coords])
+
+def _apply_to_shapely_point(point, func):
+    # points is a list of shapely Point objects
+    return Point(point.x, func(point.y))
+
+def _apply_to_shapely_points(points, func):
+    # points is a list of shapely Point objects
+    return [ Point(point.x, func(point.y)) for point in points]
+
+
+def geoseries_to_authalic(geoseries):
+    # geoseries is a geopandas GeoSeries of shapely geometries
+    return geoseries.apply(lambda geom: geom if geom.is_empty else
+                          (_apply_to_shapely_point(geom, geodetic_to_authalic) if isinstance(geom, Point) else
+                           _apply_to_simple_shapely_polygon(geom, geodetic_to_authalic)))
+
+def geoseries_to_geodetic(geoseries):
+    # geoseries is a geopandas GeoSeries of shapely geometries
+    return geoseries.apply(lambda geom: geom if geom.is_empty else
+                          (_apply_to_shapely_point(geom, authalic_to_geodetic) if isinstance(geom, Point) else
+                           _apply_to_simple_shapely_polygon(geom, authalic_to_geodetic)))

{dggrid4py-0.5.0.dev0 → dggrid4py-0.5.1.dev0}/dggrid4py/tool.py

@@ -26,7 +26,7 @@ def download_executable(url, folder="./"):
     # Return the absolute path
     return os.path.abspath(local_path)
 
-
+# TODO: could be cache checked
 def get_portable_executable(folder="./"):
     import platform
 

{dggrid4py-0.5.0.dev0 → dggrid4py-0.5.1.dev0}/pyproject.toml

@@ -1,15 +1,18 @@
-[tool.poetry]
+[project]
 name = "dggrid4py"
-version = "0.5.0-dev"
+version = "0.5.1-dev"
 description = "a Python library to run highlevel functions of DGGRIDv7 and v8"
-authors = ["Alexander Kmoch <alexander.kmoch@ut.ee>",
-    "Wai Tik Chan <wai.tik.chan@ut.ee>",
-    "Luís Moreira de Sousa <luis.de.sousa@protonmail.ch>"]
+authors = [
+  { name = "Alexander Kmoch", email = "alexander.kmoch@ut.ee" },
+  { name = "Wai Tik Chan", email = "wai.tik.chan@ut.ee>" },
+  { name = "Luís Moreira de Sousa", email = "luis.de.sousa@protonmail.ch" },
+  { name = "Francis Charette-Migneault", email = "francis.charette-migneault@crim.ca" }
+]
 license = "AGPL-3.0-or-later"
 readme = "README.md"
 repository = "https://github.com/allixender/dggrid4py"
 homepage = "https://github.com/allixender/dggrid4py"
-keywords = ["python", "GIS", "DGGS", "DGGRID", "hexagons", "grids", "spatial statistics"]
+keywords = ["python", "GIS", "DGGS", "DGGRID", "hexagons", "grids", "spatial statistics", "IGEO7"]
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Console",
@@ -32,6 +35,7 @@ pandas = ">=1.4.0, <2.4.0"
 fiona = ">=1.8.0, <2.0.0"
 shapely = ">=1.8.0, <=2.1.0"
 geopandas = ">=0.9.0, <=1.1.0"
+pygeodesy = "25.10.10"
 
 
 [tool.poetry.group.dev.dependencies]