open_gpx_2_kml 0.10.3 → 0.10.4

data/Gemfile.lock

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

data/lib/tf1_converter/gpx/waypoint.rb

@@ -15,11 +15,16 @@ module TF1Converter
         if symbol_name
           map_entry = @icon_map[symbol_name]
           return map_entry['icon'] if map_entry
-        elsif name
+        end
+
+        if name
           @icon_map.values.each do |icon_data|
-            return icon_data['icon'] if icon_data['name'].upcase == name.slice(0,3).upcase
+            if icon_data['name']
+              return icon_data['icon'] if icon_data['name'].upcase == name.slice(0,3).upcase
+            end
           end
         end
+
         'default.png'
       end
 

data/lib/tf1_converter/version.rb

@@ -1,3 +1,3 @@
 module TF1Converter
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

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

@@ -38,6 +38,12 @@ module TF1Converter::Gpx
         waypoint.icon_name.should == '42.png'
       end
 
+      it 'can find a waypoint using an ampersand' do
+        waypoint = waypoint_from(waypoint_by_name_fragment.gsub(/C05/,'&05'))
+        icon_map['meaningoflife'] = { 'icon' => '42.png', 'name' => '&05' }
+        waypoint.icon_name.should == '42.png'
+      end
+
       it 'returns a default value if there is no sym node' do
         waypoint = waypoint_from(default_fragment)
         waypoint.icon_name.should == 'default.png'
@@ -45,8 +51,19 @@ module TF1Converter::Gpx
 
       it 'gives a default value if there is no hash match' do
         node.stub_chain(:children, :select, :first, :text){ '' }
+        node.stub_chain(:xpath, :first, :text){ '' }
         waypoint.icon_name.should == 'default.png'
       end
+
+      it 'matches by name if there is no useful symbol match' do
+        fragment = %Q{ <wpt lat="38.9199972" lon="-92.2972443">
+          <sym>Non-sense</sym>
+          <name>C05icon_name_42</name>
+        </wpt> }
+        waypoint = waypoint_from(fragment)
+        icon_map['meaningoflife'] = { 'icon' => '42.png', 'name' => 'C05' }
+        waypoint.icon_name.should == '42.png'
+      end
     end
 
     describe '#icon_meaning' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_gpx_2_kml
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -254,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2485090832370901195
+      hash: 788333395735345652
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2485090832370901195
+      hash: 788333395735345652
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23