columbus3 0.4.0 → 0.5.0

data/lib/columbus3/metadata/query_parser.racc

@@ -1,10 +1,24 @@
 # parses a query and makes it into an expression which can be evaluated
 #
-# the search engine evals an expression against an array of hashes and select
-# those matching.  It does so using a select which iterates over x.
+# the search engine evals an expression against an array of hashes (each hash being a track)
+# and selects those matching.  It does so using a select which iterates over x, that is calling
+# the current hash "x".
 #
 # this parser reads a string containing a query and returns a string containing
-# the Ruby code which can be passed as argument to the search function
+# the Ruby code which can be passed as argument to the search function, that is, an expression
+# on "x" reading fields from the hash.
+#
+# thus, for instance,
+#
+#  start_date >= 2015-01-01
+#
+# is parsed to:
+#
+#  "x[:start_date] >= 2015-01-01"
+#
+# the code selecting tracks is
+#
+#  tracks.select { |x| eval("x[:start_date] >= 2015-01-01") }
 #
 # the following queries are supported:
 #
@@ -49,8 +63,8 @@ rule
   start exp
 
   exp : simple_exp  { result = "#{val[0]}" }
-      | exp AND exp { result = "(#{val[0]} and #{val[2]})" }
-      | exp OR exp  { result = "(#{val[0]} or #{val[2]})" }
+      | exp AND exp { result = "((#{val[0]}) and (#{val[2]}))" }
+      | exp OR exp  { result = "((#{val[0]}) or (#{val[2]}))" }
       | '(' exp ')' { result = "(#{val[1]})" }
 
   simple_exp: STRING { result = "x[:start_location].include?(#{val[0]}) or x[:end_location].include?(#{val[0]})" }
@@ -71,7 +85,7 @@ rule
             | FIELD op_or_equal value
               { result = "x[:#{val[0]}] #{val[1]} #{val[2]}" }
 
-  date : DATE { result = "Date.parse(\"#{val[0]}\")" }
+  date : DATE { result = "DateTime.parse(\"#{val[0]}\")" }
 
   op_or_equal : OP
               | EQUAL
@@ -131,7 +145,7 @@ def make_tokens str
       when match = scanner.scan(DATE_FIELD)
         result << [:DATE_FIELD, match]
       when match = scanner.scan(YEAR)
-        result << [:YEAR, nil]
+        result << [:YEAR_FIELD, nil]
       when match = scanner.scan(FIELD)
         result << [:FIELD, match]
       when match = scanner.scan(/"[^"]+"/)

data/lib/columbus3/metadata/query_parser.tab.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -9,7 +9,7 @@ require 'racc/parser.rb'
 require 'date'
 class QueryParser < Racc::Parser
 
-module_eval(<<'...end query_parser.racc/module_eval...', 'query_parser.racc', 86)
+module_eval(<<'...end query_parser.racc/module_eval...', 'query_parser.racc', 100)
 attr_accessor :result
 
 def parse(str)
@@ -58,7 +58,7 @@ def make_tokens str
       when match = scanner.scan(DATE_FIELD)
         result << [:DATE_FIELD, match]
       when match = scanner.scan(YEAR)
-        result << [:YEAR, nil]
+        result << [:YEAR_FIELD, nil]
       when match = scanner.scan(FIELD)
         result << [:FIELD, match]
       when match = scanner.scan(/"[^"]+"/)
@@ -89,26 +89,26 @@ end
 
 racc_action_table = [
      6,     7,     8,     9,    10,    11,     6,     7,     8,     9,
-    10,    11,     5,    13,    14,     4,    29,    30,     5,    16,
-    17,     4,     6,     7,     8,     9,    10,    11,     6,     7,
-     8,     9,    10,    11,     5,    22,    21,     4,    22,    21,
-     5,    22,    21,     4,    22,    21,    39,    40,    13,    14,
-    18,    19,    12,    31,    32,    33,    35,    35,    37,    26,
+    10,    11,     5,    13,    14,     4,    29,    12,     5,    13,
+    14,     4,     6,     7,     8,     9,    10,    11,     6,     7,
+     8,     9,    10,    11,     5,    16,    17,     4,    18,    19,
+     5,    22,    21,     4,    22,    21,    22,    21,    22,    21,
+    39,    40,    26,    30,    31,    32,    33,    35,    35,    37,
     13 ]
 
 racc_action_check = [
-     0,     0,     0,     0,     0,     0,    14,    14,    14,    14,
-    14,    14,     0,    15,    15,     0,    15,    16,    14,     6,
-     6,    14,     4,     4,     4,     4,     4,     4,    13,    13,
-    13,    13,    13,    13,     4,     8,     8,     4,     9,     9,
-    13,    10,    10,    13,    11,    11,    25,    25,     2,     2,
-     7,     7,     1,    17,    18,    19,    20,    23,    24,    12,
+     0,     0,     0,     0,     0,     0,     4,     4,     4,     4,
+     4,     4,     0,    15,    15,     0,    15,     1,     4,     2,
+     2,     4,    13,    13,    13,    13,    13,    13,    14,    14,
+    14,    14,    14,    14,    13,     6,     6,    13,     7,     7,
+    14,     8,     8,    14,     9,     9,    10,    10,    11,    11,
+    25,    25,    12,    16,    17,    18,    19,    20,    23,    24,
     28 ]
 
 racc_action_pointer = [
-    -2,    52,    33,   nil,    20,   nil,    11,    42,    26,    29,
-    32,    35,    59,    26,     4,    -2,     3,    39,    40,    41,
-    45,   nil,   nil,    46,    46,    34,   nil,   nil,    45,   nil,
+    -2,    17,     4,   nil,     4,   nil,    27,    30,    32,    35,
+    37,    39,    52,    20,    26,    -2,    39,    40,    41,    42,
+    46,   nil,   nil,    47,    47,    38,   nil,   nil,    45,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil ]
 
@@ -236,100 +236,100 @@ Racc_debug_parser = false
 
 # reduce 1 omitted
 
-module_eval(<<'.,.,', 'query_parser.racc', 50)
+module_eval(<<'.,.,', 'query_parser.racc', 64)
   def _reduce_2(val, _values, result)
      result = "#{val[0]}" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 51)
+module_eval(<<'.,.,', 'query_parser.racc', 65)
   def _reduce_3(val, _values, result)
-     result = "(#{val[0]} and #{val[2]})" 
+     result = "((#{val[0]}) and (#{val[2]}))" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 52)
+module_eval(<<'.,.,', 'query_parser.racc', 66)
   def _reduce_4(val, _values, result)
-     result = "(#{val[0]} or #{val[2]})" 
+     result = "((#{val[0]}) or (#{val[2]}))" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 53)
+module_eval(<<'.,.,', 'query_parser.racc', 67)
   def _reduce_5(val, _values, result)
      result = "(#{val[1]})" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 55)
+module_eval(<<'.,.,', 'query_parser.racc', 69)
   def _reduce_6(val, _values, result)
      result = "x[:start_location].include?(#{val[0]}) or x[:end_location].include?(#{val[0]})" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 57)
+module_eval(<<'.,.,', 'query_parser.racc', 71)
   def _reduce_7(val, _values, result)
      result = "x[:start_location].include?(#{val[2]}) or x[:end_location].include?(#{val[2]})" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 59)
+module_eval(<<'.,.,', 'query_parser.racc', 73)
   def _reduce_8(val, _values, result)
      result = "x[:start_location] == #{val[2]} or x[:end_location] == #{val[2]}" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 61)
+module_eval(<<'.,.,', 'query_parser.racc', 75)
   def _reduce_9(val, _values, result)
      result = "x[:#{val[0]}].include?(#{val[2]})" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 63)
+module_eval(<<'.,.,', 'query_parser.racc', 77)
   def _reduce_10(val, _values, result)
      result = "x[:#{val[0]}] == #{val[2]}" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 65)
+module_eval(<<'.,.,', 'query_parser.racc', 79)
   def _reduce_11(val, _values, result)
      result = "x[:start_date] #{val[1]} #{val[2]} or x[:end_date] #{val[1]} #{val[2]}"
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 67)
+module_eval(<<'.,.,', 'query_parser.racc', 81)
   def _reduce_12(val, _values, result)
      result = "#{val[0]} #{val[1]} #{val[2]}" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 69)
+module_eval(<<'.,.,', 'query_parser.racc', 83)
   def _reduce_13(val, _values, result)
      result = "x[:start_date].year #{val[1]} #{val[2]} or x[:end_date].year #{val[1]} #{val[2]}" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 71)
+module_eval(<<'.,.,', 'query_parser.racc', 85)
   def _reduce_14(val, _values, result)
      result = "x[:#{val[0]}] #{val[1]} #{val[2]}" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'query_parser.racc', 73)
+module_eval(<<'.,.,', 'query_parser.racc', 87)
   def _reduce_15(val, _values, result)
-     result = "Date.parse(\"#{val[0]}\")" 
+     result = "DateTime.parse(\"#{val[0]}\")" 
     result
   end
 .,.,

data/lib/columbus3/metadata/sidecar.rb

@@ -32,7 +32,7 @@ module Columbus3
     end
 
     def exists?
-      File.exists?(@metadata[:filename] + ".yaml")
+      File.exist?(@metadata[:filename] + ".yaml")
     end
 
     # an alias

data/lib/columbus3/renderer/flot_renderer.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'yaml'
+require 'columbus3/renderer/sanitizer'
 
 module Columbus3
   # make a track into a flot graph (speed and height)
@@ -37,9 +38,9 @@ module Columbus3
       target = to_graph_filename filename
 
       if force or not File.exists? target
-        track = V900Track.new filename
+        track = V900Track.new filename: filename
         File.open(target, "w") do |file|
-          id = sanitize filename
+          id = Sanitizer::sanitize filename
 
           file.printf <<EOS
 min_time_#{id} = #{track.first.time.to_i * 1000};\n
@@ -56,11 +57,5 @@ EOS
       filename + "_graph.js"
     end
 
-    private
-    
-    def self.sanitize filename
-      filename.gsub(/[^0-9A-Za-z\-]/, "_")
-    end
-
   end
 end

data/lib/columbus3/renderer/leaflet_renderer.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'yaml'
+require 'columbus3/renderer/sanitizer'
 
 module Columbus3
   # renderer controls the transformation of a V900 tracks into a displayable format,
@@ -18,56 +19,44 @@ module Columbus3
       @leaflet_css = File.join(bower_dir, 'leaflet/dist/leaflet.css')
       @files = files
 
-      # generate the output
-      html = renderer.result(binding)
-
-      # save it to file
+      # generate and save to file
       File.open(filename, "w") do |file|
-        file << html
+        file << renderer.result(binding)
       end
     end
 
     # make a v900 track into a leaflet layer cached to disk
     def self.to_leaflet filename, force = false
 
-      target = to_leaflet_filename filename
+      target = to_geojson_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
-latlong_#{id} = #{track.range.each.map { |i| track[i].lat_lon }};\n
-start_#{id} = L.marker(#{track.first.lat_lon}).bindPopup('Start');\n
-end_#{id} = L.marker(#{track.last.lat_lon}).bindPopup('End');\n
-poly_#{id} = L.polyline(latlong_#{id}, {color: 'red'});\n
-
-max_speed_#{id} = L.marker(#{track[track.max_speed_idx].lat_lon}).bindPopup('Max speed #{track.max_speed}')\n;
-max_height_#{id} = L.marker(#{track[track.max_height_idx].lat_lon}).bindPopup('Max height #{track.max_height}')\n;
-min_height_#{id} = L.marker(#{track[track.min_height_idx].lat_lon}).bindPopup('Min height #{track.min_height}')\n;
+        # load the template
+        template = File.join(File.dirname(__FILE__), "/../../html/track.js.erb")
+        renderer = ERB.new(File.read(template))
+      
+        # context: the track and the track's id
+        @track = V900Track.new filename: filename
+        @filename = filename
 
-#{to_leaflet_layername filename} = L.layerGroup([start_#{id}, end_#{id}, poly_#{id}, max_speed_#{id}, max_height_#{id}, min_height_#{id}]);\n
-#{to_leaflet_layername filename}.addTo(map);\n
-EOS
+        # generate and save it to file
+        File.open(target, "w") do |file|
+          file << renderer.result(binding)
         end
       end
 
     end
 
-    def self.to_leaflet_filename filename
+    def self.to_geojson_filename filename
       filename + ".js"
     end
 
     def self.to_leaflet_layername filename
-      "layer_" + sanitize(filename)
+      to_varname "layer_", Sanitizer::sanitize(filename)
     end
-
-    private
     
-    def self.sanitize filename
-      filename.gsub(/[^0-9A-Za-z\-]/, "_")
+    def self.to_varname prefix, filename
+      prefix + Sanitizer::sanitize(filename)
     end
-
   end
 end

data/lib/columbus3/renderer/sanitizer.rb

@@ -0,0 +1,8 @@
+module Columbus3
+  module Sanitizer
+    # make a filename into a nice Javascript symbol
+    def self.sanitize filename
+      File.basename(filename, ".CSV").strip.gsub(' ', '_').gsub(/[^\w]/, '')
+    end
+  end
+end

data/lib/columbus3/v900track/gpx2v900.rb

@@ -0,0 +1,31 @@
+require 'gpx'
+
+# convert from GPX to V900
+module GPX2V900
+  
+  # read a GPX file and make it into an array of V900 CSV files (one per GPX track)
+  def self.gpx2v900 file
+    input = GPX::GPXFile.new(gpx_file: file)
+    v900_files = Array.new
+
+    input.tracks.each_with_index do |track, track_index|
+      v900_file = V900Track.new filename: file.gsub(/\.[^.]+$/, "") + (input.tracks.size > 1 ? "-#{track_index}" : "") + ".csv", empty: true
+      track.points.each_with_index do |waypoint, index|
+
+        row = {"INDEX" => index,
+               "DATE"  => waypoint.time.strftime("%y%m%d"),
+               "TIME"  =>  waypoint.time.strftime("%H%M%S"),
+               "LONGITUDE E/W" => waypoint.lon.abs.to_s + (waypoint.lon > 0 ? "E" : ""),
+               "LATITUDE N/S"  => waypoint.lat.abs.to_s + (waypoint.lat > 0 ? "N" : ""),
+               "HEIGHT"  =>  waypoint.elevation.to_i,
+               "SPEED"   => waypoint.speed.to_i,
+               "HEADING" => -1}
+        v900_file.add V900Waypoint.new(row)
+      end
+      v900_files << v900_file
+    end
+
+    v900_files
+  end
+
+end

data/lib/columbus3/v900track/v900track.rb

@@ -4,12 +4,28 @@ require 'geocoder'
 require 'columbus3/v900track/v900waypoint'
 
 class V900Track
-  def initialize filename
-    read filename
+  attr_reader :filename
+
+  def initialize hash 
+    @filename = hash[:filename]
+    if hash[:empty]
+      @data = []
+    else
+      read filename
+    end
   end
 
   def read filename
-     @data = CSV::read(filename, :headers => true).each.map { |item| V900Waypoint.new(item) }
+    @filename = filename
+    @data = CSV::read(filename, headers: true).each.map { |item| V900Waypoint.new(item) }
+  end
+
+  def save
+    File.open(@filename, 'w') {|f| f.write(to_s) }
+  end
+
+  def add v900_waypoint
+    @data << v900_waypoint
   end
 
   def size
@@ -30,11 +46,11 @@ class V900Track
     @data
   end
 
-  # it does not work
-  #def each
-  #  @data.each
-  #end
-
+  # http://stackoverflow.com/questions/19226821/iterator-array-each-as-return-value-of-method-in-ruby
+  def each(&block)
+    @data.each(&block)
+  end
+ 
   def get i
     self[i]
   end
@@ -131,6 +147,16 @@ class V900Track
     metadata
   end
 
+  # a slightly more robust implementation calls data["INDEX"] in the same order
+  # in which the header is printed
+  def to_s
+    string = "INDEX,TAG,DATE,TIME,LATITUDE N/S,LONGITUDE E/W,HEIGHT,SPEED,HEADING,VOX\n"
+    @data.each do |data|
+      string << data.to_s + "\n"
+    end
+    string
+  end
+
   private
 
   def get comparison, method