summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2019-03-31 09:50:24 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-02 07:47:11 -0700
commit043d07213a60103b0b86fc37591e891a787c00ea (patch)
tree2793bcd646a59b75ffbfe16711ef11df7a22ff03
parent30230dce1027a6a0d0bad5e09581e6130cc78a62 (diff)
downloadsubsurface-043d07213a60103b0b86fc37591e891a787c00ea.tar.gz
Initial support for Mares import
This import is based on one sample I received. It was exported from some Mares software. Imported data is somewhat limited, but we do get the depth and temperature profiles. (I would love to receive some more sample logs to validate the import and to enhance the data we are grabbing.) Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
-rw-r--r--core/parse-xml.c1
-rw-r--r--subsurface.qrc1
-rw-r--r--xslt/Mares.xslt205
3 files changed, 207 insertions, 0 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c
index 3081e1351..1244e0003 100644
--- a/core/parse-xml.c
+++ b/core/parse-xml.c
@@ -2213,6 +2213,7 @@ static struct xslt_files {
{ "manualcsv", "manualcsv2xml.xslt", NULL },
{ "logbook", "DiveLog.xslt", NULL },
{ "AV1", "av1.xslt", NULL },
+ { "exportTrak", "Mares.xslt", NULL },
{ NULL, }
};
diff --git a/subsurface.qrc b/subsurface.qrc
index 20dd9236b..a549f12b3 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -41,6 +41,7 @@
<file>xslt/divelogs-export.xslt</file>
<file>xslt/divelogs.xslt</file>
<file>xslt/DivingLog.xslt</file>
+ <file>xslt/Mares.xslt</file>
<file>xslt/jdivelog2subsurface.xslt</file>
<file>xslt/MacDive.xslt</file>
<file>xslt/SuuntoDM4.xslt</file>
diff --git a/xslt/Mares.xslt b/xslt/Mares.xslt
new file mode 100644
index 000000000..4f5dbe0c9
--- /dev/null
+++ b/xslt/Mares.xslt
@@ -0,0 +1,205 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:strip-space elements="*"/>
+ <xsl:include href="commonTemplates.xsl"/>
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <divelog program='subsurface-import' version='2'>
+ <settings>
+ <divecomputerid deviceid="ffffffff">
+ <xsl:attribute name="model">
+ <xsl:value-of select="'Mares'"/>
+ </xsl:attribute>
+ <xsl:attribute name="serial">
+ <xsl:value-of select="''"/>
+ </xsl:attribute>
+ </divecomputerid>
+ </settings>
+ <divesites>
+ <xsl:for-each select="//locations/location">
+ <site>
+ <xsl:attribute name="uuid">
+ <xsl:value-of select="@id"/>
+ </xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="title"/>
+ </xsl:attribute>
+ <!-- TODO: origin needs to be set properly -->
+ <geo cat='2' origin='0'>
+ <xsl:attribute name="value">
+ <xsl:value-of select="country"/>
+ </xsl:attribute>
+ </geo>
+ </site>
+ </xsl:for-each>
+ </divesites>
+ <dives>
+ <xsl:apply-templates select="/exportTrak/logbooks/logbook/dive"/>
+ </dives>
+ </divelog>
+ </xsl:template>
+
+ <xsl:template match="dive">
+ <dive>
+ <xsl:attribute name="number">
+ <xsl:value-of select="number"/>
+ </xsl:attribute>
+
+ <xsl:attribute name="date">
+ <xsl:value-of select="substring-before(start, 'T')"/>
+ </xsl:attribute>
+
+ <xsl:attribute name="time">
+ <xsl:value-of select="substring-after(start, 'T')"/>
+ </xsl:attribute>
+
+ <xsl:variable name="ref">
+ <xsl:value-of select="@id"/>
+ </xsl:variable>
+
+ <xsl:if test="//locations/location[@id = $ref] != ''">
+ <xsl:attribute name="divesiteid">
+ <xsl:value-of select="$ref"/>
+ </xsl:attribute>
+ </xsl:if>
+
+ <notes>
+ <xsl:value-of select="comment"/>
+ </notes>
+
+ <!-- Hardcoding units to metric for now as the only Mares log I have seen was in metric -->'
+ <xsl:variable name="units">
+ <xsl:value-of select="'metric'"/>
+ </xsl:variable>
+
+ <xsl:if test="weight != ''">
+ <weightsystem>
+ <xsl:attribute name="weight">
+ <xsl:call-template name="weightConvert">
+ <xsl:with-param name="weight" select="translate(weight, ',', '.')"/>
+ <xsl:with-param name="units" select="$units"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ <xsl:attribute name="description">
+ <xsl:value-of select="'unknown'"/>
+ </xsl:attribute>
+ </weightsystem>
+ </xsl:if>
+
+ <divecomputer deviceid="ffffffff">
+ <xsl:attribute name="model">
+ <xsl:value-of select="'Mares import'"/>
+ </xsl:attribute>
+
+ <xsl:if test="maxDepth != '' or avgDepth != ''">
+ <depth>
+ <xsl:if test="maxDepth != ''">
+ <xsl:attribute name="max">
+ <xsl:call-template name="depthConvert">
+ <xsl:with-param name="depth">
+ <xsl:value-of select="maxDepth"/>
+ </xsl:with-param>
+ <xsl:with-param name="units" select="$units"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="avgDepth != ''">
+ <xsl:attribute name="mean">
+ <xsl:call-template name="depthConvert">
+ <xsl:with-param name="depth">
+ <xsl:value-of select="avgDepth"/>
+ </xsl:with-param>
+ <xsl:with-param name="units" select="$units"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ </xsl:if>
+ </depth>
+ </xsl:if>
+
+ <temperature>
+ <xsl:if test="airTemp != ''">
+ <xsl:variable name="air">
+ <xsl:call-template name="tempConvert">
+ <xsl:with-param name="temp" select="airTemp"/>
+ <xsl:with-param name="units" select="$units"/>
+ </xsl:call-template>
+ </xsl:variable>
+ </xsl:if>
+
+ <xsl:if test="minTemp != ''">
+ <xsl:variable name="water">
+ <xsl:call-template name="tempConvert">
+ <xsl:with-param name="temp" select="minTemp"/>
+ <xsl:with-param name="units" select="$units"/>
+ </xsl:call-template>
+ </xsl:variable>
+ </xsl:if>
+ </temperature>
+
+ <xsl:for-each select="diveProfiles/diveProfile">
+ <sample>
+ <xsl:attribute name="time">
+ <xsl:call-template name="timeConvert">
+ <xsl:with-param name="timeSec">
+ <xsl:value-of select="diveProfileTime div 1000"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:attribute>
+ <xsl:attribute name="depth">
+ <xsl:call-template name="depthConvert">
+ <xsl:with-param name="depth">
+ <xsl:value-of select="diveProfileDepth"/>
+ </xsl:with-param>
+ <xsl:with-param name="units" select="$units"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ <xsl:if test="diveProfileTemperature &gt; 0">
+ <xsl:attribute name="temp">
+ <xsl:call-template name="tempConvert">
+ <xsl:with-param name="temp" select="diveProfileTemperature"/>
+ <xsl:with-param name="units" select="$units"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ </xsl:if>
+ </sample>
+
+ </xsl:for-each>
+ </divecomputer>
+
+ </dive>
+ </xsl:template>
+
+ <!-- convert time in seconds to minutes:seconds -->
+ <xsl:template name="timeConvert">
+ <xsl:param name="timeSec"/>
+
+ <xsl:if test="$timeSec != ''">
+ <xsl:value-of select="concat(floor(number($timeSec) div 60), ':', format-number(floor(number($timeSec) mod 60), '00'), ' min')"/>
+ </xsl:if>
+ </xsl:template>
+ <!-- end convert time -->
+
+ <!-- convert weight to kg -->
+ <xsl:template name="weightConvert">
+ <xsl:param name="weight"/>
+ <xsl:param name="units"/>
+
+ <xsl:choose>
+ <xsl:when test="$weight &gt; 0">
+ <xsl:choose>
+ <xsl:when test="$units = 'Imperial'">
+ <xsl:value-of select="concat(format-number(($weight * 0.453592), '#.##'), ' kg')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($weight, ' kg')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$weight"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+ <!-- end convert weight -->
+
+</xsl:stylesheet>