lib/barometer/formats/geocode.rb in barometer-0.5.0 vs lib/barometer/formats/geocode.rb in barometer-0.6.1

@@ -21,24 +21,26 @@
     def self.to(original_query)
       raise ArgumentError unless is_a_query?(original_query)
       unless converts?(original_query)
         return (original_query.format == format ? original_query.dup : nil)
       end
-      converted_query = Barometer::Query.new
-    
-      converted_query = (original_query.format == :weather_id ?
-       Query::Format::WeatherID.reverse(original_query) :
-       geocode(original_query))
+      
+      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))
+        original_query.post_conversion(converted_query) if converted_query
+      end
       converted_query
     end
 
     # geocode the query
     #
     def self.geocode(original_query)
       raise ArgumentError unless is_a_query?(original_query)
+      
       converted_query = Barometer::Query.new
-
-      #converted_query.geo = _geocode(original_query)
       converted_query.geo = 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
\ No newline at end of file