comtec-dr 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051d6576635668fdf33a0f1a7231cb83a26b3a83
-  data.tar.gz: 737e0cc7dccf246a8ea3442fb673ee1d3cfcb39e
+  metadata.gz: f37b33e76c04f77f66f86b8d33b71b4648d05f68
+  data.tar.gz: 896741940c344a497b44d25dccf93781ab9d900b
 SHA512:
-  metadata.gz: 3136dd1855c2d87de6d51f1c50fd790613cc595fd496cf5dcbae87a6f239f86ad3c42f92c20eca3b692e7e793277bb3f1613f96ab7dc0f377232263e78eb8c32
-  data.tar.gz: b603a1f6c69b49e25d08dfd3215b28fe9dc7d597d1e3bcaa62e83768889a6f6cb92f8dee27bafb050748a50bd1b711f0084c007a3e5507ff256c2fd70d984626
+  metadata.gz: e1e25340b3c6471052166a911f099b5352342ccacd9ca3422cf115a8baef9098dd09c9a9f680d4e6b94e96805871b87cd6389669a15893a21f9f8e42a3e3f2ad
+  data.tar.gz: a6b6bebd3ce4445a9bba16c64ef28d55736dacbc3af888d8fe59cd56c5ba3f2690a2574705d8aad514a7e1f117e7be5e0452cd5d25ab2968681872f28e568fb7

data/exe/comtec_mov_to_csv

@@ -8,14 +8,14 @@ ARGV.each do |arg|
   if path.file? && path.basename.to_s.end_with?('.MOV')
     CSV.open("#{path.basename.to_s.gsub('.MOV','')}.csv",'w') do |csv|
       track = ComtecDR::GpsTrack.analyze path.to_s
-      track.track.each{|t| csv << t}
+      track.track.each{|t| csv << t.csv_line}
     end
   elsif path.directory?
     CSV.open("#{path.basename.to_s}.csv",'w') do |csv|
       path.children(with_directory: false).each do |child_path|
         if child_path.file? && child_path.basename.to_s.end_with?('.MOV')
           track = ComtecDR::GpsTrack.analyze child_path.to_s
-          track.track.each{|t| csv << t}
+          track.track.each{|t| csv << t.csv_line}
         end
       end
     end

data/exe/comtec_mov_to_gpx

@@ -8,7 +8,7 @@ ARGV.each do |arg|
   if path.file? && path.basename.to_s.end_with?('.MOV')
     gpx = ComtecDR::GpxGenerator.new "#{path.basename.to_s.gsub('.MOV','')}.gpx"
     track = ComtecDR::GpsTrack.analyze path.to_s
-    gpx.add_track track.compress.track
+    gpx.add_track track.compress
     gpx.write
   elsif path.directory?
     gpx = ComtecDR::GpxGenerator.new "#{path.basename.to_s}.gpx"
@@ -16,7 +16,7 @@ ARGV.each do |arg|
     path.children(with_directory: false).each do |child_path|
       if child_path.file? && child_path.basename.to_s.end_with?('.MOV')
         track = ComtecDR::GpsTrack.analyze child_path.to_s
-        gpx.add_trkseg track.compress.track
+        gpx.add_trkseg track.compress
       end
     end
     gpx.write

data/lib/comtec-dr/gps_log.rb

@@ -1,6 +1,6 @@
 module ComtecDR
   class GpsLog
-    def initialize lat, lat_s, lon, lon_s, speed, jst, msec, x_a, y_a, z_a
+    def initialize lat, lat_s, lon, lon_s, speed, jst, msec, x_a, y_a, z_a, filename
       @lat      = lat
       @lat_sign = lat_s
       @lon      = lon
@@ -11,6 +11,7 @@ module ComtecDR
       @x_acceleration = x_a
       @y_acceleration = y_a
       @z_acceleration = z_a
+      @filename = filename
     end
 
     def lat
@@ -46,7 +47,7 @@ module ComtecDR
     end
 
     def csv_line
-      [lat, lon, speed, jst, msec, x_acceleration, y_acceleration, z_acceleration]
+      [lat, lon, speed, jst, msec, x_acceleration, y_acceleration, z_acceleration, @filename]
     end
 
     private

data/lib/comtec-dr/gps_track.rb

@@ -14,8 +14,8 @@ module ComtecDR
       new_track = self.class.new
       prev = []
       self.track.each do |t|
-        new_track << t unless t[0..2] == prev[0..2]
-        prev = t
+        new_track << t unless t.csv_line[0..2] == prev
+        prev = t.csv_line[0..2]
       end
       new_track
     end
@@ -24,8 +24,8 @@ module ComtecDR
       def analyze file_path
         self.new.tap do |track|
           ComtecDR::UdatAnalyzer.analyze(ComtecDR::MovDemuxer.demux file_path).each do |line|
-            log = ComtecDR::GpsLog.new *line
-            track << [*log.csv_line, Pathname.new(file_path).basename.to_s]
+            log = ComtecDR::GpsLog.new *[*line, Pathname.new(file_path).basename.to_s]
+            track << log
           end
         end
       end

data/lib/comtec-dr/gpx_generator.rb

@@ -15,19 +15,29 @@ module ComtecDR
       @doc.add_element(@gpx)
     end
 
-    def add_track csv = nil
+    def add_track track = nil
       @trk = REXML::Element.new('trk')
       @gpx.add_element(@trk)
 
-      add_trkseg csv if !csv.nil?
+      add_trkseg track if !track.nil?
     end
 
-    def add_trkseg csv
+    def add_trkseg track
       trkseg = REXML::Element.new('trkseg')
       @trk.add_element(trkseg)
-      csv.each do |line|
+
+      track.track.each do |t|
         trkpt = REXML::Element.new('trkpt')
-        trkpt.add_attributes({'lat' => line[0], 'lon' => line[1]})
+        trkpt.add_attributes({'lat' => t.lat, 'lon' => t.lon})
+
+        time = REXML::Element.new('time')
+        time.add_text(t.jst.utc.iso8601)
+        trkpt.add_element(time)
+
+        speed = REXML::Element.new('speed')
+        speed.add_text((t.speed.to_f * 1000 / 3600).to_s)
+        trkpt.add_element(speed)
+
         trkseg.add_element(trkpt)
       end
     end

data/lib/comtec-dr/udat_analyzer.rb

@@ -1,7 +1,7 @@
 module ComtecDR
   class UdatAnalyzer
     LOG_PATTERN = /
-    A
+    (?:[AV])
     (?<lat>[\d.]*)(?<lat_sign>[NS])
     (?<lon>[\d.]*)(?<lon_sign>[EW])
     (?<speed>\d{4})

data/lib/comtec-dr/version.rb

@@ -1,6 +1,6 @@
 module ComtecDR
   MAJOR = 0
-  MINOR = 9
+  MINOR = 10
   PATCH = 0
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comtec-dr
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Shogo Kawaguchi