nakarte

commit 32b573740eb0a6f584e95bf28c0853a9f37cc590
parent 86fabeee80ee0414554a8d66ccc080a4b73f3de1
Author: Sergey Orlov <wladimirych@gmail.com>
Date:   Sat, 30 May 2020 10:35:11 +0200

tracks: move <ele> element to beginning of to conform GPX schema

Diffstat:
M
src/lib/leaflet.control.track-list/lib/geo_file_exporters.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/leaflet.control.track-list/lib/geo_file_exporters.js b/src/lib/leaflet.control.track-list/lib/geo_file_exporters.js
@@ -17,10 +17,10 @@ function saveGpx(segments, name, points, withElevations = false) {
             label = escapeHtml(label);
             label = utf8.encode(label);
             gpx.push(`\t<wpt lat="${marker.latlng.lat.toFixed(6)}" lon="${marker.latlng.lng.toFixed(6)}">`);
-            gpx.push(`\t\t<name>${label}</name>`);
             if (withElevations && marker.latlng.alt !== null) {
                 gpx.push(`\t\t<ele>${marker.latlng.alt.toFixed(1)}</ele>`);
             }
+            gpx.push(`\t\t<name>${label}</name>`);
             gpx.push('\t</wpt>');
         }
     );
@@ -39,7 +39,7 @@ function saveGpx(segments, name, points, withElevations = false) {
                 const elevation = (withElevations && point.alt !== null)
                     ? `<ele>${point.alt.toFixed(1)}</ele>` : '';
                 // time element is not necessary, added for compatibility to Garmin Connect only
-                gpx.push(`\t\t\t<trkpt lat="${y}" lon="${x}"><time>${fakeTime}</time>${elevation}</trkpt>`);
+                gpx.push(`\t\t\t<trkpt lat="${y}" lon="${x}">${elevation}<time>${fakeTime}</time></trkpt>`);
             }
             gpx.push('\t\t</trkseg>');
         }