togo 0.1.3__tar.gz → 0.1.5__tar.gz

togo-0.1.5/MANIFEST.in

@@ -0,0 +1,4 @@
+graft vendor
+include *.pyx
+include *.c
+include *.h

{togo-0.1.3/togo.egg-info → togo-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: togo
-Version: 0.1.3
+Version: 0.1.5
 Summary: Lightweight Python bindings for the TG geometry library
 Author-email: Giorgio Salluzzo <giorgio.salluzzo@gmail.com>
 License: MIT
@@ -242,6 +242,30 @@ from togo import TGIndex, set_polygon_indexing_mode
 set_polygon_indexing_mode(TGIndex.NATURAL)  # or NONE, YSTRIPES
 ```
 
+## Integration with tgx and libgeos
+
+Togo integrates with the [tgx](https://github.com/tidwall/tgx) extension and [libgeos](https://libgeos.org/) to provide advanced geometry operations, such as topological unions and conversions between TG and GEOS geometry formats. This allows you to leverage the speed of TG for basic operations and the flexibility of GEOS for more complex tasks.
+
+### Example: Unary Union (GEOS integration)
+
+The `unary_union` method demonstrates this integration. It combines multiple geometries into a single geometry using GEOS's topological union, with all conversions handled automatically:
+
+```python
+from togo import Geometry, Point, Poly, Ring
+
+# Create several polygons
+poly1 = Poly(Ring([(0,0), (2,0), (2,2), (0,2), (0,0)]))
+poly2 = Poly(Ring([(1,1), (3,1), (3,3), (1,3), (1,1)]))
+
+# Perform unary union (requires tgx and libgeos)
+union = Geometry.unary_union([poly1, poly2])
+
+# The result is a single geometry representing the union of the input polygons
+print(union.to_wkt())
+```
+
+This operation uses `tgx` to convert `TG` geometries to `GEOS`, applies the union in `libgeos`, and converts the result back to `TG` format for further use in `ToGo`.
+
 ## Performance Considerations
 
 - Togo is optimized for speed and memory efficiency

{togo-0.1.3 → togo-0.1.5}/README.md

@@ -222,6 +222,30 @@ from togo import TGIndex, set_polygon_indexing_mode
 set_polygon_indexing_mode(TGIndex.NATURAL)  # or NONE, YSTRIPES
 ```
 
+## Integration with tgx and libgeos
+
+Togo integrates with the [tgx](https://github.com/tidwall/tgx) extension and [libgeos](https://libgeos.org/) to provide advanced geometry operations, such as topological unions and conversions between TG and GEOS geometry formats. This allows you to leverage the speed of TG for basic operations and the flexibility of GEOS for more complex tasks.
+
+### Example: Unary Union (GEOS integration)
+
+The `unary_union` method demonstrates this integration. It combines multiple geometries into a single geometry using GEOS's topological union, with all conversions handled automatically:
+
+```python
+from togo import Geometry, Point, Poly, Ring
+
+# Create several polygons
+poly1 = Poly(Ring([(0,0), (2,0), (2,2), (0,2), (0,0)]))
+poly2 = Poly(Ring([(1,1), (3,1), (3,3), (1,3), (1,1)]))
+
+# Perform unary union (requires tgx and libgeos)
+union = Geometry.unary_union([poly1, poly2])
+
+# The result is a single geometry representing the union of the input polygons
+print(union.to_wkt())
+```
+
+This operation uses `tgx` to convert `TG` geometries to `GEOS`, applies the union in `libgeos`, and converts the result back to `TG` format for further use in `ToGo`.
+
 ## Performance Considerations
 
 - Togo is optimized for speed and memory efficiency

{togo-0.1.3 → togo-0.1.5}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "togo"
-version = "0.1.3"
+version = "0.1.5"
 description = "Lightweight Python bindings for the TG geometry library"
 readme = "README.md"
 authors = [
@@ -33,3 +33,13 @@ Tracker = "https://github.com/mindflayer/togo/issues"
 addopts = "-v -x -q"
 testpaths = ["tests"]
 pythonpath = ["."]
+
+[tool.cython-lint]
+max-line-length = 100
+
+[tool.cibuildwheel]
+#skip = ["*-musllinux_*"]
+build-verbosity = 1
+before-build = "bash tools/prepare_vendor.sh"
+# Compute platform ID from CIBW_BUILD and point LD_LIBRARY_PATH at the right vendor dir for repair
+repair-wheel-command = "PLATFORM_ID=$(echo \"$CIBW_BUILD\" | cut -d- -f2-); LD_LIBRARY_PATH=/project/vendor/geos/${PLATFORM_ID}/lib auditwheel repair -w {dest_dir} {wheel}"

togo-0.1.5/setup.py

@@ -0,0 +1,74 @@
+import os
+
+from setuptools import setup, Extension
+from Cython.Build import cythonize
+
+
+def _platform_id():
+    tag = os.environ.get("CIBW_BUILD", "local")
+    return tag.split("-", 1)[1] if "-" in tag else tag
+
+
+extra_compile_args = [
+    "-ffunction-sections",  # Enable function-level sections
+    "-fdata-sections",  # Enable data-level sections
+]
+# Avoid gc-sections when statically linking C++ libs with RTTI/vtables
+extra_link_args = [
+    # intentionally no --gc-sections
+    "-lstdc++",  # Link against C++ standard library
+]
+
+# Enable optional AddressSanitizer build via env var ASAN=1
+if os.environ.get("ASAN") == "1":
+    # Favor debuggability over speed
+    extra_compile_args += [
+        "-O1",
+        "-g",
+        "-fno-omit-frame-pointer",
+        "-fsanitize=address",
+    ]
+    extra_link_args += [
+        "-fsanitize=address",
+    ]
+
+repo_root = os.path.abspath(os.path.dirname(__file__))
+plat_id = _platform_id()
+
+# Prefer platform-specific vendor path, fall back to legacy flat layout
+cand_include = os.path.join(repo_root, "vendor", "geos", plat_id, "include")
+cand_lib = os.path.join(repo_root, "vendor", "geos", plat_id, "lib")
+if os.path.isdir(cand_include) and os.path.isdir(cand_lib):
+    geos_include = cand_include
+    geos_lib = cand_lib
+else:
+    geos_include = os.path.join(repo_root, "vendor", "geos", "include")
+    geos_lib = os.path.join(repo_root, "vendor", "geos", "lib")
+
+setup(
+    ext_modules=cythonize(
+        [
+            Extension(
+                "togo",
+                sources=["togo.pyx", "tg.c", "tgx.c"],
+                include_dirs=[
+                    ".",  # For tg.h and tgx.h
+                    geos_include,
+                ],
+                # Link static archives as whole-archive to keep all needed RTTI/vtables
+                extra_compile_args=extra_compile_args,
+                extra_link_args=[
+                    "-Wl,--whole-archive",
+                    os.path.join(geos_lib, "libgeos_c.a"),
+                    os.path.join(geos_lib, "libgeos.a"),
+                    "-Wl,--no-whole-archive",
+                ]
+                + extra_link_args,
+            )
+        ]
+    ),
+    # Explicitly disable auto-discovery in flat layout
+    packages=[],
+    py_modules=[],
+    license="MIT",
+)

{togo-0.1.3 → togo-0.1.5}/tests/test_geometries.py

@@ -58,3 +58,34 @@ def test_buenos_aires():
     b_aires_center = rect.center()
     assert b_aires_center.as_tuple() == (-58.38268310487112, -34.70305640194427)
     assert b_aires.intersects(b_aires_center.as_geometry())
+
+
+def test_togo_union_benin():
+    g = Geometry.unary_union(
+        [Geometry(TOGO, fmt="geojson"), Geometry(BENIN, fmt="geojson")]
+    )
+    # The union should not be empty and should be a valid geometry
+    assert not g.is_empty()
+    assert g.type_string() == "Polygon"
+    wkt = g.to_wkt()
+    new_g = Geometry(wkt, fmt="wkt")
+    assert new_g.equals(g)
+    assert new_g.rect() == g.rect()
+    assert new_g.within(g) and g.within(new_g)
+    assert g.contains(new_g) and new_g.contains(g)
+    assert g.intersects(new_g) and new_g.intersects(g)
+    assert not g.disjoint(new_g) and not new_g.disjoint(g)
+    assert not g.touches(new_g) and not new_g.touches(g)
+    assert g.num_points() == new_g.num_points()
+    assert g.dims() == new_g.dims()
+    assert g.has_z() == new_g.has_z()
+    assert g.has_m() == new_g.has_m()
+    assert g.is_feature() == new_g.is_feature()
+    assert g.is_featurecollection() == new_g.is_featurecollection()
+    assert g.to_geojson() == new_g.to_geojson()
+    assert g.to_hex() == new_g.to_hex()
+    assert g.to_wkb() == new_g.to_wkb()
+    assert g.to_geobin() == new_g.to_geobin()
+    assert g.memsize() == new_g.memsize()
+    assert g.coveredby(new_g) and new_g.coveredby(g)
+    assert g.covers(new_g) and new_g.covers(g)

{togo-0.1.3 → togo-0.1.5}/tests/test_geometry.py

@@ -1,5 +1,5 @@
 import pytest
-from togo import Geometry
+from togo import Geometry, Point, Ring, Poly
 
 
 def test_geometry_wkt():
@@ -193,3 +193,43 @@ def test_geometry_geom_at():
     assert g1.type_string() == "Point"
     assert g0.point().x == 1.0 and g0.point().y == 2.0
     assert g1.point().x == 3.0 and g1.point().y == 4.0
+
+
+def test_tgx_meters_grid():
+    # Create a simple point geometry
+    g = Geometry('{"type": "Point", "coordinates": [1.0, 2.0]}')
+    origin = Point(0.0, 0.0)
+    g2 = g.to_meters_grid(origin)
+    g3 = g2.from_meters_grid(origin)
+    # Should round-trip back to original coordinates
+    assert g3.point().x == pytest.approx(1.0, abs=1e-6)
+    assert g3.point().y == pytest.approx(2.0, abs=1e-6)
+
+
+def test_unary_union_geos_lines():
+    g1 = Geometry("LINESTRING(0 0, 1 1)", fmt="wkt")
+    g2 = Geometry("LINESTRING(1 1, 2 2)", fmt="wkt")
+    u = Geometry.unary_union([g1, g2])
+    assert u.type_string() == "MultiLineString"
+    wkt = u.to_wkt()
+    assert wkt == "MULTILINESTRING((0 0,1 1),(1 1,2 2))"
+
+
+def test_unary_union_geos_polys():
+    # Two intersecting squares
+    outer1 = Ring([(0, 0), (2, 0), (2, 2), (0, 2), (0, 0)])
+    poly1 = Poly(outer1)
+    outer2 = Ring([(1, 1), (3, 1), (3, 3), (1, 3), (1, 1)])
+    poly2 = Poly(outer2)
+    union_geom = Geometry.unary_union([poly1, poly2])
+    # Should be a single Polygon
+    assert union_geom.type_string() == "Polygon"
+    # Area should be 7 (each square is 4, overlap is 1)
+    # So union area = 4 + 4 - 1 = 7
+    area = union_geom.poly().exterior().area()
+    assert area == 7.0
+    # Bounding box should be ((0,0),(3,3))
+    assert union_geom.rect() == ((0.0, 0.0), (3.0, 3.0))
+    # WKT should represent the merged polygon
+    wkt = union_geom.to_wkt()
+    assert wkt == "POLYGON((2 0,0 0,0 2,1 2,1 3,3 3,3 1,2 1,2 0))"