Многочисленные мелкие доработки, связанные с изменением отрисовки треков и загрузкой...

[pyrungps.git] / pyrungps.py

diff --git a/pyrungps.py b/pyrungps.py
index bfff892fca2164b19b10c762e1b6175e18f642f4..ed3fce52b94fac40d21a84fcb49270dc5ffaaec1 100644 (file)
--- a/pyrungps.py
+++ b/pyrungps.py
@@ -2,6 +2,9 @@
 # coding: UTF-8
 
 import requests
+
+from urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(category=InsecureRequestWarning)
     
 #import sys
 import os
@@ -25,7 +28,7 @@ def get_page(uname,year,month):
   
   trainings = []
 
-  req = requests.get("http://www.gps-sport.net/services/getMonthlyTrainingDataHTML_V2.jsp?userName=%s&year=%s&month=%s&rnd=0.645673"% (uname,year,month), headers = {'User-agent': 'Mozilla/5.0'})
+  req = requests.get("http://www.gps-sport.net/services/getMonthlyTrainingDataHTML_V2.jsp?userName=%s&year=%s&month=%s&rnd=0.645673"% (uname,year,month), headers = {'User-agent': 'Mozilla/5.0'}, verify=False)
   page = req.text.encode('utf-8')
   dom = html.document_fromstring(page)
 
@@ -42,7 +45,7 @@ def get_gpx_track(trid,name):
 
   print "trid=",trid
 
-  req = requests.get("http://www.gps-sport.net/services/trainingGPX.jsp?trainingID=%s&tz=-180" % (trid))
+  req = requests.get("http://www.gps-sport.net/services/trainingGPX.jsp?trainingID=%s&tz=-180" % (trid), verify=False)
   xml = etree.fromstring(req.text.encode('utf-8'))
 
   return xml
@@ -116,6 +119,7 @@ def get_dbx_list(dbx,username,year,month):
       if entry.name == u'Приложения':
         for entry_app in dbx.files_list_folder(entry.id).entries:
           if entry_app.name == u'Run.GPS':
+            print "id="+entry_app.id
             gpx_list_id=entry_app.id
             break
         break
@@ -125,20 +129,29 @@ def get_dbx_list(dbx,username,year,month):
     if gpx_list_id:
     
       for file in dbx.files_list_folder(gpx_list_id).entries:
-        
+      
         filename,ext = os.path.splitext(file.name)
         if ext == '.tcx':
           try:
             fyear = int(filename[0:4])
             fmonth = int(filename[5:7])
             if fyear == year and fmonth == month:
-              sport = filename[18:]
-              timestamp = datetime.strptime(filename[0:16],'%Y-%m-%d_%H%M%S')
+              sport = filename[41:]
+              timestamp = datetime.strptime(filename[0:19],'%Y-%m-%dT%H_%M_%S')
               record={ 'id': file.id, 'timestamp': timestamp, 'sport': sport }
               res.append(record)
           except:
-            None
-    
+            try:
+              fyear = int(filename[0:4])
+              fmonth = int(filename[5:7])
+              if fyear == year and fmonth == month:
+                sport = filename[18:]
+                timestamp = datetime.strptime(filename[0:16],'%Y-%m-%d_%H%M%S')
+                record={ 'id': file.id, 'timestamp': timestamp, 'sport': sport }
+                res.append(record)
+            except:
+              None
+
     return res        
       
 
@@ -395,7 +408,7 @@ def main():
       elif dbauth:
         sync_db(dbx,pusername,current_year,current_month,outdir,options.verbose,options.force)  
 
-    generate_image.render_all(db,'/etc/mapnik-osm-carto-data/veloroad-transparent.xml',400,400)
+    generate_image.render_all(db,'/etc/mapnik-osm-carto-data/veloroad-imposm.xml',640,640)
 
 if __name__ == "__main__":