Merge pull request #63 from Diviloper/stable-1.1

Backport bugfixes and fix test workflow

.github/workflows/test.yml

@@ -91,8 +91,8 @@ jobs:
       - name: Install pymeos_cffi
         run: |
           cd PyMEOS-CFFI
-          python ./pymeos_cffi/builder/build_header.py
-          python ./pymeos_cffi/builder/build_pymeos_functions.py
+          python ./builder/build_header.py
+          python ./builder/build_pymeos_functions.py
           pip install .
 
       - name: Test PyMEOS with pytest

pymeos/main/tpoint.py

@@ -2089,7 +2089,12 @@ def __init__(
                 p = f'POINT({" ".join(str(x) for x in point)})'
             else:
                 p = f"{point}"
-            self._inner = tgeompoint_in(f"SRID={srid};{p}@{timestamp}")
+            full_str = (
+                f"SRID={srid};{p}@{timestamp}"
+                if srid is not None
+                else f"{p}@{timestamp}"
+            )
+            self._inner = tgeompoint_in(full_str)
 
 
 class TGeogPointInst(
@@ -2116,12 +2121,16 @@ def __init__(
     ) -> None:
         super().__init__(string=string, value=point, timestamp=timestamp, _inner=_inner)
         if self._inner is None:
-            p = (
-                f"POINT({point[0]} {point[1]})"
-                if isinstance(point, tuple)
-                else f"{point}"
+            if isinstance(point, tuple):
+                p = f'POINT({" ".join(str(x) for x in point)})'
+            else:
+                p = f"{point}"
+            full_str = (
+                f"SRID={srid};{p}@{timestamp}"
+                if srid is not None
+                else f"{p}@{timestamp}"
             )
-            self._inner = tgeogpoint_in(f"SRID={srid};{p}@{timestamp}")
+            self._inner = tgeogpoint_in(full_str)
 
 
 class TGeomPointSeq(