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

fix: condition should be "and"

parent 1080246f
......@@ -321,7 +321,7 @@ class SpaceTimeEllipse:
return (
haversine(self.p1_lon, self.p1_lat, rect.lon, rect.lat)
<= 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
)
......
......@@ -231,7 +231,7 @@ class Ellipse:
return (
haversine(self.p1_lon, self.p1_lat, rect.lon, rect.lat)
<= 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
)
......
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