From 5a13afb38749088c1a28ea2287043a18b5e68cc4 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 6 Oct 2017 15:34:40 +0300
Subject: [PATCH 1/3] Fix #4112

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  |  23 ++
 .../src/net/osmand/plus/helpers/kml2gpx.xslt  | 223 +++++++++---------
 2 files changed, 140 insertions(+), 106 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 8d96630b1c..3e64bb2b12 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -1447,6 +1447,29 @@ public class GPXUtilities {
 								((TrkSegment) parse).points.add(wptPt);
 								parserState.push(wptPt);
 							}
+							if (parser.getName().equals("trkptsattrs")) {
+								String segmentPoints = readText(parser, "trkptsattrs");
+								String[] pointsArr = segmentPoints.split("\n");
+								for (int i = 0; i < pointsArr.length; i++) {
+									String[] pointAttrs = pointsArr[i].split(",");
+									WptPt wptPt = new WptPt();
+									try {
+										int arrLength = pointsArr.length;
+										if (arrLength > 0) {
+											wptPt.lon = Double.parseDouble(pointAttrs[0]);
+											if (arrLength > 1) {
+												wptPt.lat = Double.parseDouble(pointAttrs[1]);
+												if (arrLength > 2) {
+													wptPt.ele = Double.parseDouble(pointAttrs[2]);
+												}
+											}
+										}
+									} catch (NumberFormatException e) {
+									}
+									((TrkSegment) parse).points.add(wptPt);
+									parserState.push(wptPt);
+								}
+							}
 							// main object to parse
 						} else if (parse instanceof WptPt) {
 							if (parser.getName().equals("name")) {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
index 8b2677e875..00752ebace 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
+++ b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
@@ -6,68 +6,69 @@
 	http://opensource.org/licenses/gpl-2.0.php
 -->
 
-<xsl:stylesheet version="1.0"
-				xmlns:kml="http://www.opengis.net/kml/2.2"
-				xmlns:gx="http://www.google.com/kml/ext/2.2"
+<xsl:stylesheet xmlns:atom="http://www.w3.org/2005/Atom"
 				xmlns:ge="http://earth.google.com/kml/2.2"
-				
-				xmlns:atom="http://www.w3.org/2005/Atom"
-				xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+				xmlns:gx="http://www.google.com/kml/ext/2.2"
+				xmlns:kml="http://www.opengis.net/kml/2.2"
 
-	<xsl:output method="xml"
-				indent="yes" />
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				version="1.0">
+
+	<xsl:output indent="yes"
+				method="xml"/>
 
 	<xsl:template match="/">
-		<gpx version="1.1"
-			 creator="kml2gpx.xslt"
+		<gpx creator="kml2gpx.xslt"
+			 version="1.1"
 			 xmlns="http://www.topografix.com/GPX/1/1">
-			 <metadata>
-			 	<name><xsl:value-of select="kml:kml/kml:Document/kml:name"/></name>
-			 	<author>
-			 		<name>
-			 			<xsl:value-of select="kml:kml/kml:Document/atom:author/atom:author"/>
-			 		</name>
-			 	</author>
-			 </metadata>
-			 	<xsl:for-each select="//ge:Placemark">
-			 		<xsl:variable name="lonlat" select="ge:Point/ge:coordinates"/>
-					<xsl:variable name="lon" select="substring-before($lonlat,' ')"/>
-					<xsl:variable name="latele" select="substring-after($lonlat,' ')"/>
-					<xsl:variable name="lat">
+			<metadata>
+				<name><xsl:value-of select="kml:kml/kml:Document/kml:name"/></name>
+				<author>
+					<name>
+						<xsl:value-of select="kml:kml/kml:Document/atom:author/atom:author"/>
+					</name>
+				</author>
+			</metadata>
+			<xsl:for-each select="//ge:Placemark">
+				<xsl:variable name="lonlat" select="ge:Point/ge:coordinates"/>
+				<xsl:variable name="lon" select="substring-before($lonlat,' ')"/>
+				<xsl:variable name="latele" select="substring-after($lonlat,' ')"/>
+				<xsl:variable name="lat">
+					<xsl:choose>
+						<xsl:when test="contains($latele,' ')">
+							<xsl:value-of select="substring-before($latele,' ')"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$latele"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:variable name="foldername" select="../ge:name"/>
+
+				<xsl:if test="$lon">
+					<wpt lon="{$lon}" lat="{$lat}">
 						<xsl:choose>
-							<xsl:when test="contains($latele,' ')">
-								<xsl:value-of select="substring-before($latele,' ')"/>
+							<xsl:when test="contains($latele,',')">
+								<ele><xsl:value-of select="substring-after($latele,',')"/></ele>
 							</xsl:when>
-								<xsl:otherwise>
-									<xsl:value-of select="$latele"/>
-							</xsl:otherwise>
 						</xsl:choose>
-					</xsl:variable>
-					<xsl:variable name="foldername" select="../ge:name"/>
-			 	
-			 		<xsl:if test="$lon">
-			 			<wpt lon="{$lon}" lat="{$lat}">
-			 				<xsl:choose>
-								<xsl:when test="contains($latele,',')">
-									<ele> <xsl:value-of select="substring-after($latele,',')"/></ele>
-								</xsl:when>
-							</xsl:choose>
-							<type>
-			 					<xsl:value-of select="$foldername"/>
-			 				</type>
-			 				<name>
-			 					<xsl:value-of select="ge:name"/>
-			 				</name>
-			 				<xsl:if test="ge:description">
-			 					<desc>
-			 						<xsl:value-of select="ge:description"/>
-			 					</desc>
-			 				</xsl:if>
-			 			</wpt>
-			 		</xsl:if>
-			 	</xsl:for-each>
-			 <xsl:for-each select="//kml:Placemark">
-			 		<xsl:variable name="lonlat" select="kml:Point/kml:coordinates"/>
+						<type>
+							<xsl:value-of select="$foldername"/>
+						</type>
+						<name>
+							<xsl:value-of select="ge:name"/>
+						</name>
+						<xsl:if test="ge:description">
+							<desc>
+								<xsl:value-of select="ge:description"/>
+							</desc>
+						</xsl:if>
+					</wpt>
+				</xsl:if>
+			</xsl:for-each>
+			<xsl:for-each select="//kml:Placemark">
+				<xsl:if test="kml:Point">
+					<xsl:variable name="lonlat" select="kml:Point/kml:coordinates"/>
 					<xsl:variable name="lon" select="substring-before($lonlat,',')"/>
 					<xsl:variable name="latele" select="substring-after($lonlat,',')"/>
 					<xsl:variable name="lat">
@@ -75,66 +76,76 @@
 							<xsl:when test="contains($latele,',')">
 								<xsl:value-of select="substring-before($latele,',')"/>
 							</xsl:when>
-								<xsl:otherwise>
-									<xsl:value-of select="$latele"/>
+							<xsl:otherwise>
+								<xsl:value-of select="$latele"/>
 							</xsl:otherwise>
 						</xsl:choose>
 					</xsl:variable>
 					<xsl:variable name="foldername" select="../kml:name"/>
-			 	
-			 		<xsl:if test="$lon">
-			 			<wpt lon="{$lon}" lat="{$lat}">
-			 				<xsl:choose>
+
+					<xsl:if test="$lon">
+						<wpt lon="{$lon}" lat="{$lat}">
+							<xsl:choose>
 								<xsl:when test="contains($latele,',')">
-									<ele> <xsl:value-of select="substring-after($latele,',')"/></ele>
+									<ele><xsl:value-of select="substring-after($latele,',')"/></ele>
 								</xsl:when>
 							</xsl:choose>
 							<type>
-			 					<xsl:value-of select="$foldername"/>
-			 				</type>
-			 				<name>
-			 					<xsl:value-of select="kml:name"/>
-			 				</name>
-			 				<xsl:if test="kml:description">
-			 					<desc>
-			 						<xsl:value-of select="kml:description"/>
-			 					</desc>
-			 				</xsl:if>
-			 			</wpt>
-			 		</xsl:if>
-			 	</xsl:for-each>
-			 <xsl:for-each select="//gx:Track">
-				 <trk>
-					 <trkseg>
-						 <xsl:for-each select="gx:coord">
-						     <xsl:variable name="i" select="position()"/>
-						 	 <xsl:variable name="lonlat" select="."/>
-							 <xsl:variable name="lon" select="substring-before($lonlat,' ')"/>
-							 <xsl:variable name="latele" select="substring-after($lonlat,' ')"/>
-							 <xsl:variable name="lat">
-							 	 <xsl:choose>
-									 <xsl:when test="contains($latele,' ')">
-										 <xsl:value-of select="substring-before($latele,' ')"/>
-									 </xsl:when>
-									 <xsl:otherwise>
-										 <xsl:value-of select="$latele"/>
-									 </xsl:otherwise>
-								 </xsl:choose>
+								<xsl:value-of select="$foldername"/>
+							</type>
+							<name>
+								<xsl:value-of select="kml:name"/>
+							</name>
+							<xsl:if test="kml:description">
+								<desc>
+									<xsl:value-of select="kml:description"/>
+								</desc>
+							</xsl:if>
+						</wpt>
+					</xsl:if>
+				</xsl:if>
+
+				<xsl:if test="kml:MultiGeometry/kml:LineString/kml:coordinates">
+					<trk>
+						<trkseg>
+							<trkptsattrs><xsl:value-of select="kml:MultiGeometry/kml:LineString/kml:coordinates"/></trkptsattrs>
+						</trkseg>
+					</trk>
+				</xsl:if>
+
+			</xsl:for-each>
+			<xsl:for-each select="//gx:Track">
+				<trk>
+					<trkseg>
+						<xsl:for-each select="gx:coord">
+							<xsl:variable name="i" select="position()"/>
+							<xsl:variable name="lonlat" select="."/>
+							<xsl:variable name="lon" select="substring-before($lonlat,' ')"/>
+							<xsl:variable name="latele" select="substring-after($lonlat,' ')"/>
+							<xsl:variable name="lat">
+								<xsl:choose>
+									<xsl:when test="contains($latele,' ')">
+										<xsl:value-of select="substring-before($latele,' ')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$latele"/>
+									</xsl:otherwise>
+								</xsl:choose>
 							</xsl:variable>
-						 	<trkpt lon="{$lon}" lat="{$lat}">
-						 		<xsl:choose>
-									 <xsl:when test="contains($latele,' ')">
-									 	<ele> <xsl:value-of select="substring-after($latele,' ')"/></ele>
-									 </xsl:when>
-								 </xsl:choose>
-								 <xsl:variable name="ts" select="../kml:when[$i]"/>
- 								 <xsl:if test="$ts">
-								 	<time><xsl:value-of select="$ts"/></time>
-								 </xsl:if>
-						 	</trkpt>
-						 </xsl:for-each>
-					 </trkseg>
-				 </trk>
+							<trkpt lon="{$lon}" lat="{$lat}">
+								<xsl:choose>
+									<xsl:when test="contains($latele,' ')">
+										<ele><xsl:value-of select="substring-after($latele,' ')"/></ele>
+									</xsl:when>
+								</xsl:choose>
+								<xsl:variable name="ts" select="../kml:when[$i]"/>
+								<xsl:if test="$ts">
+									<time><xsl:value-of select="$ts"/></time>
+								</xsl:if>
+							</trkpt>
+						</xsl:for-each>
+					</trkseg>
+				</trk>
 			</xsl:for-each>
 		</gpx>
 	</xsl:template>
@@ -142,4 +153,4 @@
 	<xsl:template match="gx:Track">
 	</xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

From 87d48b834487e302c2d4e0eb62f232cf671f4d2e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 6 Oct 2017 17:32:56 +0300
Subject: [PATCH 2/3] Rename tag and remove adding to stack

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  | 19 ++++++++-----------
 .../src/net/osmand/plus/helpers/kml2gpx.xslt  |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 3e64bb2b12..f0ca4a4756 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -1447,27 +1447,24 @@ public class GPXUtilities {
 								((TrkSegment) parse).points.add(wptPt);
 								parserState.push(wptPt);
 							}
-							if (parser.getName().equals("trkptsattrs")) {
-								String segmentPoints = readText(parser, "trkptsattrs");
+							if (parser.getName().equals("csvattributes")) {
+								String segmentPoints = readText(parser, "csvattributes");
 								String[] pointsArr = segmentPoints.split("\n");
 								for (int i = 0; i < pointsArr.length; i++) {
 									String[] pointAttrs = pointsArr[i].split(",");
-									WptPt wptPt = new WptPt();
 									try {
 										int arrLength = pointsArr.length;
-										if (arrLength > 0) {
+										if (arrLength > 1) {
+											WptPt wptPt = new WptPt();
 											wptPt.lon = Double.parseDouble(pointAttrs[0]);
-											if (arrLength > 1) {
-												wptPt.lat = Double.parseDouble(pointAttrs[1]);
-												if (arrLength > 2) {
-													wptPt.ele = Double.parseDouble(pointAttrs[2]);
-												}
+											wptPt.lat = Double.parseDouble(pointAttrs[1]);
+											if (arrLength > 2) {
+												wptPt.ele = Double.parseDouble(pointAttrs[2]);
 											}
+											((TrkSegment) parse).points.add(wptPt);
 										}
 									} catch (NumberFormatException e) {
 									}
-									((TrkSegment) parse).points.add(wptPt);
-									parserState.push(wptPt);
 								}
 							}
 							// main object to parse
diff --git a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
index 00752ebace..2d5b32048a 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
+++ b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
@@ -108,7 +108,7 @@
 				<xsl:if test="kml:MultiGeometry/kml:LineString/kml:coordinates">
 					<trk>
 						<trkseg>
-							<trkptsattrs><xsl:value-of select="kml:MultiGeometry/kml:LineString/kml:coordinates"/></trkptsattrs>
+							<csvattributes><xsl:value-of select="kml:MultiGeometry/kml:LineString/kml:coordinates"/></csvattributes>
 						</trkseg>
 					</trk>
 				</xsl:if>

From 12d9eab965a3ae732af093ecfce7ca2046700e9c Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 6 Oct 2017 17:37:54 +0300
Subject: [PATCH 3/3] Create point even without elevation

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index f0ca4a4756..2b49f5c89a 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -1458,10 +1458,10 @@ public class GPXUtilities {
 											WptPt wptPt = new WptPt();
 											wptPt.lon = Double.parseDouble(pointAttrs[0]);
 											wptPt.lat = Double.parseDouble(pointAttrs[1]);
+											((TrkSegment) parse).points.add(wptPt);
 											if (arrLength > 2) {
 												wptPt.ele = Double.parseDouble(pointAttrs[2]);
 											}
-											((TrkSegment) parse).points.add(wptPt);
 										}
 									} catch (NumberFormatException e) {
 									}