Merge branch 'release/v13.34'

rowers/courses.py

@@ -185,13 +185,9 @@ def createcourse(
             if i==0 and j==0:
                 latitude = point['latitude']
                 longitude = point['longitude']
-                g = geocoder.google([latitude,longitude],method='reverse')
+                g = geocoder.osm([latitude,longitude],method='reverse')
                 if g.ok:
-                    address = g.raw['address_components']
-                    country = 'unknown'
-                    for a in address:
-                        if 'country' in a['types']:
-                            country = a['long_name']
+                    country = g.json['country']
                 else:
                     country = 'unknown'
                 c.country = country

rowers/forms.py

@@ -209,6 +209,7 @@ class CourseForm(forms.Form):
     notes = forms.CharField(required=False,
                             max_length=200,label='Course Notes',
                             widget=forms.Textarea)
+    country = forms.CharField(required=False,max_length=150,label='Country')
 
     def __init__(self, *args, **kwargs):
         from django.forms.widgets import HiddenInput

rowers/management/commands/getblogposts.py

@@ -6,6 +6,7 @@ import os
 import requests
 import datetime
 import arrow
+import json
 
 from simplejson.errors import JSONDecodeError
 
@@ -23,6 +24,9 @@ class Command(BaseCommand):
             if response.status_code == 200:
                 try:
                     blogs_json = response.json()
+                except  JSONDecodeError:
+                    try:
+                        blogs_json = json.loads(response.text)
                     except JSONDecodeError:
                         blogs_json = []
             else:

rowers/views/racesviews.py

@@ -579,6 +579,7 @@ def course_upload_replace_view(request,id=0):
         if form.is_valid():
             f = form.cleaned_data['file']
             notes = form.cleaned_data['notes']
+            country = form.cleaned_data['country']
             if f is not None:
                 filename, path_and_filename = handle_uploaded_file(f)
 
@@ -593,6 +594,9 @@ def course_upload_replace_view(request,id=0):
                     polygons = course['polygons']
 
                     course = courses.createcourse(r,cname,polygons,notes=cnotes)
+                    if course.country == 'unknown':
+                        course.country = country
+                        course.save()
 
                     url = reverse(course_update_confirm,
                                   kwargs = {
@@ -703,6 +707,7 @@ def course_upload_view(request):
             f = form.cleaned_data['file']
             name = form.cleaned_data['name']
             notes = form.cleaned_data['notes']
+            country = form.cleaned_data['country']
             if f is not None:
                 filename,path_and_filename = handle_uploaded_file(f)
 
@@ -715,6 +720,9 @@ def course_upload_view(request):
                     polygons = course['polygons']
 
                     course = courses.createcourse(r,cname,polygons,notes=cnotes)
+                    if course.country == 'unknown':
+                        course.country = country
+                        course.save()
 
                 os.remove(path_and_filename)