From 5b422332ac7b414ed693705da172c2e455e15047 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Wed, 14 Feb 2018 21:34:07 +0200
Subject: [PATCH] UDCF import: use unit variable

Simplify depth conversion from by using the unit variable and allowing
dephtConvert template to do the work.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
---
 xslt/udcf.xslt | 48 ++++++++++++------------------------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/xslt/udcf.xslt b/xslt/udcf.xslt
index 359e606b5..ce536677a 100644
--- a/xslt/udcf.xslt
+++ b/xslt/udcf.xslt
@@ -136,24 +136,12 @@
 		  format-number(floor($timeSec mod $timeconvert), '00'), ' min')"/>
 	      </xsl:attribute>
 	      <xsl:attribute name="depth">
-                <xsl:choose>
-                  <xsl:when test="//units|//UNITS = 'imperial'">
-                    <xsl:call-template name="depthConvert">
-                      <xsl:with-param name="depth">
-                        <xsl:value-of select="."/>
-                      </xsl:with-param>
-                      <xsl:with-param name="units" select="'Imperial'"/>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:call-template name="depthConvert">
-                      <xsl:with-param name="depth">
-                        <xsl:value-of select="."/>
-                      </xsl:with-param>
-                      <xsl:with-param name="units" select="'Metric'"/>
-                    </xsl:call-template>
-                  </xsl:otherwise>
-                </xsl:choose>
+                <xsl:call-template name="depthConvert">
+                  <xsl:with-param name="depth">
+                    <xsl:value-of select="."/>
+                  </xsl:with-param>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
 	      </xsl:attribute>
 	    </sample>
 	  </xsl:for-each>
@@ -189,24 +177,12 @@
 		  format-number(floor($timeSec mod 60), '00'), ' min')"/>
 	      </xsl:attribute>
 	      <xsl:attribute name="depth">
-                <xsl:choose>
-                  <xsl:when test="//units|//UNITS = 'imperial'">
-                    <xsl:call-template name="depthConvert">
-                      <xsl:with-param name="depth">
-                        <xsl:value-of select="."/>
-                      </xsl:with-param>
-                      <xsl:with-param name="units" select="'Imperial'"/>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:call-template name="depthConvert">
-                      <xsl:with-param name="depth">
-                        <xsl:value-of select="."/>
-                      </xsl:with-param>
-                      <xsl:with-param name="units" select="'Metric'"/>
-                    </xsl:call-template>
-                  </xsl:otherwise>
-                </xsl:choose>
+                <xsl:call-template name="depthConvert">
+                  <xsl:with-param name="depth">
+                    <xsl:value-of select="."/>
+                  </xsl:with-param>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
 	      </xsl:attribute>
 	    </sample>
 	  </xsl:for-each>