Revision: 461
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=461&view=rev
Author: dgranda
Date: 2010-01-04 18:08:27 +0000 (Mon, 04 Jan 2010)
Log Message:
-----------
Reverting to right versions after david's mixup
Modified Paths:
--------------
pytrainer/trunk/plugins/garmin-hr/conf.xml
pytrainer/trunk/plugins/garmin-hr/translate.xsl
Property Changed:
----------------
pytrainer/trunk/plugins/garmin-hr/conf.xml
pytrainer/trunk/plugins/garmin-hr/translate.xsl
Modified: pytrainer/trunk/plugins/garmin-hr/conf.xml
===================================================================
--- pytrainer/trunk/plugins/garmin-hr/conf.xml 2010-01-04 17:55:28 UTC (rev 460)
+++ pytrainer/trunk/plugins/garmin-hr/conf.xml 2010-01-04 18:08:27 UTC (rev 461)
@@ -1,12 +1,11 @@
<?xml version="1.0" ?>
<pytrainer-plugin
- name="Garmin via garmintools"
- description="Import your records directly from your Garmin GPS device (e.g. Forerunner 205 or 305) using garmintools"
- plugincode="garmintools_full"
- pluginbutton="Import from Garmin GPS device (via garmintools)"
- executable="garmintools_full"
+ name="Garmin via GPSBabel 1.3.5"
+ description="Import your records directly from your Garmin GPS device (e.g. Forerunner 205 or 305) using GPSBabel (version 1.3.5)"
+ plugincode="garminhr"
+ pluginbutton="Import from Garmin GPS device (via GPSBabel)"
+ executable="garminhr"
>
+<conf-values variable="device" value="usb:"/>
<conf-values variable="Force_sport_to" value=""/>
-<conf-values variable="Not_older_days" value="0"/>
-<conf-values variable="Legacy_comparison" value="True"/>
</pytrainer-plugin>
Property changes on: pytrainer/trunk/plugins/garmin-hr/conf.xml
___________________________________________________________________
Added: dummyproperty
+ 0
Modified: pytrainer/trunk/plugins/garmin-hr/translate.xsl
===================================================================
--- pytrainer/trunk/plugins/garmin-hr/translate.xsl 2010-01-04 17:55:28 UTC (rev 460)
+++ pytrainer/trunk/plugins/garmin-hr/translate.xsl 2010-01-04 18:08:27 UTC (rev 461)
@@ -2,7 +2,7 @@
<!-- note defining a namespace for TrainingCenterDatabase as the translation does not seem to work with a default namespace -->
<xsl:stylesheet version="1.0"
-xmlns:t="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2"
+xmlns:t="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>
@@ -17,8 +17,8 @@
xmlns:gpxdata="http://www.cluetrust.com/XML/GPXDATA/1/0" >
<xsl:value-of select="$newline"/>
- <xsl:variable name="sport"><xsl:value-of select="root/run/@sport"/></xsl:variable>
- <xsl:variable name="time"><xsl:value-of select="root/point/@time"/></xsl:variable>
+ <xsl:variable name="sport">"Run"</xsl:variable>
+ <xsl:variable name="time"><xsl:value-of select="t:Track/t:Trackpoint/t:Time"/></xsl:variable>
<xsl:variable name="name"><xsl:value-of select="$sport"/><xsl:value-of select="substring($time, 1,10)"/></xsl:variable>
<metadata><xsl:value-of select="$newline"/>
<name><xsl:value-of select="$name"/></name><xsl:value-of select="$newline"/>
@@ -26,57 +26,28 @@
<time><xsl:value-of select="$time"/></time><xsl:value-of select="$newline"/>
</metadata><xsl:value-of select="$newline"/>
<trk><xsl:value-of select="$newline"/>
+ <xsl:for-each select="t:Track">
<trkseg><xsl:value-of select="$newline"/>
- <!-- <xsl:variable name="calories"><xsl:value-of select="t:Calories"/></xsl:variable> -->
- <xsl:for-each select="root/point">
- <xsl:if test="@lat"> <!-- only write trkpt if lat/lon exist -->
- <xsl:variable name="lat"><xsl:value-of select="@lat"/></xsl:variable>
- <xsl:variable name="lon"><xsl:value-of select="@lon"/></xsl:variable>
- <trkpt lat="{$lat}" lon="{$lon}"><xsl:value-of select="$newline"/>
- <ele><xsl:value-of select="@alt"/></ele><xsl:value-of select="$newline"/>
- <time><xsl:value-of select="@time"/></time><xsl:value-of select="$newline"/>
- <xsl:if test="@hr">
- <extensions><xsl:value-of select="$newline"/>
- <gpxdata:hr><xsl:value-of select="@hr"/></gpxdata:hr><xsl:value-of select="$newline"/>
- </extensions><xsl:value-of select="$newline"/>
- </xsl:if>
- </trkpt><xsl:value-of select="$newline"/>
- </xsl:if>
+ <xsl:for-each select="t:Trackpoint">
+ <!-- only output a trkpt if a position exists -->
+ <xsl:if test="t:Position">
+ <xsl:variable name="lat"><xsl:value-of select="t:Position/t:LatitudeDegrees"/></xsl:variable>
+ <xsl:variable name="lon"><xsl:value-of select="t:Position/t:LongitudeDegrees"/></xsl:variable>
+ <trkpt lat="{$lat}" lon="{$lon}"><xsl:value-of select="$newline"/>
+ <ele><xsl:value-of select="t:AltitudeMeters"/></ele><xsl:value-of select="$newline"/>
+ <time><xsl:value-of select="t:Time"/></time><xsl:value-of select="$newline"/>
+ <xsl:if test="t:HeartRateBpm">
+ <extensions><xsl:value-of select="$newline"/>
+ <gpxdata:hr><xsl:value-of select="t:HeartRateBpm"/></gpxdata:hr><xsl:value-of select="$newline"/>
+ </extensions><xsl:value-of select="$newline"/>
+ </xsl:if>
+ </trkpt><xsl:value-of select="$newline"/>
+ </xsl:if>
</xsl:for-each>
<xsl:value-of select="$newline"/>
</trkseg><xsl:value-of select="$newline"/>
- </trk><xsl:value-of select="$newline"/>
-
-<!-- Lap Data -->
- <xsl:value-of select="$newline"/>
- <extensions><xsl:value-of select="$newline"/>
- <xsl:for-each select="root/lap">
- <xsl:variable name="vIndex">
- <xsl:number count="lap"/>
- </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="begin_pos/@lat"/></xsl:variable>
- <xsl:variable name="stlon"><xsl:value-of select="begin_pos/@lon"/></xsl:variable>
- <gpxdata:startPoint lat="{$stlat}" lon="{$stlon}"/><xsl:value-of select="$newline"/>
- <xsl:variable name="endlat"><xsl:value-of select="end_pos/@lat"/></xsl:variable>
- <xsl:variable name="endlon"><xsl:value-of select="end_pos/@lon"/></xsl:variable>
- <gpxdata:endPoint lat="{$endlat}" lon="{$endlon}"/><xsl:value-of select="$newline"/>
- <gpxdata:startTime><xsl:value-of select="@start"/></gpxdata:startTime><xsl:value-of select="$newline"/>
- <gpxdata:elapsedTime><xsl:value-of select="@duration"/></gpxdata:elapsedTime><xsl:value-of select="$newline"/> <!-- Needs converting to seconds -->
- <gpxdata:calories><xsl:value-of select="calories"/></gpxdata:calories><xsl:value-of select="$newline"/>
- <gpxdata:distance><xsl:value-of select="@distance"/></gpxdata:distance><xsl:value-of select="$newline"/>
- <gpxdata:summary><xsl:value-of select="$newline"/>
- <MaximumSpeed kind="max"><xsl:value-of select="max_speed"/></MaximumSpeed><xsl:value-of select="$newline"/>
- <AverageHeartRateBpm kind="avg"><xsl:value-of select="avg_hr"/></AverageHeartRateBpm><xsl:value-of select="$newline"/>
- <MaximumHeartRateBpm kind="max"><xsl:value-of select="max_hr"/></MaximumHeartRateBpm><xsl:value-of select="$newline"/>
- </gpxdata:summary><xsl:value-of select="$newline"/>
- <gpxdata:trigger><xsl:value-of select="@trigger"/></gpxdata:trigger><xsl:value-of select="$newline"/>
- <gpxdata:intensity><xsl:value-of select="intensity"/></gpxdata:intensity><xsl:value-of select="$newline"/>
- </gpxdata:lap><xsl:value-of select="$newline"/>
</xsl:for-each>
- </extensions><xsl:value-of select="$newline"/>
-
+ </trk><xsl:value-of select="$newline"/>
</gpx><xsl:value-of select="$newline"/>
</xsl:template>
</xsl:stylesheet>
Property changes on: pytrainer/trunk/plugins/garmin-hr/translate.xsl
___________________________________________________________________
Added: dummyproperty
+ 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|