gooby 0.9.4 → 0.9.5

data/lib/gooby.rb

@@ -1,15 +1,41 @@
-# Packaged on Fri Mar 09 06:03:09 EST 2007 
-
 =begin
 
-This file contains the classes and modules for the Gooby project.
 Gooby = Google APIs + Ruby
+This file contains the classes and modules for the Gooby project.
 
 See file 'tests/ts_gooby.rb' for the regression test suite.
 
+Index of Modules and Classes in this file:
+line  type    Module or Class name
+----  ------  ---------------------------
+  51  module  Gooby
+  58  module  GoobyKernel
+ 185  module  TestHelper
+ 203  class   GoobyObject
+ 216  class   CounterHash
+ 299  class   DelimLine
+ 334  class   DtTm
+ 411  class   Duration
+ 490  class   ForerunnerXmlParser
+ 661  class   ForerunnerXmlSplitter
+ 771  class   TrainingCenterXmlParser
+ 948  class   TrainingCenterXmlSplitter
+1053  class   GeoData
+1236  class   GoogleMapGenerator
+1608  class   History
+1639  class   Lap
+1654  class   Line
+1724  class   Options
+1799  class   Position
+1843  class   Run
+2032  class   SimpleXmlParser
+2072  class   Track
+2119  class   Trackpoint
+2308  class   CodeScanner
+2600  class   GoobyCommand
+  
 Gooby - Copyright 2007 by Chris Joakim.
 Gooby is available under GNU General Public License (GPL) license.
-
 =end
 
 require 'date'
@@ -20,28 +46,37 @@ require 'rexml/streamlistener'
 require 'time'
 require 'yaml'
 
+# =============================================================================
+
 module Gooby
 
 =begin rdoc
   This module is used to embed information about the Gooby project and
   version into the codebase.
-
-  Gooby - Copyright 2007 by Chris Joakim.
-  Gooby is available under GNU General Public License (GPL) license.
 =end
   
-  module GoobyProjectInfo
+  module GoobyKernel
 
   # Return a String version number, like '1.0.0'.
+  
+    def project_name
+      'Gooby'
+    end
+    
     def project_version_number   
-      '0.9.4'
+      '0.9.5'
     end
 
-  # Return a String date, like '2007/02/25'.  
+  # Return a String date, like '2007/03/15'.  
     def project_date       
-      '2007/03/03'
+      '2007/03/15'
     end
- 
+
+    # Return a String containing the project author name.
+    def project_author
+      'Chris Joakim'
+    end
+  
   # Return a String year, like '2007'. 
     def project_year       
       project_date[0...4]  # start, length
@@ -51,115 +86,15 @@ module Gooby
     def project_copyright
       "Copyright (C) #{project_year} #{project_author}"
     end
-  
-  # Return a String containing GNU/GPL, and the gpl.html URL.  
-    def project_license    
-      'GNU General Public License (GPL).  See http://www.gnu.org/copyleft/gpl.html'
-    end
-  
-    # Return a String containing the project author name.
-    def project_author
-      'Chris Joakim'
-    end
-  
-    def google_maps_api_level
-      '2'
-    end
-  
-    def some_new_thing
-      '2'
-    end
-      
-    def tested_files
-      array = Array.new
-      array << 'cls_counter_hash.rb'
-      array << 'cls_delim_line.rb'
-      array << 'cls_dttm.rb'
-      array << 'cls_duration.rb'
-      array << 'cls_forerunner_xml_parser.rb'
-      array << 'cls_geo_data.rb'
-      array << 'cls_gooby_object.rb'
-      array << 'cls_google_map_generator.rb'
-      array << 'cls_history.rb'
-      array << 'cls_lap.rb'
-      array << 'cls_line.rb'
-      array << 'cls_options.rb'
-      array << 'cls_position.rb'
-      array << 'cls_run.rb'
-      array << 'cls_simple_xml_parser.rb'
-      array << 'cls_track.rb'
-      array << 'cls_trackpoint.rb'
-      array << 'mod_constants.rb'
-      array << 'mod_introspect.rb'
-      array << 'mod_io.rb'
-      array << 'mod_project_info.rb'
-      array << 'mod_string.rb'
-      array
-    end
-  
-  end
-  
-  
-  module Con
-
-    public 
-
-    def default_delimiter
-      return '|'
-    end
 
-    def invalid_distance
-      return -99999999
-    end
-
-    def invalid_minutes
-      return -99999999
-    end
-                
-    def invalid_time
-      return -99999999
-    end
-   
-    def invalid_latitude
-      return -1
-    end
-  
-    def invalid_longitude
-      return -1
-    end
-  
-    def invalid_altitude
-       return -1
+    def project_embedded_comment
+      "#{project_name} #{project_version_number}"
     end
     
-  end
-  
-  
-  module Introspect
-  
-  # Return a String w/instance variable and method info.    
-    def introspect         
-      c  = self.class
-      s  = "Class: #{c} "
-      iv = self.instance_variables.sort
-      s << " ivc=#{iv.size}"
-      iv.each { |v| s << " #{v}" } 
-      meth = self.methods.sort
-      s << " mc=#{meth.size}"
-      meth.each { |m| s << " #{m}" }
-      s << ""
-      s
-    end 
-
-  # Return 'self.instance_variables'.
-    def to_yaml_properties   
-      self.instance_variables 
+  # Return a String containing GNU/GPL, and the gpl.html URL.  
+    def project_license    
+      'GNU General Public License (GPL).  See http://www.gnu.org/copyleft/gpl.html'
     end
-  
-  end 
-  
-  
-  module GoobyIO
 
   # Return an Array of lines in file, optionally stripped.  
     def read_lines(filename, strip=false)  
@@ -211,13 +146,8 @@ module Gooby
       end
       return newArray
     end
-      
-  end
 
-  
-  module GoobyString
-
-    def tokenize(string, delim, strip=false)  
+    def tokenize(string, delim=nil, strip=false)  
       if string
         tokens = string.split(delim)
         if strip
@@ -228,10 +158,30 @@ module Gooby
         Array.new
       end
     end
-
-  end
+    
+    def default_delimiter
+      return '|'
+    end
+                
+    def invalid_time
+      return -99999999
+    end
    
+    def invalid_latitude
+      return -1
+    end
   
+    def invalid_longitude
+      return -1
+    end
+  
+    def invalid_altitude
+       return -1
+    end
+  end
+
+# =============================================================================
+
   module TestHelper  
     
     def setup
@@ -241,9 +191,9 @@ module Gooby
     def teardown
       @debug = false
     end
-  
   end
-  
+
+# =============================================================================
 
 =begin rdoc
   This is the abstract superclass of several Gooby classes.
@@ -252,14 +202,10 @@ module Gooby
   
   class GoobyObject  
     
-    include Gooby::GoobyIO  
-    include Gooby::GoobyString
-    include Gooby::Introspect
-    include Gooby::GoobyProjectInfo
-    include Gooby::Con
-    
+    include Gooby::GoobyKernel  
   end
-  
+
+# =============================================================================
 
 =begin rdoc
   This class wrappers a Hash object and provides increment/decrement functionality 
@@ -272,6 +218,10 @@ module Gooby
     def initialize
       @hash = Hash.new(0)  
     end
+    
+    def size
+      @hash.size
+    end
  
   # Return the Integer count for the given key; zero default.  
     def value(key)   
@@ -290,6 +240,11 @@ module Gooby
         @hash[key] = 1
       end  
     end
+    
+    def increment_tokens(text)
+      tokens = tokenize(text)
+      tokens.each { |token| increment(token) }
+    end
 
   # Decrement the count for the given key.  
     def decrement(key) 
@@ -314,7 +269,7 @@ module Gooby
       s = "CHash:"
       sorted_keys.each { |key|
         val = @hash[key]
-        s << " key: [#{key}] val: [#{val}]"
+        s << " key: [#{key}] val: [#{val}]\n"
       }
       s
     end
@@ -333,9 +288,9 @@ module Gooby
       s << " </CHash>"
       s   
     end  
-    
   end
-  
+
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a delimited line of text, such as csv.
@@ -346,9 +301,9 @@ module Gooby
     attr_reader :line, :trim, :delim, :tokens
     
     def initialize(line, trim=true, delim=default_delimiter)
-      @line  = line
-      @trim  = trim
-      @delim = delim
+      @line   = line
+      @trim   = trim
+      @delim  = delim
       @tokens = @line.split(@delim)  
       if trim
         @tokens.each { | token | token.strip! }
@@ -366,10 +321,10 @@ module Gooby
     def to_s
       "DelimLine: length: #{@line.size} trim: #{@trim} delim: #{@delim} tokens: #{@tokens.size}"
     end
-  
   end
 
-  
+# =============================================================================
+
 =begin rdoc
   Instances of this class represent a Date and Time as parsed from a value 
   such as '2006-01-15T13:41:40Z' in an XML file produced by a GPS device.
@@ -385,8 +340,8 @@ module Gooby
       if raw
         @rawdata = raw.strip
         if @rawdata.size > 18
-          @dateTime = DateTime.parse(@rawdata[0..18])
-          @time  = Time.parse(@dateTime.to_s)
+          @date_time = DateTime.parse(@rawdata[0..18])
+          @time  = Time.parse(@date_time.to_s)
           @valid = true
         else
           @valid = false
@@ -443,9 +398,9 @@ module Gooby
     def print_string  
       "DtTm: #{yyyy_mm_dd_hh_mm_ss} #{to_i} #{@rawdata}"
     end
-    
   end
-  
+
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent the contents of a Forerunner extract
@@ -460,7 +415,7 @@ module Gooby
   # Constructor; arg is a String like 'PT507.870S'.
     def initialize(raw)  
       if raw
-        @rawdata  = scrub(raw)
+        @rawdata  = scrub("#{raw}")
         @seconds  = @rawdata.to_f
         @minutes  = @seconds / 60
         @base_min = @minutes.floor
@@ -519,9 +474,9 @@ module Gooby
     def print_string  
       "Duration: #{@rawdata} sec: #{@seconds} min: #{@minutes} mmss: #{@mmss} bm: #{@base_min} fm: #{@frac_min} fs: #{@frac_sec}"
     end
-    
   end
-  
+
+# =============================================================================
 
 =begin rdoc
   Instances of this class are used to parse a Forerunner XML file in a SAX-like
@@ -541,121 +496,120 @@ module Gooby
     attr_reader :history, :cvHash, :tagCount
   
     def initialize
-      @cvHash            = Hash.new("")
-      @tagCount          = 0
-      @runCount          = 0
-      @lapCount          = 0
-      @trackCount        = 0
-      @trackpoint_count  = 0
-      @currText          = "";
-      @history           = History.new
-      @currRun           = nil
-      @currLap           = nil
-      @currTrack         = nil
-      @currBeginPosition = nil
-      @currEndPosition   = nil
+      @cv_hash            = Hash.new("")
+      @tag_count          = 0
+      @run_count          = 0
+      @lap_count          = 0
+      @track_count        = 0
+      @trackpoint_count   = 0
+      @curr_text          = "";
+      @history            = History.new
+      @curr_run           = nil
+      @curr_lap           = nil
+      @curr_track         = nil
+      @curr_begin_position = nil
+      @@curr_end_position   = nil
     end
   
     public
  
     # SAX API method; handles 'Run', 'Lap', 'Track'.   
     def tag_start(tagname, attrs) 
-      @tagCount += 1
+      @tag_count += 1
       @currTag = tagname
-      @cvHash[tagname] = ''
+      @cv_hash[tagname] = ''
     
       if detail_tag?(tagname)
         @inDetail = true
       end
     
       if is_tag?('Run', tagname)
-        @runCount = @runCount + 1
-        @lapCount = 0
-        @trackCount = 0
-        @currRun  = Run.new(@runCount)
-        @history.add_run(@currRun)
-        @cvHash['Notes'] = ''
+        @run_count = @run_count + 1
+        @lap_count = 0
+        @track_count = 0
+        @curr_run  = Run.new(@run_count)
+        @history.add_run(@curr_run)
+        @cv_hash['Notes'] = ''
         return
       end
     
       if is_tag?('Lap', tagname)
-        @lapCount = @lapCount + 1
-        @currLap  = Lap.new(@lapCount)
+        @lap_count = @lap_count + 1
+        @curr_lap  = Lap.new(@lap_count)
         return
       end
     
       if is_tag?('Track', tagname)
-        @trackCount = @trackCount + 1      
-        @currTrack  = Track.new(@trackCount)
+        @track_count = @track_count + 1      
+        @curr_track  = Track.new(@track_count)
         @trackpoint_count = 0   
         return   
       end
-    
     end
 
     # SAX API method; handles 'Position', 'Trackpoint', 'Track', 'Lap', 'Run'. 
     def tag_end(tagname) 
       if @inDetail    
-        @cvHash[tagname] = @currText
+        @cv_hash[tagname] = @curr_text
       else
         if is_tag?('Position', tagname)
-          lat  = @cvHash['Latitude']
-          long = @cvHash['Longitude']
-          @currBeginPosition = Position.new(lat.strip, long.strip, '')
-          @currEndPosition   = Position.new(lat.strip, long.strip, '')       
+          lat  = @cv_hash['Latitude']
+          long = @cv_hash['Longitude']
+          @curr_begin_position = Position.new(lat.strip, long.strip, '')
+          @@curr_end_position   = Position.new(lat.strip, long.strip, '')       
         end 
         
         if is_tag?('BeginPosition', tagname)
-          lat  = @cvHash['Latitude']
-          long = @cvHash['Longitude']
-          @currBeginPosition = Position.new(lat.strip, long.strip, '')      
+          lat  = @cv_hash['Latitude']
+          long = @cv_hash['Longitude']
+          @curr_begin_position = Position.new(lat.strip, long.strip, '')      
         end
         
         if is_tag?('EndPosition', tagname)
-          lat  = @cvHash['Latitude']
-          long = @cvHash['Longitude']
-          @currEndPosition = Position.new(lat.strip, long.strip, '')      
+          lat  = @cv_hash['Latitude']
+          long = @cv_hash['Longitude']
+          @@curr_end_position = Position.new(lat.strip, long.strip, '')      
         end
               
         if is_tag?('Trackpoint', tagname)
           @trackpoint_count = @trackpoint_count + 1
-          lat  = @cvHash['Latitude']
-          long = @cvHash['Longitude']
-          alt  = @cvHash['Altitude']   
-          time = @cvHash['Time']                
+          lat  = @cv_hash['Latitude']
+          long = @cv_hash['Longitude']
+          alt  = @cv_hash['Altitude']   
+          time = @cv_hash['Time']                
           tp   = Trackpoint.new(@trackpoint_count, lat, long, alt, time)
-          @currTrack.add_trackpoint(tp)
+          @curr_track.add_trackpoint(tp)
         end
       
         if is_tag?('Track', tagname)
-          if @currRun != nil
-            @currRun.add_track(@currTrack)
+          if @curr_run != nil
+            @curr_run.add_track(@curr_track)
           end
         end
       
         if is_tag?('Lap', tagname)
-          @currLap.startTime = @cvHash['StartTime']
-          @currLap.duration  = Duration.new(@cvHash['Duration'])
-          @currLap.length    = @cvHash['Length']                          
-          @currLap.beginPosition = @currBeginPosition
-          @currLap.endPosition   = @currEndPosition        
-          @currRun.add_lap(@currLap)
+          @curr_lap.startTime = @cv_hash['StartTime']
+          @curr_lap.duration  = Duration.new(@cv_hash['Duration'])
+          @curr_lap.length    = @cv_hash['Length']                          
+          @curr_lap.begin_position = @curr_begin_position
+          @curr_lap.end_position   = @@curr_end_position        
+          @curr_run.add_lap(@curr_lap)
         end
       
         if is_tag?('Run', tagname)
-          @currRun.notes =  @cvHash['Notes'] 
+          @curr_run.notes =  @cv_hash['Notes'] 
         end
       end
     
       @inDetail = false    
-      @currText = ""
+      @curr_text = ""
       @currTag  = ""                     
     end
 
     # SAX API method.
     def text(txt)  
       if @inDetail
-        @currText = @currText + txt   
+        @curr_text = @curr_text + txt   
       end
     end
 
@@ -695,9 +649,9 @@ module Gooby
       }
       return false
     end
-  
   end
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class are used to split a large ForerunnerLogbook
@@ -801,9 +755,9 @@ module Gooby
       }
       puts "output files written."
     end
-    
   end
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class are used to parse a Garmin TrainingCenter XML file
@@ -825,53 +779,53 @@ module Gooby
     attr_reader :history, :cvHash, :tagCount
   
     def initialize
-      @cvHash            = Hash.new("")
-      @tagCount          = 0
-      @runCount          = 0
-      @lapCount          = 0
-      @trackCount        = 0
-      @trackpoint_count  = 0
-      @currText          = "";
-      @history           = History.new
-      @currRun           = nil
-      @currLap           = nil
-      @currTrack         = nil
-      @currBeginPosition = nil
-      @currEndPosition   = nil
+      @cv_hash             = Hash.new("")
+      @tag_count           = 0
+      @run_count           = 0
+      @lap_count           = 0
+      @track_count         = 0
+      @trackpoint_count    = 0
+      @curr_text           = "";
+      @history             = History.new
+      @curr_run            = nil
+      @curr_lap            = nil
+      @curr_track          = nil
+      @curr_begin_position = nil
+      @@curr_end_position  = nil
     end
   
     public
  
     # SAX API method; handles 'Activity', 'Lap', 'Track'.   
     def tag_start(tagname, attrs) 
-      @tagCount += 1
+      @tag_count += 1
       @currTag = tagname
-      @cvHash[tagname] = ''
+      @cv_hash[tagname] = ''
     
       if detail_tag?(tagname)
         @inDetail = true
       end
     
       if is_tag?('Activity', tagname)
-        @runCount = @runCount + 1
-        @lapCount = 0
-        @trackCount = 0
-        @currRun  = Run.new(@runCount)
-        @history.add_run(@currRun)
-        @cvHash['Notes'] = ''
+        @run_count = @run_count + 1
+        @lap_count = 0
+        @track_count = 0
+        @curr_run  = Run.new(@run_count)
+        @history.add_run(@curr_run)
+        @cv_hash['Notes'] = ''
         return
       end
     
       if is_tag?('Lap', tagname)
-        @lapCount = @lapCount + 1
-        @currLap  = Lap.new(@lapCount)
+        @lap_count = @lap_count + 1
+        @curr_lap  = Lap.new(@lap_count)
         # TODO - capture value of 'StartTime' attribute.       
         return
       end
     
       if is_tag?('Track', tagname)
-        @trackCount = @trackCount + 1      
-        @currTrack  = Track.new(@trackCount)
+        @track_count = @track_count + 1      
+        @curr_track  = Track.new(@track_count)
         @trackpoint_count = 0   
         return   
       end
@@ -881,68 +835,68 @@ module Gooby
     # SAX API method; handles 'Position', 'Trackpoint', 'Track', 'Lap', 'Run'. 
     def tag_end(tagname) 
       if @inDetail    
-        @cvHash[tagname] = @currText
+        @cv_hash[tagname] = @curr_text
       else
         if is_tag?('Position', tagname)
-          lat  = @cvHash['LatitudeDegrees']
-          long = @cvHash['LongitudeDegrees']
-          @currBeginPosition = Position.new(lat.strip, long.strip, '')
-          @currEndPosition   = Position.new(lat.strip, long.strip, '')       
+          lat  = @cv_hash['LatitudeDegrees']
+          long = @cv_hash['LongitudeDegrees']
+          @curr_begin_position = Position.new(lat.strip, long.strip, '')
+          @@curr_end_position   = Position.new(lat.strip, long.strip, '')       
         end 
         
         if is_tag?('BeginPosition', tagname)
-          lat  = @cvHash['LatitudeDegrees']
-          long = @cvHash['LongitudeDegrees']
-          @currBeginPosition = Position.new(lat.strip, long.strip, '')      
+          lat  = @cv_hash['LatitudeDegrees']
+          long = @cv_hash['LongitudeDegrees']
+          @curr_begin_position = Position.new(lat.strip, long.strip, '')      
         end
         
         if is_tag?('EndPosition', tagname)
-          lat  = @cvHash['LatitudeDegrees']
-          long = @cvHash['LongitudeDegrees']
-          @currEndPosition = Position.new(lat.strip, long.strip, '')      
+          lat  = @cv_hash['LatitudeDegrees']
+          long = @cv_hash['LongitudeDegrees']
+          @@curr_end_position = Position.new(lat.strip, long.strip, '')      
         end
               
         if is_tag?('Trackpoint', tagname)
           @trackpoint_count = @trackpoint_count + 1
-          lat  = @cvHash['LatitudeDegrees']
-          long = @cvHash['LongitudeDegrees']
-          alt  = @cvHash['AltitudeMeters']   
-          time = @cvHash['Time']                
+          lat  = @cv_hash['LatitudeDegrees']
+          long = @cv_hash['LongitudeDegrees']
+          alt  = @cv_hash['AltitudeMeters']   
+          time = @cv_hash['Time']                
           tp   = Trackpoint.new(@trackpoint_count, lat, long, alt, time)
-          @currTrack.add_trackpoint(tp)
+          @curr_track.add_trackpoint(tp)
         end
       
         if is_tag?('Track', tagname)
-          if @currRun != nil
-            @currRun.add_track(@currTrack)
+          if @curr_run != nil
+            @curr_run.add_track(@curr_track)
           end
         end
       
         if is_tag?('Lap', tagname)
           # TotalTimeSeconds DistanceMeters
           # TODO - rework tnd of Lap for tcx
-          # @currLap.startTime = @cvHash['StartTime']
-          # @currLap.duration  = Duration.new(@cvHash['Duration'])
-          # @currLap.length    = @cvHash['Length']                          
-          # @currLap.beginPosition = @currBeginPosition
-          # @currLap.endPosition   = @currEndPosition        
-          @currRun.add_lap(@currLap)
+          # @curr_lap.startTime = @cv_hash['StartTime']
+          # @curr_lap.duration  = Duration.new(@cv_hash['Duration'])
+          # @curr_lap.length    = @cv_hash['Length']                          
+          # @curr_lap.begin_position = @curr_begin_position
+          # @curr_lap.end_position   = @@curr_end_position        
+          @curr_run.add_lap(@curr_lap)
         end
       
         if is_tag?('Activity', tagname)
-          @currRun.notes =  @cvHash['Notes'] 
+          @curr_run.notes =  @cv_hash['Notes'] 
         end
       end
     
       @inDetail = false    
-      @currText = ""
+      @curr_text = ""
       @currTag  = ""                     
     end
 
     # SAX API method.
     def text(txt)  
       if @inDetail
-        @currText = @currText + txt   
+        @curr_text = @curr_text + txt   
       end
     end
 
@@ -982,9 +936,9 @@ module Gooby
       }
       return false
     end
-  
   end
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class are used to split a large Garmin TrainingCenter
@@ -999,7 +953,7 @@ module Gooby
       @out_dir = out_dir
       @training_center_files = Array.new
       @training_center_files << tcx_file
-      @out_files_hash   = Hash.new
+      @out_files_hash = Hash.new
     end
     
     def split
@@ -1088,9 +1042,9 @@ module Gooby
       }
       puts "output files written."
     end
-    
   end
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a the set of Geographic data defined in file geo.txt
@@ -1267,9 +1221,9 @@ module Gooby
         puts "Route: '#{key}'"
       }      
     end
-      
   end 
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a <Run> aggregate object from a
@@ -1297,13 +1251,21 @@ module Gooby
       @lng_idx   = lng_idx
       @alt_idx   = alt_idx
       @cdist_idx = cdist_idx
+      
+      # Override default csv value indices if specified in the options yaml file.
       @options   =  Gooby::Options.new(nil)
+      @dttm_idx  = @options.get('csv_dttm_idx')  if @options.get('csv_dttm_idx')
+      @num_idx   = @options.get('csv_num_idx')   if @options.get('csv_num_idx')
+      @lat_idx   = @options.get('csv_lat_idx')   if @options.get('csv_lat_idx')
+      @lng_idx   = @options.get('csv_lng_idx')   if @options.get('csv_lng_idx')
+      @alt_idx   = @options.get('csv_alt_idx')   if @options.get('csv_alt_idx')
+            
       @content_hash = Hash.new('')
       @run   = Gooby::Run.new(1)
       @track = Gooby::Track.new(1)
       @run.add_track(@track)
       @tkpts = Array.new
-      
+      @icon_url_base = @options.get('gmap_icon_url_base')
       @csv_lines = read_as_ascii_lines(@csv_file, 10, true) 
       @csv_lines.each { | line |
         dline = Gooby::DelimLine.new(line)
@@ -1327,7 +1289,8 @@ Returns a Hash with specific generated content at the following keys:
         @options = options
       end  
       @content_hash['when_generated'] = Time.now
-      @content_hash['title'] = @options.get('gmap_title')               
+      @content_hash['title'] = @options.get('gmap_title')
+      @icon_url_base = @options.get('gmap_icon_url_base')               
       filter_trackpoints  
       compute_center_point
       generate_key_js
@@ -1374,6 +1337,8 @@ s = <<HERE
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+    <meta name="description" content="Google Map generated with #{project_embedded_comment}">
+    <meta name="keywords" content="Google Map #{project_embedded_comment} GPS">
     <title> Google Map by Gooby </title>
     #{content_hash['key_js']}
     #{content_hash['main_js_start']}
@@ -1450,11 +1415,12 @@ HERE
     end
     
     def generate_main_js_start
-      id    = @options.get('gmap_map_element_id')  
-      size  = @options.get('gmap_size_control')
-      type  = @options.get('gmap_type')
-      zoom  = @options.get('gmap_zoom_level')
-      title = @options.get('gmap_title')            
+      id       = @options.get('gmap_map_element_id')  
+      size     = @options.get('gmap_size_control')
+      type     = @options.get('gmap_type')
+      zoom     = @options.get('gmap_zoom_level')
+      title    = @options.get('gmap_title') 
+      zoom_tab = @options.get('gmap_zoom_tab')            
       if size
         if size == 'smallmap'
           size = 'GSmallMapControl'
@@ -1502,7 +1468,7 @@ HERE
         # s << ');'
         s << "\n"        
       end   
-      s << "            var centerPoint = new GLatLng(#{@center_latitude}, #{@center_longitude}); \n"
+      s << "            var centerPoint = new GLatLng(#{@center_latitude}, #{@center_longitude}); // #{project_embedded_comment} \n"
       s << "            map.setCenter(centerPoint, #{zoom}); \n"         
       s << "\n"
       @content_hash['main_js_start'] = s 
@@ -1510,11 +1476,11 @@ HERE
     end
     
     def generate_main_js_route_overlay
-      tkpt_count = @tkpts.size.to_f
-      app_max    = @options.get('gmap_approx_max_points').to_f
-      comments   = @options.get('gmap_gen_comments')   
-      ratio      = tkpt_count / app_max
-      @start_dttm = nil
+      tkpt_count   = @tkpts.size.to_f
+      app_max      = @options.get('gmap_approx_max_points').to_f
+      gen_comments = @options.get('gmap_gen_comments')   
+      ratio        = tkpt_count / app_max
+      @start_dttm  = nil
       if ratio > 1.0
         increment = (tkpt_count / app_max).to_i
       else
@@ -1531,8 +1497,10 @@ HERE
         end
         if ((curr_idx == next_idx) || (curr_idx == last_idx) || (tkpt.is_split()))
           gpoint_count = gpoint_count + 1
-          s << tkpt.as_glatlng(comments, tkpt_count, curr_idx, gpoint_count, @start_dttm)
+          s << tkpt.as_glatlng(false, gen_comments, tkpt_count, curr_idx, @start_dttm)
           next_idx = curr_idx + increment
+        else
+          s << tkpt.as_glatlng(true, gen_comments, tkpt_count, curr_idx, @start_dttm)
         end
       }
       s << "\n"
@@ -1544,16 +1512,16 @@ HERE
     
     def generate_main_js_checkpoint_overlays
       s =  "\n            // Create a base icon for all of our markers that specifies the "
-  		s << "\n            // shadow, icon dimensions, etc."
-  		s << "\n            var baseIcon = new GIcon();"
-  		s << "\n            baseIcon.shadow = \"http://www.joakim-systems.com/gicons/shadow50.png\";"
-  		s << "\n            baseIcon.iconSize = new GSize(20, 34);"
-  		s << "\n            baseIcon.shadowSize = new GSize(37, 34);"
-  		s << "\n            baseIcon.iconAnchor = new GPoint(9, 34);"
-  		s << "\n            baseIcon.infoWindowAnchor = new GPoint(9, 2);"
-  		s << "\n            baseIcon.infoShadowAnchor = new GPoint(18, 25);"
-  		s << "\n"
-  		
+      s << "\n            // shadow, icon dimensions, etc."
+      s << "\n            var baseIcon = new GIcon();"
+      s << "\n            baseIcon.shadow = \"#{@icon_url_base}shadow50.png\";"
+      s << "\n            baseIcon.iconSize = new GSize(20, 34);"
+      s << "\n            baseIcon.shadowSize = new GSize(37, 34);"
+      s << "\n            baseIcon.iconAnchor = new GPoint(9, 34);"
+      s << "\n            baseIcon.infoWindowAnchor = new GPoint(9, 2);"
+      s << "\n            baseIcon.infoShadowAnchor = new GPoint(18, 25);"
+      s << "\n"
+      
       curr_idx  = -1
       last_idx  = @tkpts.size - 1
       next_checkpoint = 0.0
@@ -1564,38 +1532,38 @@ HERE
           @start_dttm = tkpt.dttm           
           info_window_html = tkpt.as_info_window_html('Start', @start_dttm)
           s << "\n            var iconStart = new GIcon(baseIcon); "
-          s << "\n            iconStart.image = \"http://www.joakim-systems.com/gicons/dd-start.png\";"
+          s << "\n            iconStart.image = \"#{@icon_url_base}dd-start.png\";"
           s << "\n            var pStart = new GPoint(#{tkpt.longitude_as_float}, #{tkpt.latitude_as_float});"
           s << "\n            var mStart = new GMarker(pStart, iconStart);"
           s << "\n            GEvent.addListener(mStart, \"click\", function() { "
           s << "\n                mStart.openInfoWindowHtml(#{info_window_html});"
-          s << "\n            });	"
+          s << "\n            }); "
           s << "\n            map.addOverlay(mStart);"
           s << "\n " 
           next_checkpoint = 1.0      
         elsif curr_idx == last_idx
           info_window_html = tkpt.as_info_window_html('Finish', @start_dttm)          
           s << "\n            var iconFinish = new GIcon(baseIcon); "
-          s << "\n            iconFinish.image = \"http://www.joakim-systems.com/gicons/dd-end.png\";"
+          s << "\n            iconFinish.image = \"#{@icon_url_base}dd-end.png\";"
           s << "\n            var pFinish = new GPoint(#{tkpt.longitude_as_float}, #{tkpt.latitude_as_float});"
           s << "\n            var mFinish = new GMarker(pFinish, iconFinish);"
           s << "\n            GEvent.addListener(mFinish, \"click\", function() { "
           s << "\n                mFinish.openInfoWindowHtml(#{info_window_html});"
-          s << "\n            });	"
+          s << "\n            }); "
           s << "\n            map.addOverlay(mFinish);"
           s << "\n " 
           next_checkpoint = 999999
         else
-          if (tkpt.cumulativeDistance >= next_checkpoint)
+          if (tkpt.cumulative_distance >= next_checkpoint)
             integer = next_checkpoint.to_i
             info_window_html = tkpt.as_info_window_html("#{integer}", @start_dttm)              
             s << "\n            var icon#{integer} = new GIcon(baseIcon); "
-            s << "\n            icon#{integer}.image = \"http://www.joakim-systems.com/gicons/marker#{integer}.png\";"
+            s << "\n            icon#{integer}.image = \"#{@icon_url_base}marker#{integer}.png\";"
             s << "\n            var p#{integer} = new GPoint(#{tkpt.longitude_as_float}, #{tkpt.latitude_as_float});"
             s << "\n            var m#{integer} = new GMarker(p#{integer}, icon#{integer});"
             s << "\n            GEvent.addListener(m#{integer}, \"click\", function() { "
             s << "\n                m#{integer}.openInfoWindowHtml(#{info_window_html});"
-            s << "\n            });	"
+            s << "\n            }); "
             s << "\n            map.addOverlay(m#{integer});"
             s << "\n " 
             next_checkpoint = next_checkpoint + 1.0   
@@ -1628,9 +1596,9 @@ HERE
        
       @content_hash['main_js_end'] = s            
     end
-       
   end
-  
+
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a <History> aggregate object from a
@@ -1659,9 +1627,9 @@ HERE
       runs.each { | run | s << run.print_string }
       s
     end
-    
   end 
-  
+
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a <Lap> aggregate object from a
@@ -1670,22 +1638,18 @@ HERE
   
   class Lap < GoobyObject
   
-    attr_accessor :number, :startTime, :duration, :length, :beginPosition, :endPosition
+    attr_accessor :number, :startTime, :duration, :length, :begin_position, :end_position
   
     def initialize(num)
       @number = num  
     end
 
     def to_s
-      return "Lap: num: #{@number} start: #{@startTime} dur: #{@duration} len: #{@length} begin: #{@beginPosition.to_s} end: #{@endPosition.to_s}"
+      return "Lap: num: #{@number} start: #{@startTime} dur: #{@duration} len: #{@length} begin: #{@begin_position.to_s} end: #{@end_position.to_s}"
     end
-      
   end 
 
-  
-=begin rdoc
-
-=end
+# =============================================================================
 
   class Line < GoobyObject  
   
@@ -1755,21 +1719,20 @@ HERE
     end
   end
 
-  
+# =============================================================================
+
   class Options < GoobyObject
   
-    attr_reader :yamlFilename, :options
+    attr_reader :yaml_filename, :options
   
     def initialize(filename)  # Constructor.
-      filename ? @yamlFilename = filename : @yamlFilename = 'gooby_options.yaml'     
+      filename ? @yaml_filename = filename : @yaml_filename = 'gooby_options.yaml'     
       loadFile()
     end
-  
-    public
  
-  # Load the @yamlFilename  
+  # Load the @yaml_filename  
     def loadFile   
-      File.open("#{@yamlFilename}") { |fn| 
+      File.open("#{@yaml_filename}") { |fn| 
         @options = YAML::load(fn)    
       }
     end
@@ -1792,6 +1755,8 @@ HERE
           return 'map'  
         elsif (name == 'gmap_height')             
           return '600'
+        elsif (name == 'gmap_icon_url_base')             
+          return 'http://www.your-web-site.com/gicons/'          
         elsif (name == 'gmap_key')                
           return 'enter your Google Map Key here'       
         elsif (name == 'gmap_type_control')       
@@ -1812,14 +1777,18 @@ HERE
       end
       s
     end
+    
+    def size
+      @options.size
+    end
      
   # Return a String containing yaml filename and entry count.  
     def to_s
-      return "Options: filename: #{@yamlFilename} entries: #{@options.size}"
+      return "Options: filename: #{@yaml_filename} entries: #{@options.size}"
     end
-  
   end 
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a <Position> aggregate object from a
@@ -1859,9 +1828,9 @@ HERE
     def altitude_as_float
       @altitude ? @altitude.to_f : invalid_altitude
     end
-  
   end
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a <Run> aggregate object from a
@@ -1896,7 +1865,7 @@ HERE
        unless @finished
          @tracks.each { |trk|  
            trk.trackpoints().each { |tkpt|
-             tkpt.runNumber = @number
+             tkpt.run_number = @number
              @tkpts.push(tkpt)             
            }
          }      
@@ -1922,7 +1891,7 @@ HERE
       @laps.push(lap)    
     end
   
-    def lapCount()
+    def lap_count()
       @laps.size    
     end
   
@@ -1984,7 +1953,7 @@ HERE
     def to_s
       finish() unless @finished 
       s = "Run: #{@number} date: #{start_yyyy_mm_dd} distance: #{distance} duration: #{duration} "
-      s << "  tracks: #{@tracks.size} tkpts: #{trackpoint_count} laps: #{lapCount} "
+      s << "  tracks: #{@tracks.size} tkpts: #{trackpoint_count} laps: #{lap_count} "
       s << "  notes: #{@notes} "
       s
     end
@@ -1996,13 +1965,13 @@ HERE
   
     def put_csv()
       finish() unless @finished
-      puts "#{@number}|#{}|#{start_yyyy_mm_dd()}|#{start_hh_mm_ss()}|#{end_hh_mm_ss}|#{duration()}|#{@distance}|#{@tracks.size}|#{trackpoint_count()}|#{lapCount}|#{@notes.strip}" 
+      puts "#{@number}|#{}|#{start_yyyy_mm_dd()}|#{start_hh_mm_ss()}|#{end_hh_mm_ss}|#{duration()}|#{@distance}|#{@tracks.size}|#{trackpoint_count()}|#{lap_count}|#{@notes.strip}" 
     end
   
     def put_tkpt_csv(with_header_comment=false)
       finish() unless @finished    
       if with_header_comment
-        puts "# Run: #{@number} date: #{start_yyyy_mm_dd} dist: #{distance} dur: #{duration} trks: #{@tracks.size} tkpts: #{trackpoint_count} laps: #{lapCount} "
+        puts "# Run: #{@number} date: #{start_yyyy_mm_dd} dist: #{distance} dur: #{duration} trks: #{@tracks.size} tkpts: #{trackpoint_count} laps: #{lap_count} "
       end
       @tkpts.each { | tkpt | puts tkpt.to_csv }
     end
@@ -2033,14 +2002,14 @@ HERE
   
     def compute_splits              
       nextSplitDist = 1.00
-      prevSplitTkpt = nil
+      prev_splitTkpt = nil
       loop1Count    = 0;
       @tkpts.each { |tkpt|
         loop1Count = loop1Count + 1
-        if tkpt.cumulativeDistance() >= nextSplitDist
-          tkpt.set_split(0 + nextSplitDist, prevSplitTkpt)
+        if tkpt.cumulative_distance() >= nextSplitDist
+          tkpt.set_split(0 + nextSplitDist, prev_splitTkpt)
           nextSplitDist = nextSplitDist + 1.00
-          prevSplitTkpt = tkpt
+          prev_splitTkpt = tkpt
         end
       } 
       # set first and last booleans
@@ -2051,12 +2020,13 @@ HERE
         tkpt.last  = true  if count == loop1Count
       }         
     end
-    
   end
-  
+
+# =============================================================================
 
 =begin rdoc
   Sample implementation of a REXML::StreamListener SAX parser.
+  This class isn't actually used in Gooby, but is retained for future use.
 =end 
 
   class SimpleXmlParser
@@ -2090,189 +2060,9 @@ HERE
     def dump   
       puts @counter_hash.to_s
     end
-  
-  end
-
-
-=begin rdoc
-  This class is used to generate, on an ongoing basis, the various Gooby test
-  classes.  Regeneration retains the current test methods, and adds stubs for 
-  new test methods.  All methods, old and new, appear in the merged output in 
-  propper sort sequence.
-=end
-    
-  class TestGenerator < GoobyObject 
-    
-    def initialize
-      tested_files.each { | base_rb_file | 
-        test_file = "tc_#{base_rb_file}"
-        if true
-          @codeLines  = read_lines("lib/#{base_rb_file}") 
-          @testLines  = read_lines("tests/#{test_file}") 
-          @codeHash   = Hash.new     
-          @testHash   = Hash.new     
-          @mergedHash = Hash.new
-          @excludeClasses = %w( TestHelper TestGenerator )    
-          puts "current codeLines = #{@codeLines.size}" 
-          puts "current testLines = #{@testLines.size}" 
-          parse_code_lines
-          parse_test_lines    
-          merge_keys
-          regenerate(test_file)
-        end
-      }
-    end 
-  
-    private
-  
-    #  Produce a Hash with keys and values like the following:
-    #  test|class|Trackpoint|deg2rad      Trackpoint|deg2rad(degrees)
-  
-    def parse_code_lines
-      type      = ''
-      type_name = ''
-      meth_name = ''    
-      @codeLines.each { | line | 
-        line.strip!
-        if (line.match(/^module /))
-          type      = 'module'
-          tokens    = line.split
-          type_name = tokens[1]    
-        elsif (line.match(/^class /))
-          type      = 'class'
-          tokens    = line.split
-          type_name = tokens[1]          
-        elsif (line.match(/^def /))
-          signature = line[4...999]
-          short_method = parse_meth_name("#{signature}")
-          @codeHash["test_#{type}_#{type_name}"] = "#{type_name}"          
-          @codeHash["test_#{type}_#{type_name}_#{short_method}"] = "#{type_name}|#{signature}"           
-        end        
-      }          
-    end 
-
-    def parse_meth_name(string)
-      string.gsub!('(', ' ')
-      string.gsub!(')', ' ')    
-      tokens = string.split
-      tokens[0]
-    end
-  
-    def parse_test_lines
-      in_method  = true
-      method_name = 'a_start'
-      method_lines = Array.new
-      line_num = 0
-    
-      @testLines.each { | line | 
-        line_num = line_num + 1  
-        line.chomp!
-        prefix   = line[0...5]   # '  def'         
-        prefix21 = line[0...21]  # '  ### Start of tests.'
-            
-        if ((prefix == '  def') || (prefix == "\tdef"))
-          in_method   = true 
-          tokens      = line.split
-          method_name = tokens[1] 
-          method_lines = Array.new   
-        end
-        if in_method
-          method_lines << "#{line}"
-        end
-        if prefix21 == '  ### Start of tests.'
-          in_method = false 
-          @testHash["#{method_name}"] = method_lines            
-        end   
-        if ((prefix == '  end') || (prefix == "\tend")) 
-          in_method = false 
-          @testHash["#{method_name}"] = method_lines            
-        end       
-      }      
-    end 
-  
-    def merge_keys
-      @codeHash.keys.sort.each { |key| @mergedHash["#{key}"] = "code" }
-      @testHash.keys.sort.each { |key| @mergedHash["#{key}"] = "test" }       
-    end
-  
-    def regenerate(test_file)
-      code = ''
-      @mergedHash.keys.sort.each { |key|  
-
-        tokens = key.split('_')
-        type, name, meth = tokens[1], tokens[2], tokens[3]  
-        
-        processThisKey = true      
-        @excludeClasses.each { |xc| 
-          if xc == name 
-            processThisKey = false
-          end
-        }
-      
-        next if !processThisKey
-            
-        if @testHash.has_key?(key)
-          # We already have a test method written in the test class, 
-          # so keep this currently existing test code!
-
-          if @codeHash.has_key?(key)
-            comment = nil
-          else
-            if key != 'a_start'
-              comment = "# Warning: possible obsolete test method - #{key}"
-            end
-          end
-        
-          code << "\n"
-          if comment != nil
-            code << "\n#{comment}"
-            code << "\n"
-          end
-          array = @testHash["#{key}"]
-          array.each { |line| code << "\n#{line}" }
-        else
-          # We don't have this test method in the current test class,
-          # so generate a test method stub.
-        
-          code << "\n"
-          code << "\n  def #{key}"
-          code << "\n"
-        
-          if @gen_impl_stub
-            if type = 'class' 
-              code << "\n    #obj = #{type}.new"
-              code << "\n    #result   = obj.#{meth}"
-              code << "\n    #expected = ''"
-              s = "\n"
-              s << '    #assert_equal(expected, actual, "'
-              s << "#{type}.#{meth} "
-              s << 'values are not as expected; #{result} vs #{expected}")'
-              code << s      
-            else
-              code << "\n    #result   = #{type}.#{meth}"
-              code << "\n    #expected = ''"
-              s = "\n"
-              s <<  '    #assert_equal(expected, actual, "'
-              s << "#{type}.#{meth} "
-              s << 'values are not as expected; #{result} vs #{expected}")'
-              code << s         
-            end
-          end
-          code << "\n  end"
-        end
-      }
-      code << "\nend" # end of class 
-      code << "\n"      
-      fn  = "tests/#{test_file}"
-      out = File.new fn, "w+"
-      out.write code
-      out.flush
-      out.close
-      puts "file written: #{fn}"
-    end
-
   end
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a <Track> aggregate object from a Forerunner
@@ -2298,14 +2088,6 @@ HERE
     def size
       @trackpoints.size
     end
-  
-    def first_tkpt
-      @trackpoints.size > 0 ? @trackpoints[0] : nil
-    end
- 
-    def last_tkpt
-      @trackpoints.size > 0 ? @trackpoints[-1] : nil
-    end
       
     def to_s
       return "Trk: #{@descr} tkpts: #{size}"
@@ -2315,9 +2097,9 @@ HERE
       puts "Track: '#{@descr}'  tkpts: #{size}"
       @trackpoints.each { |tkpt| puts tkpt.to_csv } # to_geo_s
     end
-    
   end 
 
+# =============================================================================
 
 =begin rdoc
   Instances of this class represent a <Trackpoint> aggregate from a Forerunner 
@@ -2336,13 +2118,13 @@ HERE
   
   class Trackpoint < Position
   
-    attr_reader :first, :last, :number, :runNumber, :dttm, :prevTkpt, :descr
-    attr_reader :cumulativeDistance, :cumulativePace, :incrementalDistance, :split, :prevSplit
-    attr_writer :first, :last, :runNumber
+    attr_reader :first, :last, :number, :run_number, :dttm, :prev_tkpt, :descr
+    attr_reader :cumulative_distance, :cumulative_pace, :incremental_distance, :split, :prev_split
+    attr_writer :first, :last, :run_number
   
     def initialize(num, lat, lng, alt, time_string, descr='')
       @number    = num
-      @runNumber = 0
+      @run_number = 0
 
       # initialize superclass variables:
       @latitude  = lat.to_s
@@ -2352,9 +2134,9 @@ HERE
       @dttm      = DtTm.new(time_string)
       @first     = false
       @last      = false
-      @prevTkpt  = nil      
-      @cumulativeDistance, @split = 0.0, 0.0
-      @cumulativePace = ""
+      @prev_tkpt  = nil      
+      @cumulative_distance, @split = 0.0, 0.0
+      @cumulative_pace = ""
       @descr     = descr
     end
   
@@ -2365,12 +2147,12 @@ HERE
     end
     
     def to_s
-        "Tkpt: #{@number} #{super.to_s} date: #{@dttm.to_s} cdist: #{@cumulativeDistance}"
+        "Tkpt: #{@number} #{super.to_s} date: #{@dttm.to_s} cdist: #{@cumulative_distance}"
     end
   
     def to_csv
       ss = position.to_csv
-      "#{@runNumber} | #{@dttm.to_s} | #{@number} | #{ss} | #{@cumulativeDistance} "
+      "#{@run_number} | #{@dttm.to_s} | #{@number} | #{ss} | #{@cumulative_distance} "
     end
     
     def to_geo_s
@@ -2380,7 +2162,7 @@ HERE
     
     def compute_distance_and_pace(curr_index, start_dttm, prev_cumulative_dist, prev_trackpoint, units)     
       @prev_tkpt = prev_trackpoint
-      @cumulativeDistance = prev_cumulative_dist.to_f
+      @cumulative_distance = prev_cumulative_dist.to_f
         
       if @prev_tkpt
         arg1  = latitude().to_f
@@ -2410,54 +2192,46 @@ HERE
                 if units == "N"
                    incremental_distance = incremental_distance * 0.8684;
                 end  
-                @cumulativeDistance =  @cumulativeDistance + incremental_distance.to_f 
+                @cumulative_distance =  @cumulative_distance + incremental_distance.to_f 
               end
             end
           end
         end    
         compute_cumulative_pace(start_dttm)
-        @cumulativeDistance
+        @cumulative_distance
       else
         0  
       end    
     end
   
     def compute_cumulative_pace(start_dttm)      
-      if @cumulativeDistance > 0
+      if @cumulative_distance > 0
         secsDiff  = @dttm.seconds_diff(start_dttm)
-        secsMile  = ((secsDiff.to_f) / (@cumulativeDistance.to_f))
+        secsMile  = ((secsDiff.to_f) / (@cumulative_distance.to_f))
         minsMile  = (secsMile / 60)
         wholeMins = minsMile.floor 
         secsBal   = secsMile - (wholeMins * 60)
-        s1 = "#{secsDiff} #{secsMile} #{minsMile} #{wholeMins} #{secsBal} #{@cumulativeDistance} | "
+        s1 = "#{secsDiff} #{secsMile} #{minsMile} #{wholeMins} #{secsBal} #{@cumulative_distance} | "
         s2 = sprintf("%d:%2.1f", minsMile, secsBal)
-        @cumulativePace = "#{s2}"
+        @cumulative_pace = "#{s2}"
       else 
-        @cumulativePace = ""
+        @cumulative_pace = ""
       end
     end
   
     def set_split(n, tkpt)
-      @split, @prevSplit = n, tkpt
+      @split, @prev_split = n, tkpt
     end
   
     def is_split()
      (@split >= 1)
     end
   
-    def is_first()
-      @first
-    end
-  
-    def is_last()
-      @last
-    end
-  
     def split_info(dtTm) 
       if is_split
         hhmmss = ''
-        if @prevSplit
-          return "#{@split} #{@dttm.hhmmss_diff(@prevSplit.dttm())}"          
+        if @prev_split
+          return "#{@split} #{@dttm.hhmmss_diff(@prev_split.dttm())}"          
         else
           return "#{@split} #{@dttm.hhmmss_diff(dtTm)}"      
         end
@@ -2478,14 +2252,15 @@ HERE
 
     public 
     
-    def as_glatlng(comments, tkpt_count, curr_idx, gpoint_count, start_dttm)
-      if comments
+    def as_glatlng(comment_out, gen_comments, tkpt_count, curr_idx, start_dttm)
+      comment_out ? comment = '// ' : comment = ''
+      if gen_comments
         secs_diff = @dttm.seconds_diff(start_dttm)
         fmt_time  = @dttm.hhmmss_diff(start_dttm)
-          "\n            points.push(new GLatLng(#{latitude_as_float},#{longitude_as_float})); " +
-            "// #{gpoint_count} (#{curr_idx + 1} of #{tkpt_count}) #{@dttm.to_s} #{secs_diff} #{fmt_time} #{@cumulativeDistance} #{split_info(start_dttm)} "
+          "\n            #{comment}points.push(new GLatLng(#{latitude_as_float},#{longitude_as_float})); " +
+            "// (#{curr_idx + 1} of #{tkpt_count}) #{@dttm.to_s} #{secs_diff} #{fmt_time} #{@cumulative_distance} #{split_info(start_dttm)} #{project_embedded_comment} "
       else
-          "\n            points.push(new GLatLng(#{latitude_as_float},#{longitude_as_float})); "  
+          "\n            #{comment}points.push(new GLatLng(#{latitude_as_float},#{longitude_as_float})); // #{project_embedded_comment} "  
       end      
     end
   
@@ -2502,10 +2277,10 @@ HERE
         else
           s << "<tr><td colspan='2'><b>Checkpoint #{checkpoint}</b></td></tr>"
         end
-        s << "<tr><td>Distance: </td><td>#{@cumulativeDistance}</td></tr>"
+        s << "<tr><td>Distance: </td><td>#{@cumulative_distance}</td></tr>"
         s << "<tr><td>Time of Day: </td><td>#{@dttm.to_s} </td></tr>" 
         s << "<tr><td>Elapsed Time: </td><td>#{fmt_time} </td></tr>"  
-        s << "<tr><td>Average Pace: </td><td>#{@cumulativePace} </td></tr>"      
+        s << "<tr><td>Average Pace: </td><td>#{@cumulative_pace} </td></tr>"      
         s << "<tr><td>Lat/Lng: </td><td>#{latitude_as_float} , #{longitude_as_float} </td></tr>" 
         s << "<tr><td>Altitude: </td><td>#{altitude_as_float}m </td></tr>"
         s
@@ -2513,13 +2288,313 @@ HERE
       s << "</table>\""
       s
     end
-        
   end  
 
+# =============================================================================
+
+=begin rdoc
+  This class reads and scans the Gooby code for various purposes.  
+  
+  Primarily, it is used to regenerate, on an ongoing basis, the various 
+  regression tests in file 'ts_gooby.rb'.  Regeneration retains the current 
+  test methods, adds stubs for new test methods, and flags obsolete methods. 
+  
+  It is also used to create a Gooby class, module, and method "quick reference"
+  - somewhat similar to the TextMate symbol list.  
+  
+  TODO: Method indexing and where used" functionality.
+=end
+    
+  class CodeScanner < GoobyObject 
+         
+    def initialize(argv)
+
+      function = 'outline'
+      if (argv.size > 0)
+        function = argv[0]
+      end
+            
+      @codebase_file = 'gooby.rb'
+      @testbase_file = 'ts_gooby.rb'
+      @code_lines    = read_lines("lib/#{@codebase_file}") 
+      @test_lines    = read_lines("tests/#{@testbase_file}") 
+      
+      puts "code lines = #{@code_lines.size}" 
+      puts "test lines = #{@test_lines.size}"
+
+      @tokens_hash       = CounterHash.new      
+      @module_names_hash = CounterHash.new 
+      @class_names_hash  = CounterHash.new
+      @method_names_hash = CounterHash.new
+      @mc_line_num_array = Array.new
+      @type_names        = Hash.new      
+      @code_hash         = Hash.new
+      @test_hash         = Hash.new
+      @api_hash          = Hash.new
+      @merged_hash       = Hash.new
+      @exclude_classes   = Array.new 
+                        
+      regenerate_test_suite  if (function == 'regenerate_test_suite')
+      regenerate_test_suite  if (function == 'tests') 
+
+      model_class_outline    if (function == 'model_class_outline')  
+      model_class_outline    if (function == 'outline')  
+               
+      quick_reference_guide  if (function == 'quick_reference_guide')      
+      quick_reference_guide  if (function == 'qrg')   
+      
+      mcm_references         if (function == 'mcm_references')  
+      mcm_references         if (function == 'mcm') 
+    end 
+
+    private
+    
+    def regenerate_test_suite
+      @exclude_classes = %w( TestHelper CodeScanner )    
+      parse_code_lines
+      parse_test_lines    
+      merge_keys
+      regenerate(@testbase_file)
+    end
+    
+    def model_class_outline
+      parse_code_lines     
+      @mc_line_num_array.each { |line|
+        tokens = tokenize(line)
+        type  = tokens[0].ljust(6)
+        name  = tokens[1]
+        count = tokens[2].rjust(6)
+        puts "  #{count}  #{type}  #{name}"        
+      }
+    end
+      
+    def quick_reference_guide
+      parse_code_lines
+      determine_longest_names
+      quick_reference_guide_report('module')
+      quick_reference_guide_report('class')
+    end
+  
+    def quick_reference_guide_report(obj_type)
+      @api_hash.keys.sort.each { |key| 
+        val = @api_hash[key]
+        tokens = tokenize(key, '|')
+        if (tokens[0] == obj_type)
+          s1 = tokens[0].ljust(6)
+          s2 = tokens[1].ljust(@longest_classname + 1)
+          s3 = tokens[2]
+          # s = sprintf("%6s '%30s %s'", tokens[0], tokens[1], tokens[2])
+          puts "#{s1} #{s2} #{s3}"
+        end
+      }
+    end
+    
+    def determine_longest_names
+      @longest_classname = 0
+      @api_hash.keys.sort.each { |key| 
+        tokens = tokenize(@api_hash[key], '|')
+        @longest_classname = tokens[1].size  if tokens[1].size > @longest_classname
+      }     
+    end
+        
+    def mcm_references
+      parse_code_lines
+      determine_longest_names      
+      @module_names_hash.sorted_keys.each { |name|
+        count = @tokens_hash.value(name)
+        puts "module: #{name}   (#{count})" 
+      }
+      @class_names_hash.sorted_keys.each { |name|
+        count = @tokens_hash.value(name)
+        puts "class:  #{name}   (#{count})" 
+      }
+      @method_names_hash.sorted_keys.each { |name|
+        count = @tokens_hash.value(name)
+        puts "method: #{name}   (#{count})" 
+      }  
+      # puts @tokens_hash.to_s
+      # puts @tokens_hash.size
+    end
+  
+    def parse_code_lines
+      type      = ''
+      type_name = ''
+      meth_name = '' 
+      line_number = 0   
+      @code_lines.each { | line | 
+        line_number = line_number + 1
+        line.strip!
+        if (line.match(/^module /))
+          type      = 'module'
+          tokens    = line.split
+          type_name = tokens[1]  
+          @module_names_hash.increment(type_name)  
+          @mc_line_num_array << "module #{type_name} #{line_number}"       
+        elsif (line.match(/^class /))
+          type      = 'class'
+          tokens    = line.split
+          type_name = tokens[1]   
+          @class_names_hash.increment(type_name)   
+          @mc_line_num_array << "class #{type_name} #{line_number}"                            
+        elsif (line.match(/^def /))
+          signature = line[4...999]
+          short_method = parse_meth_name("#{signature}")
+          @code_hash["test_#{type}_#{type_name}"] = "#{type_name}"          
+          @code_hash["test_#{type}_#{type_name}_#{short_method}"] = "#{type_name}|#{signature}"  
+          @api_hash["#{type}|#{type_name}|#{signature}" ] = "#{type}|#{type_name}|#{signature}" 
+          @method_names_hash.increment(short_method)                                 
+        end 
+        increment_tokens(line)       
+      }          
+    end 
+    
+    def increment_tokens(line)
+      # see http://www.asciitable.com/
+      s = ''
+      line.each_byte { |b|
+        keep = false
+        keep = true if ((b >= 65) && (b <= 90))  # A-Z
+        keep = true if ((b >= 97) && (b <= 122)) # a-z
+        keep = true if ((b >= 48) && (b <= 57))  # 0-9
+        keep = true if (b == 95) # _
+        keep = true if (b == 64) # @
+        keep = true if (b == 63) # ?
+        keep = true if (b == 33) # !        
+        if keep
+          s << b.chr
+        else
+          s << ' '
+        end        
+      } 
+      @tokens_hash.increment_tokens(s)        
+    end
+
+    def parse_meth_name(string)
+      string.gsub!('(', ' ')
+      string.gsub!(')', ' ')    
+      tokens = string.split
+      tokens[0]
+    end
+  
+    def parse_test_lines
+      in_zone      = true
+      method_name  = 'a_start'
+      method_lines = Array.new
+      line_num = 0
+    
+      @test_lines.each { | line | 
+        line_num = line_num + 1  
+        line.chomp!
+        prefix   = line[0...5]   # '  def' or '   end' 
+        prefix42 = line [0..42]        
+            
+        if ((prefix == '  def') || (prefix == "\tdef"))
+          in_zone      = true 
+          tokens       = line.split
+          method_name  = tokens[1] 
+          method_lines = Array.new   
+        end
+                
+        if in_zone
+          method_lines << "#{line}"
+        end
+        if (prefix42 == '  # beginning of tests - keep this marker')
+          in_zone = false
+          @test_hash["aaa"] = method_lines                
+        end
+        if ((prefix == '  end') || (prefix == "\tend"))       
+          in_zone = false 
+          @test_hash["#{method_name}"] = method_lines            
+        end       
+      }      
+    end 
+  
+    def merge_keys
+      @merged_hash = Hash.new
+      @code_hash.keys.sort.each { |key| @merged_hash["#{key}"] = "code" }
+      @test_hash.keys.sort.each { |key| @merged_hash["#{key}"] = "test" }       
+    end
+  
+    def regenerate(test_file)
+      code = ''
+      @merged_hash.keys.sort.each { |key|
+        tokens = key.split('_')
+        type, name, meth = tokens[1], tokens[2], tokens[3]  
+        
+        processThisKey = true      
+        @exclude_classes.each { |xc| 
+          if xc == name 
+            processThisKey = false
+          end
+        }
+      
+        next if !processThisKey
+            
+        if @test_hash.has_key?(key)
+          # We already have a test method written in the test class, 
+          # so keep this currently existing test code!
+
+          if @code_hash.has_key?(key)
+            comment = nil
+          else
+            if key != 'a_start'
+              comment = "# Warning: possible obsolete test method - #{key}"
+            end
+          end
+        
+          code << "\n"
+          if comment != nil
+            code << "\n#{comment}"
+            code << "\n"
+          end
+          array = @test_hash["#{key}"]
+          array.each { |line| code << "\n#{line}" }
+        else
+          # We don't have this test method in the current test class,
+          # so generate a test method stub.        
+          code << "\n"
+          code << "\n  def #{key}"
+          code << "\n"
+        
+          if @gen_impl_stub
+            if type = 'class' 
+              code << "\n    #obj = #{type}.new"
+              code << "\n    #result   = obj.#{meth}"
+              code << "\n    #expected = ''"
+              s = "\n"
+              s << '    #assert_equal(expected, actual, "'
+              s << "#{type}.#{meth} "
+              s << 'values are not as expected; #{result} vs #{expected}")'
+              code << s      
+            else
+              code << "\n    #result   = #{type}.#{meth}"
+              code << "\n    #expected = ''"
+              s = "\n"
+              s <<  '    #assert_equal(expected, actual, "'
+              s << "#{type}.#{meth} "
+              s << 'values are not as expected; #{result} vs #{expected}")'
+              code << s         
+            end
+          end
+          code << "\n  end"
+        end
+      }
+      code << "\nend" # end of class 
+      code << "\n"      
+      fn  = "tests/#{test_file}" 
+      out = File.new fn, "w+"
+      out.write code
+      out.flush
+      out.close
+      puts "file written: #{fn}"
+    end
+  end
+
+# =============================================================================
 
 =begin rdoc
   This class provides "user friendly DSL" functionality for the use
-  of Gooby.
+  of Gooby.  See 'bin/example_usage.rb' for examples using this class.
 =end
   
   class GoobyCommand < GoobyObject 
@@ -2557,7 +2632,5 @@ HERE
       generator = Gooby::GoogleMapGenerator.new(csv_filename)  
       generator.generate_page(options_obj)
     end
-         
   end
-  
 end # end of module