geoptima 0.0.4 → 0.0.5

data/bin/geoptima_file_time

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'date'
+
+$root=DateTime.parse("1970-01-01 00:00:00")
+ARGV.each do |arg|
+  base,seconds=arg.split(/_/)
+  date = ($root + seconds.to_f/(60*60*24))
+  puts "#{date}\t#{arg}"
+end

data/bin/show_geoptima

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.0.3")
+Geoptima::assert_version("0.0.5")
 
 $debug=false
 
@@ -39,6 +39,8 @@ while arg=ARGV.shift do
         $export_stats=true
       when 'm'
         $map_headers=true
+      when 'l'
+        $more_headers=true
       when 'E'
         $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
       when 'T'
@@ -71,6 +73,7 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -x  export IMEI specific CSV files for further processing #{cw $export}
   -o  export field statistis #{cw $export_stats}
   -m  map headers to classic NetView compatible version #{cw $map_headers}
+  -l  longer header list (phone and operator fields) #{cw $more_headers}
   -s  seperate the export files by event type #{cw $seperate}
   -h  show this help
   -L  limit verbose output to specific number of lines #{cw $print_limit}
@@ -86,6 +89,7 @@ $datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range
 class Export
   attr_reader :files, :imei, :names, :headers
   def initialize(imei,names,dataset)
+    imei = dataset.imsi if(imei.to_s.length < 1)
     @imei = imei
     @names = names
     if $export
@@ -106,7 +110,7 @@ class Export
     end
     @headers[nil] = @headers.values.flatten
     files && files.each do |key,file|
-      file.puts map_headers(['Time','Event','Latitude','Longitude','IMSI','IMEI']+header(key)).join("\t")
+      file.puts map_headers(base_headers+more_headers+header(key)).join("\t")
     end
     if $debug || $verbose
       @headers.each do |name,head|
@@ -114,6 +118,42 @@ class Export
       end
     end
   end
+  def base_headers
+    ['Time','Event','Latitude','Longitude']
+  end
+  def more_headers
+    $more_headers ? ['IMSI','IMEI','MSISDN','MCC','MNC','LAC','CI','RSSI','Platform','Model','OS','Operator'] : []
+  end
+  def base_fields(event)
+    [event.time_key,event.name,event.latitude,event.longitude]
+  end
+  def more_fields(event,dataset)
+    more_headers.map do |h|
+      case h
+      when 'RSSI'
+        dataset.recent(event,'signal.strength')
+      when 'LAC'
+        dataset.recent(event,'service.lac')
+      when 'CI'
+        dataset.recent(event,'service.cell_id')
+      when 'MCC'
+        dataset[h] || dataset.recent(event,'service.mcc')
+      when 'MNC'
+        dataset[h] || dataset.recent(event,'service.mnc')
+      when 'Operator'
+        dataset['carrierName']
+      when 'IMSI'
+        dataset.imsi
+      when 'IMEI'
+        dataset.imei
+      else
+        dataset[h]
+      end
+    end
+  end
+  def get_field(event,name)
+    h=(base_headers+more_headers).grep(/#{name}/)
+  end
   def cap(array,sep="")
     array.map do |v|
       "#{v[0..0].upcase}#{v[1..-1]}"
@@ -194,8 +234,9 @@ $datasets.keys.sort.each do |imei|
       names.each do |name|
         if event.name === name
           fields = export.header($seperate ? name : nil).map{|h| event[h]}
-          export.puts_to "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{fields.join("\t")}", name
-          if_le{puts "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{event.fields.inspect}"}
+          b_fields = export.base_fields(event) + export.more_fields(event,dataset)
+          export.puts_to "#{b_fields.join("\t")}\t#{fields.join("\t")}", name
+          if_le{puts "#{b_fields.join("\t")}\t#{event.fields.inspect}"}
         end
       end
     end

data/examples/geoptima_file_time.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'date'
+
+$root=DateTime.parse("1970-01-01 00:00:00")
+ARGV.each do |arg|
+  base,seconds=arg.split(/_/)
+  date = ($root + seconds.to_f/(60*60*24))
+  puts "#{date}\t#{arg}"
+end

data/examples/show_geoptima.rb

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.0.4")
+Geoptima::assert_version("0.0.5")
 
 $debug=false
 
@@ -39,6 +39,8 @@ while arg=ARGV.shift do
         $export_stats=true
       when 'm'
         $map_headers=true
+      when 'l'
+        $more_headers=true
       when 'E'
         $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
       when 'T'
@@ -71,6 +73,7 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -x  export IMEI specific CSV files for further processing #{cw $export}
   -o  export field statistis #{cw $export_stats}
   -m  map headers to classic NetView compatible version #{cw $map_headers}
+  -l  longer header list (phone and operator fields) #{cw $more_headers}
   -s  seperate the export files by event type #{cw $seperate}
   -h  show this help
   -L  limit verbose output to specific number of lines #{cw $print_limit}
@@ -86,6 +89,7 @@ $datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range
 class Export
   attr_reader :files, :imei, :names, :headers
   def initialize(imei,names,dataset)
+    imei = dataset.imsi if(imei.to_s.length < 1)
     @imei = imei
     @names = names
     if $export
@@ -106,7 +110,7 @@ class Export
     end
     @headers[nil] = @headers.values.flatten
     files && files.each do |key,file|
-      file.puts map_headers(['Time','Event','Latitude','Longitude','IMSI','IMEI']+header(key)).join("\t")
+      file.puts map_headers(base_headers+more_headers+header(key)).join("\t")
     end
     if $debug || $verbose
       @headers.each do |name,head|
@@ -114,6 +118,42 @@ class Export
       end
     end
   end
+  def base_headers
+    ['Time','Event','Latitude','Longitude']
+  end
+  def more_headers
+    $more_headers ? ['IMSI','IMEI','MSISDN','MCC','MNC','LAC','CI','RSSI','Platform','Model','OS','Operator'] : []
+  end
+  def base_fields(event)
+    [event.time_key,event.name,event.latitude,event.longitude]
+  end
+  def more_fields(event,dataset)
+    more_headers.map do |h|
+      case h
+      when 'RSSI'
+        dataset.recent(event,'signal.strength')
+      when 'LAC'
+        dataset.recent(event,'service.lac')
+      when 'CI'
+        dataset.recent(event,'service.cell_id')
+      when 'MCC'
+        dataset[h] || dataset.recent(event,'service.mcc')
+      when 'MNC'
+        dataset[h] || dataset.recent(event,'service.mnc')
+      when 'Operator'
+        dataset['carrierName']
+      when 'IMSI'
+        dataset.imsi
+      when 'IMEI'
+        dataset.imei
+      else
+        dataset[h]
+      end
+    end
+  end
+  def get_field(event,name)
+    h=(base_headers+more_headers).grep(/#{name}/)
+  end
   def cap(array,sep="")
     array.map do |v|
       "#{v[0..0].upcase}#{v[1..-1]}"
@@ -194,8 +234,9 @@ $datasets.keys.sort.each do |imei|
       names.each do |name|
         if event.name === name
           fields = export.header($seperate ? name : nil).map{|h| event[h]}
-          export.puts_to "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{fields.join("\t")}", name
-          if_le{puts "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{event.fields.inspect}"}
+          b_fields = export.base_fields(event) + export.more_fields(event,dataset)
+          export.puts_to "#{b_fields.join("\t")}\t#{fields.join("\t")}", name
+          if_le{puts "#{b_fields.join("\t")}\t#{event.fields.inspect}"}
         end
       end
     end

data/geoptima.gemspec

@@ -25,10 +25,11 @@ EOF
   s.files        = Dir.glob("{bin,lib,rdoc}/**/*").reject{|x| x=~/(tmp|target|test-data)/ || x=~/~$/} +
                    Dir.glob("examples/*rb") + Dir.glob("examples/sample*json") + 
                    %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile geoptima.gemspec)
-  s.executables  = ['show_geoptima']
-  s.has_rdoc = true
+  s.executables  = ['show_geoptima','geoptima_file_time']
+
   s.extra_rdoc_files = %w( README.rdoc )
-  s.rdoc_options = ["--quiet", "--title", "geoptima.rb", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
+  s.rdoc_options = ["--quiet", "--title", "Geoptima.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
+
   s.add_dependency('json',">= 1.6.5")
   s.required_ruby_version = ">= 1.8.6"
 end

data/lib/geoptima/data.rb

@@ -71,6 +71,9 @@ module Geoptima
     def [](key)
       @fields[key] || @fields[key.gsub(/#{name}\./,'')]
     end
+    def []=(key,value)
+      @fields[key] ||= value
+    end
     def -(other)
       (self.time - other.time) * SPERDAY
     end
@@ -95,13 +98,14 @@ module Geoptima
     def initialize(path)
       @path = path
       @json = JSON.parse(File.read(path))
+      @fields = {}
       if $debug
         puts "Read Geoptima: #{geoptima.to_json}"
         puts "\tSubscriber: #{subscriber.to_json}"
-        puts "\tIMSI: #{imsi}"
-        puts "\tIMEI: #{imei}"
-        puts "\tMCC: #{subscriber['MCC']}"
-        puts "\tMNC: #{subscriber['MNC']}"
+        puts "\tIMSI: #{self['imsi']}"
+        puts "\tIMEI: #{self['imei']}"
+        puts "\tMCC: #{self['MCC']}"
+        puts "\tMNC: #{self['MNC']}"
         puts "\tStart: #{start}"
       end
     end
@@ -114,20 +118,8 @@ module Geoptima
     def subscriber
       @subscriber ||= geoptima['subscriber']
     end
-    def imsi
-      @imsi ||= subscriber['imsi']
-    end
-    def imei
-      @imei ||= subscriber['imei']
-    end
-    def platform
-      @platform ||= subscriber['Platform'] || subscriber['platform']
-    end
-    def model
-      @model ||= subscriber['Model'] || subscriber['model']
-    end
-    def os
-      @os ||= subscriber['OS']
+    def [](key)
+      @fields[key] ||= subscriber[key] || subscriber[key.downcase]
     end
     def start
       @start ||= subscriber['start'] && DateTime.parse(subscriber['start'].gsub(/Asia\/Bangkok/,'GMT+7').gsub(/Mar 17 2044/,'Feb 14 2012'))
@@ -220,6 +212,7 @@ module Geoptima
       @data = []
       @options = options
       @time_range = options[:time_range] || Range.new(Config[:min_datetime],Config[:max_datetime])
+      @fields = {}
     end
 
     def <<(data)
@@ -237,8 +230,8 @@ module Geoptima
 
     def imsis
       @imsis ||= @data.inject({}) do |a,d|
-        a[d.imsi] ||= 0
-        a[d.imsi] += d.count.to_i
+        a[d['imsi']] ||= 0
+        a[d['imsi']] += d.count.to_i
         a
       end.to_a.sort do |a,b|
         b[1]<=>a[1]
@@ -248,16 +241,44 @@ module Geoptima
       end.compact.uniq
     end
 
+    def recent(event,key)
+      unless event[key]
+        puts "Searching for recent values for '#{key}' starting at event #{event}" if($debug)
+        ev,prop=key.split(/\./)
+        ar=sorted
+        puts "\tSearching through #{ar && ar.length} events for event type #{ev} and property #{prop}" if($debug)
+        if i=ar.index(event)
+          afe = while(i>0)
+            fe = ar[i-=1]
+            puts "\t\tTesting event[#{i}]: #{fe}" if($debug)
+            break(fe) if(fe.nil? || fe.name == ev || (event.time - fe.time) * SPERDAY > 60)
+          end
+          if afe && afe.name == ev
+            puts "\t\tFound event[#{i}] with #{prop} => #{afe[prop]} and time gap of #{(event.time - fe.time) * SPERDAY} seconds" if($verbose)
+            event[key] = afe[prop]
+          end
+        else
+          puts "Event not found in search for recent '#{key}': #{event}"
+        end
+      end
+#      @recent[key] ||= ''
+      event[key]
+    end
+
+    def [](key)
+      @fields[key.downcase] ||= @data.map{|d| d[key]}.compact.uniq[0]
+    end
+
     def platform
-      @platform ||= @data.map{|d| d.platform}.compact.uniq[0]
+      self['Platform']
     end
 
     def model
-      @model ||= @data.map{|d| d.model}.compact.uniq[0]
+      self['Model']
     end
 
     def os
-      @os ||= @data.map{|d| d.os}.compact.uniq[0]
+      self['OS']
     end
 
     def first
@@ -360,8 +381,8 @@ module Geoptima
         unless geoptima.valid?
           puts "INVALID: #{geoptima.start}\t#{file}\n\n"
         else
-          datasets[geoptima.imei] ||= Geoptima::Dataset.new(geoptima.imei, options)
-          datasets[geoptima.imei] << geoptima
+          datasets[geoptima['imei']] ||= Geoptima::Dataset.new(geoptima['imei'], options)
+          datasets[geoptima['imei']] << geoptima
         end
       end
       datasets

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   def self.version_as_int(ver)
     base = 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoptima
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Craig Taverner
@@ -45,12 +45,14 @@ description: |
 email: craig@amanzi.com
 executables: 
 - show_geoptima
+- geoptima_file_time
 extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
 files: 
 - bin/show_geoptima
+- bin/geoptima_file_time
 - lib/geoptima/version.rb
 - lib/geoptima/data.rb
 - lib/geoptima.rb
@@ -58,6 +60,7 @@ files:
 - examples/export_layer.rb
 - examples/stats.rb
 - examples/show_geoptima.rb
+- examples/geoptima_file_time.rb
 - examples/sample_geoptima.json
 - README.rdoc
 - CHANGELOG
@@ -71,9 +74,7 @@ post_install_message:
 rdoc_options: 
 - --quiet
 - --title
-- geoptima.rb
-- --opname
-- index.html
+- Geoptima.rb
 - --line-numbers
 - --main
 - README.rdoc