togo 0.1.4__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.4/togo.egg-info → togo-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: togo
-Version: 0.1.4
+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.4 → 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.4 → togo-0.1.5}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "togo"
-version = "0.1.4"
+version = "0.1.5"
 description = "Lightweight Python bindings for the TG geometry library"
 readme = "README.md"
 authors = [
@@ -36,3 +36,10 @@ 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.4 → togo-0.1.5}/togo.c

@@ -4,17 +4,24 @@
 {
     "distutils": {
         "depends": [
-            "/usr/include/geos_c.h",
+            "/home/employee/repos/togo/vendor/geos/local/include/geos_c.h",
             "tg.h",
             "tgx.h"
         ],
+        "extra_compile_args": [
+            "-ffunction-sections",
+            "-fdata-sections"
+        ],
+        "extra_link_args": [
+            "-Wl,--whole-archive",
+            "/home/employee/repos/togo/vendor/geos/local/lib/libgeos_c.a",
+            "/home/employee/repos/togo/vendor/geos/local/lib/libgeos.a",
+            "-Wl,--no-whole-archive",
+            "-lstdc++"
+        ],
         "include_dirs": [
             ".",
-            "/usr/include",
-            "/usr/include/geos"
-        ],
-        "libraries": [
-            "geos_c"
+            "/home/employee/repos/togo/vendor/geos/local/include"
         ],
         "name": "togo",
         "sources": [

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: togo
-Version: 0.1.4
+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.4 → togo-0.1.5}/togo.egg-info/SOURCES.txt

@@ -21,4 +21,8 @@ tests/test_segment.py
 togo.egg-info/PKG-INFO
 togo.egg-info/SOURCES.txt
 togo.egg-info/dependency_links.txt
-togo.egg-info/top_level.txt
+togo.egg-info/top_level.txt
+vendor/geos/local/include/geos_c.h
+vendor/geos/local/include/geos/export.h
+vendor/geos/local/lib/libgeos.a
+vendor/geos/local/lib/libgeos_c.a

togo-0.1.5/vendor/geos/local/include/geos/export.h

@@ -0,0 +1,51 @@
+/**********************************************************************
+ *
+ * GEOS - Geometry Engine Open Source
+ * http://geos.osgeo.org
+ *
+ * Copyright (C) 2009   Ragi Y. Burhum <ragi@burhum.com>
+ *
+ * This is free software; you can redistribute and/or modify it under
+ * the terms of the GNU Lesser General Public Licence as published
+ * by the Free Software Foundation.
+ * See the COPYING file for more information.
+ *
+ **********************************************************************/
+#pragma once
+
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || \
+    defined( __BCPLUSPLUS__)  || defined( __MWERKS__)
+
+#  if defined(GEOS_DLL_EXPORT)
+#    define GEOS_DLL   __declspec(dllexport)
+#  elif defined(GEOS_DLL_IMPORT)
+#    define GEOS_DLL   extern __declspec(dllimport)
+#  else
+#    define GEOS_DLL
+#  endif
+#else
+#  define GEOS_DLL
+#endif
+
+
+#if defined(_MSC_VER)
+#  pragma warning(disable: 4251) // identifier : class type needs to have dll-interface to be used by clients of class type2
+#endif
+
+
+/**********************************************************************
+ * Portability macros
+ **********************************************************************/
+
+#ifdef _MSC_VER
+#include <sal.h>
+#define GEOS_PRINTF_FORMAT _Printf_format_string_
+#define GEOS_PRINTF_FORMAT_ATTR(format_param, dots_param) /**/
+#elif __GNUC__
+#define GEOS_PRINTF_FORMAT /**/
+#define GEOS_PRINTF_FORMAT_ATTR(format_param, dots_param) \
+  __attribute__((format(printf, format_param, dots_param)))
+#else
+#define GEOS_PRINTF_FORMAT /**/
+#define GEOS_PRINTF_FORMAT_ATTR(format_param, dots_param) /**/
+#endif