geoptima 0.1.13 → 0.1.14

data/bin/show_geoptima

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version(">=0.1.13")
+Geoptima::assert_version(">=0.1.14")
 
 $debug=false
 
@@ -16,7 +16,7 @@ $event_names=[]
 $files = []
 $print_limit = 10000
 $gpx_options = {
-  'scale' => 195, 'padding' => 5,
+  'scale' => 190, 'padding' => 5,
   'limit' => 2, 'png_limit' => 10,
   'points' => true, 'point_size' => 2, 'point_color' => '0000aa'
 }
@@ -35,6 +35,7 @@ $files = Geoptima::Options.process_args do |option|
   option.P {$export_prefix = ARGV.shift}
   option.E {$event_names += ARGV.shift.split(/[\,\;\:\.]+/)}
   option.T {$time_range = Geoptima::DateRange.from ARGV.shift}
+  option.B {$location_range = Geoptima::LocationRange.from ARGV.shift}
   option.L {$print_limit = [1,ARGV.shift.to_i].max}
   option.M {$mapfile = ARGV.shift}
   option.G {$gpx_options.merge! ARGV.shift.split(/[\,\;]+/).inject({}){|a,v| k=v.split(/[\:\=]+/);a[k[0]]=k[1]||true;a}}
@@ -136,20 +137,23 @@ Usage: show_geoptima <-dwvpxomlsafegh> <-P export_prefix> <-L limit> <-E types>
   -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(',')})
   -T  time range to limit results to (default: all; current: #{$time_range})
+  -B  location limited to specified bounds in formats
+      either minlat,minlon,maxlat,maxlon or minlat..maxlat,minlon..maxlon
+      (default: all; current: #{$location_range})
   -L  limit verbose output to specific number of lines #{cw $print_limit}
   -M  mapfile of normal->altered header names: #{$mapfile}
   -G  GPX export options as ';' separated list of key:value pairs
       Current GPX options: #{$gpx_options.inspect}
       Known supported GPX options (might be more, see data.rb code):
-        limit:#{$gpx_options['limit']}\tLimit GPX output to traces with at least this number of events
-        png_limit:#{$gpx_options['png_limit']}\tLimit PNG output to traces with at least this number of events
-        scale:#{$gpx_options['scale']}\tSize of print area in PNG output
-        padding:#{$gpx_options['padding']}\tSpace around print area
-        points:#{$gpx_options['points']}\tTurn on/off points
-        point_size:#{$gpx_options['point_size']}\tSet point size
-        point_color:#{$gpx_options['point_color']}\tSet point color: RRGGBBAA in hex
-      PNG images will be 'scale + 2 * padding' big. The scale will be used for
-      the widest dimension, and the other will be reduced to fit the trace.
+        limit:#{$gpx_options['limit']}\t\tLimit GPX output to traces with at least this number of events
+        png_limit:#{$gpx_options['png_limit']}\t\tLimit PNG output to traces with at least this number of events
+        scale:#{$gpx_options['scale']}\t\tSize of print area in PNG output
+        padding:#{$gpx_options['padding']}\t\tSpace around print area
+        points:#{$gpx_options['points']}\t\tTurn on/off points
+        point_size:#{$gpx_options['point_size']}\t\tSet point size
+        point_color:#{$gpx_options['point_color']}\tSet point color: RRGGBBAA in hex (else 'auto')
+        format:#{$gpx_options['format']}\t\tExport format: 'gpx', 'png', default 'all'
+      PNG images will be 'scale + 2 * padding' big (#{$gpx_options['scale'].to_i+2*$gpx_options['padding'].to_i} for current settings). The scale will be used for the widest dimension, and the other will be reduced to fit the actual size of the trace. The projection used is non, with the points simply mapped to their GPS locations. This will cause visual distortions far from the equator where dlat!=dlon.
 EOHELP
   show_header_maps
   exit 0
@@ -158,7 +162,7 @@ end
 $verbose = $verbose || $debug
 show_header_maps if($verbose)
 
-$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range, :combine_all => $combine_all)
+$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range, :location_range => $location_range, :combine_all => $combine_all)
 
 class Export
   attr_reader :files, :imei, :names, :headers
@@ -287,19 +291,23 @@ class Export
     end
   end
   def export_gpx(trace)
-    File.open("#{$export_prefix}#{trace}.gpx",'w') do |out|
-      puts "Exporting #{trace.length} GPS events to trace: #{trace}"
-      out.puts trace.as_gpx
+    if !($gpx_options['format'].to_s =~ /png/)
+      File.open("#{$export_prefix}#{trace}.gpx",'w') do |out|
+        puts "Exporting #{trace.length} GPS events to trace: #{trace}"
+        out.puts trace.as_gpx
+      end
     end
   end
   def export_png(trace)
-    puts "Exporting #{trace.length} GPS events to PNG: #{trace}"
-    if $verbose
-      puts "\tBounds: #{trace.bounds}"
-      puts "\tWidth: #{trace.width}"
-      puts "\tHeight: #{trace.height}"
+    if !($gpx_options['format'].to_s =~ /gpx/)
+      puts "Exporting #{trace.length} GPS events to PNG: #{trace}"
+      if $verbose
+        puts "\tBounds: #{trace.bounds}"
+        puts "\tWidth: #{trace.width}"
+        puts "\tHeight: #{trace.height}"
+      end
+      trace.to_png "#{$export_prefix}#{trace}.png", $gpx_options
     end
-    trace.to_png "#{$export_prefix}#{trace}.png", $gpx_options
   end
   def header(name=nil)
     @headers[name]

data/examples/show_geoptima.rb

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version(">=0.1.13")
+Geoptima::assert_version(">=0.1.14")
 
 $debug=false
 
@@ -16,7 +16,7 @@ $event_names=[]
 $files = []
 $print_limit = 10000
 $gpx_options = {
-  'scale' => 195, 'padding' => 5,
+  'scale' => 190, 'padding' => 5,
   'limit' => 2, 'png_limit' => 10,
   'points' => true, 'point_size' => 2, 'point_color' => '0000aa'
 }
@@ -35,6 +35,7 @@ $files = Geoptima::Options.process_args do |option|
   option.P {$export_prefix = ARGV.shift}
   option.E {$event_names += ARGV.shift.split(/[\,\;\:\.]+/)}
   option.T {$time_range = Geoptima::DateRange.from ARGV.shift}
+  option.B {$location_range = Geoptima::LocationRange.from ARGV.shift}
   option.L {$print_limit = [1,ARGV.shift.to_i].max}
   option.M {$mapfile = ARGV.shift}
   option.G {$gpx_options.merge! ARGV.shift.split(/[\,\;]+/).inject({}){|a,v| k=v.split(/[\:\=]+/);a[k[0]]=k[1]||true;a}}
@@ -136,20 +137,23 @@ Usage: show_geoptima <-dwvpxomlsafegh> <-P export_prefix> <-L limit> <-E types>
   -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(',')})
   -T  time range to limit results to (default: all; current: #{$time_range})
+  -B  location limited to specified bounds in formats
+      either minlat,minlon,maxlat,maxlon or minlat..maxlat,minlon..maxlon
+      (default: all; current: #{$location_range})
   -L  limit verbose output to specific number of lines #{cw $print_limit}
   -M  mapfile of normal->altered header names: #{$mapfile}
   -G  GPX export options as ';' separated list of key:value pairs
       Current GPX options: #{$gpx_options.inspect}
       Known supported GPX options (might be more, see data.rb code):
-        limit:#{$gpx_options['limit']}\tLimit GPX output to traces with at least this number of events
-        png_limit:#{$gpx_options['png_limit']}\tLimit PNG output to traces with at least this number of events
-        scale:#{$gpx_options['scale']}\tSize of print area in PNG output
-        padding:#{$gpx_options['padding']}\tSpace around print area
-        points:#{$gpx_options['points']}\tTurn on/off points
-        point_size:#{$gpx_options['point_size']}\tSet point size
-        point_color:#{$gpx_options['point_color']}\tSet point color: RRGGBBAA in hex
-      PNG images will be 'scale + 2 * padding' big. The scale will be used for
-      the widest dimension, and the other will be reduced to fit the trace.
+        limit:#{$gpx_options['limit']}\t\tLimit GPX output to traces with at least this number of events
+        png_limit:#{$gpx_options['png_limit']}\t\tLimit PNG output to traces with at least this number of events
+        scale:#{$gpx_options['scale']}\t\tSize of print area in PNG output
+        padding:#{$gpx_options['padding']}\t\tSpace around print area
+        points:#{$gpx_options['points']}\t\tTurn on/off points
+        point_size:#{$gpx_options['point_size']}\t\tSet point size
+        point_color:#{$gpx_options['point_color']}\tSet point color: RRGGBBAA in hex (else 'auto')
+        format:#{$gpx_options['format']}\t\tExport format: 'gpx', 'png', default 'all'
+      PNG images will be 'scale + 2 * padding' big (#{$gpx_options['scale'].to_i+2*$gpx_options['padding'].to_i} for current settings). The scale will be used for the widest dimension, and the other will be reduced to fit the actual size of the trace. The projection used is non, with the points simply mapped to their GPS locations. This will cause visual distortions far from the equator where dlat!=dlon.
 EOHELP
   show_header_maps
   exit 0
@@ -158,7 +162,7 @@ end
 $verbose = $verbose || $debug
 show_header_maps if($verbose)
 
-$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range, :combine_all => $combine_all)
+$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range, :location_range => $location_range, :combine_all => $combine_all)
 
 class Export
   attr_reader :files, :imei, :names, :headers
@@ -287,19 +291,23 @@ class Export
     end
   end
   def export_gpx(trace)
-    File.open("#{$export_prefix}#{trace}.gpx",'w') do |out|
-      puts "Exporting #{trace.length} GPS events to trace: #{trace}"
-      out.puts trace.as_gpx
+    if !($gpx_options['format'].to_s =~ /png/)
+      File.open("#{$export_prefix}#{trace}.gpx",'w') do |out|
+        puts "Exporting #{trace.length} GPS events to trace: #{trace}"
+        out.puts trace.as_gpx
+      end
     end
   end
   def export_png(trace)
-    puts "Exporting #{trace.length} GPS events to PNG: #{trace}"
-    if $verbose
-      puts "\tBounds: #{trace.bounds}"
-      puts "\tWidth: #{trace.width}"
-      puts "\tHeight: #{trace.height}"
+    if !($gpx_options['format'].to_s =~ /gpx/)
+      puts "Exporting #{trace.length} GPS events to PNG: #{trace}"
+      if $verbose
+        puts "\tBounds: #{trace.bounds}"
+        puts "\tWidth: #{trace.width}"
+        puts "\tHeight: #{trace.height}"
+      end
+      trace.to_png "#{$export_prefix}#{trace}.png", $gpx_options
     end
-    trace.to_png "#{$export_prefix}#{trace}.png", $gpx_options
   end
   def header(name=nil)
     @headers[name]

data/lib/geoptima/data.rb

@@ -3,9 +3,10 @@
 require 'rubygems'
 require 'multi_json'
 require 'geoptima/daterange'
+require 'geoptima/locationrange'
 begin
   require 'png'
-rescue
+rescue LoadError
   puts "No PNG library installed, ignoring PNG output of GPX results"
 end
 
@@ -39,15 +40,23 @@ module Geoptima
   end
 
   class Trace
-    attr_reader :dataset, :name, :tracename, :bounds, :events, :scale, :padding
+    attr_reader :dataset, :data_id, :data_ids, :name, :tracename
+    attr_reader :bounds, :events, :totals, :scale, :padding
     def initialize(dataset)
       @dataset = dataset
+      @data_id = nil
+      @data_ids = []
       @name = dataset.name
       @events = []
     end
     def <<(e)
       @tracename ||= "#{name}-#{e.time}"
+      unless @data_id
+        @data_id ||= e.file.id
+        @data_ids << e.file.id
+      end
       check_bounds(e)
+      check_totals(e)
       @events << e unless(co_located(e,@events[-1]))
     end
     def co_located(event,other)
@@ -59,6 +68,12 @@ module Geoptima
     def to_s
       tracename || name
     end
+    def check_totals(e)
+      @totals ||= [0.0,0.0,0]
+      @totals[0] += e.latitude
+      @totals[1] += e.longitude
+      @totals[2] += 1
+    end
     def check_bounds(e)
       @bounds ||= {}
       check_bounds_min :minlat, e.latitude
@@ -69,7 +84,14 @@ module Geoptima
       @height = nil
     end
     def check_bounds_min(key,value)
-      @bounds[key] = value if(@bounds[key].nil? || @bounds[key] > value)
+      if value.is_a? String
+        raise "Passed a string value: #{value.inspect}"
+      end
+      begin
+        @bounds[key] = value if(@bounds[key].nil? || @bounds[key] > value)
+      rescue
+         raise "Failed to set bounds using current:#{@bounds.inspect}, value=#{value.inspect}"
+      end
     end
     def check_bounds_max(key,value)
       @bounds[key] = value if(@bounds[key].nil? || @bounds[key] < value)
@@ -109,6 +131,34 @@ module Geoptima
     def bottom
       @bottom ||= @bounds[:minlat].to_f
     end
+    def average
+      [totals[0] / totals[2], totals[1] / totals[2]]
+    end
+    def remove_outliers
+      if width > 0.1 || height > 0.1
+        distances = []
+        total_distance = 0.0
+        max_distance = 0.0
+        center = Point.new(*average)
+        self.each do |e|
+          distance = e.distance_from(center)
+          distances << [e,distance]
+          total_distance += distance
+          max_distance = distance if(max_distance < distance)
+        end
+        average_distance = total_distance / distances.length
+        threshold = max_distance / 3
+        if threshold > average_distance * 3
+          puts "Average distance #{average_distance} much less than max distance #{max_distance}, trimming all beyond #{threshold}"
+          @bounds = {}
+          distances.each do |d|
+            check_bounds(d[0]) if(d[1] < threshold)
+          end
+        else
+          puts "Average distance #{average_distance} not much less than max distance #{max_distance}, not trimming outliers"
+        end
+      end
+    end
     def scale_event(e)
       p = [e.longitude.to_f, e.latitude.to_f]
       if scale
@@ -164,7 +214,7 @@ module Geoptima
       [self]
     end
     def colors
-      @colors ||= PNG::Color.constants.reject{|c| (c.is_a?(PNG::Color)) || c.to_s =~ /max/i || c.to_s =~ /background/i}.map{|c| PNG::Color.const_get c}.reject{|c| c == PNG::Color::Background}
+      @colors ||= PNG::Color.constants.reject{|c| (c.is_a?(PNG::Color)) || c.to_s =~ /max/i || c.to_s =~ /background/i}.map{|c| PNG::Color.const_get c}.reject{|c| c == PNG::Color::Background || c == PNG::Color::Black || c == PNG::Color::White}
     end
     def color(index=1)
       self.colors[index%(self.colors.length)]
@@ -174,14 +224,24 @@ module Geoptima
       puts "Exporting with options: #{options.inspect}"
       self.scale = options['scale']
       self.padding = options['padding']
+      remove_outliers
       ['scale','padding','size','bounds','width','height'].each do |a|
         puts "\t#{a}: #{self.send(a).inspect}"
       end
-      canvas = PNG::Canvas.new size[0],size[1]
+      begin
+        canvas = PNG::Canvas.new size[0],size[1]
+      rescue
+        puts "Unable to initialize PNG:Canvas - is 'png' gem installed? #{$!}"
+        return
+      end
 
+      data_idm = data_ids.inject({}){|a,v| a[v]=a.length;a}
+      if data_ids.length > 1
+        data_ids.each do |did|
+          puts "Mapped data ID '#{did}' to color: #{color(data_idm[did])}"
+        end
+      end
       traces.each_with_index do |trace,index|
-        prev = nil
-        point_color = color(index)
         line_color = PNG::Color.from "0x00006688"
         if options['point_color'] && !(options['point_color'] =~ /auto/i)
           pc = options['point_color'].gsub(/^\#/,'').gsub(/^0x/,'').upcase
@@ -191,8 +251,15 @@ module Geoptima
           rescue
             puts "Failed to interpret color #{pc}, use format 0x00000000: #{$!}"
           end
+        elsif data_ids.length > 1
+          point_color = color(data_idm[trace.data_id])
+          puts "Got point color #{point_color} from data ID '#{trace.data_id}' index #{data_idm[trace.data_id]}" if($debug)
+        else
+          point_color = color(index)
+          puts "Got point color #{point_color} from trace index #{index}"
         end
-        puts "Got point color #{point_color} from index #{index}"
+
+        prev = nil
         trace.events.each do |e|
           p = scale_event(e)
           begin
@@ -229,19 +296,33 @@ module Geoptima
     def initialize(dataset)
       @dataset = dataset
       @name = dataset.name
+      @data_ids = []
       @traces = []
     end
     def tracename
       @tracename ||= "Merged-#{traces.length}-traces-#{traces[0]}"
     end
     def <<(t)
-      check_bounds(t)
+      check_trace_totals(t)
+      check_trace_bounds(t)
+      @data_ids = (@data_ids+t.data_ids).sort.uniq.compact
       @traces << t
     end
+    def each
+      traces.each do |t|
+        t.events.each do |e|
+          yield e
+        end
+      end
+    end
     def length
       @length ||= traces.inject(0){|a,t| a+=t.length;a}
     end
-    def check_bounds(t)
+    def check_trace_totals(t)
+      @totals ||= [0.0,0.0,0]
+      [0,1,2].each{|i| @totals[i] += t.totals[i]}
+    end
+    def check_trace_bounds(t)
       @bounds ||= {}
       check_bounds_min :minlat, t.bounds[:minlat]
       check_bounds_min :minlon, t.bounds[:minlon]
@@ -373,9 +454,14 @@ module Geoptima
     def closer_than(other,seconds=60)
       (self - other).abs < seconds
     end
+    def location
+      @location ||= self['latitude'] && Point.new(self['latitude'],self['longitude'])
+    end
     def locate(gps)
-      @latitude = gps['latitude']
-      @longitude = gps['longitude']
+      incr_error "GPS String Data" if(gps['latitude'].is_a? String)
+      @latitude = gps['latitude'].to_f
+      @longitude = gps['longitude'].to_f
+      @location = nil
     end
     def locate_if_closer_than(gps,seconds=60)
       locate(gps) if(closer_than(gps,seconds))
@@ -581,6 +667,7 @@ module Geoptima
       @data = []
       @options = options
       @time_range = options[:time_range] || DateRange.new(Config[:min_datetime],Config[:max_datetime])
+      @location_range = options[:location_range] || LocationRange.everywhere
       @fields = {}
     end
 
@@ -729,6 +816,7 @@ module Geoptima
         event_hash = {}
         puts "Creating sorted maps for #{self}" if($debug)
         events_names.each do |name|
+          is_gps = name == 'gps'
           puts "Preparing maps for #{name}" if($debug)
           @data.each do |data|
             puts "Processing #{(e=data.events[name]) && e.length} events for #{name}" if($debug)
@@ -736,8 +824,10 @@ module Geoptima
               puts "\t\tTesting #{event.time} inside #{@time_range}" if($debug)
               if @time_range.include?(event.time)
                 puts "\t\t\tEvent at #{event.time} is inside #{@time_range}" if($debug)
-                key = "#{event.time_key} #{name}"
-                event_hash[key] = event
+                if !is_gps || @location_range.nil? || @location_range.include?(event.location)
+                  key = "#{event.time_key} #{name}"
+                  event_hash[key] = event
+                end
               end
             end
             combine_errors data

data/lib/geoptima/locationrange.rb

@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+
+module Geoptima
+
+  class Point
+    attr_reader :latitude, :longitude
+    def initialize(latitude,longitude)
+      @latitude = latitude.to_f
+      @longitude = longitude.to_f
+    end
+    def >(other)
+      self.latitude - other.latitude > 0 && self.longitude - other.longitude > 0
+    end
+    def <(other)
+      self.latitude - other.latitude < 0 && self.longitude - other.longitude < 0
+    end
+    def >=(other)
+      self.latitude - other.latitude >= 0 && self.longitude - other.longitude >= 0
+    end
+    def <=(other)
+      self.latitude - other.latitude <= 0 && self.longitude - other.longitude <= 0
+    end
+    def to_s
+      [@latitude,@longitude].inspect
+    end
+  end
+
+  class LocationRange
+    attr_reader :min, :max
+    def initialize(spec)
+      f=spec.gsub(/\.\./,':').split(/[\,\;\:]/)
+      if spec =~ /\.\./
+        @min = Point.new(f[0],f[2])
+        @max = Point.new(f[1],f[3])
+      else
+        @min = Point.new(f[0],f[1])
+        @max = Point.new(f[2],f[3])
+      end
+      if @min > @max
+        p = @min
+        @min = @max
+        @max = p
+      end
+    end
+    def include?(point)
+      puts "Testing point #{point} in range #{self}" if($debug)
+      point && point < @max && point >= @min
+    end
+    def to_s
+      [min,max].join(',')
+    end
+    def self.from(spec)
+      if spec == '*' || spec =~ /everywhere/i
+        LocationEverywhere.new
+      else
+        LocationRange.new(spec)
+      end
+    end
+    def self.everywhere
+      @@everywhere ||= LocationEverywhere.new
+    end
+    def self.test
+      [
+        '56.1..57.0,12.0..15.8',
+        '56.1,12.0,57.0,15.8',
+        'everywhere',
+        '*'
+      ].each do |test|
+        puts "Testing: #{test}"
+        range = Geoptima::LocationRange.from(test)
+        puts "\t#{range}"
+        puts "\tTesting MIN: #{range}.include?(#{range.min}) => #{range.include?(range.min)}"
+        puts "\tTesting MAX: #{range}.include?(#{range.max}) => #{range.include?(range.max)}"
+        (0..10).each do |i|
+          latitude = 56.0 + 0.1 * i
+          longitude = 11.0 + 0.2 * i
+          p = Point.new(latitude,longitude)
+          puts "\tTesting #{range}.include?(#{p}) => #{range.include?(p)}"
+        end
+      end
+    end
+  end
+  class LocationEverywhere <LocationRange
+    def initialize()
+      super("-90,90,-180,180")
+    end
+    def to_s
+      "everywhere"
+    end
+    def include?(point)
+      true
+    end
+  end
+end
+

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 
   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.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -88,6 +88,7 @@ files:
 - lib/geoptima/daterange.rb
 - lib/geoptima/options.rb
 - lib/geoptima/file_time.rb
+- lib/geoptima/locationrange.rb
 - lib/geoptima.rb
 - examples/show_geoptima_sos.rb
 - examples/show_geoptima.rb