Skip to content

GitLab

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

fix: condition should be "and"

parent 1080246f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
GeoSpatialTools/octtree.py
View file @ a24506f6
...@@ -321,7 +321,7 @@ class SpaceTimeEllipse: ...@@ -321,7 +321,7 @@ class SpaceTimeEllipse:
return ( return (
haversine(self.p1_lon, self.p1_lat, rect.lon, rect.lat) haversine(self.p1_lon, self.p1_lat, rect.lon, rect.lat)
<= corner_dist + self.a <= corner_dist + self.a
or haversine(self.p2_lon, self.p2_lat, rect.lon, rect.lat) and haversine(self.p2_lon, self.p2_lat, rect.lon, rect.lat)
<= corner_dist + self.a <= corner_dist + self.a
) )
......
GeoSpatialTools/quadtree.py
View file @ a24506f6
...@@ -231,7 +231,7 @@ class Ellipse: ...@@ -231,7 +231,7 @@ class Ellipse:
return ( return (
haversine(self.p1_lon, self.p1_lat, rect.lon, rect.lat) haversine(self.p1_lon, self.p1_lat, rect.lon, rect.lat)
<= corner_dist + self.a <= corner_dist + self.a
or haversine(self.p2_lon, self.p2_lat, rect.lon, rect.lat) and haversine(self.p2_lon, self.p2_lat, rect.lon, rect.lat)
<= corner_dist + self.a <= corner_dist + self.a
) )
......
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