lib/geocoder/lookups/mapquest.rb in geocoder-1.1.3 vs lib/geocoder/lookups/mapquest.rb in geocoder-1.1.4
- old
+ new
@@ -1,33 +1,15 @@
require 'geocoder/lookups/base'
+require "geocoder/lookups/nominatim"
require "geocoder/results/mapquest"
module Geocoder::Lookup
- class Mapquest < Base
+ class Mapquest < Nominatim
private # ---------------------------------------------------------------
- def results(query, reverse = false)
- return [] unless doc = fetch_data(query, reverse)
- doc.is_a?(Array) ? doc : [doc]
- end
-
- def query_url(query, reverse = false)
- params = {
- :format => "json",
- :polygon => "1",
- :addressdetails => "1",
- :"accept-language" => Geocoder::Configuration.language
- }
- if (reverse)
- method = 'reverse'
- parts = query.split(/\s*,\s*/);
- params[:lat] = parts[0]
- params[:lon] = parts[1]
- else
- method = 'search'
- params[:q] = query
- end
- "http://open.mapquestapi.com/#{method}?" + hash_to_query(params)
+ def query_url(query)
+ method = query.reverse_geocode? ? "reverse" : "search"
+ "http://open.mapquestapi.com/#{method}?" + url_query_string(query)
end
end
end