fixed codeduplication in tests

LazyTesting · LazyTesting · commit 150eded26244 · 2016-11-10T15:21:36.000+01:00
diff --git a/core/calculate-distance-horizontal/spec.js b/core/calculate-distance-horizontal/spec.js
@@ -1,18 +1,18 @@
 const assert = require('assert');
 const hdistance = require('./app.js');
 
+const pos1 = { lat: '46.974974', lon: '10.311162' };
+const pos2 = { lat: '46.97495', lon: '10.311144' };
+
 describe('calculate distance horizontal', () => {
     it('should return a positive result', () => {
-        const pos1 = { lat: '46.974974', lon: '10.311162' };
-        const pos2 = { lat: '46.97495', lon: '10.311144' };
         const result = hdistance(pos1, pos2);
         assert(result > 0);
     });
 
     it('should not return a negative value', () => {
-        const pos1 = { lat: '46.97495', lon: '10.311144' };
-        const pos2 = { lat: '46.974974', lon: '10.311162' };
-        const result = hdistance(pos1, pos2);
+        const result = hdistance(pos2, pos1);
         assert(result > 0);
     });
 });
+
diff --git a/core/convert-gpx-data/app.js b/core/convert-gpx-data/app.js
@@ -1,31 +1,20 @@
-const xml2js = require('xml2js');
+const gpxParse = require('gpx-parse');
 
 const get = function(gpxData) {
-    const json = xml2JSON(gpxData);
+    let convertedPoints = [];
 
-    return getDataPoints(json);
-};
-
-var xml2JSON = function (xml){
-    var parser = new xml2js.Parser();
-    var json;
-    parser.parseString(xml, function (err, result) {
-        json = result;
+    gpxParse.parseGpx(gpxData, (error, data)=>{
+        const points = data.tracks.map(track => track.segments.map(segment => segment));
+        convertedPoints = points[0][0].map(point => ({
+            date: point.time,
+            ele: point.elevation,
+            lat: point.lat,
+            lon: point.lon
+        }));
     });
-    return json;
-}
 
-var getDataPoints = function(json) {
-    var result = json["gpx"]["trk"][0]["trkseg"][0]["trkpt"];
-    var formated = result.map(function(obj){
-        var item = {};
-        item.date = obj.time[0];
-        item.ele = obj.ele[0];
-        item.lat = obj.$.lat;
-        item.lon = obj.$.lon;
-        return item;
-    });
-    return formated;
-}
+    return convertedPoints;
+};
+
 
 module.exports = get;
diff --git a/core/convert-gpx-data/package.json b/core/convert-gpx-data/package.json
@@ -9,6 +9,7 @@
   "author": "Maarten Groeneweg",
   "license": "ISC",
   "dependencies": {
+    "togeojson": "^0.16.0",
     "xml2js": "^0.4.17"
   },
   "devDependencies": {
diff --git a/core/convert-gpx-data/spec.js b/core/convert-gpx-data/spec.js
@@ -9,14 +9,14 @@ describe('Convert GPX data', () => {
         const content = fs.readFileSync(filePath, 'utf8');
 
         const expected = [
-            { date: '2015-01-11T15:10:11.000+01:00',
-            ele: '2182.0',
-            lat: '46.974974',
-            lon: '10.311162' },
-            { date: '2015-01-11T15:10:12.000+01:00',
-                ele: '2185.0',
-                lat: '46.97495',
-                lon: '10.311144' }
+            { date: '2015-01-11T14:10:11.000Z',
+            ele: 2182,
+            lat: 46.974974,
+            lon: 10.311162 },
+            { date: '2015-01-11T14:10:12.000Z',
+                ele: 2185,
+                lat: 46.97495,
+                lon: 10.311144 }
         ];
         const result = gpxData(content);
 
