comtec-dr 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ef6784e41a9bd1c4778ab734adb382e2a3860e
-  data.tar.gz: 8a784e19f516e8f597cb9e4733e01802a8b4db84
+  metadata.gz: 80e24446a1bc5937c236b7a810ee53533695692e
+  data.tar.gz: 76ae164fedf54aa09230b970b798e1128cd2ac2a
 SHA512:
-  metadata.gz: 3d2c9b06f10caf8bad474a3a27aa2e0cd239925fb3c9340876fbe3c2923872ab467c271722d8788af95265e49631cfe0d57bfeed81446b97641ca9906a8449cb
-  data.tar.gz: 0e5cd18743b3f51fa79de9a38b5a49fbba70e303ca509c28ad16100eedc47cb4ee61710d5ed9195a8eded01e7ed5b40abcd2ddf535b39c61c4bc52249f405700
+  metadata.gz: 87611f1a944be3c93b6d7c353f47241024fb09c7ef9b72b6a428814e55ce01709de7d435fe73fc025560a549227564e8f3b695a298e631744dac7f83d0f71bad
+  data.tar.gz: 79f3d0e2c1991da3bef41180b5340a318f8f65087b816def1826ca26e2e5699c3d3769ae52ef4efe025aea6095922516bfa0f2c1058a6d12d6bc7e6a5feae5f8

data/exe/comtec_csv_to_gps

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'pathname'
+require 'csv'
+require 'comtec-dr'
+
+ARGV.each do |arg|
+  path = Pathname arg
+  if path.file? && path.basename.to_s.end_with?('.csv')
+    gpx = ComtecDR::GpxGenerator.new "#{path.basename.to_s.gsub('.csv','')}.gpx"
+    csv = CSV.read path.to_s
+    gpx.add_track csv
+    gpx.write
+  elsif path.directory?
+    gpx = ComtecDR::GpxGenerator.new "#{path.basename.to_s}.gpx"
+    csvs = []
+    path.children.each do |child_path|
+      if child_path.file? && child_path.basename.to_s.end_with?('.csv')
+        csv = CSV.read child_path.to_s
+        csvs << csv
+      end
+    end
+    csvs.each do |csv|
+      gpx.add_track csv
+    end
+    gpx.write
+  end
+end

data/exe/comtec_mov_demux

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+require 'bundler/setup'
 require 'pathname'
-require "comtec-dr"
+require 'comtec-dr'
 
 ARGV.each do |arg|
   path = Pathname arg

data/exe/comtec_mov_to_csv

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+require 'bundler/setup'
 require 'pathname'
 require 'csv'
-require "comtec-dr"
+require 'comtec-dr'
 
 ARGV.each do |arg|
   path = Pathname arg
   if path.file? && path.basename.to_s.end_with?('.MOV')
     CSV.open("#{path.basename.to_s.gsub('.MOV','')}.csv",'w') do |csv|
       ComtecDR::UdatAnalyzer.analyze(ComtecDR::MovDemuxer.demux path.to_s).each do |line|
-        log = GpsLog.new *line
+        log = ComtecDR::GpsLog.new *line
         csv << [*log.csv_line, path.basename.to_s]
       end
     end
@@ -19,7 +19,7 @@ ARGV.each do |arg|
       path.children.each do |child_path|
         if child_path.file? && child_path.basename.to_s.end_with?('.MOV')
           ComtecDR::UdatAnalyzer.analyze(ComtecDR::MovDemuxer.demux child_path.to_s).each do |line|
-            log = GpsLog.new *line
+            log = ComtecDR::GpsLog.new *line
             csv << [*log.csv_line, child_path.basename.to_s]
           end
         end

data/exe/comtec_mov_to_gpx

@@ -1,25 +1,26 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+require 'bundler/setup'
 require 'pathname'
-require "comtec-dr"
+require 'comtec-dr'
 
 ARGV.each do |arg|
   path = Pathname arg
   if path.file? && path.basename.to_s.end_with?('.MOV')
     gpx = ComtecDR::GpxGenerator.new "#{path.basename.to_s.gsub('.MOV','')}.gpx"
     csv = ComtecDR::UdatAnalyzer.analyze(ComtecDR::MovDemuxer.demux path.to_s).map do |line|
-      log = GpsLog.new *line
+      log = ComtecDR::GpsLog.new *line
       log.csv_line
     end
-    gpx.add_trkseg csv
+    gpx.add_track csv
     gpx.write
   elsif path.directory?
     gpx = ComtecDR::GpxGenerator.new "#{path.basename.to_s}.gpx"
+    gpx.add_track
     path.children.each do |child_path|
       if child_path.file? && child_path.basename.to_s.end_with?('.MOV')
         csv = ComtecDR::UdatAnalyzer.analyze(ComtecDR::MovDemuxer.demux child_path.to_s).map do |line|
-          log = GpsLog.new *line
+          log = ComtecDR::GpsLog.new *line
           log.csv_line
         end
         gpx.add_trkseg csv

data/lib/comtec-dr/gps_log.rb

@@ -1,57 +1,59 @@
-class GpsLog
-  def initialize lat, lat_s, lon, lon_s, speed, jst, msec, x_a, y_a, z_a
-    @lat      = lat
-    @lat_sign = lat_s
-    @lon      = lon
-    @lon_sign = lon_s
-    @speed = speed
-    @jst   = jst
-    @msec  = msec
-    @x_acceleration = x_a
-    @y_acceleration = y_a
-    @z_acceleration = z_a
-  end
-
-  def lat
-    (dmm_to_dms(@lat) * (@lat_sign == 'N' ? 1 : -1)).to_f
-  end
-
-  def lon
-    (dmm_to_dms(@lon) * (@lon_sign == 'E' ? 1 : -1)).to_f
-  end
-
-  def speed
-    @speed.to_i
-  end
-
-  def jst
-    Time.parse "20#{@jst}}+0900"
-  end
-
-  def msec
-    @msec.to_i
-  end
-
-  def x_acceleration
-    @x_acceleration.to_f/1000
-  end
-
-  def y_acceleration
-    @y_acceleration.to_f/1000
-  end
-
-  def z_acceleration
-    @z_acceleration.to_f/1000
-  end
-
-  def csv_line
-    [lat, lon, speed, jst, msec, x_acceleration, y_acceleration, z_acceleration]
-  end
-
-  private
-  # DMM形式から変換
-  def dmm_to_dms str
-    number, fractional = str.split('.')
-    number[0...-2].to_r + "#{number[-2..-1]}.#{fractional}".to_r / 60
+module ComtecDR
+  class GpsLog
+    def initialize lat, lat_s, lon, lon_s, speed, jst, msec, x_a, y_a, z_a
+      @lat      = lat
+      @lat_sign = lat_s
+      @lon      = lon
+      @lon_sign = lon_s
+      @speed = speed
+      @jst   = jst
+      @msec  = msec
+      @x_acceleration = x_a
+      @y_acceleration = y_a
+      @z_acceleration = z_a
+    end
+
+    def lat
+      (dmm_to_dms(@lat) * (@lat_sign == 'N' ? 1 : -1)).to_f
+    end
+
+    def lon
+      (dmm_to_dms(@lon) * (@lon_sign == 'E' ? 1 : -1)).to_f
+    end
+
+    def speed
+      @speed.to_i
+    end
+
+    def jst
+      Time.parse "20#{@jst}}+0900"
+    end
+
+    def msec
+      @msec.to_i
+    end
+
+    def x_acceleration
+      @x_acceleration.to_f/1000
+    end
+
+    def y_acceleration
+      @y_acceleration.to_f/1000
+    end
+
+    def z_acceleration
+      @z_acceleration.to_f/1000
+    end
+
+    def csv_line
+      [lat, lon, speed, jst, msec, x_acceleration, y_acceleration, z_acceleration]
+    end
+
+    private
+    # DMM形式から変換
+    def dmm_to_dms str
+      number, fractional = str.split('.')
+      number[0...-2].to_r + "#{number[-2..-1]}.#{fractional}".to_r / 60
+    end
   end
 end

data/lib/comtec-dr/gpx_generator.rb

@@ -13,9 +13,19 @@ module ComtecDR
         'xsi:schemaLocation' => 'http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd'
       })
       @doc.add_element(@gpx)
+    end
 
+    def add_track csv = nil
       @trk = REXML::Element.new('trk')
       @gpx.add_element(@trk)
+
+      trkseg = REXML::Element.new('trkseg')
+      @trk.add_element(trkseg)
+      csv.each do |line|
+        trkpt = REXML::Element.new('trkpt')
+        trkpt.add_attributes({'lat' => line[0], 'lon' => line[1]})
+        trkseg.add_element(trkpt)
+      end if !csv.nil?
     end
 
     def add_trkseg csv
@@ -28,7 +38,6 @@ module ComtecDR
       end
     end
 
-
     def write
       File.open(@filename, 'w') do |file|
         @doc.write(file, indent=2)

data/lib/comtec-dr/udat_analyzer.rb

@@ -15,7 +15,7 @@ module ComtecDR
 
     class << self
       def analyze udat
-        udat.gsub(/[[:cntrl:]]/,"").scan(LOG_PATTERN)
+        udat.to_s.gsub(/[[:cntrl:]]/,"").scan(LOG_PATTERN)
       end
     end
   end

data/lib/comtec-dr/version.rb

@@ -1,6 +1,6 @@
 module ComtecDR
   MAJOR = 0
-  MINOR = 7
+  MINOR = 8
   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.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Shogo Kawaguchi
@@ -56,6 +56,7 @@ description: comtec drive recorder analyzer
 email:
 - platycod0n.ramosa@gmail.com
 executables:
+- comtec_csv_to_gps
 - comtec_mov_demux
 - comtec_mov_to_csv
 - comtec_mov_to_gpx
@@ -71,6 +72,7 @@ files:
 - bin/console
 - bin/setup
 - comtec-dr.gemspec
+- exe/comtec_csv_to_gps
 - exe/comtec_mov_demux
 - exe/comtec_mov_to_csv
 - exe/comtec_mov_to_gpx