columbus3 0.2.1 → 0.3.0

data/columbus3.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Manage V900 and V990 GPS tracks from the command line.}
   spec.description   = %q{Some simple command line commands to manage tracks generated by the V900 family of GPS loggers (CSV format).}
-  spec.homepage      = "http://ict4g.net/adolfo/columbus3"
+  spec.homepage      = "http://www.github.com/avillafiorita/columbus3"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/exe/columbus3

@@ -24,8 +24,43 @@ tracks on a map.
 EXAMPLES
   #{appname} -h                            # get syntax of each command
   columbus3 process 11010101.CSV           # generate a sidecar file
-  columbus3 search ...
-  columbus3 show 11010101.CSV 11010201.CSV # show tracks
+  columbus3 search 'location ~ "USA"'      # track in the USA
+  columbus3 show 11010101.CSV 11010201.CSV # show tracks on a map (_show.html)
+  columbus3 graph 11010101.CSV             # show info about a track (_graph.html)
+
+SEARCH SYNTAX
+
+  >>> DON'T FORGET TO EMBED YOUR QUERY IN SINGLE QUOTES <<<
+
+Terms you can search for:
+  location, start_location, end_location
+  date, start_date, end_date
+  year
+  duration
+  max_speed
+  min_height
+  max_height
+
+Numerical operators:  
+  <, <=, ==, >=, >
+
+String operators (locations):
+  ~ (contains), == (is exactly)
+
+Complex Terms:
+  Use "and" and "or" to build complex queries
+
+Examples of simple searches
+  'location ~ "USA"'     any track whose start or end location contains USA
+  'date > 2015-02-14'    any track whose start or end date is after Feb 14, 2015
+  'year == 2015'         any track whose start or end date is in 2015
+  'duration <= 01:02:03' any track with a duration of less than 1h, 2min, and 3secs
+  'max_speed > 120'      any track with a max speed greater than 120 km/h
+  'min_height == 10'     any track with a min height lower than 10 meters
+
+Examplex of more more complex searches
+  'location ~ "USA" and start_date >= 2015-01-01' tracks in the USA after or on Jan 1, 2015
+  'start_location ~ "Trenton" and end_location ~ "New York"'  trips from Trenton to New York
 
 VERSION
   This is version #{version}
@@ -33,12 +68,12 @@ VERSION
 LICENSE
   MIT
 
-  Columbus3 uses leaflet and leafleft-providers to diplay tracks.  They
+  Columbus3 uses leaflet, leafleft-providers, flot, and jquery.  They
   are distributed under a different license: see their websites for more
   details (or have a look at the license file shipped with the Gem)
 
 SEE ALSO
-  If you are looking for a graphical client, you might want to
+  If you are looking for a full graphical client, you might want to
   download Columbus from http://www.minimalbit.com
 
   https://github.com/avillafiorita/columbus3
@@ -73,14 +108,21 @@ opts = Slop.parse :help => true do
     banner "#{appname} process [--help] [track ...]"
     description "Generate a sidecar file for the specified tracks"
 
+    on "--force", "Overwrite existing sidecar files"
+    
     run do |opts, args|
       cmd ="process"
-
+      force = opts.to_hash[:force]
+      
       args.each do |arg|
         track = V900Track.new arg
         sidecar = Columbus3::Sidecar.new arg
-        sidecar.metadata = track.metadata
-        sidecar.save
+        if sidecar.exist? and not force
+          puts "Sidecar file for #{track} already exists. Use --force if you want to overwrite it."
+        else
+          sidecar.metadata = track.metadata
+          sidecar.save
+        end
       end
     end
   end
@@ -139,6 +181,29 @@ opts = Slop.parse :help => true do
     end
   end
 
+  ##############################################################################
+  command :graph do
+    banner "#{appname} show [--help] [--filename filename] [--force] track"
+    description "Plot speed and height profile of track"
+
+    on "--force", "Force rewriting of the js file, even if it already exists"
+
+    run do |opts, args|
+      cmd ="graph"
+
+      filename = opts.to_hash[:filename] || "_graph.html"
+      force = opts.to_hash[:force]
+
+      input_filename = args[0]
+      if input_filename
+        Columbus3::FlotRenderer::to_graph_data input_filename, force
+        Columbus3::FlotRenderer::show filename, input_filename
+      else
+        puts "Error: please specify a track file"
+      end
+    end
+  end
+
   ##############################################################################
   command :export do
     banner "#{appname} export [--help] [track ...]"

data/lib/columbus3.rb

@@ -3,4 +3,5 @@ require "columbus3/metadata/query_parser.tab"
 require "columbus3/metadata/sidecar"
 require "columbus3/v900track/v900track"
 require "columbus3/v900track/v900waypoint"
-require "columbus3/renderer/renderer"
+require "columbus3/renderer/leaflet_renderer"
+require "columbus3/renderer/flot_renderer"

data/lib/columbus3/metadata/sidecar.rb

@@ -22,7 +22,7 @@ module Columbus3
     end
 
     def load
-      YAML.load(File.read(@metadata[:filename] + ".yaml", "r"))
+      @metadata = YAML.load(File.read(@metadata[:filename] + ".yaml"))
     end
 
     def save
@@ -30,6 +30,15 @@ module Columbus3
         file << @metadata.to_yaml
       end
     end
+
+    def exists?
+      File.exists?(@metadata[:filename] + ".yaml")
+    end
+
+    # an alias
+    def exist? 
+      exists?
+    end
   end
 
   class SidecarSearch

data/lib/columbus3/renderer/flot_renderer.rb

@@ -0,0 +1,66 @@
+require 'erb'
+require 'yaml'
+
+module Columbus3
+  # make a track into a flot graph (speed and height)
+  module FlotRenderer
+    # apply the ERB in html/flot.html.erb
+    # and save it in the current directory, under _flot.html
+    def self.show filename, file
+      template = File.join(File.dirname(__FILE__), "/../../html/flot.html.erb")
+      renderer = ERB.new(File.read(template))
+      
+      # context: location of css and js + list of files to show
+      bower_dir = File.join(File.dirname(__FILE__), "/../../../bower_components")
+      @flot_js = [File.join(bower_dir, 'jquery/dist/jquery.min.js'),
+                  File.join(bower_dir, 'flot/jquery.flot.js'),
+                  File.join(bower_dir, 'flot/jquery.flot.resize.js'),
+                  File.join(bower_dir, 'flot/jquery.flot.time.js'),
+                  File.join(bower_dir, 'flot/jquery.flot.selection.js')                  
+                 ]
+      @file = file
+      # TODO: manage the case of sidecar not existing
+      @track_info = Sidecar.new @file
+      @track_info.load
+
+      # generate the output
+      html = renderer.result(binding)
+
+      # save it to file
+      File.open(filename, "w") do |file|
+        file << html
+      end
+    end
+
+    # make a v900 track into a graph layer cached to disk
+    def self.to_graph_data filename, force = false
+      target = to_graph_filename filename
+
+      if force or not File.exists? target
+        track = V900Track.new filename
+        File.open(target, "w") do |file|
+          id = sanitize filename
+
+          file.printf <<EOS
+min_time_#{id} = #{track.first.time.to_i * 1000};\n
+max_time_#{id} = #{track.last.time.to_i * 1000};\n
+speed_#{id} = #{track.range.each.map { |i| [track[i].time.to_i * 1000, track[i].speed] }};\n
+height_#{id} = #{track.range.each.map { |i|[track[i].time.to_i * 1000, track[i].height] }};\n
+EOS
+        end
+      end
+
+    end
+
+    def self.to_graph_filename filename
+      filename + "_graph.js"
+    end
+
+    private
+    
+    def self.sanitize filename
+      filename.gsub(/[^0-9A-Za-z\-]/, "_")
+    end
+
+  end
+end

data/lib/columbus3/version.rb

@@ -1,3 +1,3 @@
 module Columbus3
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/html/flot.html.erb

@@ -0,0 +1,106 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <title>Columbus 3 - Show Graph</title>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <link rel="stylesheet" href="<%= @flot_css %>" />
+        <% @flot_js.each do |file| %>
+            <script src="<%= file %>"></script>
+        <% end %>
+        <style>
+         #chart {
+             width: 100%;
+             height: 300px;
+         }
+        </style>
+    </head>
+    <body>
+        <h1>Showing data for <%= @file %></h1>
+
+        <h2>Plot</h2>
+        <div id="chart" style="padding:20px"></div>
+        <a href="#" onclick="javascript:resetZoom()">Reset Zoom</a> 
+        <div id="tooltip" style="position: absolute; display: none; border: 1px solid rgb(255, 221, 221); padding: 6px; background-color: rgb(10, 10, 10); color: rgb(255,255,255); opacity: 0.8; font-size: 12px;"></div>
+
+        <h2>Info</h2>
+        
+        <div id="info">
+            <% @track_info.metadata.keys.each do |key| %>
+                <p>
+                    <b><%= key.to_s %>:</b>
+                    <%= @track_info.metadata[key] %>
+                </p>
+            <% end %>
+        </div>
+
+        <script src="<%= to_graph_filename @file %>"></script>
+        <script>
+         // required by plot for tooltips (it moves the tooltip, appending it directly to body
+         $("<div id='tooltip'></div>").appendTo("body");
+
+         // the plot and its options
+         var plot; 
+
+         var options = {
+             series: {
+                 lines:  { show: true },
+                 points: { show: true, radius: 2 },
+                 shadowSize: 0
+             },
+             xaxis: { mode: "time", timeformat: "%H:%M:%S"},
+             yaxes:  [ { }, { position: "right" } ],
+             grid: { hoverable: true, clickable: true, borderWidth: 1, borderColor: "#CCCCCC" },
+             selection: { mode: "x" },
+         };
+
+         // required for tooltips
+         $("#chart").bind("plothover", function (event, pos, item) {
+             if (item) {
+                 var x = item.datapoint[0].toFixed(2), y = item.datapoint[1].toFixed(2);
+                 var d = new Date(parseInt(x));
+                 var curr_hour = d.getUTCHours();
+                 var curr_min = d.getMinutes();
+                 var curr_sec = d.getSeconds();
+                 var time = " " + (curr_hour <= 9 ? "0" + curr_hour : curr_hour) + ":" +
+                                   (curr_min <= 9 ? "0" + curr_min : curr_min) + ":" +
+                                   (curr_sec <= 9 ? "0" + curr_sec : curr_sec);
+
+                 $("#tooltip").html(item.series.label + " at " + time + " (point " + (item.dataIndex + 1) + "): " + y)
+                              .css({top: item.pageY+5, left: item.pageX+5})
+                              .fadeIn(200);
+             } else {
+                 $("#tooltip").hide();
+             }
+         });
+
+         $("#chart").bind("plotselected", function (event, ranges) {
+             $.each(plot.getXAxes(), function(_, axis) {
+                 var opts = axis.options;
+                 opts.min = ranges.xaxis.from;
+                 opts.max = ranges.xaxis.to;
+             });
+             plot.setupGrid();
+             plot.draw();
+             plot.clearSelection();
+         });
+
+         function resetZoom() {
+             $.each(plot.getXAxes(), function(_, axis) {
+                 var opts = axis.options;
+                 opts.min = min_time_<%= sanitize @file %>;
+                 opts.max = max_time_<%= sanitize @file %>;
+             });
+             plot.setupGrid();
+             plot.draw();
+             plot.clearSelection();
+         }
+
+         plot = $.plot('#chart',
+                       [{ label: "Speed",  data: <%= "speed_" + sanitize(@file) %>, color: "#F04124" },
+                        { label: "Height", data: <%= "height_" + sanitize(@file) %>, yaxis: 2, color: "#4C9ED9" }],
+                       options)
+        </script>
+    </body>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columbus3
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,10 +93,197 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
-- README.md
+- README.textile
 - Rakefile
 - bin/console
 - bin/setup
+- bower_components/flot/.bower.json
+- bower_components/flot/.gitignore
+- bower_components/flot/.travis.yml
+- bower_components/flot/API.md
+- bower_components/flot/CONTRIBUTING.md
+- bower_components/flot/FAQ.md
+- bower_components/flot/LICENSE.txt
+- bower_components/flot/Makefile
+- bower_components/flot/NEWS.md
+- bower_components/flot/PLUGINS.md
+- bower_components/flot/README.md
+- bower_components/flot/component.json
+- bower_components/flot/examples/ajax/data-eu-gdp-growth-1.json
+- bower_components/flot/examples/ajax/data-eu-gdp-growth-2.json
+- bower_components/flot/examples/ajax/data-eu-gdp-growth-3.json
+- bower_components/flot/examples/ajax/data-eu-gdp-growth-4.json
+- bower_components/flot/examples/ajax/data-eu-gdp-growth-5.json
+- bower_components/flot/examples/ajax/data-eu-gdp-growth.json
+- bower_components/flot/examples/ajax/data-japan-gdp-growth.json
+- bower_components/flot/examples/ajax/data-usa-gdp-growth.json
+- bower_components/flot/examples/ajax/index.html
+- bower_components/flot/examples/annotating/index.html
+- bower_components/flot/examples/axes-interacting/index.html
+- bower_components/flot/examples/axes-multiple/index.html
+- bower_components/flot/examples/axes-time-zones/date.js
+- bower_components/flot/examples/axes-time-zones/index.html
+- bower_components/flot/examples/axes-time-zones/tz/africa
+- bower_components/flot/examples/axes-time-zones/tz/antarctica
+- bower_components/flot/examples/axes-time-zones/tz/asia
+- bower_components/flot/examples/axes-time-zones/tz/australasia
+- bower_components/flot/examples/axes-time-zones/tz/backward
+- bower_components/flot/examples/axes-time-zones/tz/etcetera
+- bower_components/flot/examples/axes-time-zones/tz/europe
+- bower_components/flot/examples/axes-time-zones/tz/factory
+- bower_components/flot/examples/axes-time-zones/tz/iso3166.tab
+- bower_components/flot/examples/axes-time-zones/tz/leapseconds
+- bower_components/flot/examples/axes-time-zones/tz/northamerica
+- bower_components/flot/examples/axes-time-zones/tz/pacificnew
+- bower_components/flot/examples/axes-time-zones/tz/solar87
+- bower_components/flot/examples/axes-time-zones/tz/solar88
+- bower_components/flot/examples/axes-time-zones/tz/solar89
+- bower_components/flot/examples/axes-time-zones/tz/southamerica
+- bower_components/flot/examples/axes-time-zones/tz/systemv
+- bower_components/flot/examples/axes-time-zones/tz/yearistype.sh
+- bower_components/flot/examples/axes-time-zones/tz/zone.tab
+- bower_components/flot/examples/axes-time/index.html
+- bower_components/flot/examples/background.png
+- bower_components/flot/examples/basic-options/index.html
+- bower_components/flot/examples/basic-usage/index.html
+- bower_components/flot/examples/canvas/index.html
+- bower_components/flot/examples/categories/index.html
+- bower_components/flot/examples/examples.css
+- bower_components/flot/examples/image/hs-2004-27-a-large-web.jpg
+- bower_components/flot/examples/image/index.html
+- bower_components/flot/examples/index.html
+- bower_components/flot/examples/interacting/index.html
+- bower_components/flot/examples/navigate/arrow-down.gif
+- bower_components/flot/examples/navigate/arrow-left.gif
+- bower_components/flot/examples/navigate/arrow-right.gif
+- bower_components/flot/examples/navigate/arrow-up.gif
+- bower_components/flot/examples/navigate/index.html
+- bower_components/flot/examples/percentiles/index.html
+- bower_components/flot/examples/realtime/index.html
+- bower_components/flot/examples/resize/index.html
+- bower_components/flot/examples/selection/index.html
+- bower_components/flot/examples/series-errorbars/index.html
+- bower_components/flot/examples/series-pie/index.html
+- bower_components/flot/examples/series-toggle/index.html
+- bower_components/flot/examples/series-types/index.html
+- bower_components/flot/examples/shared/jquery-ui/jquery-ui.min.css
+- bower_components/flot/examples/stacking/index.html
+- bower_components/flot/examples/symbols/index.html
+- bower_components/flot/examples/threshold/index.html
+- bower_components/flot/examples/tracking/index.html
+- bower_components/flot/examples/visitors/index.html
+- bower_components/flot/examples/zooming/index.html
+- bower_components/flot/excanvas.js
+- bower_components/flot/excanvas.min.js
+- bower_components/flot/flot.jquery.json
+- bower_components/flot/jquery.colorhelpers.js
+- bower_components/flot/jquery.flot.canvas.js
+- bower_components/flot/jquery.flot.categories.js
+- bower_components/flot/jquery.flot.crosshair.js
+- bower_components/flot/jquery.flot.errorbars.js
+- bower_components/flot/jquery.flot.fillbetween.js
+- bower_components/flot/jquery.flot.image.js
+- bower_components/flot/jquery.flot.js
+- bower_components/flot/jquery.flot.navigate.js
+- bower_components/flot/jquery.flot.pie.js
+- bower_components/flot/jquery.flot.resize.js
+- bower_components/flot/jquery.flot.selection.js
+- bower_components/flot/jquery.flot.stack.js
+- bower_components/flot/jquery.flot.symbol.js
+- bower_components/flot/jquery.flot.threshold.js
+- bower_components/flot/jquery.flot.time.js
+- bower_components/flot/jquery.js
+- bower_components/flot/package.json
+- bower_components/jquery/.bower.json
+- bower_components/jquery/MIT-LICENSE.txt
+- bower_components/jquery/bower.json
+- bower_components/jquery/dist/jquery.js
+- bower_components/jquery/dist/jquery.min.js
+- bower_components/jquery/dist/jquery.min.map
+- bower_components/jquery/src/ajax.js
+- bower_components/jquery/src/ajax/jsonp.js
+- bower_components/jquery/src/ajax/load.js
+- bower_components/jquery/src/ajax/parseJSON.js
+- bower_components/jquery/src/ajax/parseXML.js
+- bower_components/jquery/src/ajax/script.js
+- bower_components/jquery/src/ajax/var/nonce.js
+- bower_components/jquery/src/ajax/var/rquery.js
+- bower_components/jquery/src/ajax/xhr.js
+- bower_components/jquery/src/attributes.js
+- bower_components/jquery/src/attributes/attr.js
+- bower_components/jquery/src/attributes/classes.js
+- bower_components/jquery/src/attributes/prop.js
+- bower_components/jquery/src/attributes/support.js
+- bower_components/jquery/src/attributes/val.js
+- bower_components/jquery/src/callbacks.js
+- bower_components/jquery/src/core.js
+- bower_components/jquery/src/core/access.js
+- bower_components/jquery/src/core/init.js
+- bower_components/jquery/src/core/parseHTML.js
+- bower_components/jquery/src/core/ready.js
+- bower_components/jquery/src/core/var/rsingleTag.js
+- bower_components/jquery/src/css.js
+- bower_components/jquery/src/css/addGetHookIf.js
+- bower_components/jquery/src/css/curCSS.js
+- bower_components/jquery/src/css/defaultDisplay.js
+- bower_components/jquery/src/css/hiddenVisibleSelectors.js
+- bower_components/jquery/src/css/support.js
+- bower_components/jquery/src/css/swap.js
+- bower_components/jquery/src/css/var/cssExpand.js
+- bower_components/jquery/src/css/var/getStyles.js
+- bower_components/jquery/src/css/var/isHidden.js
+- bower_components/jquery/src/css/var/rmargin.js
+- bower_components/jquery/src/css/var/rnumnonpx.js
+- bower_components/jquery/src/data.js
+- bower_components/jquery/src/data/Data.js
+- bower_components/jquery/src/data/accepts.js
+- bower_components/jquery/src/data/var/data_priv.js
+- bower_components/jquery/src/data/var/data_user.js
+- bower_components/jquery/src/deferred.js
+- bower_components/jquery/src/deprecated.js
+- bower_components/jquery/src/dimensions.js
+- bower_components/jquery/src/effects.js
+- bower_components/jquery/src/effects/Tween.js
+- bower_components/jquery/src/effects/animatedSelector.js
+- bower_components/jquery/src/event.js
+- bower_components/jquery/src/event/ajax.js
+- bower_components/jquery/src/event/alias.js
+- bower_components/jquery/src/event/support.js
+- bower_components/jquery/src/exports/amd.js
+- bower_components/jquery/src/exports/global.js
+- bower_components/jquery/src/intro.js
+- bower_components/jquery/src/jquery.js
+- bower_components/jquery/src/manipulation.js
+- bower_components/jquery/src/manipulation/_evalUrl.js
+- bower_components/jquery/src/manipulation/support.js
+- bower_components/jquery/src/manipulation/var/rcheckableType.js
+- bower_components/jquery/src/offset.js
+- bower_components/jquery/src/outro.js
+- bower_components/jquery/src/queue.js
+- bower_components/jquery/src/queue/delay.js
+- bower_components/jquery/src/selector-native.js
+- bower_components/jquery/src/selector-sizzle.js
+- bower_components/jquery/src/selector.js
+- bower_components/jquery/src/serialize.js
+- bower_components/jquery/src/sizzle/dist/sizzle.js
+- bower_components/jquery/src/sizzle/dist/sizzle.min.js
+- bower_components/jquery/src/sizzle/dist/sizzle.min.map
+- bower_components/jquery/src/traversing.js
+- bower_components/jquery/src/traversing/findFilter.js
+- bower_components/jquery/src/traversing/var/rneedsContext.js
+- bower_components/jquery/src/var/arr.js
+- bower_components/jquery/src/var/class2type.js
+- bower_components/jquery/src/var/concat.js
+- bower_components/jquery/src/var/hasOwn.js
+- bower_components/jquery/src/var/indexOf.js
+- bower_components/jquery/src/var/pnum.js
+- bower_components/jquery/src/var/push.js
+- bower_components/jquery/src/var/rnotwhite.js
+- bower_components/jquery/src/var/slice.js
+- bower_components/jquery/src/var/strundefined.js
+- bower_components/jquery/src/var/support.js
+- bower_components/jquery/src/var/toString.js
+- bower_components/jquery/src/wrap.js
 - bower_components/leaflet-providers/.bower.json
 - bower_components/leaflet-providers/CONTRIBUTING.md
 - bower_components/leaflet-providers/README.md
@@ -130,13 +317,15 @@ files:
 - lib/columbus3/metadata/query_parser.racc
 - lib/columbus3/metadata/query_parser.tab.rb
 - lib/columbus3/metadata/sidecar.rb
-- lib/columbus3/renderer/renderer.rb
+- lib/columbus3/renderer/flot_renderer.rb
+- lib/columbus3/renderer/leaflet_renderer.rb
 - lib/columbus3/v900track/v900track.rb
 - lib/columbus3/v900track/v900waypoint.rb
 - lib/columbus3/version.rb
+- lib/html/flot.html.erb
 - lib/html/show.html.erb
 - lib/html/track.js.erb
-homepage: http://ict4g.net/adolfo/columbus3
+homepage: http://www.github.com/avillafiorita/columbus3
 licenses:
 - MIT
 metadata: {}