geoptima 0.1.14 → 0.1.15

data/bin/csv_merge

@@ -213,8 +213,8 @@ class CSVDatasets
     filename = "#{$export_dir}/#{$export_name}"
     File.open(filename,'w') do |out|
       out.puts headers.join("\t")
-      @datasets.sort.each(headers) do |dataset|
-        dataset.each do |day,line|
+      @datasets.sort.each do |dataset|
+        dataset.each(headers) do |day,line|
           out.puts line.join("\t")
         end
       end

data/bin/show_geoptima

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version(">=0.1.14")
+Geoptima::assert_version(">=0.1.15")
 
 $debug=false
 
@@ -18,7 +18,7 @@ $print_limit = 10000
 $gpx_options = {
   'scale' => 190, 'padding' => 5,
   'limit' => 2, 'png_limit' => 10,
-  'points' => true, 'point_size' => 2, 'point_color' => '0000aa'
+  'points' => true, 'point_size' => 2, 'point_color' => 'auto'
 }
 
 $files = Geoptima::Options.process_args do |option|
@@ -147,12 +147,13 @@ Usage: show_geoptima <-dwvpxomlsafegh> <-P export_prefix> <-L limit> <-E types>
       Known supported GPX options (might be more, see data.rb code):
         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
+        merge:#{$gpx_options['merge']}\t\tMerge all traces into a single trace
         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'
+        format:#{$gpx_options['format']}\t\tExport format: 'gpx', 'csv', '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
@@ -290,16 +291,24 @@ class Export
       end
     end
   end
-  def export_gpx(trace)
-    if !($gpx_options['format'].to_s =~ /png/)
+  def self.export_gpx(trace)
+    if $gpx_options['format'].to_s =~ /^(gpx|all|)$/
       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)
-    if !($gpx_options['format'].to_s =~ /gpx/)
+  def self.export_gps(trace)
+    if $gpx_options['format'].to_s =~ /^(csv|all|)$/
+      File.open("#{$export_prefix}#{trace}.csv",'w') do |out|
+        puts "Exporting #{trace.length} GPS events to trace: #{trace}"
+        out.puts trace.as_csv
+      end
+    end
+  end
+  def self.export_png(trace)
+    if $gpx_options['format'].to_s =~ /^(png|all|)$/
       puts "Exporting #{trace.length} GPS events to PNG: #{trace}"
       if $verbose
         puts "\tBounds: #{trace.bounds}"
@@ -363,23 +372,25 @@ $datasets.keys.sort.each do |imei|
     puts "\tLast Event:  #{dataset.last}"
     dataset.report_errors "\t"
   end
+  if $export_gpx
+    merged_traces = Geoptima::MergedTrace.new(dataset)
+    dataset.each_trace do |trace|
+      Export.export_gpx(trace) if(trace.length>=($gpx_options['limit'] || 1).to_i)
+      Export.export_gps(trace) if(trace.length>=($gpx_options['limit'] || 1).to_i)
+      Export.export_png(trace) if(trace.length>=($gpx_options['png_limit'] || 10).to_i)
+      merged_traces << trace if($gpx_options['merge'])
+    end
+    if($gpx_options['merge'])
+      Export.export_gpx(merged_traces)
+      Export.export_gps(merged_traces)
+      Export.export_png(merged_traces)
+    end
+  end
   if events && ($print || $export)
     names = $event_names
     names = dataset.events_names if(names.length<1)
     export = Export.new(imei,names,dataset)
     export.export_stats(dataset.stats) if($export_stats)
-    if $export_gpx
-      merged_traces = Geoptima::MergedTrace.new(dataset)
-      dataset.each_trace do |trace|
-        export.export_gpx(trace) if(trace.length>=($gpx_options['limit'] || 1).to_i)
-        export.export_png(trace) if(trace.length>=($gpx_options['png_limit'] || 10).to_i)
-        merged_traces << trace if($gpx_options['merge'])
-      end
-      if($gpx_options['merge'])
-        export.export_gpx(merged_traces)
-        export.export_png(merged_traces)
-      end
-    end
     if $header_maps && $header_maps.length > 0
       $header_maps.each do |hm|
         puts "Searching for events for header_maps '#{hm.event}'"

data/examples/csv_merge.rb

@@ -213,8 +213,8 @@ class CSVDatasets
     filename = "#{$export_dir}/#{$export_name}"
     File.open(filename,'w') do |out|
       out.puts headers.join("\t")
-      @datasets.sort.each(headers) do |dataset|
-        dataset.each do |day,line|
+      @datasets.sort.each do |dataset|
+        dataset.each(headers) do |day,line|
           out.puts line.join("\t")
         end
       end

data/examples/show_geoptima.rb

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version(">=0.1.14")
+Geoptima::assert_version(">=0.1.15")
 
 $debug=false
 
@@ -18,7 +18,7 @@ $print_limit = 10000
 $gpx_options = {
   'scale' => 190, 'padding' => 5,
   'limit' => 2, 'png_limit' => 10,
-  'points' => true, 'point_size' => 2, 'point_color' => '0000aa'
+  'points' => true, 'point_size' => 2, 'point_color' => 'auto'
 }
 
 $files = Geoptima::Options.process_args do |option|
@@ -147,12 +147,13 @@ Usage: show_geoptima <-dwvpxomlsafegh> <-P export_prefix> <-L limit> <-E types>
       Known supported GPX options (might be more, see data.rb code):
         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
+        merge:#{$gpx_options['merge']}\t\tMerge all traces into a single trace
         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'
+        format:#{$gpx_options['format']}\t\tExport format: 'gpx', 'csv', '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
@@ -290,16 +291,24 @@ class Export
       end
     end
   end
-  def export_gpx(trace)
-    if !($gpx_options['format'].to_s =~ /png/)
+  def self.export_gpx(trace)
+    if $gpx_options['format'].to_s =~ /^(gpx|all|)$/
       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)
-    if !($gpx_options['format'].to_s =~ /gpx/)
+  def self.export_gps(trace)
+    if $gpx_options['format'].to_s =~ /^(csv|all|)$/
+      File.open("#{$export_prefix}#{trace}.csv",'w') do |out|
+        puts "Exporting #{trace.length} GPS events to trace: #{trace}"
+        out.puts trace.as_csv
+      end
+    end
+  end
+  def self.export_png(trace)
+    if $gpx_options['format'].to_s =~ /^(png|all|)$/
       puts "Exporting #{trace.length} GPS events to PNG: #{trace}"
       if $verbose
         puts "\tBounds: #{trace.bounds}"
@@ -363,23 +372,25 @@ $datasets.keys.sort.each do |imei|
     puts "\tLast Event:  #{dataset.last}"
     dataset.report_errors "\t"
   end
+  if $export_gpx
+    merged_traces = Geoptima::MergedTrace.new(dataset)
+    dataset.each_trace do |trace|
+      Export.export_gpx(trace) if(trace.length>=($gpx_options['limit'] || 1).to_i)
+      Export.export_gps(trace) if(trace.length>=($gpx_options['limit'] || 1).to_i)
+      Export.export_png(trace) if(trace.length>=($gpx_options['png_limit'] || 10).to_i)
+      merged_traces << trace if($gpx_options['merge'])
+    end
+    if($gpx_options['merge'])
+      Export.export_gpx(merged_traces)
+      Export.export_gps(merged_traces)
+      Export.export_png(merged_traces)
+    end
+  end
   if events && ($print || $export)
     names = $event_names
     names = dataset.events_names if(names.length<1)
     export = Export.new(imei,names,dataset)
     export.export_stats(dataset.stats) if($export_stats)
-    if $export_gpx
-      merged_traces = Geoptima::MergedTrace.new(dataset)
-      dataset.each_trace do |trace|
-        export.export_gpx(trace) if(trace.length>=($gpx_options['limit'] || 1).to_i)
-        export.export_png(trace) if(trace.length>=($gpx_options['png_limit'] || 10).to_i)
-        merged_traces << trace if($gpx_options['merge'])
-      end
-      if($gpx_options['merge'])
-        export.export_gpx(merged_traces)
-        export.export_png(merged_traces)
-      end
-    end
     if $header_maps && $header_maps.length > 0
       $header_maps.each do |hm|
         puts "Searching for events for header_maps '#{hm.event}'"

data/lib/geoptima/data.rb

@@ -112,9 +112,10 @@ module Geoptima
     def scale
       @scale ||= [100,100]
       unless @rescaled
-        major,minor = (width > height) ? [0,1] : [1,0]
-        puts "About to rescale scale=#{@scale.inspect} using major=#{major}, minor=#{minor}, height=#{height}, width=#{width}" if($debug)
-        @scale[minor] = (@scale[major].to_f * height / width).to_i
+        major = [width,height].max
+        puts "About to rescale scale=#{@scale.inspect} using major=#{major}, height=#{height}, width=#{width}" if($debug)
+        @scale[0] = (@scale[0].to_f * width / major).to_i
+        @scale[1] = (@scale[1].to_f * height / major).to_i
         @rescaled = true
       end
       @scale
@@ -135,7 +136,7 @@ module Geoptima
       [totals[0] / totals[2], totals[1] / totals[2]]
     end
     def remove_outliers
-      if width > 0.1 || height > 0.1
+      if @bounds && (width > 0.1 || height > 0.1)
         distances = []
         total_distance = 0.0
         max_distance = 0.0
@@ -199,6 +200,13 @@ module Geoptima
 </gpx>
 """
     end
+    def as_csv
+      traces.map do |trace|
+        trace.events.map do |e|
+          [e.time_key,e.latitude,e.longitude].join("\t")
+        end.join("\n")
+      end.join("\n")
+    end
     def fix_options(options={})
       options.keys.each do |key|
         val = options[key]
@@ -220,6 +228,7 @@ module Geoptima
       self.colors[index%(self.colors.length)]
     end
     def to_png(filename, options={})
+      return unless(length>0)
       fix_options options
       puts "Exporting with options: #{options.inspect}"
       self.scale = options['scale']
@@ -242,6 +251,7 @@ module Geoptima
         end
       end
       traces.each_with_index do |trace,index|
+        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
@@ -256,7 +266,7 @@ module Geoptima
           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}"
+          puts "Got point color #{point_color} from trace index #{index}" if($debug)
         end
 
         prev = nil

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 
   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.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json