From ef4a83642f4b9817858b8664ad09ae57c53a0500 Mon Sep 17 00:00:00 2001
From: Luke Wendling <luke@lukewendling.com>
Date: Mon, 2 Jun 2014 11:18:28 -0500
Subject: [PATCH] use more forgiving 'unstructured' query format in Bing
Locations API
---
lib/geocoder/lookups/bing.rb | 4 +++-
test/unit/lookups/bing_test.rb | 10 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/geocoder/lookups/bing.rb b/lib/geocoder/lookups/bing.rb
index 92628283..5509ac12 100644
--- a/lib/geocoder/lookups/bing.rb
+++ b/lib/geocoder/lookups/bing.rb
@@ -27,7 +27,9 @@ module Geocoder::Lookup
if !query.reverse_geocode? and r = query.options[:region]
url << "/#{r}"
end
- url + "/" + URI.escape(query.sanitized_text.strip) + "?"
+ # use the more forgiving 'unstructured' query format to allow special
+ # chars, newlines, brackets, typos.
+ url + "?q=" + URI.escape(query.sanitized_text.strip) + "&"
end
def results(query)
diff --git a/test/unit/lookups/bing_test.rb b/test/unit/lookups/bing_test.rb
index 3fe765a4..d7b31a1e 100644
--- a/test/unit/lookups/bing_test.rb
+++ b/test/unit/lookups/bing_test.rb
@@ -12,7 +12,7 @@ class BingTest < GeocoderTestCase
def test_query_for_reverse_geocode
lookup = Geocoder::Lookup::Bing.new
url = lookup.query_url(Geocoder::Query.new([45.423733, -75.676333]))
- assert_match(/Locations\/45.423733/, url)
+ assert_match(/Locations\?q=45.423733/, url)
end
def test_result_components
@@ -33,7 +33,7 @@ class BingTest < GeocoderTestCase
"manchester",
:region => "uk"
))
- assert_match(/Locations\/uk\/manchester/, url)
+ assert_match(/Locations\/uk\?q=manchester/, url)
assert_no_match(/query/, url)
end
@@ -42,7 +42,7 @@ class BingTest < GeocoderTestCase
url = lookup.query_url(Geocoder::Query.new(
"manchester"
))
- assert_match(/Locations\/manchester/, url)
+ assert_match(/Locations\?q=manchester/, url)
assert_no_match(/query/, url)
end
@@ -52,7 +52,7 @@ class BingTest < GeocoderTestCase
"manchester, lancashire",
:region => "uk"
))
- assert_match(/Locations\/uk\/manchester,%20lancashire/, url)
+ assert_match(/Locations\/uk\?q=manchester,%20lancashire/, url)
assert_no_match(/query/, url)
end
@@ -62,7 +62,7 @@ class BingTest < GeocoderTestCase
" manchester, lancashire ",
:region => "uk"
))
- assert_match(/Locations\/uk\/manchester,%20lancashire/, url)
+ assert_match(/Locations\/uk\?q=manchester,%20lancashire/, url)
assert_no_match(/query/, url)
end
end
--
GitLab