geoptima 0.1.9 → 0.1.10

data/bin/show_geoptima

@@ -24,6 +24,8 @@ $files = Geoptima::Options.process_args do |option|
   option.m {$map_headers = true}
   option.a {$combine_all = true}
   option.l {$more_headers = true}
+  option.e {$show_error_stats = true}
+  option.g {$export_gpx = true}
   option.P {$export_prefix = ARGV.shift}
   option.E {$event_names += ARGV.shift.split(/[\,\;\:\.]+/)}
   option.T {$time_range = Geoptima::DateRange.from ARGV.shift}
@@ -108,7 +110,7 @@ exit 0 if($print_version && !$verbose)
 $help = true if($files.length < 1)
 if $help
   puts <<EOHELP
-Usage: show_geoptima <-dwvpxomlsafh> <-P export_prefix> <-L limit> <-E types> <-T min,max> <-M mapfile> file <files>
+Usage: show_geoptima <-dwvpxomlsafegh> <-P export_prefix> <-L limit> <-E types> <-T min,max> <-M mapfile> file <files>
   -d  debug mode (output more context during processing) #{cw $debug}
   -w  verbose mode (output extra information to console) #{cw $verbose}
   -v  print geoptima library version #{Geoptima::VERSION}
@@ -120,6 +122,8 @@ Usage: show_geoptima <-dwvpxomlsafh> <-P export_prefix> <-L limit> <-E types> <-
   -s  seperate the export files by event type #{cw $seperate}
   -a  combine all IMEI's into a single dataset #{cw $combine_all}
   -f  flush stdout #{cw $flush_stdout}
+  -e  show error statistics #{cw $show_error_stats}
+  -g  export GPX traces #{cw $export_gpx}
   -h  show this help
   -P  prefix for exported files (default: ''; current: #{$export_prefix})
   -E  comma-seperated list of event types to show and export (default: all; current: #{$event_names.join(',')})
@@ -288,12 +292,21 @@ end
 
 puts "Found #{$datasets.length} datasets: #{$datasets.values.join('; ')}"
 
+if $show_error_stats
+  $datasets.keys.sort.each do |imei|
+    dataset = $datasets[imei]
+    events = dataset.sorted # required to get the errors count
+    puts "Found #{dataset.errors.keys.length} errors in #{dataset.description}"
+    dataset.report_errors
+  end
+end
+
 $datasets.keys.sort.each do |imei|
   dataset = $datasets[imei]
   imsi = dataset.imsi
   events = dataset.sorted
   puts if($print)
-  puts "Found #{dataset.description}"
+  puts "Found #{dataset.description}" if($verbose || $print || $export)
   if $verbose
     puts "\tFirst Event: #{dataset.first}"
     puts "\tLast Event:  #{dataset.last}"

data/examples/show_geoptima.rb

@@ -24,6 +24,8 @@ $files = Geoptima::Options.process_args do |option|
   option.m {$map_headers = true}
   option.a {$combine_all = true}
   option.l {$more_headers = true}
+  option.e {$show_error_stats = true}
+  option.g {$export_gpx = true}
   option.P {$export_prefix = ARGV.shift}
   option.E {$event_names += ARGV.shift.split(/[\,\;\:\.]+/)}
   option.T {$time_range = Geoptima::DateRange.from ARGV.shift}
@@ -108,7 +110,7 @@ exit 0 if($print_version && !$verbose)
 $help = true if($files.length < 1)
 if $help
   puts <<EOHELP
-Usage: show_geoptima <-dwvpxomlsafh> <-P export_prefix> <-L limit> <-E types> <-T min,max> <-M mapfile> file <files>
+Usage: show_geoptima <-dwvpxomlsafegh> <-P export_prefix> <-L limit> <-E types> <-T min,max> <-M mapfile> file <files>
   -d  debug mode (output more context during processing) #{cw $debug}
   -w  verbose mode (output extra information to console) #{cw $verbose}
   -v  print geoptima library version #{Geoptima::VERSION}
@@ -120,6 +122,8 @@ Usage: show_geoptima <-dwvpxomlsafh> <-P export_prefix> <-L limit> <-E types> <-
   -s  seperate the export files by event type #{cw $seperate}
   -a  combine all IMEI's into a single dataset #{cw $combine_all}
   -f  flush stdout #{cw $flush_stdout}
+  -e  show error statistics #{cw $show_error_stats}
+  -g  export GPX traces #{cw $export_gpx}
   -h  show this help
   -P  prefix for exported files (default: ''; current: #{$export_prefix})
   -E  comma-seperated list of event types to show and export (default: all; current: #{$event_names.join(',')})
@@ -288,12 +292,21 @@ end
 
 puts "Found #{$datasets.length} datasets: #{$datasets.values.join('; ')}"
 
+if $show_error_stats
+  $datasets.keys.sort.each do |imei|
+    dataset = $datasets[imei]
+    events = dataset.sorted # required to get the errors count
+    puts "Found #{dataset.errors.keys.length} errors in #{dataset.description}"
+    dataset.report_errors
+  end
+end
+
 $datasets.keys.sort.each do |imei|
   dataset = $datasets[imei]
   imsi = dataset.imsi
   events = dataset.sorted
   puts if($print)
-  puts "Found #{dataset.description}"
+  puts "Found #{dataset.description}" if($verbose || $print || $export)
   if $verbose
     puts "\tFirst Event: #{dataset.first}"
     puts "\tLast Event:  #{dataset.last}"

data/lib/geoptima/data.rb

@@ -235,6 +235,7 @@ module Geoptima
       geoptima['events'].each do |data|
         events = data['values']
         event_type = data.keys.reject{|k| k=~/values/}[0]
+        event_count = data[event_type]
         header = @events_metadata[event_type]
         # If the JSON is broken (known bug on some releases of the iPhone app)
         # Then get the header information from a list of known headers
@@ -245,17 +246,26 @@ module Geoptima
         end
         # Double-check the header length matches a multiple of the data length
         if header
-          mismatch = events.length % header.length
-          if mismatch != 0
-            puts "'#{event_type}' header length #{header.length} incompatible with data length #{events.length}"
+          mismatch_records = events.length - header.length * event_count
+          if mismatch_records != 0
+            puts "'#{event_type}' header length #{header.length} incompatible with data length #{events.length} and record count #{event_count}"
             header = nil
             incr_error "Metadata mismatch"
             if Event::ALT_HEADERS.keys.grep(event_type).length>0
               incr_error "#{Event::HEADER_BUGS[event_type]} #{event_type}"
               [Event::KNOWN_HEADERS[event_type],*(Event::ALT_HEADERS[event_type])].each do |alt_header|
-                if alt_header && (events.length % alt_header.length) == 0
-                  header = alt_header
-                  puts "Found alternative header that matches #{event_type}: #{header.join(',')}"
+                puts "Trying alternative header: #{alt_header.inspect}" if($debug)
+                if alt_header && (events.length == alt_header.length * event_count)
+                  puts "\tAlternative header length matches: #{alt_header.inspect}" if($debug)
+                  records_valid = (0...[10,event_count].min).inject(true) do |vt,ri|
+                    timeoffset = events[ri*alt_header.length]
+                    vt &&= timeoffset.is_a?(Fixnum)
+                  end
+                  if records_valid
+                    header = alt_header
+                    puts "Found alternative header that matches #{event_type}: #{header.join(',')}"
+                    break
+                  end
                 end
               end
             end

data/lib/geoptima/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoptima
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-29 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json