From 7143136f35bab70966abcb22c23933bce79c970b Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Sat, 4 Apr 2015 09:38:14 -0400
Subject: [PATCH] Revert "Merge pull request #508 from
jezstephens/mapquest-version"
This reverts commit 4ba15c8233597ff82d8f06083ecf37831bdf218d, reversing
changes made to c740bbb7b7b20bd3bda2a17f2bf5fbd4e399b9a0.
Conflicts:
lib/geocoder/lookups/mapquest.rb
test/services_test.rb
---
lib/geocoder/lookups/mapquest.rb | 3 +--
test/unit/lookups/mapquest_test.rb | 6 ------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/geocoder/lookups/mapquest.rb b/lib/geocoder/lookups/mapquest.rb
index 133c26bb..7f53c093 100644
--- a/lib/geocoder/lookups/mapquest.rb
+++ b/lib/geocoder/lookups/mapquest.rb
@@ -15,8 +15,7 @@ module Geocoder::Lookup
def query_url(query)
domain = configuration[:open] ? "open" : "www"
- version = configuration[:version] || 1
- url = "#{protocol}://#{domain}.mapquestapi.com/geocoding/v#{version}/#{search_type(query)}?"
+ url = "#{protocol}://#{domain}.mapquestapi.com/geocoding/v1/#{search_type(query)}?"
url + url_query_string(query)
end
diff --git a/test/unit/lookups/mapquest_test.rb b/test/unit/lookups/mapquest_test.rb
index a15f26ea..2387c93f 100644
--- a/test/unit/lookups/mapquest_test.rb
+++ b/test/unit/lookups/mapquest_test.rb
@@ -14,12 +14,6 @@ class MapquestTest < GeocoderTestCase
assert_equal "http://www.mapquestapi.com/geocoding/v1/address?key=abc123&location=Bluffton%2C+SC", query.url
end
- def test_url_for_version_2
- Geocoder.configure(mapquest: {api_key: "abc123", version: 2})
- query = Geocoder::Query.new("Bluffton, SC")
- assert_equal "http://www.mapquestapi.com/geocoding/v2/address?key=abc123&location=Bluffton%2C+SC", query.url
- end
-
def test_url_for_open_street_maps
Geocoder.configure(mapquest: {api_key: "abc123", open: true})
query = Geocoder::Query.new("Bluffton, SC")
--
GitLab