gpx 0.4 → 0.5

data/ChangeLog

@@ -0,0 +1,132 @@
+2009-07-07 02:51  dougfales
+
+	* lib/gpx/gpx.rb: Revving to version 0.5.
+
+2009-07-07 02:43  dougfales
+
+	* README: Changing my contact email address.
+
+2009-07-07 02:41  dougfales
+
+	* lib/gpx/gpx_file.rb, tests/gpx_file_test.rb,
+	  tests/gpx_files/with_or_without_elev.gpx: Patches from Tom
+	  Verbeure (mtbguru.com) to work with libxml-ruby 1.x.
+
+2009-06-17 14:20  dougfales
+
+	* lib/gpx/point.rb: Patch from Kang-min Liu to support speed
+	  element.
+
+2008-02-19 04:09  dougfales
+
+	* lib/gpx/gpx.rb: Revving to 0.4.
+
+2008-02-19 04:06  dougfales
+
+	* lib/gpx/gpx.rb, lib/gpx/gpx_file.rb, lib/gpx/point.rb,
+	  lib/gpx/route.rb, lib/gpx/track.rb, lib/gpx/waypoint.rb,
+	  tests/gpx_file_test.rb, tests/gpx_files, tests/gpx_files/big.gpx,
+	  tests/output, tests/output_test.rb, tests/track_test.rb: Adding
+	  some new unit tests and fixing several file export bugs reported
+	  by Jochen Topf.
+	  New unit tests also uncovered a bug where the number of
+	  trackpoints reported in a file was twice the actual number.
+
+2008-02-11 21:20  dougfales
+
+	* lib/gpx/gpx.rb: Going to version 0.3.
+
+2008-02-11 21:13  dougfales
+
+	* tests/gpx10_test.rb, tests/gpx_files/routes.gpx,
+	  tests/gpx_files/waypoints.gpx, tests/magellan_test.rb,
+	  tests/route_test.rb, tests/segment_test.rb,
+	  tests/track_file_test.rb, tests/track_test.rb,
+	  tests/waypoint_test.rb: Updating unit tests in light of recent
+	  fixes to routes and waypoints code.
+
+2008-02-08 23:26  dougfales
+
+	* lib/gpx/gpx.rb, lib/gpx/point.rb, lib/gpx/route.rb,
+	  lib/gpx/waypoint.rb: Thanks to Mike Gauland for discovering some
+	  route- and waypoint-related bugs. I've fixed them and also added
+	  #to_s on Waypoint so it's easier to debug.
+
+2007-12-04 17:58  dougfales
+
+	* lib/gpx/waypoint.rb: Thanks to Christian Koerner for finding and
+	  fixing these bugs in the waypoint
+	  code.
+
+2007-12-04 17:52  dougfales
+
+	* lib/gpx/gpx_file.rb, tests/gpx_file_test.rb: Another patch from
+	  Gaku Ueda. This one allows you to pass in a string of GPX
+	  data using the :gpx_date => option. Thanks Gaku!
+
+2007-11-30 06:29  dougfales
+
+	* lib/gpx/gpx.rb: Updating the version #.
+
+2007-11-30 06:26  dougfales
+
+	* lib/gpx/gpx.rb, lib/gpx/gpx_file.rb, lib/gpx/point.rb,
+	  lib/gpx/route.rb, lib/gpx/segment.rb, lib/gpx/track.rb,
+	  tests/gpx10_test.rb, tests/gpx_files/gpx10.gpx: Updates courtesy
+	  of Gaku Ueda:
+	  * Adding support for GPX 1.0 as well as 1.1 (since libxml
+	  namespace parsing
+	  was hard-coded to 1.1. previously).
+	  * Adding a GPX 1.0 unit test file.
+	  * Miscellaneous updates to make it work with Ruby 1.8.6.
+
+2006-12-04 06:47  dougfales
+
+	* README, lib/gpx.rb, lib/gpx/bounds.rb, lib/gpx/gpx.rb,
+	  lib/gpx/gpx_file.rb, lib/gpx/point.rb, lib/gpx/route.rb,
+	  lib/gpx/segment.rb, lib/gpx/track.rb, lib/gpx/waypoint.rb,
+	  tests/segment_test.rb: First stab at using libxml-ruby instead of
+	  REXML. I'm seeing the unit tests
+	  finish in under 14 seconds. That is compared to 2 minutes using
+	  REXML.
+
+2006-12-03 07:31  dougfales
+
+	* lib/gpx/point.rb, lib/gpx/segment.rb: Fixing more nil time
+	  exceptions.
+
+2006-12-03 06:59  dougfales
+
+	* lib/gpx/segment.rb: Fixing an exception in contains_time?.
+
+2006-11-28 15:35  dougfales
+
+	* lib/gpx/bounds.rb, lib/gpx/gpx_file.rb: A couple of fixes to make
+	  the library comply with the different attribute names
+	  possible on the bounds element.
+	  
+	  Formerly, a bounds element with a minlat or minLat attribute
+	  (instead of
+	  min_lat) would not be properly parsed. Now all three styles of
+	  attribute name
+	  are accepted.
+
+2006-10-28 22:09  dougfales
+
+	* lib/gpx/segment.rb: Fixing nil time bug.
+
+2006-10-14 13:20  dougfales
+
+	* ., README, Rakefile, bin, docs, lib, lib/gpx, lib/gpx.rb,
+	  lib/gpx/bounds.rb, lib/gpx/gpx.rb, lib/gpx/gpx_file.rb,
+	  lib/gpx/magellan_track_log.rb, lib/gpx/point.rb,
+	  lib/gpx/route.rb, lib/gpx/segment.rb, lib/gpx/track.rb,
+	  lib/gpx/trackpoint.rb, lib/gpx/waypoint.rb, tests,
+	  tests/gpx_files, tests/gpx_files/arches.gpx,
+	  tests/gpx_files/magellan_track.log,
+	  tests/gpx_files/one_segment.gpx, tests/gpx_files/one_track.gpx,
+	  tests/gpx_files/routes.gpx, tests/gpx_files/tracks.gpx,
+	  tests/gpx_files/waypoints.gpx, tests/magellan_test.rb,
+	  tests/segment_test.rb, tests/track_file_test.rb,
+	  tests/track_test.rb: Initial import of gpx gem.
+

data/README

@@ -1,6 +1,6 @@
 = GPX Gem
 Copyright (C) 2006  Doug Fales
-Doug Fales mailto:doug.fales@gmail.com
+Doug Fales mailto:doug@falesafeconsulting.com
 
 == What It Does
 This library reads GPX files and provides an API for reading and manipulating
@@ -28,7 +28,7 @@ Converting a Magellan track log to GPX:
 
 == Notes
 This library was written to bridge the gap between my Garmin Geko
-and my website, WalkingBoss.org.  For that reason, it has always been more of a
+and my website, WalkingBoss.org (RIP).  For that reason, it has always been more of a
 work-in-progress than an attempt at full GPX compliance.  The track side of the
 library has seen much more use than the route/waypoint side, so if you're doing
 something with routes or waypoints, you may need to tweak some things.  

data/lib/gpx/gpx.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 module GPX
-  VERSION = "0.4"
+  VERSION = "0.5"
 
   # A common base class which provides a useful initializer method to many
   # class in the GPX library.

data/lib/gpx/gpx_file.rb

@@ -54,13 +54,12 @@ module GPX
               gpx_file = gpx_file.name if gpx_file.is_a?(File) 
               @xml = XML::Document.file(gpx_file)
             else
-              parser = XML::Parser.new
-              parser.string = opts[:gpx_data]
+              parser = XML::Parser.string(opts[:gpx_data])
               @xml = parser.parse
             end
             # set XML namespace for XML find
-            if @xml.root.namespace_node
-              @ns = 'gpx:' + @xml.root.namespace_node.href
+            if @xml.root.namespaces.namespace
+              @ns = 'gpx:' + @xml.root.namespaces.namespace.href
             else
               @ns = 'gpx:http://www.topografix.com/GPX/1/1'  # default to GPX 1.1
             end
@@ -197,8 +196,8 @@ module GPX
       # you modify the GPX data (i.e. by adding or deleting points) and you
       # want the meta data to accurately reflect the new data.
       def update_meta_data(trk, get_bounds = true)
-         @lowest_point   = trk.lowest_point if(@lowest_point.nil? or trk.lowest_point.elevation < @lowest_point.elevation)
-         @highest_point  = trk.highest_point if(@highest_point.nil? or trk.highest_point.elevation > @highest_point.elevation)
+         @lowest_point   = trk.lowest_point if(@lowest_point.nil? or (!trk.lowest_point.nil? and trk.lowest_point.elevation < @lowest_point.elevation))
+         @highest_point  = trk.highest_point if(@highest_point.nil? or (!trk.highest_point.nil? and trk.highest_point.elevation > @highest_point.elevation))
          @bounds.add(trk.bounds) if get_bounds
          @distance += trk.distance
       end
@@ -236,7 +235,7 @@ module GPX
          waypoints.each { |w| gpx_elem << w.to_xml } unless waypoints.nil?
          routes.each    { |r| gpx_elem << r.to_xml } unless routes.nil?
 
-         doc.save(filename, true)
+         doc.save(filename, :indent => true)
       end
 
       private 

data/lib/gpx/point.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006  Doug Fales 
+# Copyright (c) 2006  Doug Fales
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,7 +25,7 @@ module GPX
    # The base class for all points.  Trackpoint and Waypoint both descend from this base class.
    class Point < Base
       D_TO_R = PI/180.0;
-      attr_accessor :lat, :lon, :time, :elevation, :gpx_file
+      attr_accessor :lat, :lon, :time, :elevation, :gpx_file, :speed
 
       # When you need to manipulate individual points, you can create a Point
       # object with a latitude, a longitude, an elevation, and a time.  In
@@ -33,18 +33,20 @@ module GPX
       # relevant info will be parsed out.
       def initialize(opts = {:lat => 0.0, :lon => 0.0, :elevation => 0.0, :time => Time.now } )
          @gpx_file = opts[:gpx_file]
-         if (opts[:element]) 
+         if (opts[:element])
             elem = opts[:element]
             @lat, @lon = elem["lat"].to_f, elem["lon"].to_f
             @latr, @lonr = (D_TO_R * @lat), (D_TO_R * @lon)
             #'-'? yyyy '-' mm '-' dd 'T' hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
             @time = (Time.xmlschema(elem.find("gpx:time", @gpx_file.ns).first.content) rescue nil)
             @elevation = elem.find("gpx:ele", @gpx_file.ns).first.content.to_f unless elem.find("gpx:ele", @gpx_file.ns).empty?
+            @speed = elem.find("gpx:speed", @gpx_file.ns).first.content.to_f unless elem.find("gpx:speed", @gpx_file.ns).empty?
          else
             @lat = opts[:lat]
             @lon = opts[:lon]
             @elevation = opts[:elevation]
             @time = opts[:time]
+            @speed = opts[:speed]
          end
 
       end

data/tests/gpx_file_test.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../lib/gpx'
 class GPXFileTest < Test::Unit::TestCase
 
   ONE_TRACK_FILE = File.join(File.dirname(__FILE__), "gpx_files/one_track.gpx")
+  WITH_OR_WITHOUT_ELEV_FILE = File.join(File.dirname(__FILE__), "gpx_files/with_or_without_elev.gpx")
   BIG_FILE = File.join(File.dirname(__FILE__), "gpx_files/big.gpx")
 
   def test_load_data_from_string
@@ -38,4 +39,10 @@ class GPXFileTest < Test::Unit::TestCase
 	assert_equal(7968, gpx_file.tracks.first.points.size)
   end
 
+  def test_with_or_with_elev
+    gpx_file = GPX::GPXFile.new(:gpx_file => WITH_OR_WITHOUT_ELEV_FILE)
+	assert_equal(2, gpx_file.tracks.size)
+	#assert_equal(7968, gpx_file.tracks.first.points.size)
+  end
+
 end

data/tests/gpx_files/with_or_without_elev.gpx

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<gpx xmlns="http://www.topografix.com/GPX/1/1" creator="MapSource 6.5" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+
+  <metadata>
+    <link href="http://www.garmin.com">
+      <text>Garmin International</text>
+    </link>
+    <time>2007-04-16T18:11:47Z</time>
+    <bounds maxlat="40.207429" maxlon="116.670578" minlat="39.876895" minlon="101.636217"/>
+  </metadata>
+
+  <trk>
+    <name>ACTIVE LOG</name>
+    <trkseg>
+      <trkpt lat="40.079434" lon="116.295948">
+        <ele>50.606567</ele>
+        <time>2007-03-25T05:17:34Z</time>
+      </trkpt>
+    </trkseg>
+  </trk>
+
+  <trk>
+    <name>LINE-13</name>
+    <trkseg>
+      <trkpt lat="39.949744" lon="116.427398"/>
+    </trkseg>
+  </trk>
+
+</gpx>

data/tests/output/new_gpx_file_from_scratch.gpx

@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="GPX RubyGem 0.1 Copyright 2006 Doug Fales -- http://walkingboss.com" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+  <metadata>
+    <name>new_gpx_file_from_scratch.gpx</name>
+    <time>2009-07-06T20:37:26-06:00</time>
+    <bounds minlat="90.0" minlon="180.0" maxlat="-90.0" maxlon="-180.0"/>
+  </metadata>
+  <trk>
+    <name/>
+    <trkseg>
+      <trkpt lat="40.036926" lon="-105.253487">
+        <time>2005-12-31T22:01:24Z</time>
+        <ele>1737.24</ele>
+      </trkpt>
+      <trkpt lat="40.036604" lon="-105.253487">
+        <time>2005-12-31T22:02:01Z</time>
+        <ele>1738.682</ele>
+      </trkpt>
+      <trkpt lat="40.036347" lon="-105.25383">
+        <time>2005-12-31T22:02:08Z</time>
+        <ele>1738.682</ele>
+      </trkpt>
+      <trkpt lat="40.035574" lon="-105.254045">
+        <time>2005-12-31T22:02:20Z</time>
+        <ele>1737.24</ele>
+      </trkpt>
+      <trkpt lat="40.035467" lon="-105.254366">
+        <time>2005-12-31T22:02:29Z</time>
+        <ele>1735.798</ele>
+      </trkpt>
+      <trkpt lat="40.035317" lon="-105.254388">
+        <time>2005-12-31T22:02:33Z</time>
+        <ele>1735.798</ele>
+      </trkpt>
+      <trkpt lat="40.035274" lon="-105.254431">
+        <time>2005-12-31T22:02:49Z</time>
+        <ele>1736.278</ele>
+      </trkpt>
+      <trkpt lat="40.035274" lon="-105.254431">
+        <time>2005-12-31T22:02:54Z</time>
+        <ele>1739.643</ele>
+      </trkpt>
+      <trkpt lat="40.035317" lon="-105.254431">
+        <time>2005-12-31T22:05:08Z</time>
+        <ele>1732.433</ele>
+      </trkpt>
+      <trkpt lat="40.035317" lon="-105.254431">
+        <time>2005-12-31T22:05:09Z</time>
+        <ele>1726.665</ele>
+      </trkpt>
+    </trkseg>
+  </trk>
+  <wpt lat="39.997298" lon="-105.292674">
+    <name>GRG-CA</name>
+    <sym>Waypoint</sym>
+    <ele>1766.535</ele>
+  </wpt>
+  <wpt lat="33.33019" lon="-111.94611">
+    <name>GRMPHX</name>
+    <cmt>Hey here's a comment.</cmt>
+    <desc>Somewhere in my backyard.</desc>
+    <sym>Waypoint</sym>
+    <fix>3d</fix>
+    <sat>8</sat>
+    <hdop>50.5</hdop>
+    <vdop>6.8</vdop>
+    <pdop>7.6</pdop>
+    <ele>361.0981</ele>
+  </wpt>
+  <wpt lat="25.061783" lon="121.640267">
+    <name>GRMTWN</name>
+    <sym>Waypoint</sym>
+    <ele>38.09766</ele>
+  </wpt>
+  <wpt lat="39.99984" lon="-105.214696">
+    <name>SBDR</name>
+    <sym>Waypoint</sym>
+    <ele>1612.965</ele>
+  </wpt>
+  <wpt lat="39.989739" lon="-105.295285">
+    <name>TO</name>
+    <sym>Waypoint</sym>
+    <ele>2163.556</ele>
+  </wpt>
+  <wpt lat="40.035301" lon="-105.254443">
+    <name>VICS</name>
+    <sym>Waypoint</sym>
+    <ele>1535.34</ele>
+  </wpt>
+  <rte>
+    <name/>
+    <rtept lat="40.035467" lon="-105.254366">
+      <time>2005-12-31T22:02:29Z</time>
+      <ele>1735.798</ele>
+    </rtept>
+    <rtept lat="40.035317" lon="-105.254388">
+      <time>2005-12-31T22:02:33Z</time>
+      <ele>1735.798</ele>
+    </rtept>
+    <rtept lat="40.035274" lon="-105.254431">
+      <time>2005-12-31T22:02:49Z</time>
+      <ele>1736.278</ele>
+    </rtept>
+  </rte>
+</gpx>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gpx
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Doug Fales
@@ -9,11 +9,11 @@ autorequire: gpx
 bindir: bin
 cert_chain: []
 
-date: 2008-02-18 00:00:00 -07:00
+date: 2009-07-06 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: A basic API for reading and writing GPX files.
+description: "   A basic API for reading and writing GPX files.\n"
 email: doug.fales@gmail.com
 executables: []
 
@@ -22,7 +22,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/gpx
 - lib/gpx/bounds.rb
 - lib/gpx/gpx.rb
 - lib/gpx/gpx_file.rb
@@ -36,7 +35,6 @@ files:
 - lib/gpx.rb
 - tests/gpx10_test.rb
 - tests/gpx_file_test.rb
-- tests/gpx_files
 - tests/gpx_files/arches.gpx
 - tests/gpx_files/big.gpx
 - tests/gpx_files/gpx10.gpx
@@ -46,18 +44,22 @@ files:
 - tests/gpx_files/routes.gpx
 - tests/gpx_files/tracks.gpx
 - tests/gpx_files/waypoints.gpx
+- tests/gpx_files/with_or_without_elev.gpx
 - tests/magellan_test.rb
-- tests/output
+- tests/output/new_gpx_file_from_scratch.gpx
 - tests/output_test.rb
 - tests/route_test.rb
 - tests/segment_test.rb
 - tests/track_file_test.rb
 - tests/track_test.rb
 - tests/waypoint_test.rb
+- ChangeLog
 - Rakefile
 - README
 has_rdoc: true
 homepage: http://gpx.rubyforge.com/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -78,9 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A basic API for reading and writing GPX files.
 test_files: []