vatsim 0.0.5 → 0.0.6

data/lib/vatsim/airport.rb

@@ -7,10 +7,7 @@ module Vatsim
     attr_reader :icao, :latitude, :longitude
 
     # Cache of Airports already looked up to prevent searching for it again.
-    @@airport_cache = Hash.new
-
-    # Start line for each ICAO prefix. Indexing to provide quick lookups.
-    @@line_numbers = {"0"=>0, "1"=>1156, "2"=>2313, "3"=>3558, "4"=>4622, "5"=>5595, "6"=>6569, "7"=>7481, "8"=>8370, "9"=>9195, "A"=>10031, "B"=>11250, "b"=>11249, "C"=>14238, "c"=>14237, "D"=>14702, "E"=>15055, "F"=>16696, "G"=>18544, "H"=>18935, "I"=>19392, "J"=>20249, "K"=>20325, "L"=>25378, "l"=>25377, "M"=>26275, "N"=>27968, "O"=>29427, "P"=>30384, "Q"=>31200, "q"=>31202, "R"=>31324, "r"=>31323, "S"=>32180, "T"=>38523, "U"=>39188, "V"=>40322, "W"=>41258, "X"=>42159, "Y"=>42387, "Z"=>44033}
+    @@airport_cache = nil
 
     # Initialize Airport with colon delimited line
     def initialize line
@@ -24,29 +21,24 @@ module Vatsim
       }
     end
 
+
     # Returns Airport with given icao, or nil if it can't be found
     def self.get icao
-      airport = nil
-
-      return @@airport_cache[icao] if(@@airport_cache.has_key?(icao))
-
-      line_number = 0
-      start_line_number = @@line_numbers[icao[0]]
-      start_line_number = 0 if start_line_number.nil?
-
-      Zlib::GzipReader.open(File.dirname(__FILE__) + "/airports.gz").each_line { |line|
-        if(line_number >= start_line_number)
-          if line.start_with?("#{icao}:")
-            values = line.split(":")
-            airport = Airport.new(line)
-            @@airport_cache.store(icao, airport) if !@@airport_cache.has_key?(icao)
-            break
-          end
-        end
-        line_number += 1
-      }
+      return self.airport_cache[icao]
+    end
 
-      airport
+    private
+
+    # Returns Hash of airport instances
+    def self.airport_cache
+      if @@airport_cache.nil?
+        @@airport_cache ||= Hash.new
+        Zlib::GzipReader.open(File.dirname(__FILE__) + "/airports.gz").each_line { |line|
+          airport = Airport.new(line)
+          @@airport_cache.store(airport.icao, airport)
+        }
+      end
+      @@airport_cache
     end
   end
 end

data/lib/vatsim/pilot.rb

@@ -3,24 +3,21 @@ module Vatsim
   class Pilot < Client
     attr_reader :callsign, :cid, :realname, :clienttype, :latitude, :longitude, :altitude, :groundspeed, :planned_aircraft, :planned_tascruise, :planned_depairport, :planned_altitude, :planned_destairport, :server, :protrevision, :rating, :transponder, :planned_revision, :planned_flighttype, :planned_deptime, :planned_actdeptime, :planned_hrsenroute, :planned_minenroute, :planned_hrsfuel, :planned_minfuel, :planned_altairport, :planned_remarks, :planned_route, :planned_depairport_lat, :planned_depairport_lon, :planned_destairport_lat, :planned_destairport_lon, :time_logon, :heading, :QNH_iHg, :QNH_Mb
 
-    def planned_depairport_lat
-      depairport = Vatsim::Airport.get(planned_depairport)
-      return depairport.nil? ? 0 : depairport.latitude
+    def initialize line
+      super line
+      set_airport_locations
     end
 
-    def planned_depairport_lon
-      depairport = Vatsim::Airport.get(planned_depairport)
-      return depairport.nil? ? 0 : depairport.longitude
-    end
+    private
 
-    def planned_destairport_lat
-      destairport = Vatsim::Airport.get(planned_destairport)
-      return destairport.nil? ? 0 : destairport.latitude
-    end
-
-    def planned_destairport_lon
+    # Set planned_depairport/planned_destairport latitude and longitude
+    def set_airport_locations
+      depairport = Vatsim::Airport.get(planned_depairport)
       destairport = Vatsim::Airport.get(planned_destairport)
-      return destairport.nil? ? 0 : destairport.longitude
+      @planned_depairport_lat = depairport.nil? ? 0 : depairport.latitude
+      @planned_depairport_lon = depairport.nil? ? 0 : depairport.longitude
+      @planned_destairport_lat = destairport.nil? ? 0 : destairport.latitude
+      @planned_destairport_lon = destairport.nil? ? 0 : destairport.longitude
     end
 
   end

data/lib/vatsim/version.rb

@@ -1,4 +1,4 @@
 module Vatsim
-  VERSION = "0.0.5" # Current gem version
+  VERSION = "0.0.6" # Current gem version
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatsim
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -709285723652735854
+      hash: -2755347641327459897
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -709285723652735854
+      hash: -2755347641327459897
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24