Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MultiPolyIntersector bug with "not" vs "is None" #161

Merged
merged 2 commits into from
Jan 9, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ def _run_test(self, pt1, pt2, poly_points, polys, poly_ids, t_vals, pts, startin
assert_str = f'Point {idx}[{i}], : Expected {point[i]}. Got {out_point[i]}'
assert math.isclose(out_point[i], point[i]), assert_str

def test_init(self):
"""Tests the initializer."""
with self.assertRaises(ValueError) as error:
grid.geometry.MultiPolyIntersector(None, [1, 2, 3])
assert str(error) == 'points is a required argument.'
with self.assertRaises(ValueError) as error:
grid.geometry.MultiPolyIntersector([[1, 2, 3]], None)
assert str(error) == 'polys is a required argument.'
with self.assertRaises(ValueError) as error:
grid.geometry.MultiPolyIntersector([[1, 2, 3]], [1, 2, 3], query='bob')
assert str(error) == 'query must be either "covered_by" or "intersects".'

def test_traverse_line_segment_1_out_out(self):
r"""A test.

Expand Down
2 changes: 1 addition & 1 deletion _package/xms/grid/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
from . import triangulate # NOQA: F401
from . import ugrid # NOQA: F401

__version__ = '7.8.0'
__version__ = '7.8.1'
6 changes: 3 additions & 3 deletions _package/xms/grid/geometry/multi_poly_intersector.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ def __init__(self, points, polys, starting_id=1, query='covered_by', **kwargs) -
**kwargs (dict): Generic keyword arguments
"""
if 'instance' not in kwargs:
if not points:
raise ValueError('points is a required arguments.')
if not polys:
if points is None:
raise ValueError('points is a required argument.')
if polys is None:
raise ValueError('polys is a required argument.')
if query not in {'covered_by', 'intersects'}:
raise ValueError('query must be either "covered_by" or "intersects".')
Expand Down
Loading