Merge pull request #13 from ParallelDots/improvements

Fix: Improve within angle search method
ParallelDots · Jul 12, 2024 · 967622a · 967622a
2 parents 793ea11 + 9734829
commit 967622a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/retailtree/retailtree.py b/retailtree/retailtree.py
@@ -105,10 +105,13 @@ def __fetching_ann_in_range(self, result_dict, min_angle, max_angle, result_lst)
         elif max_angle is None and min_angle < result_dict['angle']:
             result_lst.append(result_dict)
         elif min_angle is not None and max_angle is not None:
-            if min_angle <= result_dict['angle'] <= max_angle:
-                result_lst.append(result_dict)
-        else:
-            pass
+            if min_angle <= max_angle:
+                if min_angle <= result_dict['angle'] <= max_angle:
+                    result_lst.append(result_dict)
+            else:
+                if min_angle <= result_dict['angle'] or max_angle >= result_dict['angle']:
+                    result_lst.append(result_dict)
+
         # if min_angle is None:
         return result_lst
 

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@ def read(fname):
 
 setup(
     name="retailtree",
-    version="1.3.1",
+    version="1.3.2",
     long_description=read("README.md"),
     long_description_content_type='text/markdown',
     packages=find_packages(),