sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2024-02-29 10:43:56 +01:00
parent d07b20eb29
commit 4fd98fbbab
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/models.py
View File

@@ -598,9 +598,9 @@ def polygon_nearest_point(polygon, latitude, longitude,debug=False):
points = GeoPoint.objects.filter(polygon=polygon) points = GeoPoint.objects.filter(polygon=polygon)
points = sorted(points, key = lambda p: geo_distance(p.latitude, p.longitude, latitude, longitude)) points = sorted(points, key = lambda p: geo_distance(p.latitude, p.longitude, latitude, longitude))
if debug: #if debug:
for p in points: # for p in points:
print(p,p.latitude, p.longitude, latitude, longitude, geo_distance(p.latitude, p.longitude, latitude, longitude)) # print(p,p.latitude, p.longitude, latitude, longitude, geo_distance(p.latitude, p.longitude, latitude, longitude))
return points[0].latitude, points[0].longitude return points[0].latitude, points[0].longitude

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

5
rowers/views/analysisviews.py
View File

@@ -2680,9 +2680,10 @@ def history_view(request, userid=0):
last28 = timezone.now() - datetime.timedelta(days=28) last28 = timezone.now() - datetime.timedelta(days=28)
today = timezone.now() today = timezone.now()
lastyear = today - datetime.timedelta(days=365)
lastyear = datetime.datetime( #lastyear = datetime.datetime(
year=today.year - 1, month=today.month, day=today.day) # year=today.year - 1, month=today.month, day=today.day)
firstmay = datetime.datetime( firstmay = datetime.datetime(
year=today.year, month=5, day=1).astimezone(usertimezone) year=today.year, month=5, day=1).astimezone(usertimezone)