diff --git a/rowers/models.py b/rowers/models.py index c1760c78..a05e0be3 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -598,9 +598,9 @@ def polygon_nearest_point(polygon, latitude, longitude,debug=False): points = GeoPoint.objects.filter(polygon=polygon) points = sorted(points, key = lambda p: geo_distance(p.latitude, p.longitude, latitude, longitude)) - if debug: - for p in points: - print(p,p.latitude, p.longitude, latitude, longitude, geo_distance(p.latitude, p.longitude, latitude, longitude)) + #if debug: + # for p in points: + # print(p,p.latitude, p.longitude, latitude, longitude, geo_distance(p.latitude, p.longitude, latitude, longitude)) return points[0].latitude, points[0].longitude diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 6ffeb4f2..23bd61cc 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 38b7ec34..403b37b4 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -2680,9 +2680,10 @@ def history_view(request, userid=0): last28 = timezone.now() - datetime.timedelta(days=28) today = timezone.now() + lastyear = today - datetime.timedelta(days=365) - lastyear = datetime.datetime( - year=today.year - 1, month=today.month, day=today.day) + #lastyear = datetime.datetime( + # year=today.year - 1, month=today.month, day=today.day) firstmay = datetime.datetime( year=today.year, month=5, day=1).astimezone(usertimezone)