Skip to content

GitLab

Commit cfdb2d7e authored by Joseph Siddons's avatar Joseph Siddons
Browse files

fix: account for Rectangle fully inside another in intersects method

parent 70d3df9c
main 10-improve-documentation v0.11.2 v0.11.1 v0.11.0 v0.10.1 v0.10.0 v0.9.0 v0.8.0 v0.7.1 v0.7.0 v0.6.0
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 4 deletions
GeoSpatialTools/octtree.py
View file @ cfdb2d7e
...@@ -224,8 +224,14 @@ class SpaceTimeRectangle: ...@@ -224,8 +224,14 @@ class SpaceTimeRectangle:
# Other is fully south of self # Other is fully south of self
return False return False
# Handle east / west edges # Handle east / west edges
return self._test_east_west(other.west) or self._test_east_west( return (
other.east self._test_east_west(other.west)
or self._test_east_west(other.east)
# Fully contained within other
or (
other._test_east_west(self.west)
and other._test_east_west(self.east)
)
) )
def nearby( def nearby(
......
GeoSpatialTools/quadtree.py
View file @ cfdb2d7e
...@@ -192,8 +192,14 @@ class Rectangle: ...@@ -192,8 +192,14 @@ class Rectangle:
# Other is fully south of self # Other is fully south of self
return False return False
# Handle east / west edges # Handle east / west edges
return self._test_east_west(other.west) or self._test_east_west( return (
other.east self._test_east_west(other.west)
or self._test_east_west(other.east)
# Fully contained within other
or (
other._test_east_west(self.west)
and other._test_east_west(self.east)
)
) )
def nearby( def nearby(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment