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

Revert "try another calc strategy"

Browse Source 
This reverts commit fe101f3
This commit is contained in:
Kuroshini 2019-12-05 14:19:56 +03:00
parent fe101f3cb0
commit aa8304acaf
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/search_indexes/filters.py
View File

@ -13,13 +13,25 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend):
@staticmethod
def calculate_center(first, second):
if second[1] < first[1]:
res_longtitude = first[1] + (first[1] - second[1]) / 2
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[1] - diff)
else:
result_part = 180 - (180 - first[1] - diff)
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:
res_longtitude = first[1] + (second[1] - first[1]) / 2
result_part = (first[1] + second[1]) / 2
# return (first[0] + second[0]) / 2, result_part
return (first[0] + second[0]) / 2, res_longtitude
return (first[0] + second[0]) / 2, (first[1] + second[1]) / 2
def filter_queryset(self, request, queryset, view):
ret = super().filter_queryset(request, queryset, view)