geoptima 0.1.19 → 0.1.20

data/bin/show_geoptima

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version(">=0.1.19")
+Geoptima::assert_version(">=0.1.20")
 
 $debug=false
 
@@ -517,7 +517,7 @@ $datasets.keys.sort.each do |imei|
             dataset.timer('export.event.write').start
             export.puts_to "#{b_fields.join("\t")}\t#{fields.join("\t")}", name
             dataset.timer('export.event.write').stop
-            if_le{puts "#{b_fields.join("\t")}\t#{event.fields.inspect}"}
+            if_le{puts "#{b_fields.join("\t")}\t#{event.fields.inspect}\t(GPS:#{event.previous_gps && event.previous_gps.fields.inspect})"}
             dataset.timer('export.event').stop
           end
         end

data/examples/show_geoptima.rb

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version(">=0.1.19")
+Geoptima::assert_version(">=0.1.20")
 
 $debug=false
 
@@ -517,7 +517,7 @@ $datasets.keys.sort.each do |imei|
             dataset.timer('export.event.write').start
             export.puts_to "#{b_fields.join("\t")}\t#{fields.join("\t")}", name
             dataset.timer('export.event.write').stop
-            if_le{puts "#{b_fields.join("\t")}\t#{event.fields.inspect}"}
+            if_le{puts "#{b_fields.join("\t")}\t#{event.fields.inspect}\t(GPS:#{event.previous_gps && event.previous_gps.fields.inspect})"}
             dataset.timer('export.event').stop
           end
         end

data/lib/geoptima/locator.rb

@@ -61,7 +61,7 @@ module Geoptima
     end
   end
   module Locatable
-    attr_accessor :previous_point, :next_point, :previous_point_gap, :next_point_gap, :location
+    attr_accessor :previous_gps, :previous_point, :next_point, :previous_point_gap, :next_point_gap, :location
     def closer_than(gps,window=0.0)
       if $debug && gps && window > 0
         puts "Comparing times:"
@@ -79,9 +79,12 @@ module Geoptima
       end
     end
     def set_previous_if(gps,time_window=0.0)
-      if closer_than(gps,time_window)
-        self.previous_point = gps.location
-        self.previous_point_gap = (self - gps).abs
+      if gps
+        self.previous_gps = gps
+        if closer_than(gps,time_window)
+          self.previous_point = gps.location
+          self.previous_point_gap = (self - gps).abs
+        end
       end
     end
   end

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 
   class Version
     attr_reader :comparator, :version, :major, :minor, :patch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoptima
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 909654323
+      hash: 609685665
 requirements: []
 rubyforge_project: geoptima
 rubygems_version: 1.8.25