phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "possible fix center calculation"

Browse Source 
This reverts commit ca80f7a
This commit is contained in:
Kuroshini 2019-12-05 13:15:51 +03:00
parent ca80f7a797
commit 66fc2fae99
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/search_indexes/filters.py
View File

@ -13,24 +13,24 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend):
@staticmethod
def calculate_center(first, second):
if second[0] < 0 < first[0]:
reverse_first, reverse_second = 180 - abs(first[0]), 180 - abs(second[0])
if second[1] < 0 < first[1]:
reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1])
diff = (reverse_first + reverse_second) / 2
if reverse_first < reverse_second:
result_part = -180 + (180 + second[0] - diff)
result_part = -180 + (180 + second[1] - diff)
else:
result_part = 180 - (180 - first[0] - diff)
result_part = 180 - (180 - first[1] - diff)
elif second[0] < 0 > first[0] or second[0] > 0 < first[0]:
elif second[1] < 0 > first[1] or second[1] > 0 < first[1]:
reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1])
result_part = ((reverse_first + reverse_second) / 2) * (-1 + (second[1] < 0) * 2)
else:
result_part = (first[0] + second[0]) / 2
result_part = (first[1] + second[1]) / 2
return result_part, (first[1] + second[1]) / 2
return (first[0] + second[0]) / 2, result_part
def filter_queryset(self, request, queryset, view):
ret = super().filter_queryset(request, queryset, view)