From 63155dab236434ccbdc28786d2ca98b7bf59b232 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Wed, 7 Nov 2012 20:24:37 -0500
Subject: [PATCH] Use configured protocol instead of HTTP.
In most of these cases using anything but HTTP won't work, but this
seems more correct, and avoids having to make a change after a
provider adds HTTPS support.
---
lib/geocoder/lookups/bing.rb | 2 +-
lib/geocoder/lookups/freegeoip.rb | 2 +-
lib/geocoder/lookups/geocoder_ca.rb | 2 +-
lib/geocoder/lookups/mapquest.rb | 2 +-
lib/geocoder/lookups/nominatim.rb | 2 +-
lib/geocoder/lookups/yahoo.rb | 2 +-
lib/geocoder/lookups/yandex.rb | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/geocoder/lookups/bing.rb b/lib/geocoder/lookups/bing.rb
index 1edb567a..1f8f4c20 100644
--- a/lib/geocoder/lookups/bing.rb
+++ b/lib/geocoder/lookups/bing.rb
@@ -29,7 +29,7 @@ module Geocoder::Lookup
end
def query_url(query)
- "http://dev.virtualearth.net/REST/v1/Locations" +
+ "#{protocol}://dev.virtualearth.net/REST/v1/Locations" +
(query.reverse_geocode? ? "/#{query.sanitized_text}?" : "?") +
url_query_string(query)
end
diff --git a/lib/geocoder/lookups/freegeoip.rb b/lib/geocoder/lookups/freegeoip.rb
index 621d8ed6..e6f8f231 100644
--- a/lib/geocoder/lookups/freegeoip.rb
+++ b/lib/geocoder/lookups/freegeoip.rb
@@ -37,7 +37,7 @@ module Geocoder::Lookup
end
def query_url(query)
- "http://freegeoip.net/json/#{query.sanitized_text}"
+ "#{protocol}://freegeoip.net/json/#{query.sanitized_text}"
end
end
end
diff --git a/lib/geocoder/lookups/geocoder_ca.rb b/lib/geocoder/lookups/geocoder_ca.rb
index 97ac2721..9c62d954 100644
--- a/lib/geocoder/lookups/geocoder_ca.rb
+++ b/lib/geocoder/lookups/geocoder_ca.rb
@@ -39,7 +39,7 @@ module Geocoder::Lookup
end
def query_url(query)
- "http://geocoder.ca/?" + url_query_string(query)
+ "#{protocol}://geocoder.ca/?" + url_query_string(query)
end
def parse_raw_data(raw_data)
diff --git a/lib/geocoder/lookups/mapquest.rb b/lib/geocoder/lookups/mapquest.rb
index 1ce5e403..6a852933 100644
--- a/lib/geocoder/lookups/mapquest.rb
+++ b/lib/geocoder/lookups/mapquest.rb
@@ -10,7 +10,7 @@ module Geocoder::Lookup
def query_url(query)
key = Geocoder::Configuration.api_key
domain = key ? "www" : "open"
- url = "http://#{domain}.mapquestapi.com/geocoding/v1/#{search_type(query)}?"
+ url = "#{protocol}://#{domain}.mapquestapi.com/geocoding/v1/#{search_type(query)}?"
url + url_query_string(query)
end
diff --git a/lib/geocoder/lookups/nominatim.rb b/lib/geocoder/lookups/nominatim.rb
index d79f7312..0391d1bb 100644
--- a/lib/geocoder/lookups/nominatim.rb
+++ b/lib/geocoder/lookups/nominatim.rb
@@ -34,7 +34,7 @@ module Geocoder::Lookup
def query_url(query)
method = query.reverse_geocode? ? "reverse" : "search"
- "http://nominatim.openstreetmap.org/#{method}?" + url_query_string(query)
+ "#{protocol}://nominatim.openstreetmap.org/#{method}?" + url_query_string(query)
end
end
end
diff --git a/lib/geocoder/lookups/yahoo.rb b/lib/geocoder/lookups/yahoo.rb
index 548b217a..b4381782 100644
--- a/lib/geocoder/lookups/yahoo.rb
+++ b/lib/geocoder/lookups/yahoo.rb
@@ -39,7 +39,7 @@ module Geocoder::Lookup
end
def base_url
- "http://yboss.yahooapis.com/geo/placefinder?"
+ "#{protocol}://yboss.yahooapis.com/geo/placefinder?"
end
def raw_url(query)
diff --git a/lib/geocoder/lookups/yandex.rb b/lib/geocoder/lookups/yandex.rb
index 9b4f63d6..70dbaa7d 100644
--- a/lib/geocoder/lookups/yandex.rb
+++ b/lib/geocoder/lookups/yandex.rb
@@ -40,7 +40,7 @@ module Geocoder::Lookup
end
def query_url(query)
- "http://geocode-maps.yandex.ru/1.x/?" + url_query_string(query)
+ "#{protocol}://geocode-maps.yandex.ru/1.x/?" + url_query_string(query)
end
end
end
--
GitLab