lib/geolookup/usa/county.rb in geolookup-0.5.5 vs lib/geolookup/usa/county.rb in geolookup-0.5.6

@@ -17,13 +17,11 @@
       # Else return nil
       #
       # EX: code_to_name(1, 1) => "AUTAUGA"
       def self.code_to_name(state_code, county_code)
         @county_code_to_name ||= Geolookup.load_hash_from_file(COUNTY_CODE_TO_NAME_FILE)
-        return nil unless @county_code_to_name[state_code.to_s.to_i]
-
-        @county_code_to_name[state_code.to_s.to_i][county_code.to_s.to_i]
+        get_value_from_hash(@county_code_to_name, state_code.to_s.to_i, county_code.to_s.to_i)
       end
 
 
       ###################################################################
       # self.name_to_code
@@ -32,25 +30,36 @@
       # Else return nil
       #
       # EX: name_to_code(1, 'baldwin') => {1 => {"AUTAUGA" => 1, "BALDWIN" => 3, ....}}
       def self.name_to_code(state_code, county_name)
         @county_name_to_code ||= Geolookup.load_hash_from_file(COUNTY_NAME_TO_CODE_FILE)
-        return nil unless @county_name_to_code[state_code.to_s.to_i]
-
-        @county_name_to_code[state_code.to_s.to_i][county_name.to_s.upcase]
+        get_value_from_hash(@county_name_to_code, state_code.to_s.to_i, county_name.to_s.upcase)
       end
 
 
       ###################################################################
       # self.code_to_lat_long
       #
       # Given a state and county code output county latitude longitude.  Else return nil
       #
       def self.code_to_lat_long(state_code, county_code)
         @county_lat_long ||= Geolookup.load_hash_from_file(COUNTY_LAT_LONG_FILE)
-        return nil unless @county_lat_long[state_code.to_s.to_i]
+        get_value_from_hash(@county_lat_long, state_code.to_s.to_i, county_code.to_s.to_i)
+      end
 
-        @county_lat_long[state_code.to_s.to_i][county_code.to_s.to_i]
+      ###################################################################
+      # self.get_value_from_hash
+      #
+      # Helper function to reduce code repetition
+      # Given a hash and 2 keys returns the value at that hash
+      # Return nil if the either key is not in the hash
+      #
+      # EX: get_value(@county_code_to_name, 1, 1) => "AUTAUGA"
+      def self.get_value_from_hash(hash, key1, key2)
+        return nil unless hash[key1]
+        hash[key1][key2]
       end
+
+      private_class_method :get_value_from_hash
     end
   end
 end