[Pytrainer-svn] SF.net SVN: pytrainer:[477] pytrainer/trunk

[<jb...@us...>]

Revision: 477
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=477&view=rev
Author:   jblance
Date:     2010-01-16 22:57:55 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
Make gmaps3 default, change option to allow v2 api to be used, minor tidy up of some googlemaps lap display

Modified Paths:
--------------
    pytrainer/trunk/import/translate_garmintcxv2.xsl
    pytrainer/trunk/pytrainer/extensions/googlemaps.py
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/import/translate_garmintcxv2.xsl
===================================================================
--- pytrainer/trunk/import/translate_garmintcxv2.xsl	2010-01-16 22:14:16 UTC (rev 476)
+++ pytrainer/trunk/import/translate_garmintcxv2.xsl	2010-01-16 22:57:55 UTC (rev 477)
@@ -67,8 +67,8 @@
     </xsl:variable>
 		<gpxdata:lap><xsl:value-of select="$newline"/>
 			<gpxdata:index><xsl:value-of select="$vIndex"/></gpxdata:index><xsl:value-of select="$newline"/>
-            <xsl:variable name="stlat"><xsl:value-of select="t:Track/t:Trackpoint[1]/t:Position/t:LatitudeDegrees"/></xsl:variable>
-            <xsl:variable name="stlon"><xsl:value-of select="t:Track/t:Trackpoint[1]/t:Position/t:LongitudeDegrees"/></xsl:variable>
+            <xsl:variable name="stlat"><xsl:value-of select="t:Track/t:Trackpoint/t:Position[1]/t:LatitudeDegrees"/></xsl:variable>
+            <xsl:variable name="stlon"><xsl:value-of select="t:Track/t:Trackpoint/t:Position[1]/t:LongitudeDegrees"/></xsl:variable>
             <gpxdata:startPoint lat="{$stlat}" lon="{$stlon}"/><xsl:value-of select="$newline"/>
 			<xsl:variable name="cnt"><xsl:value-of select="count(t:Track/t:Trackpoint/t:Position)-1"/></xsl:variable>
 			<xsl:variable name="endlat"><xsl:value-of select="t:Track/t:Trackpoint[number($cnt)]/t:Position/t:LatitudeDegrees"/></xsl:variable>

Modified: pytrainer/trunk/pytrainer/extensions/googlemaps.py
===================================================================
--- pytrainer/trunk/pytrainer/extensions/googlemaps.py	2010-01-16 22:14:16 UTC (rev 476)
+++ pytrainer/trunk/pytrainer/extensions/googlemaps.py	2010-01-16 22:57:55 UTC (rev 477)
@@ -199,10 +199,23 @@
 			elapsedTimeHours = int(elapsedTime/3600)
 			elapsedTimeMins = int((elapsedTime - (elapsedTimeHours * 3600)) / 60)
 			elapsedTimeSecs = elapsedTime - (elapsedTimeHours * 3600) - (elapsedTimeMins * 60)
-			strElapsedTime = "%0.0dh:%0.2dm:%0.2fs" % (elapsedTimeHours, elapsedTimeMins, elapsedTimeSecs) 
-			content += "var lap%dmarker = new google.maps.Marker({position: new google.maps.LatLng(%f, %f), icon: lapimage, map: map,  title:\"Lap%d\"}); \n " % (lapNumber, float(lap[1]), float(lap[2]), lapNumber)
-			content += "var lap%d = new google.maps.InfoWindow({content: \"<div class='info_content'>End of lap:%s<br>Elapsed time:%s<br>Distance:%0.2f km<br>Calories:%s</div>\" });\n" % (lapNumber, lapNumber, strElapsedTime, float(lap[4])/1000, lap[3])
-			content += "google.maps.event.addListener(lap%dmarker, 'click', function() { lap%d.open(map,lap%dmarker); });\n" % (lapNumber,lapNumber,lapNumber)
+			if elapsedTimeHours > 0:
+				strElapsedTime = "%0.0dh:%0.2dm:%0.2fs" % (elapsedTimeHours, elapsedTimeMins, elapsedTimeSecs) 
+			elif elapsedTimeMins > 0:
+				strElapsedTime = "%0.0dm:%0.2fs" % (elapsedTimeMins, elapsedTimeSecs) 
+			else:
+				strElapsedTime = "%0.0fs" % (elapsedTimeSecs) 
+			#process lat and lon for this lap
+			try:
+				lapLat = float(lap[1])
+				lapLon = float(lap[2])
+				content += "var lap%dmarker = new google.maps.Marker({position: new google.maps.LatLng(%f, %f), icon: lapimage, map: map,  title:\"Lap%d\"}); \n " % (lapNumber, lapLat, lapLon, lapNumber)
+				content += "var lap%d = new google.maps.InfoWindow({content: \"<div class='info_content'>End of lap:%s<br>Elapsed time:%s<br>Distance:%0.2f km<br>Calories:%s</div>\" });\n" % (lapNumber, lapNumber, strElapsedTime, float(lap[4])/1000, lap[3])
+				content += "google.maps.event.addListener(lap%dmarker, 'click', function() { lap%d.open(map,lap%dmarker); });\n" % (lapNumber,lapNumber,lapNumber)
+			except:
+				#Error processing lap lat or lon
+				#dont show this lap
+				print "Error processing lap "+ str(lapNumber) + " (lat,lon) ( " + str(lap[1]) + "," +str (lap[2]) + ")"
 
 		content += '''
 

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2010-01-16 22:14:16 UTC (rev 476)
+++ pytrainer/trunk/pytrainer/main.py	2010-01-16 22:57:55 UTC (rev 477)
@@ -75,13 +75,13 @@
 For more help on valid options try:
    %prog -h """
 parser = OptionParser(usage=usage)
-parser.set_defaults(log_level=logging.ERROR, validate=False, gm3=False, testimport=False)
+parser.set_defaults(log_level=logging.ERROR, validate=False, gm3=True, testimport=False)
 parser.add_option("-d", "--debug", action="store_const", const=logging.DEBUG, dest="log_level", help="enable logging at debug level")
 parser.add_option("-i", "--info", action="store_const", const=logging.INFO, dest="log_level", help="enable logging at info level")
 parser.add_option("-w", "--warn", action="store_const", const=logging.WARNING, dest="log_level", help="enable logging at warning level")
 parser.add_option("--valid", action="store_true", dest="validate", help="enable validation of files imported by plugins (details at info or debug logging level) - note plugin must support validation")
 parser.add_option("--check", action="store_true", dest="check", help="triggers database (only sqlite based) and configuration file sanity checks, adding fields if necessary. Backup of database is done before any change. Details at info or debug logging level")
-parser.add_option("--gmaps3", action="store_true", dest="gm3", help="EXPERIMENTAL: use Google Maps API version3 (currently slower than version 2, but includes some new functionality)")
+parser.add_option("--gmaps2", action="store_false", dest="gm3", help="Use old Google Maps API version (v2)")
 parser.add_option("--testimport", action="store_true", dest="testimport", help="EXPERIMENTAL: show new import functionality - for testing only USE AT YOUR OWN RISK")
 (options, args) = parser.parse_args()
 log_level = options.log_level


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.