lib/barometer/formats/coordinates.rb in barometer-0.7.3 vs lib/barometer/formats/coordinates.rb in barometer-0.8.0
- old
+ new
@@ -6,24 +6,24 @@
#
# This class is used to determine if a query is a
# :coordinates and how to convert to :coordinates.
#
class Query::Format::Coordinates < Query::Format
-
+
def self.format; :coordinates; end
def self.regex; /^[-]?[0-9\.]+[,]{1}\s?[-]?[0-9\.]+$/; end
def self.convertable_formats
[:short_zipcode, :zipcode, :postalcode, :weather_id, :coordinates, :icao, :geocode, :woe_id]
end
-
+
# convert to this format, X -> :coordinates
#
def self.to(original_query)
raise ArgumentError unless is_a_query?(original_query)
return nil unless converts?(original_query)
converted_query = Barometer::Query.new
-
+
# pre-convert
#
pre_query = nil
if original_query.format == :weather_id
unless pre_query = original_query.get_conversion(Query::Format::Geocode.format)
@@ -31,27 +31,27 @@
original_query.post_conversion(pre_query)
end
elsif original_query.format == :woe_id
pre_query = Query::Format::WoeID.reverse(original_query)
end
-
+
# convert & adjust
#
converted_query = Query::Format::Geocode.geocode(pre_query || original_query)
converted_query.q = converted_query.geo.coordinates if converted_query.geo
converted_query.format = format
converted_query
end
-
+
def self.parse_latitude(query)
coordinates = query.to_s.split(',')
coordinates ? coordinates[0] : nil
end
-
+
def self.parse_longitude(query)
coordinates = query.to_s.split(',')
coordinates ? coordinates[1] : nil
end
end
-end
\ No newline at end of file
+end