Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pymeos/boxes/tbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -1082,10 +1082,7 @@ def nearest_approach_distance(self, other: TBox | TNumber) -> float:
nad_tbox_tbox
"""
if isinstance(other, TBox):
if self._is_float():
return nad_tboxfloat_tboxfloat(self._inner, other._inner)
else:
return nad_tboxint_tboxint(self._inner, other._inner)
return nad_tbox_tbox(self._inner, other._inner)
elif isinstance(other, TInt):
return nad_tint_tbox(other._inner, self._inner)
elif isinstance(other, TFloat):
Expand Down
2 changes: 1 addition & 1 deletion pymeos/collections/base/spanset.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def __repr__(self):
A new :class:`str` instance

MEOS Functions:
tstzspanset_out
spanset_out
"""
return f"{self.__class__.__name__}({self})"

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/number/floatset.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
floatset_end_value,
floatset_in,
floatset_make,
floatset_out,
floatset_shift_scale,
floatset_start_value,
floatset_value_n,
Expand All @@ -23,6 +22,7 @@
overleft_set_float,
overright_set_float,
right_set_float,
set_out,
union_set_float,
union_set_set,
)
Expand Down Expand Up @@ -78,9 +78,9 @@ def as_text(self, max_decimals: int = 15) -> str:
A new :class:`str` instance

MEOS Functions:
floatset_out
set_out
"""
return floatset_out(self._inner, max_decimals)
return set_out(self._inner, max_decimals)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/number/floatspan.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
floatspan_in,
floatspan_lower,
floatspan_make,
floatspan_out,
floatspan_shift_scale,
floatspan_to_intspan,
floatspan_upper,
Expand All @@ -28,6 +27,7 @@
overright_span_float,
right_span_float,
span_eq,
span_out,
union_span_float,
union_span_span,
union_spanset_span,
Expand Down Expand Up @@ -84,9 +84,9 @@ def as_text(self, max_decimals: int = 15) -> str:
A new :class:`str` instance

MEOS Functions:
floatspan_out
span_out
"""
return floatspan_out(self._inner, max_decimals)
return span_out(self._inner, max_decimals)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/number/floatspanset.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
distance_spanset_float,
float_to_spanset,
floatspanset_in,
floatspanset_out,
floatspanset_shift_scale,
floatspanset_to_intspanset,
floatspanset_width,
Expand All @@ -21,6 +20,7 @@
overright_spanset_float,
right_spanset_float,
spanset_eq,
spanset_out,
union_spanset_float,
)

Expand Down Expand Up @@ -72,9 +72,9 @@ def as_text(self, max_decimals: int = 15) -> str:
A new :class:`str` instance

MEOS Functions:
floatspanset_out
spanset_out
"""
return floatspanset_out(self._inner, max_decimals)
return spanset_out(self._inner, max_decimals)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/number/intset.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
intset_end_value,
intset_in,
intset_make,
intset_out,
intset_shift_scale,
intset_start_value,
intset_value_n,
Expand All @@ -23,6 +22,7 @@
overleft_set_int,
overright_set_int,
right_set_int,
set_out,
union_set_int,
union_set_set,
)
Expand Down Expand Up @@ -77,9 +77,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
intset_out
set_out
"""
return intset_out(self._inner)
return set_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/number/intspan.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
intspan_in,
intspan_lower,
intspan_make,
intspan_out,
intspan_shift_scale,
intspan_to_floatspan,
intspan_upper,
Expand All @@ -28,6 +27,7 @@
overright_span_int,
right_span_int,
span_eq,
span_out,
union_span_int,
union_span_span,
union_spanset_span,
Expand Down Expand Up @@ -83,9 +83,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
intspan_out
span_out
"""
return intspan_out(self._inner)
return span_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/number/intspanset.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
int_to_spanset,
intersection_spanset_int,
intspanset_in,
intspanset_out,
intspanset_shift_scale,
intspanset_to_floatspanset,
intspanset_width,
Expand All @@ -21,6 +20,7 @@
overright_spanset_int,
right_spanset_int,
spanset_eq,
spanset_out,
union_spanset_int,
)

Expand Down Expand Up @@ -72,9 +72,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
intspanset_out
spanset_out
"""
return intspanset_out(self._inner)
return spanset_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
4 changes: 2 additions & 2 deletions pymeos/collections/text/textset.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
textset_out
set_out
"""
return textset_out(self._inner)
return set_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/time/dateset.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
dateset_end_value,
dateset_in,
dateset_make,
dateset_out,
dateset_shift_scale,
dateset_start_value,
dateset_value_n,
Expand All @@ -27,6 +26,7 @@
minus_set_set,
overafter_set_date,
overbefore_set_date,
set_out,
union_set_date,
union_set_set,
)
Expand Down Expand Up @@ -83,9 +83,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
dateset_out
set_out
"""
return dateset_out(self._inner)
return set_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/time/datespan.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
datespan_in,
datespan_lower,
datespan_make,
datespan_out,
datespan_shift_scale,
datespan_to_tstzspan,
datespan_upper,
Expand All @@ -31,6 +30,7 @@
minus_span_spanset,
overafter_span_date,
overbefore_span_date,
span_out,
union_span_date,
)

Expand Down Expand Up @@ -89,9 +89,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
datespan_out
span_out
"""
return datespan_out(self._inner)
return span_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
6 changes: 3 additions & 3 deletions pymeos/collections/time/datespanset.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
datespanset_end_date,
datespanset_in,
datespanset_num_dates,
datespanset_out,
datespanset_shift_scale,
datespanset_start_date,
datespanset_to_tstzspanset,
Expand All @@ -30,6 +29,7 @@
minus_spanset_date,
overafter_spanset_date,
overbefore_spanset_date,
spanset_out,
union_spanset_date,
)

Expand Down Expand Up @@ -84,9 +84,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
datespanset_out
spanset_out
"""
return datespanset_out(self._inner)
return spanset_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
4 changes: 2 additions & 2 deletions pymeos/collections/time/tstzset.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
tstzset_out
set_out
"""
return tstzset_out(self._inner)
return set_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------
# ------------------------- Accessors -------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions pymeos/collections/time/tstzspan.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
tstzspan_out
span_out
"""
return tstzspan_out(self._inner)
return span_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
4 changes: 2 additions & 2 deletions pymeos/collections/time/tstzspanset.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def as_text(self) -> str:
A new :class:`str` instance

MEOS Functions:
tstzspanset_out
spanset_out
"""
return tstzspanset_out(self._inner)
return spanset_out(self._inner, 0)

# ------------------------- Conversions -----------------------------------

Expand Down
16 changes: 11 additions & 5 deletions pymeos/main/_generated/tgeogpoint_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def at(self, other):
"""Generated regular ``at``.

MEOS Functions:
tgeo_at_geom, tgeo_at_stbox, tgeo_at_value, tpoint_at_elevation, tpoint_at_geom, tpoint_at_value
tgeo_at_geom, tgeo_at_stbox, tgeo_at_value, tpoint_at_elevation
"""
from ...boxes import STBox

Expand All @@ -109,7 +109,9 @@ def disjoint(self, other):
"""
from ..tpoint import TGeogPoint

if isinstance(other, TGeogPoint):
if isinstance(other, shpb.BaseGeometry):
result = tdisjoint_tgeo_geo(self._inner, geo_to_gserialized(other, True))
elif isinstance(other, TGeogPoint):
result = tdisjoint_tgeo_tgeo(self._inner, other._inner)
else:
raise TypeError(f"Operation not supported with type {other.__class__}")
Expand Down Expand Up @@ -187,7 +189,9 @@ def intersects(self, other):
"""
from ..tpoint import TGeogPoint

if isinstance(other, TGeogPoint):
if isinstance(other, shpb.BaseGeometry):
result = tintersects_tgeo_geo(self._inner, geo_to_gserialized(other, True))
elif isinstance(other, TGeogPoint):
result = tintersects_tgeo_tgeo(self._inner, other._inner)
else:
raise TypeError(f"Operation not supported with type {other.__class__}")
Expand Down Expand Up @@ -217,7 +221,9 @@ def is_always_within_distance(self, other, distance):
"""
from ..tpoint import TGeogPoint

if isinstance(other, TGeogPoint):
if isinstance(other, shpb.BaseGeometry):
result = adwithin_tgeo_geo(self._inner, geo_to_gserialized(other, True), distance, True)
elif isinstance(other, TGeogPoint):
result = adwithin_tgeo_tgeo(self._inner, other._inner, distance, True)
else:
raise TypeError(f"Operation not supported with type {other.__class__}")
Expand Down Expand Up @@ -259,7 +265,7 @@ def minus(self, other):
"""Generated regular ``minus``.

MEOS Functions:
tgeo_minus_geom, tgeo_minus_stbox, tgeo_minus_value, tpoint_minus_elevation, tpoint_minus_geom, tpoint_minus_value
tgeo_minus_geom, tgeo_minus_stbox, tgeo_minus_value, tpoint_minus_elevation
"""
from ...boxes import STBox

Expand Down
4 changes: 2 additions & 2 deletions pymeos/main/_generated/tgeompoint_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def at(self, other):
"""Generated regular ``at``.

MEOS Functions:
tgeo_at_geom, tgeo_at_stbox, tgeo_at_value, tpoint_at_elevation, tpoint_at_geom, tpoint_at_value
tgeo_at_geom, tgeo_at_stbox, tgeo_at_value, tpoint_at_elevation
"""
from ...boxes import STBox

Expand Down Expand Up @@ -289,7 +289,7 @@ def minus(self, other):
"""Generated regular ``minus``.

MEOS Functions:
tgeo_minus_geom, tgeo_minus_stbox, tgeo_minus_value, tpoint_minus_elevation, tpoint_minus_geom, tpoint_minus_value
tgeo_minus_geom, tgeo_minus_stbox, tgeo_minus_value, tpoint_minus_elevation
"""
from ...boxes import STBox

Expand Down
Loading
Loading