comtec-dr 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e24446a1bc5937c236b7a810ee53533695692e
-  data.tar.gz: 76ae164fedf54aa09230b970b798e1128cd2ac2a
+  metadata.gz: 051d6576635668fdf33a0f1a7231cb83a26b3a83
+  data.tar.gz: 737e0cc7dccf246a8ea3442fb673ee1d3cfcb39e
 SHA512:
-  metadata.gz: 87611f1a944be3c93b6d7c353f47241024fb09c7ef9b72b6a428814e55ce01709de7d435fe73fc025560a549227564e8f3b695a298e631744dac7f83d0f71bad
-  data.tar.gz: 79f3d0e2c1991da3bef41180b5340a318f8f65087b816def1826ca26e2e5699c3d3769ae52ef4efe025aea6095922516bfa0f2c1058a6d12d6bc7e6a5feae5f8
+  metadata.gz: 3136dd1855c2d87de6d51f1c50fd790613cc595fd496cf5dcbae87a6f239f86ad3c42f92c20eca3b692e7e793277bb3f1613f96ab7dc0f377232263e78eb8c32
+  data.tar.gz: b603a1f6c69b49e25d08dfd3215b28fe9dc7d597d1e3bcaa62e83768889a6f6cb92f8dee27bafb050748a50bd1b711f0084c007a3e5507ff256c2fd70d984626

data/README.md

@@ -21,24 +21,52 @@ Or install it yourself as:
 
 ## Usage
 
-movファイルもしくはディレクトリを引数に取ることが出来ます
 
 ### CSVデータで取り出し
 
+movファイルもしくはディレクトリを引数に取ることが出来ます
+
 ```
 comtec_mov_to_csv /Volumes/NO\ NAME/DCIM/20171005_003/007_130755_G.MOV
+comtec_mov_to_csv /Volumes/NO\ NAME/DCIM/20171005_003
 ```
 
+CSVファイルの列には以下の情報が含まれています。
+緯度, 経度, 速度(km/h), 時刻, ミリ秒, X軸加速度, Y軸加速度, Z軸加速度, ファイル名
+
 ```
-comtec_mov_to_csv /Volumes/NO\ NAME/DCIM/20171005_003
+35.673485,         136.95376166666668, 67, 2017-10-04 10:48:54 +0900, 29160, 0.175, 0.052, 0.003,  000_104824_A.MOV
+35.673485,         136.95376166666668, 67, 2017-10-04 10:48:54 +0900, 29260, 0.184, 0.091, -0.009, 000_104824_A.MOV
+35.67357166666667, 136.95374833333332, 70, 2017-10-04 10:48:54 +0900, 29360, 0.188, 0.034, 0.021,  000_104824_A.MOV
+35.67357166666667, 136.95374833333332, 70, 2017-10-04 10:48:54 +0900, 29460, 0.184, 0.046, 0.047,  000_104824_A.MOV
+35.67357166666667, 136.95374833333332, 70, 2017-10-04 10:48:54 +0900, 29560, 0.146, 0.084, 0.005,  000_104824_A.MOV
+35.67357166666667, 136.95374833333332, 70, 2017-10-04 10:48:54 +0900, 29660, 0.164, 0.06,  0.001,  000_104824_A.MOV
+35.67357166666667, 136.95374833333332, 70, 2017-10-04 10:48:54 +0900, 29760, 0.17,  0.073, -0.029, 000_104824_A.MOV
+35.67366333333333, 136.953735,         72, 2017-10-04 10:48:54 +0900, 29860, 0.187, 0.069, 0.006,  000_104824_A.MOV
+35.67366333333333, 136.953735,         72, 2017-10-04 10:48:54 +0900, 29960, 0.154, 0.089, 0.048,  000_104824_A.MOV
+35.67366333333333, 136.953735,         72, 2017-10-04 10:48:54 +0900, 30060, 0.186, 0.064, -0.006, 000_104824_A.MOV
+35.67366333333333, 136.953735,         72, 2017-10-04 10:48:55 +0900, 30160, 0.16,  0.031, 0.006,  000_104824_A.MOV
+35.67366333333333, 136.953735,         72, 2017-10-04 10:48:55 +0900, 30260, 0.157, 0.036, 0.005,  000_104824_A.MOV
+35.67375666666667, 136.95372166666667, 75, 2017-10-04 10:48:55 +0900, 30360, 0.186, 0.043, 0.056,  000_104824_A.MOV
+35.67375666666667, 136.95372166666667, 75, 2017-10-04 10:48:55 +0900, 30460, 0.151, 0.067, 0.034,  000_104824_A.MOV
+35.67375666666667, 136.95372166666667, 75, 2017-10-04 10:48:55 +0900, 30560, 0.122, 0.034, -0.015, 000_104824_A.MOV
+35.67375666666667, 136.95372166666667, 75, 2017-10-04 10:48:55 +0900, 30660, 0.224, 0.046, 0.002,  000_104824_A.MOV
+35.67375666666667, 136.95372166666667, 75, 2017-10-04 10:48:55 +0900, 30760, 0.135, 0.081, -0.008, 000_104824_A.MOV
+35.673855,         136.95370833333334, 78, 2017-10-04 10:48:55 +0900, 30860, 0.142, 0.042, -0.008, 000_104824_A.MOV
+35.673855,         136.95370833333334, 78, 2017-10-04 10:48:55 +0900, 30960, 0.168, 0.033, 0.007,  000_104824_A.MOV
+35.673855,         136.95370833333334, 78, 2017-10-04 10:48:55 +0900, 31060, 0.134, 0.073, -0.003, 000_104824_A.MOV
 ```
 
+上記の例は2秒間のログを抜粋したもので、
+緯度,経度,速度は秒間2回、加速度は秒間10回センシングされているようです。
+
 ### GPXデータで取り出し
 
-```
-comtec_mov_to_gpx /Volumes/NO\ NAME/DCIM/20171005_003/007_130755_G.MOV
-```
+movファイルもしくはディレクトリを引数に取ることが出来ます
 
 ```
+comtec_mov_to_gpx /Volumes/NO\ NAME/DCIM/20171005_003/007_130755_G.MOV
 comtec_mov_to_gpx /Volumes/NO\ NAME/DCIM/20171005_003
 ```
+
+GPXデータ生成時には重複した位置情報は取り除きます。

data/exe/comtec_mov_demux

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'pathname'
 require 'comtec-dr'
 
 ARGV.each do |arg|
@@ -9,7 +8,7 @@ ARGV.each do |arg|
   if path.file? && path.basename.to_s.end_with?('.MOV')
     puts ComtecDR::MovDemuxer.demux path.to_s
   elsif path.directory?
-    path.children.each do |child_path|
+    path.children(with_directory: false).each do |child_path|
       if child_path.file? && child_path.basename.to_s.end_with?('.MOV')
         puts ComtecDR::MovDemuxer.demux child_path.to_s
       end

data/exe/comtec_mov_to_csv

@@ -1,27 +1,21 @@
 #!/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?('.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 = ComtecDR::GpsLog.new *line
-        csv << [*log.csv_line, path.basename.to_s]
-      end
+      track = ComtecDR::GpsTrack.analyze path.to_s
+      track.track.each{|t| csv << t}
     end
   elsif path.directory?
     CSV.open("#{path.basename.to_s}.csv",'w') do |csv|
-      path.children.each do |child_path|
+      path.children(with_directory: false).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 = ComtecDR::GpsLog.new *line
-            csv << [*log.csv_line, child_path.basename.to_s]
-          end
+          track = ComtecDR::GpsTrack.analyze child_path.to_s
+          track.track.each{|t| csv << t}
         end
       end
     end

data/exe/comtec_mov_to_gpx

@@ -1,29 +1,22 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'pathname'
 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 = ComtecDR::GpsLog.new *line
-      log.csv_line
-    end
-    gpx.add_track csv
+    track = ComtecDR::GpsTrack.analyze path.to_s
+    gpx.add_track track.compress.track
     gpx.write
   elsif path.directory?
     gpx = ComtecDR::GpxGenerator.new "#{path.basename.to_s}.gpx"
     gpx.add_track
-    path.children.each do |child_path|
+    path.children(with_directory: false).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 = ComtecDR::GpsLog.new *line
-          log.csv_line
-        end
-        gpx.add_trkseg csv
+        track = ComtecDR::GpsTrack.analyze child_path.to_s
+        gpx.add_trkseg track.compress.track
       end
     end
     gpx.write

data/lib/comtec-dr.rb

@@ -1,10 +1,13 @@
 require "time"
 require 'rexml/document'
+require 'pathname'
+require 'csv'
 require "comtec-dr/version"
 require "comtec-dr/gps_log"
 require "comtec-dr/mov_demuxer"
 require "comtec-dr/udat_analyzer"
 require "comtec-dr/gpx_generator"
+require "comtec-dr/gps_track"
 
 module ComtecDR
 end

data/lib/comtec-dr/gps_track.rb

@@ -0,0 +1,34 @@
+module ComtecDR
+  class GpsTrack
+    attr_reader :track
+    def initialize
+      @track = []
+    end
+
+    def << log
+      @track << log
+    end
+
+    # 位置情報を圧縮
+    def compress
+      new_track = self.class.new
+      prev = []
+      self.track.each do |t|
+        new_track << t unless t[0..2] == prev[0..2]
+        prev = t
+      end
+      new_track
+    end
+
+    class << self
+      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]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/comtec-dr/gpx_generator.rb

@@ -19,13 +19,7 @@ module ComtecDR
       @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?
+      add_trkseg csv if !csv.nil?
     end
 
     def add_trkseg csv

data/lib/comtec-dr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comtec-dr
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Shogo Kawaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,6 @@ 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
@@ -72,12 +71,12 @@ 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
 - lib/comtec-dr.rb
 - lib/comtec-dr/gps_log.rb
+- lib/comtec-dr/gps_track.rb
 - lib/comtec-dr/gpx_generator.rb
 - lib/comtec-dr/mov_demuxer.rb
 - lib/comtec-dr/udat_analyzer.rb

data/exe/comtec_csv_to_gps

@@ -1,29 +0,0 @@
-#!/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