metar-parser 0.1.6 → 0.1.7

data/lib/metar/station.rb

@@ -49,13 +49,15 @@ module Metar
       end
 
       def to_longitude(s)
-        s =~ /^(\d+)-(\d+)([EW])/ or return nil
-        ($3 == 'E' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0)
+        s =~ /^(\d+)-(\d+)(-(\d+))?([EW])/ or return nil
+        seconds = $4 ? $4.to_f / 3600.0 : 0.0
+        ($5 == 'E' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0 + seconds)
       end
 
       def to_latitude(s)
-        s =~ /^(\d+)-(\d+)([SN])/ or return nil
-        ($3 == 'N' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0)
+        s =~ /^(\d+)-(\d+)(-(\d+))?([SN])/ or return nil
+        seconds = $4 ? $4.to_f / 3600.0 : 0.0
+        ($3 == 'N' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0 + seconds)
       end
     end
 
@@ -159,6 +161,7 @@ module Metar
 
     # Get data from the NOAA data file (very slow on first call!)
     def load!
+      return if @loaded
       noaa_data  = Station.find_data_by_cccc(@cccc)
       raise "Station identifier '#{ @cccc }' not found" if noaa_data.nil?
       @name      = noaa_data[:name]

data/lib/metar.rb

@@ -8,7 +8,7 @@ module Metar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY = 6
+    TINY = 7
  
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Joe Yates