From a24506f69d4d1390212c212a8c7346cb6fde196a Mon Sep 17 00:00:00 2001
From: josidd <joseph.siddons@noc.ac.uk>
Date: Wed, 25 Sep 2024 14:18:06 +0100
Subject: [PATCH] fix: condition should be "and"
---
GeoSpatialTools/octtree.py | 2 +-
GeoSpatialTools/quadtree.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/GeoSpatialTools/octtree.py b/GeoSpatialTools/octtree.py
index 86785a4..19724b4 100644
--- a/GeoSpatialTools/octtree.py
+++ b/GeoSpatialTools/octtree.py
@@ -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
)
diff --git a/GeoSpatialTools/quadtree.py b/GeoSpatialTools/quadtree.py
index 92c2e37..41f52ed 100644
--- a/GeoSpatialTools/quadtree.py
+++ b/GeoSpatialTools/quadtree.py
@@ -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
)
--
GitLab