open_gpx_2_kml 1.0.4 → 1.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    open_gpx_2_kml (1.0.4)
+    open_gpx_2_kml (1.0.5)
       builder (= 3.1.4)
       geo_swap (= 0.2.1)
       nokogiri (= 1.5.6)

data/lib/tf1_converter/csv_file.rb

@@ -11,7 +11,7 @@ module TF1Converter
       CSV.open(@path, 'wb') do |csv|
         csv << ['filename', 'name', 'meaning', 'time', 'lat', 'long', 'usng', 'elevation']
         @waypoints.each do |wp|
-          csv << [raw_path, wp.name, wp.icon_meaning, wp.timestamp, wp.lat, wp.long, wp.usng, wp.elevation]
+          csv << [raw_path, wp.name, wp.icon_meaning, wp.timestamp, wp.lat, wp.long, wp.usng, ele_for(wp)]
         end
       end
     end
@@ -27,5 +27,15 @@ module TF1Converter
     def self.raw_path(path)
       path.split('.')[0...-1].join('.')
     end
+
+    private
+    def ele_for(wp)
+      if wp.elevation == Gpx::Waypoint::NoElevation
+        ''
+      else
+        wp.elevation
+      end
+    end
+
   end
 end

data/lib/tf1_converter/gpx/waypoint.rb

@@ -35,8 +35,12 @@ module TF1Converter
         @node.attribute('lon').value
       end
 
+      class NoElevation; end
+
       def elevation
-        @node.children.select{ |child| child.name == 'ele' }.first.text
+        ele_node = @node.children.select{ |child| child.name == 'ele' }.first
+        return ele_node.text if ele_node
+        NoElevation
       end
 
       def usng

data/lib/tf1_converter/kml_file.rb

@@ -73,7 +73,9 @@ module TF1Converter
       desc << '<br>' << "Filename: #{@filename}"
       desc << "<br>" << "USNG:  #{waypoint.usng}"
       desc << "<br>" << "Lat,Long:  #{waypoint.lat},#{waypoint.long}"
-      desc << "<br>" << "Elevation:  #{waypoint.elevation}"
+      if waypoint.elevation.is_a? String
+        desc << "<br>" << "Elevation:  #{waypoint.elevation}"
+      end
     end
 
   end

data/lib/tf1_converter/version.rb

@@ -1,3 +1,3 @@
 module TF1Converter
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/lib/tf1_converter/csv_file_spec.rb

@@ -1,15 +1,29 @@
 require_relative '../../../lib/tf1_converter/csv_file'
+require_relative '../../../lib/tf1_converter/gpx/waypoint'
 
 module TF1Converter
   describe CsvFile do
 
-    it 'writes waypoints to the csv file' do
-      waypoints = [double('waypoint').as_null_object]
-      base_path = '/some/long.path/with.file/test.gpx'
-      csv = []
-      CSV.stub(:open).and_yield(csv)
-      CsvFile.new(waypoints, base_path).to_csv!
-      csv[1].first.should == '/some/long.path/with.file/test'
+    describe '#to_csv!' do
+      it 'writes waypoints to the csv file' do
+        waypoints = [double('waypoint').as_null_object]
+        base_path = '/some/long.path/with.file/test.gpx'
+        csv = []
+        CSV.stub(:open).and_yield(csv)
+        CsvFile.new(waypoints, base_path).to_csv!
+        csv[1].first.should == '/some/long.path/with.file/test'
+      end
+
+      it 'writes a blank string when theres no elevation' do
+        waypoint = double('waypoint', elevation: Gpx::Waypoint::NoElevation).as_null_object
+        waypoints = [waypoint]
+        base_path = '/some/long.path/with.file/test.gpx'
+        csv = []
+        CSV.stub(:open).and_yield(csv)
+        CsvFile.new(waypoints, base_path).to_csv!
+        csv[1].last.should == ''
+      end
+
     end
 
     describe '.translate_filename' do

data/spec/lib/tf1_converter/gpx/waypoint_spec.rb

@@ -105,5 +105,18 @@ module TF1Converter::Gpx
       end
 
     end
+
+    describe '#elevation' do
+      it 'uses the ele value' do
+        fragment = %Q{ <wpt> <ele>1.7531</ele> </wpt> }
+        waypoint_from(fragment).elevation.should == '1.7531'
+      end
+
+      it 'returns blank if there is no ele' do
+        fragment = %Q{ <wpt></wpt> }
+        waypoint_from(fragment).elevation.should == Waypoint::NoElevation
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_gpx_2_kml
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2034610430434596952
+      hash: 634324867566425609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2034610430434596952
+      hash: 634324867566425609
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23