lib/barometer/formats/geocode.rb in barometer-0.6.7 vs lib/barometer/formats/geocode.rb in barometer-0.7.0

@@ -11,11 +11,11 @@
   class Query::Format::Geocode < Query::Format
 
     def self.format; :geocode; end
     def self.is?(query=nil); query.is_a?(String) ? true : false; end
     def self.convertable_formats
-      [:short_zipcode, :zipcode, :coordinates, :weather_id, :icao]
+      [:short_zipcode, :zipcode, :coordinates, :weather_id, :icao, :woe_id]
     end
 
     # convert to this format, X -> :geocode
     #
     def self.to(original_query)
@@ -24,13 +24,20 @@
         return (original_query.format == format ? original_query.dup : nil)
       end
       
       unless converted_query = original_query.get_conversion(format)
         converted_query = Barometer::Query.new
-        converted_query = (original_query.format == :weather_id ?
-         Query::Format::WeatherID.reverse(original_query) :
-         geocode(original_query))
+        
+        converted_query = case original_query.format
+        when :weather_id
+          Query::Format::WeatherID.reverse(original_query)
+        when :woe_id
+          Query::Format::WoeID.reverse(original_query)
+        else
+          geocode(original_query)
+        end
+        
         original_query.post_conversion(converted_query) if converted_query
       end
       converted_query
     end
 
@@ -38,10 +45,10 @@
     #
     def self.geocode(original_query)
       raise ArgumentError unless is_a_query?(original_query)
       
       converted_query = Barometer::Query.new
-      converted_query.geo = WebService::Geocode.fetch(original_query)
+      converted_query.geo = Barometer::WebService::Geocode.fetch(original_query)
       if converted_query.geo
         converted_query.country_code = converted_query.geo.country_code
         converted_query.q = converted_query.geo.to_s
         converted_query.format = format
       end
\ No newline at end of file