From 5c127f913a6c2cfdf424709c618ba328e63f3669 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Fri, 8 Nov 2024 14:42:18 +0100
Subject: [PATCH] Make sure speed is recorded when importing GPX files

---
 app/services/gpx/track_parser.rb       |  7 ++++
 spec/services/gpx/track_parser_spec.rb | 48 +++++++++++++++-----------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/app/services/gpx/track_parser.rb b/app/services/gpx/track_parser.rb
index 27cf1ae2..c9a6414b 100644
--- a/app/services/gpx/track_parser.rb
+++ b/app/services/gpx/track_parser.rb
@@ -39,6 +39,7 @@ class Gpx::TrackParser
       altitude:   point['ele'].to_i,
       timestamp:  Time.parse(point['time']).to_i,
       import_id:  import.id,
+      velocity:   speed(point),
       raw_data: point,
       user_id:
     )
@@ -54,4 +55,10 @@ class Gpx::TrackParser
       user_id:
     )
   end
+
+  def speed(point)
+    return if point['extensions'].blank?
+
+    point.dig('extensions', 'speed').to_f || point.dig('extensions', 'TrackPointExtension', 'speed').to_f
+  end
 end
diff --git a/spec/services/gpx/track_parser_spec.rb b/spec/services/gpx/track_parser_spec.rb
index 9e9a47c1..30203852 100644
--- a/spec/services/gpx/track_parser_spec.rb
+++ b/spec/services/gpx/track_parser_spec.rb
@@ -11,31 +11,29 @@ RSpec.describe Gpx::TrackParser do
     let(:raw_data) { Hash.from_xml(File.read(file_path)) }
     let(:import) { create(:import, user:, name: 'gpx_track.gpx', raw_data:) }
 
-    context 'when file exists' do
-      context 'when file has a single segment' do
-        it 'creates points' do
-          expect { parser }.to change { Point.count }.by(301)
-        end
-
-        it 'broadcasts importing progress' do
-          expect_any_instance_of(Imports::Broadcaster).to receive(:broadcast_import_progress).exactly(301).times
-
-          parser
-        end
+    context 'when file has a single segment' do
+      it 'creates points' do
+        expect { parser }.to change { Point.count }.by(301)
       end
 
-      context 'when file has multiple segments' do
-        let(:file_path) { Rails.root.join('spec/fixtures/files/gpx/gpx_track_multiple_segments.gpx') }
+      it 'broadcasts importing progress' do
+        expect_any_instance_of(Imports::Broadcaster).to receive(:broadcast_import_progress).exactly(301).times
 
-        it 'creates points' do
-          expect { parser }.to change { Point.count }.by(558)
-        end
+        parser
+      end
+    end
 
-        it 'broadcasts importing progress' do
-          expect_any_instance_of(Imports::Broadcaster).to receive(:broadcast_import_progress).exactly(558).times
+    context 'when file has multiple segments' do
+      let(:file_path) { Rails.root.join('spec/fixtures/files/gpx/gpx_track_multiple_segments.gpx') }
 
-          parser
-        end
+      it 'creates points' do
+        expect { parser }.to change { Point.count }.by(558)
+      end
+
+      it 'broadcasts importing progress' do
+        expect_any_instance_of(Imports::Broadcaster).to receive(:broadcast_import_progress).exactly(558).times
+
+        parser
       end
     end
 
@@ -51,6 +49,16 @@ RSpec.describe Gpx::TrackParser do
 
         parser
       end
+
+      it 'creates points with correct data' do
+        parser
+
+        expect(Point.first.latitude).to eq(37.17221.to_d)
+        expect(Point.first.longitude).to eq(-3.55468.to_d)
+        expect(Point.first.altitude).to eq(1066)
+        expect(Point.first.timestamp).to eq(Time.zone.parse('2024-04-21T10:19:55Z').to_i)
+        expect(Point.first.velocity).to eq('2.9')
+      end
     end
   end
 end