spektrum-log 0.0.5 → 0.0.6

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
  - 1.9.3
  - 2.0.0
- - jruby
 
 notifications:
  disabled: true

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Nick Veys
+Copyright (c) 2013 Aramis Group, LLC dba code lever
 
 MIT License
 

data/lib/{spektrum-log → spektrum/log}/flight.rb

@@ -1,3 +1,5 @@
+require 'ruby_kml'
+
 module Spektrum
   module Log
 
@@ -9,8 +11,8 @@ module Spektrum
 
       # Creates a new flight.
       #
-      # @param headers [Array] array of Header objects read from the file
-      # @param records [Array] array of Record objects read from the file
+      # @param headers [Array<Header>] headers read from the file
+      # @param records [Array<Record>] records read from the file
       def initialize(headers, records)
         @headers = headers
         @records = records
@@ -18,9 +20,9 @@ module Spektrum
 
       # Gets the duration of the flight, in seconds.
       #
-      # @return [Fixnum] duration of the flight, in seconds
+      # @return [Float] duration of the flight, in seconds
       def duration
-        @duration ||= ((@records.empty? ? 0 : @records.last.timestamp - @records.first.timestamp) / 256)
+        @duration ||= ((@records.empty? ? 0.0 : @records.last.timestamp - @records.first.timestamp) / 256.0)
       end
 
       # Determines if this flight has any data.  Models without telemetry
@@ -129,12 +131,49 @@ module Spektrum
         select_records SpeedRecord
       end
 
+      def to_kml?
+        gps1_records?
+      end
+
+      def to_kml
+        unless to_kml?
+          raise RuntimeError, 'No coordinates available for KML path generation'
+        end
+
+        kml = KMLFile.new
+        kml.objects << KML::Document.new(
+            :name => 'NAME HERE',
+            :description => 'DESCRIPTION HERE',
+            :styles => [
+                KML::Style.new(
+                    :id => 'yellowLineGreenPoly',
+                    :line_style => KML::LineStyle.new(:color => '7f00ffff', :width => 4),
+                    :poly_style => KML::PolyStyle.new(:color => '7f00ff00')
+                )
+            ],
+            :features => [
+                KML::Placemark.new(
+                    :name => 'Absolute Extruded',
+                    :description => 'Transparent green wall with yellow outlines',
+                    :style_url => '#yellowLineGreenPoly',
+                    :geometry => KML::LineString.new(
+                        :extrude => true,
+                        :tessellate => true,
+                        :altitude_mode => 'absolute',
+                        :coordinates => gps1_records.map(&:coordinate).map { |c| c.join(',') }.join(' ')
+                    )
+                )
+            ]
+        )
+        kml.render
+      end
+
       private
 
       # Determines if there are any records in this flight of the given type.
       #
       # @param type [Class] type of record to check for
-      # @return []
+      # @return [Boolean] true if there are records, false otherwise
       def any_records?(type)
         @records.any? { |rec| rec.is_a? type }
       end

data/lib/{spektrum-log → spektrum/log}/reader.rb

@@ -28,7 +28,6 @@ module Spektrum
 
             first = first4.unpack('V')[0]
             if 0xFFFFFFFF == first
-
               if headers_complete || !records.empty?
                 # we have records, this is a new entry
                 @flights << Flight.new(headers, records)
@@ -41,7 +40,6 @@ module Spektrum
               headers << Headers.create(rest)
 
               headers_complete = rest.unpack('S')[0] == 0x1717
-
             else
               type = file.read(1).unpack('C')[0]
               rest = file.read(15)
@@ -55,4 +53,4 @@ module Spektrum
     end
 
   end
-end
+end

data/lib/{spektrum-log → spektrum/log}/records.rb

@@ -158,26 +158,45 @@ module Spektrum
         @altitude ||= two_byte_field(1..2, :little)
       end
 
+      def latitude_elements
+        a = hex_byte_field(6) # degrees
+        b = hex_byte_field(5) # degree-minutes
+        c = hex_byte_field(4) # degree-minutes / 10
+        d = hex_byte_field(3) # degree-minutes / 1000
+        [a, b, c, d]
+      end
+
       def latitude
-        a = byte_field(3) # 1/100 degree-second
-        b = byte_field(4) # degree-seconds
-        c = byte_field(5) # degree-minutes
-        d = byte_field(6) # degrees
-        [d, c, b, a]
+        @latitude ||= mindec_to_degdec latitude_elements
+      end
+
+      def longitude_elements
+        a = hex_byte_field(10) # degrees
+        b = hex_byte_field(9)  # degree-minutes
+        c = hex_byte_field(8)  # degree-minutes / 10
+        d = hex_byte_field(7)  # degree-minutes / 1000
+        [a, b, c, d]
       end
 
       def longitude
-        a = byte_field(7) # 1/100 degree-second
-        b = byte_field(8) # degree-seconds
-        c = byte_field(9) # degree-minutes
-        d = byte_field(10) # degrees
-        [d, c, b, a]
+        @longitude ||= mindec_to_degdec longitude_elements
+      end
+
+      def coordinate
+        [longitude, latitude, altitude]
       end
 
       def heading
         @heading ||= (two_byte_field(11..12, :little) / 10.0)
       end
 
+      private
+
+      def mindec_to_degdec elts
+        raise ArgumentError unless elts.length == 4
+        elts[0] + ("#{elts[1]}.#{elts[2]}#{elts[3]}".to_f / 60.0)
+      end
+
     end
 
     class GPSRecord2 < Record
@@ -257,4 +276,4 @@ module Spektrum
     end
 
   end
-end
+end

data/lib/{spektrum-log → spektrum/log}/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/spektrum/log.rb

@@ -0,0 +1,5 @@
+require "spektrum/log/flight"
+require "spektrum/log/headers"
+require "spektrum/log/reader"
+require "spektrum/log/records"
+require "spektrum/log/version"

data/spec/flight_spec.rb

@@ -14,7 +14,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(191).records }
 
-      its(:duration) { should eql(4) }
+      its(:duration) { should be_within(0.1).of(4.5) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -24,6 +24,10 @@ describe Spektrum::Log::Flight do
 
       its(:model_type) { should eql('Fixed Wing') }
 
+      its(:gps1_records?) { should be_true }
+
+      its(:gps2_records?) { should be_true }
+
     end
 
     context 'flight 2' do
@@ -34,7 +38,11 @@ describe Spektrum::Log::Flight do
 
       it { should have(634).records }
 
-      its(:duration) { should eql(14) }
+      its(:duration) { should be_within(0.1).of(14.8) }
+
+      its(:gps1_records?) { should be_true }
+
+      its(:gps2_records?) { should be_true }
 
     end
 
@@ -46,7 +54,11 @@ describe Spektrum::Log::Flight do
 
       it { should have(641).records }
 
-      its(:duration) { should eql(15) }
+      its(:duration) { should be_within(0.1).of(15.0) }
+
+      its(:gps1_records?) { should be_true }
+
+      its(:gps2_records?) { should be_true }
 
     end
 
@@ -66,7 +78,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should eql(2) }
+      its(:duration) { should be_within(0.1).of(2.2) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -92,7 +104,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -106,7 +118,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -120,7 +132,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -134,7 +146,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -148,7 +160,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -162,7 +174,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -176,7 +188,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -190,7 +202,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(0).records }
 
-      its(:duration) { should eql(0) }
+      its(:duration) { should eql(0.0) }
 
       it { should be_empty }
 
@@ -204,7 +216,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(23155).records }
 
-      its(:duration) { should eql(579) }
+      its(:duration) { should be_within(0.1).of(579.5) }
 
       it { should_not be_empty }
 
@@ -226,7 +238,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should eql(63) }
+      its(:duration) { should be_within(0.1).of(63.7) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -254,4 +266,34 @@ describe Spektrum::Log::Flight do
 
   end
 
-end
+  context 'data file GPS.TLM' do
+
+    let(:reader) { Spektrum::Log::Reader.new(data_file('GPS.TLM')) }
+
+    context 'flight 1' do
+
+      subject { reader.flights[0] }
+
+      its(:gps1_records?) { should be_true }
+
+      its(:gps2_records?) { should be_true }
+
+      its(:to_kml?) { should be_true }
+
+    end
+
+    context 'flight 2' do
+
+      subject { reader.flights[1] }
+
+      its(:gps1_records?) { should be_true }
+
+      its(:gps2_records?) { should be_true }
+
+      its(:to_kml?) { should be_true }
+
+    end
+
+  end
+
+end

data/spec/gps_record1_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Spektrum::Log::GPSRecord1 do
+
+  let(:timestamp) { 0x00010E8D }
+
+  let(:raw_data) { ["00870084214054886918094633093B"].pack('H*') }
+
+  subject { Spektrum::Log::GPSRecord1.new(timestamp, raw_data) }
+
+  its(:timestamp) { should eql(0x00010E8D) }
+
+  its(:latitude) { should be_within(0.000001).of(54.670307) }
+
+  its(:longitude) { should be_within(0.000001).of(9.311646) }
+
+end

data/spec/reader_spec.rb

@@ -34,4 +34,16 @@ describe Spektrum::Log::Reader do
 
   end
 
+  context 'data file GPS.TLM' do
+
+    subject { Spektrum::Log::Reader.new(data_file('GPS.TLM')) }
+
+    it { should have(2).flights }
+
+  end
+
+  it 'should raise on bad input' do
+    expect { Spektrum::Log::Reader.new(__FILE__) }.to raise_error
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
+require 'simplecov'
+require 'simplecov-gem-adapter'
+require 'simplecov-rcov'
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+SimpleCov.start 'gem' if ENV['COVERAGE']
+
+require 'awesome_print'
 require 'pathname'
-require 'spektrum-log'
+require 'spektrum/log'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spektrum-log.gemspec

@@ -1,21 +1,31 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/spektrum-log/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'spektrum/log/version'
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Nick Veys"]
-  gem.email         = ["nick@codelever.com"]
-  gem.description   = %q{Read and interpret Spektrum TLM log files.}
-  gem.summary       = %q{Spektrum TLM log file reader}
-  gem.homepage      = ""
+Gem::Specification.new do |spec|
+  spec.name          = "spektrum-log"
+  spec.version       = Spektrum::Log::VERSION
+  spec.authors       = ["Nick Veys"]
+  spec.email         = ["nick@codelever.com"]
+  spec.description   = %q{Read and interpret Spektrum TLM log files.}
+  spec.summary       = %q{Spektrum TLM log file reader}
+  spec.homepage      = ""
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "spektrum-log"
-  gem.require_paths = ["lib"]
-  gem.version       = Spektrum::Log::VERSION
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rspec', '~> 2.12'
-  gem.add_development_dependency 'rake', '~> 10.0'
-  gem.add_development_dependency 'ci_reporter', '= 1.8.4'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'ci_reporter', '= 1.8.4'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 2.13'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-gem-adapter'
+  spec.add_development_dependency 'simplecov-rcov'
+
+  spec.add_dependency 'ruby_kml', '~> 0.1'
 end

metadata

@@ -1,46 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,10 +54,107 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-gem-adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_kml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Read and interpret Spektrum TLM log files.
 email:
 - nick@codelever.com
@@ -70,45 +173,49 @@ files:
 - data/2.TLM
 - data/3.TLM
 - data/4.TLM
-- lib/spektrum-log.rb
-- lib/spektrum-log/flight.rb
-- lib/spektrum-log/headers.rb
-- lib/spektrum-log/reader.rb
-- lib/spektrum-log/records.rb
-- lib/spektrum-log/version.rb
+- data/GPS.TLM
+- lib/spektrum/log.rb
+- lib/spektrum/log/flight.rb
+- lib/spektrum/log/headers.rb
+- lib/spektrum/log/reader.rb
+- lib/spektrum/log/records.rb
+- lib/spektrum/log/version.rb
 - spec/basic_data_record_spec.rb
 - spec/flight_log_record_spec.rb
 - spec/flight_spec.rb
+- spec/gps_record1_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
 - spektrum-log.gemspec
 homepage: ''
-licenses: []
-metadata: {}
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.22
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Spektrum TLM log file reader
 test_files:
 - spec/basic_data_record_spec.rb
 - spec/flight_log_record_spec.rb
 - spec/flight_spec.rb
+- spec/gps_record1_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1290e1e85c63b06ca04ff2ddcb1e6e6bc1a078a9
-  data.tar.gz: d844267c31ffe4c308dfd187bb969ade4e8f0d34
-SHA512:
-  metadata.gz: a77e5bf2d17d03b7e4d16c9760a16423b7692f02d66f93c3daacee07be052350ddce87168268b6c40a8570a368673773e82e8e9a6ab37429f3b5dab12af8863d
-  data.tar.gz: 6e4baf468c95764744ec1847034a72831ff541d4ee5c4a1c667a6ff479c373a60effc26ae64b73a036d63aff86e6ae25fe1743a05b3868de0f10df31cb3daa3b

data/lib/spektrum-log.rb

@@ -1,5 +0,0 @@
-require "spektrum-log/flight"
-require "spektrum-log/headers"
-require "spektrum-log/reader"
-require "spektrum-log/records"
-require "spektrum-log/version"