From: Roman Bazalevskiy <rvb@rvb.name>
Date: Sun, 4 Mar 2018 13:38:33 +0000 (+0300)
Subject: Исправлены URL, добавлены User-Agent и Referer в обращении к Nominatim
X-Git-Url: https://git.rvb.name/pyrungps.git/commitdiff_plain/096f13fe34f8352a16bc9fc2824df37e93368d2b?ds=sidebyside

Исправлены URL, добавлены User-Agent и Referer в обращении к Nominatim
---

diff --git a/pyosmname.py b/pyosmname.py
index a0ee16f..e6dc29e 100644
--- a/pyosmname.py
+++ b/pyosmname.py
@@ -8,7 +8,10 @@ from lxml import etree
 
 def GetXMLDescr(lat,lon):
 
-    req = urllib2.Request("http://nominatim.openstreetmap.org/reverse?lat=%s&lon=%s&accept-language=ru,en" %(lat,lon), None)
+    reqstr = "http://nominatim.openstreetmap.org/reverse?lat=%s&lon=%s&accept-language=ru,en" %(lat,lon)
+    print reqstr
+    headers = { 'User-Agent' : 'PyRunGPS/1.0', 'Referer' : 'https://maps.rvb.name' }    
+    req = urllib2.Request(reqstr, None, headers)
     page = urllib2.urlopen(req).read()
 
     return etree.fromstring(page)
diff --git a/pyrungps.py b/pyrungps.py
index 31b0695..bff314a 100644
--- a/pyrungps.py
+++ b/pyrungps.py
@@ -16,7 +16,7 @@ def get_page(uname,year,month):
   
   trainings = []
 
-  req = urllib2.Request("http://www.gps-sport.net/embedCalendar.jsp?userName=%s&year=%s&month=%s"% (uname,year,month), None, {'User-agent': 'Mozilla/5.0'})
+  req = urllib2.Request("http://www.gps-sport.net/services/getMonthlyTrainingDataHTML_V2.jsp?userName=%s&year=%s&month=%s&rnd=0.645673"% (uname,year,month), None, {'User-agent': 'Mozilla/5.0'})
   page = urllib2.urlopen(req).read()
   dom = html.document_fromstring(page)
 
@@ -31,7 +31,9 @@ def get_page(uname,year,month):
 
 def get_gpx_track(trid,name):
 
-  req = urllib2.urlopen("http://www.gps-sport.net/services/trainingGPX.jsp?trainingID=%s" % (trid))
+  print "trid=",trid
+
+  req = urllib2.urlopen("http://www.gps-sport.net/services/trainingGPX.jsp?trainingID=%s&tz=-180" % (trid))
   
   xml = etree.parse(req)