diff --git a/lib/geocoder/lookups/bing.rb b/lib/geocoder/lookups/bing.rb index 1edb567a8532a4b3ddc8c10b0640e0c1ee2861c9..1f8f4c2079b6f393513b18d2a5ce2c2c709d1ced 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 621d8ed638699b05bb695c370f8130cf22660151..e6f8f23178f8c4db52ac4122815a380a05f6d805 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 97ac2721c756fe0e158f7ac51b3106f7bb9af1bb..9c62d954dfa9ec49ebbb51b3cefc819c1f351440 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 1ce5e4033f257bd0a3126ef021d371c7a9304bd4..6a852933e9e83aaf3b8b7e048bfa5d7edeb40913 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 d79f7312650c2d6d3d7df63285c0b6cea5b4bb19..0391d1bbbc854f8de8eb0126fa7fe239fc0b3a09 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 548b217ada9de1218b083885c0cdb5ef7eb539a0..b4381782ad7e9cfaa656a3dcdb44f3fc16669cc2 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 9b4f63d6e8104fe422f7d48474e51fba30973bf6..70dbaa7d4106e58291f0a79b45d1ce392e6206e1 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