From ac5261d9a823a6cee5d09cbbbac2a8bccf3a7593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Garc=C3=ADa=20Granda?= <dgranda@gmail.com>
Date: Sun, 29 Jan 2012 13:23:00 +0100
Subject: [PATCH] Amended stylesheets to match GPXDATA schema

---
 import/translate_garmintcxv2.xsl       | 15 ++++++-----
 import/translate_garmintools.xsl       | 35 +++++++++++++++-----------
 plugins/garmin-tcxv2/translate.xsl     | 11 ++++----
 plugins/garmintools/translate.xsl      | 35 +++++++++++++++-----------
 plugins/garmintools_full/translate.xsl | 35 +++++++++++++++-----------
 5 files changed, 75 insertions(+), 56 deletions(-)

diff --git a/import/translate_garmintcxv2.xsl b/import/translate_garmintcxv2.xsl
index 01551d28..82623cea 100644
--- a/import/translate_garmintcxv2.xsl
+++ b/import/translate_garmintcxv2.xsl
@@ -67,8 +67,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     </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/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>
+            <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>
             <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>
@@ -79,12 +79,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 			<gpxdata:calories><xsl:value-of select="t:Calories"/></gpxdata:calories><xsl:value-of select="$newline"/>
 			<gpxdata:distance><xsl:value-of select="t:DistanceMeters"/></gpxdata:distance><xsl:value-of select="$newline"/>
 			<!-- <gpxdata:trackReference>Reference information for the track which corresponds to this lap type="trackReferenceType"</gpxdata:trackReference><xsl:value-of select="$newline"/> -->
-			<gpxdata:summary><xsl:value-of select="$newline"/>
-				<MaximumSpeed kind="max"><xsl:value-of select="t:MaximumSpeed"/></MaximumSpeed><xsl:value-of select="$newline"/>
-				<AverageHeartRateBpm kind="avg"><xsl:value-of select="t:AverageHeartRateBpm/t:Value"/></AverageHeartRateBpm><xsl:value-of select="$newline"/>
-				<MaximumHeartRateBpm kind="max"><xsl:value-of select="t:MaximumHeartRateBpm/t:Value"/></MaximumHeartRateBpm><xsl:value-of select="$newline"/>
-			</gpxdata:summary><xsl:value-of select="$newline"/> 
-			<gpxdata:trigger><xsl:value-of select="t:TriggerMethod"/></gpxdata:trigger><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="MaximumSpeed" kind="max"><xsl:value-of select="t:MaximumSpeed"/></gpxdata:summary><xsl:value-of select="$newline"/>
+		    <gpxdata:summary name="AverageHeartRateBpm" kind="avg"><xsl:value-of select="t:AverageHeartRateBpm/t:Value"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name ="MaximumHeartRateBpm" kind="max"><xsl:value-of select="t:MaximumHeartRateBpm/t:Value"/></gpxdata:summary><xsl:value-of select="$newline"/>
+            <xsl:variable name="trigger_kind"><xsl:value-of select="t:TriggerMethod"/></xsl:variable>
+			<gpxdata:trigger kind="{$trigger_kind}" /><xsl:value-of select="$newline"/>
 			<gpxdata:intensity><xsl:value-of select="t:Intensity"/></gpxdata:intensity><xsl:value-of select="$newline"/>
 		</gpxdata:lap><xsl:value-of select="$newline"/>
     </xsl:for-each>
diff --git a/import/translate_garmintools.xsl b/import/translate_garmintools.xsl
index b6ee6f33..d72abf1d 100644
--- a/import/translate_garmintools.xsl
+++ b/import/translate_garmintools.xsl
@@ -54,24 +54,31 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     <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"/>
+	<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"/>
+			<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 -->
+            
+            <xsl:variable name="duration_string"><xsl:value-of select="@duration"/></xsl:variable>
+		    <xsl:variable name="hours" select="substring-before($duration_string,':')"/>
+            <xsl:variable name="rest_duration" select="substring-after($duration_string,':')"/>
+            <xsl:variable name="minutes" select="substring-before($rest_duration,':')"/>
+            <xsl:variable name="seconds" select="substring-after($rest_duration,':')"/>
+            <xsl:variable name="duration_seconds" select="$hours*3600 + $minutes*60 + $seconds"/>
+            <!-- Forcing sum result to have '.' as decimal separator -->
+			<gpxdata:elapsedTime><xsl:value-of select='format-number($duration_seconds, "#.##")'/></gpxdata:elapsedTime><xsl:value-of select="$newline"/>
 			<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:summary name="MaximumSpeed" kind="max"><xsl:value-of select="max_speed"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="AverageHeartRateBpm" kind="avg"><xsl:value-of select="avg_hr"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="MaximumHeartRateBpm" kind="max"><xsl:value-of select="max_hr"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<xsl:variable name="trigger"><xsl:value-of select="@trigger"/></xsl:variable>
+			<gpxdata:trigger kind="{$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>
diff --git a/plugins/garmin-tcxv2/translate.xsl b/plugins/garmin-tcxv2/translate.xsl
index 73745a12..82623cea 100644
--- a/plugins/garmin-tcxv2/translate.xsl
+++ b/plugins/garmin-tcxv2/translate.xsl
@@ -79,12 +79,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 			<gpxdata:calories><xsl:value-of select="t:Calories"/></gpxdata:calories><xsl:value-of select="$newline"/>
 			<gpxdata:distance><xsl:value-of select="t:DistanceMeters"/></gpxdata:distance><xsl:value-of select="$newline"/>
 			<!-- <gpxdata:trackReference>Reference information for the track which corresponds to this lap type="trackReferenceType"</gpxdata:trackReference><xsl:value-of select="$newline"/> -->
-			<gpxdata:summary><xsl:value-of select="$newline"/>
-				<MaximumSpeed kind="max"><xsl:value-of select="t:MaximumSpeed"/></MaximumSpeed><xsl:value-of select="$newline"/>
-				<AverageHeartRateBpm kind="avg"><xsl:value-of select="t:AverageHeartRateBpm/t:Value"/></AverageHeartRateBpm><xsl:value-of select="$newline"/>
-				<MaximumHeartRateBpm kind="max"><xsl:value-of select="t:MaximumHeartRateBpm/t:Value"/></MaximumHeartRateBpm><xsl:value-of select="$newline"/>
-			</gpxdata:summary><xsl:value-of select="$newline"/> 
-			<gpxdata:trigger><xsl:value-of select="t:TriggerMethod"/></gpxdata:trigger><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="MaximumSpeed" kind="max"><xsl:value-of select="t:MaximumSpeed"/></gpxdata:summary><xsl:value-of select="$newline"/>
+		    <gpxdata:summary name="AverageHeartRateBpm" kind="avg"><xsl:value-of select="t:AverageHeartRateBpm/t:Value"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name ="MaximumHeartRateBpm" kind="max"><xsl:value-of select="t:MaximumHeartRateBpm/t:Value"/></gpxdata:summary><xsl:value-of select="$newline"/>
+            <xsl:variable name="trigger_kind"><xsl:value-of select="t:TriggerMethod"/></xsl:variable>
+			<gpxdata:trigger kind="{$trigger_kind}" /><xsl:value-of select="$newline"/>
 			<gpxdata:intensity><xsl:value-of select="t:Intensity"/></gpxdata:intensity><xsl:value-of select="$newline"/>
 		</gpxdata:lap><xsl:value-of select="$newline"/>
     </xsl:for-each>
diff --git a/plugins/garmintools/translate.xsl b/plugins/garmintools/translate.xsl
index b6ee6f33..d72abf1d 100644
--- a/plugins/garmintools/translate.xsl
+++ b/plugins/garmintools/translate.xsl
@@ -54,24 +54,31 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     <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"/>
+	<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"/>
+			<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 -->
+            
+            <xsl:variable name="duration_string"><xsl:value-of select="@duration"/></xsl:variable>
+		    <xsl:variable name="hours" select="substring-before($duration_string,':')"/>
+            <xsl:variable name="rest_duration" select="substring-after($duration_string,':')"/>
+            <xsl:variable name="minutes" select="substring-before($rest_duration,':')"/>
+            <xsl:variable name="seconds" select="substring-after($rest_duration,':')"/>
+            <xsl:variable name="duration_seconds" select="$hours*3600 + $minutes*60 + $seconds"/>
+            <!-- Forcing sum result to have '.' as decimal separator -->
+			<gpxdata:elapsedTime><xsl:value-of select='format-number($duration_seconds, "#.##")'/></gpxdata:elapsedTime><xsl:value-of select="$newline"/>
 			<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:summary name="MaximumSpeed" kind="max"><xsl:value-of select="max_speed"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="AverageHeartRateBpm" kind="avg"><xsl:value-of select="avg_hr"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="MaximumHeartRateBpm" kind="max"><xsl:value-of select="max_hr"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<xsl:variable name="trigger"><xsl:value-of select="@trigger"/></xsl:variable>
+			<gpxdata:trigger kind="{$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>
diff --git a/plugins/garmintools_full/translate.xsl b/plugins/garmintools_full/translate.xsl
index b6ee6f33..d72abf1d 100644
--- a/plugins/garmintools_full/translate.xsl
+++ b/plugins/garmintools_full/translate.xsl
@@ -54,24 +54,31 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     <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"/>
+	<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"/>
+			<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 -->
+            
+            <xsl:variable name="duration_string"><xsl:value-of select="@duration"/></xsl:variable>
+		    <xsl:variable name="hours" select="substring-before($duration_string,':')"/>
+            <xsl:variable name="rest_duration" select="substring-after($duration_string,':')"/>
+            <xsl:variable name="minutes" select="substring-before($rest_duration,':')"/>
+            <xsl:variable name="seconds" select="substring-after($rest_duration,':')"/>
+            <xsl:variable name="duration_seconds" select="$hours*3600 + $minutes*60 + $seconds"/>
+            <!-- Forcing sum result to have '.' as decimal separator -->
+			<gpxdata:elapsedTime><xsl:value-of select='format-number($duration_seconds, "#.##")'/></gpxdata:elapsedTime><xsl:value-of select="$newline"/>
 			<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:summary name="MaximumSpeed" kind="max"><xsl:value-of select="max_speed"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="AverageHeartRateBpm" kind="avg"><xsl:value-of select="avg_hr"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<gpxdata:summary name="MaximumHeartRateBpm" kind="max"><xsl:value-of select="max_hr"/></gpxdata:summary><xsl:value-of select="$newline"/>
+			<xsl:variable name="trigger"><xsl:value-of select="@trigger"/></xsl:variable>
+			<gpxdata:trigger kind="{$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>