Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
NOCSurfaceProcesses
GeoSpatialTools
Commits
a24506f6
Commit
a24506f6
authored
5 months ago
by
Joseph Siddons
Browse files
Options
Download
Email Patches
Plain Diff
fix: condition should be "and"
parent
1080246f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
GeoSpatialTools/octtree.py
GeoSpatialTools/octtree.py
+1
-1
GeoSpatialTools/quadtree.py
GeoSpatialTools/quadtree.py
+1
-1
No files found.
GeoSpatialTools/octtree.py
View file @
a24506f6
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
GeoSpatialTools/quadtree.py
View file @
a24506f6
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment