Skip to content

Commit

Permalink
Sync with MEOS (#68)
Browse files Browse the repository at this point in the history
* Update modified functions

* Update tile functions
  • Loading branch information
Diviloper authored Aug 12, 2024
1 parent 96031b1 commit df24a8f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pymeos/boxes/stbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ def tile(
else pgis_geometry_in("Point(0 0 0)", -1)
)
)
tiles, count = stbox_tile_list(self._inner, sz, sz, sz, dt, gs, st)
tiles, count = stbox_space_time_tiles(self._inner, sz, sz, sz, dt, gs, st)
return [STBox(_inner=tiles + i) for i in range(count)]

# ------------------------- Comparisons -----------------------------------
Expand Down
4 changes: 2 additions & 2 deletions pymeos/boxes/tbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,9 @@ def tile(
)
)
if self._is_float():
tiles, count = tfloatbox_tile_list(self._inner, size, dt, origin, st)
tiles, count = tfloatbox_value_time_tiles(self._inner, size, dt, origin, st)
else:
tiles, count = tintbox_tile_list(
tiles, count = tintbox_value_time_tiles(
self._inner, int(size), dt, int(origin), st
)
return [TBox(_inner=tiles + c) for c in range(count)]
Expand Down
4 changes: 1 addition & 3 deletions pymeos/main/tpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def stboxes(self) -> List[STBox]:
"""
from ..boxes import STBox

result, count = tpoint_stboxes(self._inner, self.num_instants())
result, count = tpoint_stboxes(self._inner)
return [STBox(_inner=result + i) for i in range(count)]

def is_simple(self) -> bool:
Expand Down Expand Up @@ -788,8 +788,6 @@ def is_ever_disjoint(self, other: TPoint) -> bool:
MEOS Functions:
edisjoint_tpoint_geo, edisjoint_tpoint_tpoint
"""
from ..boxes import STBox

if isinstance(other, TPoint):
result = edisjoint_tpoint_tpoint(self._inner, other._inner)
else:
Expand Down
2 changes: 1 addition & 1 deletion pymeos/temporal/tinstant.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from abc import ABC
from datetime import datetime
from typing import Optional, Union, Any, TYPE_CHECKING, TypeVar, List
from typing import Optional, Union, TypeVar, List

from pymeos_cffi import *

Expand Down

0 comments on commit df24a8f

Please sign in to comment.