geokit 1.8.4 → 1.8.5

data/lib/geokit/geocoders/google.rb

@@ -1,7 +1,8 @@
 module Geokit
   module Geocoders
     class GoogleGeocoder < Geocoder
-      config :client_id, :cryptographic_key, :channel
+      config :client_id, :cryptographic_key, :channel, :api_key
+      self.secure = true
 
       private
       # ==== OPTIONS
@@ -62,9 +63,12 @@ module Geokit
           channel_string = channel ? "&channel=#{channel}" : ''
           urlToSign = query_string + "&client=#{client_id}" + channel_string
           signature = sign_gmap_bus_api_url(urlToSign, cryptographic_key)
-          "http://maps.googleapis.com" + urlToSign + "&signature=#{signature}"
+          "#{protocol}://maps.googleapis.com" + urlToSign + "&signature=#{signature}"
+        elsif api_key
+          url_with_key = query_string + "&key=#{api_key}"
+          "#{protocol}://maps.googleapis.com" + url_with_key
         else
-          "http://maps.google.com" + query_string
+          "#{protocol}://maps.google.com" + query_string
         end
       end
 

data/lib/geokit/geocoders/mapquest.rb

@@ -4,20 +4,21 @@ module Geokit
     # contain a MapQuest API key.  Conforms to the interface set by the Geocoder class.
     class MapQuestGeocoder < Geocoder
       config :key
+      self.secure = true
 
       private
 
       # Template method which does the reverse-geocode lookup.
       def self.do_reverse_geocode(latlng)
         latlng=LatLng.normalize(latlng)
-        url = "http://www.mapquestapi.com/geocoding/v1/reverse?key=#{key}&location=#{latlng.lat},#{latlng.lng}"
+        url = "#{protocol}://www.mapquestapi.com/geocoding/v1/reverse?key=#{key}&location=#{latlng.lat},#{latlng.lng}"
         process :json, url
       end
 
       # Template method which does the geocode lookup.
       def self.do_geocode(address)
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
-        url = "http://www.mapquestapi.com/geocoding/v1/address?key=#{key}&location=#{Geokit::Inflector::url_escape(address_str)}"
+        url = "#{protocol}://www.mapquestapi.com/geocoding/v1/address?key=#{key}&location=#{Geokit::Inflector::url_escape(address_str)}"
         process :json, url
       end
 

data/lib/geokit/geocoders/ripe.rb

@@ -2,6 +2,7 @@ module Geokit
   module Geocoders
     # Provides geocoding based upon an IP address.  The underlying web service is geoplugin.net
     class RipeGeocoder < BaseIpGeocoder
+      self.secure = false # supports HTTPS, but Net::HTTPS doesn't like the server
       private
 
       def self.do_geocode(ip)
@@ -9,17 +10,19 @@ module Geokit
       end
 
       def self.submit_url(ip)
-        "http://stat.ripe.net/data/geoloc/data.json?resource=#{ip}"
+        "#{protocol}://stat.ripe.net/data/geoloc/data.json?resource=#{ip}"
       end
 
       def self.parse_json(json)
         loc = new_loc
         data = json['data']['locations'][0]
 
-        loc.lat = data['latitude']
-        loc.lng = data['longitude']
-        set_address_components(data, loc)
-        loc.success = (data['status_code'] == 200)
+        if data
+          loc.lat = data['latitude']
+          loc.lng = data['longitude']
+          set_address_components(data, loc)
+          loc.success = data && (data['status_code'] == 200)
+        end
         loc
       end
 

data/lib/geokit/geocoders/yahoo.rb

@@ -4,6 +4,7 @@ module Geokit
     # contain a Yahoo API key.  Conforms to the interface set by the Geocoder class.
     class YahooGeocoder < Geocoder
       config :key, :secret
+      self.secure = true
 
       private
       def self.submit_url(address)
@@ -13,7 +14,7 @@ module Geokit
         o = OauthUtil.new
         o.consumer_key = key
         o.consumer_secret = secret
-        base = "http://yboss.yahooapis.com/geo/placefinder"
+        base = "#{protocol}://yboss.yahooapis.com/geo/placefinder"
         parsed_url = URI.parse("#{base}#{query_string}")
         "#{base}?#{o.sign(parsed_url).query_string}"
       end

data/lib/geokit/lat_lng.rb

@@ -32,6 +32,16 @@ module Geokit
       "#{lat},#{lng}"
     end
 
+    # returns latitude as [ degree, minute, second ] array
+    def lat_dms
+      self.class.decimal_to_dms(lat)
+    end
+
+    # returns longitude as [ degree, minute, second ] array
+    def lng_dms
+      self.class.decimal_to_dms(lng)
+    end
+
     #returns a string with comma-separated lat,lng values
     def to_s
       ll
@@ -70,7 +80,7 @@ module Geokit
     #  4) an array in the format [37.1234,-129.1234]
     #  5) a LatLng or GeoLoc (which is just passed through as-is)
     #  6) anything responding to to_lat_lng -- a LatLng will be extracted from it
-    def self.normalize(thing,other=nil)
+    def self.normalize(thing, other=nil)
       return Geokit::LatLng.new(thing, other) if other
 
       case thing
@@ -78,7 +88,7 @@ module Geokit
         from_string(thing)
       when Array
         thing.size == 2 or raise ArgumentError.new("Must initialize with an Array with both latitude and longitude")
-        Geokit::LatLng.new(thing[0],thing[1])
+        Geokit::LatLng.new(thing[0], thing[1])
       when LatLng # will also be true for GeoLocs
         thing
       else
@@ -93,7 +103,7 @@ module Geokit
     def self.from_string(thing)
       thing.strip!
       if match=thing.match(/(\-?\d+\.?\d*)[, ] ?(\-?\d+\.?\d*)$/)
-        Geokit::LatLng.new(match[1],match[2])
+        Geokit::LatLng.new(match[1], match[2])
       else
         res = Geokit::Geocoders::MultiGeocoder.geocode(thing)
         return res if res.success?

data/lib/geokit/mappable.rb

@@ -127,6 +127,19 @@ module Geokit
         raise Geokit::Geocoders::GeocodeError
       end
 
+      # Given a decimal degree like -87.660333
+      # return a 3-element array like [ -87, 39, 37.198... ]
+      def decimal_to_dms(deg)
+        return false unless deg.is_a?(Numeric)
+        # seconds is 0...3599.999, representing the entire fractional part.
+        seconds = (deg.abs % 1.0) * 3600.0
+        [
+            deg.to_i,               # degrees as positive or negative integer
+            (seconds / 60).to_i,    # minutes as positive integer
+            (seconds % 60)          # seconds as positive float
+        ]
+      end
+      
       protected
 
       def deg2rad(degrees)

data/lib/geokit/multi_geocoder.rb

@@ -23,8 +23,7 @@ module Geokit
       # The failover approach is crucial for production-grade apps, but is rarely used.
       # 98% of your geocoding calls will be successful with the first call
       def self.do_geocode(address, *args)
-        geocode_ip = /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/.match(address)
-        provider_order = geocode_ip ? Geokit::Geocoders::ip_provider_order : Geokit::Geocoders::provider_order
+        provider_order = provider_order_for(address, args)
 
         provider_order.each do |provider|
           klass = geocoder(provider)
@@ -59,6 +58,18 @@ module Geokit
       def self.geocoder(provider)
         Geokit::Geocoders.const_get "#{Geokit::Inflector::camelize(provider.to_s)}Geocoder"
       end
+
+      def self.provider_order_for(address, args)
+        if args.last.is_a?(Hash) && args.last.key?(:provider_order)
+          args.last.delete(:provider_order)
+        else
+          if /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/.match(address)
+            Geokit::Geocoders::ip_provider_order
+          else
+            Geokit::Geocoders::provider_order
+          end
+        end
+      end
     end
   end
 end

data/lib/geokit/net_adapter/net_http.rb

@@ -10,7 +10,12 @@ module Geokit
           proxy_uri = URI.parse(proxy_uri_string)
           net_http_args += [proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password]
         end
-        Net::HTTP::new(*net_http_args).start { |http| http.request(req) }
+        http = Net::HTTP::new(*net_http_args)
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = Geokit::Geocoders.ssl_verify_mode
+        end
+        http.start { |http| http.request(req) }
       end
 
       def self.success?(response)

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = '1.8.4'
+  VERSION = '1.8.5'
 end

data/test/helper.rb

@@ -11,7 +11,7 @@ end
 require 'geoip'
 
 if ENV['COVERAGE']
-  COVERAGE_THRESHOLD = 91
+  COVERAGE_THRESHOLD = 95
   require 'simplecov'
   require 'simplecov-rcov'
   require 'coveralls'
@@ -110,6 +110,7 @@ class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
 
   # Defines common test fixtures.
   def setup
+    Geokit::Geocoders::request_timeout = 10
     @address = 'San Francisco, CA'
     @full_address = '100 Spear St, San Francisco, CA, 94105-1522, US'
     @full_address_short_zip = '100 Spear St, San Francisco, CA, 94105, US'

data/test/test_bing_geocoder.rb

@@ -16,7 +16,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_bing_full_address
     VCR.use_cassette('bing_full') do
     key = Geokit::Geocoders::BingGeocoder.key
-    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(@full_address)}?key=#{key}&o=xml"
+    url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(@full_address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(@full_address)
     assert_equal "CA", res.state
     assert_equal "San Francisco", res.city
@@ -32,7 +32,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
     address = '440 King William Street, Adelaide, Australia'
     VCR.use_cassette('bing_full_au') do
     key = Geokit::Geocoders::BingGeocoder.key
-    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
+    url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(address)
     assert_equal "SA", res.state
     assert_equal "Adelaide", res.city
@@ -49,7 +49,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
     address = "Platz der Republik 1, 11011 Berlin, Germany"
     VCR.use_cassette('bing_full_de') do
     key = Geokit::Geocoders::BingGeocoder.key
-    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
+    url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(address)
     assert_equal "BE", res.state
     assert_equal "Berlin", res.city
@@ -57,6 +57,26 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert res.country == 'Germany'
     assert_equal "Platz der Republik 1, 10557 Berlin", res.full_address
     assert_equal "bing", res.provider
+    assert_equal 'address', res.precision
+    assert_equal 8, res.accuracy
+    assert_url url
+    end
+  end
+
+  def test_bing_country
+    address = "Australia"
+    VCR.use_cassette('bing_au') do
+    key = Geokit::Geocoders::BingGeocoder.key
+    url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
+    res = Geokit::Geocoders::BingGeocoder.geocode(address)
+    assert_equal nil, res.state
+    assert_equal nil, res.city
+    assert_array_in_delta [-25.585, 134.504], res.to_a
+    assert res.country == 'Australia'
+    assert_equal 'Australia', res.full_address
+    assert_equal "bing", res.provider
+    assert_equal 'country', res.precision
+    assert_equal 8, res.accuracy
     assert_url url
     end
   end

data/test/test_fcc_geocoder.rb

@@ -12,7 +12,7 @@ class FCCGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_fcc_reverse_geocode
     VCR.use_cassette('fcc_reverse_geocode') do
-    url = "http://data.fcc.gov/api/block/find?format=json&latitude=34.05&longitude=-118.25"
+    url = "https://data.fcc.gov/api/block/find?format=json&latitude=34.05&longitude=-118.25"
     res = Geokit::Geocoders::FCCGeocoder.reverse_geocode(@la)
     assert_url url
     assert_equal res.country_code, 'US'

data/test/test_geocodio_geocoder.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+Geokit::Geocoders::GeocodioGeocoder.key = '723d41115152d224fd74727df34727c444537f7'
+
+class GeocodioGeocoderTest < BaseGeocoderTest #:nodoc: all
+  def setup
+    super
+    @full_address = '1 Infinite Loop, Cupertino, CA 95014'
+    @second_address = '300 Brannan St, San Francisco, CA 94107'
+  end
+
+  def assert_url(expected_url)
+    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
+  end
+
+  def test_geocodio_geocode
+    VCR.use_cassette('geocodio_geocode') do
+      res = Geokit::Geocoders::GeocodioGeocoder.geocode(@full_address)
+      url = "http://api.geocod.io/v1/geocode?q=#{Geokit::Inflector.url_escape(@full_address)}&api_key=723d41115152d224fd74727df34727c444537f7"
+
+      assert_url url
+
+      verify(res)
+    end
+  end
+
+  def verify(location)
+    assert_equal location.city, 'Cupertino'
+    assert_equal location.zip, '95014'
+    assert_equal location.lat, 37.331669
+    assert_equal location.lng, -122.03074
+  end
+end

data/test/test_google_geocoder.rb

@@ -33,12 +33,26 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     url = Geokit::Geocoders::GoogleGeocoder.send(:submit_url, 'address=New+York')
     Geokit::Geocoders::GoogleGeocoder.client_id = nil
     Geokit::Geocoders::GoogleGeocoder.cryptographic_key = nil
-    assert_equal 'http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=New+York&client=clientID&signature=9mevp7SoVsSKzF9nj-vApMYbatg=', url
+    assert_equal 'https://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=New+York&client=clientID&signature=9mevp7SoVsSKzF9nj-vApMYbatg=', url
+  end
+
+  def test_google_api_key
+    Geokit::Geocoders::GoogleGeocoder.api_key = 'someKey'
+    url = Geokit::Geocoders::GoogleGeocoder.send(:submit_url, 'address=New+York')
+    Geokit::Geocoders::GoogleGeocoder.api_key = nil
+    assert_equal 'https://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=New+York&key=someKey', url
+  end
+
+  def test_google_insecure_url
+    Geokit::Geocoders.secure = false
+    url = Geokit::Geocoders::GoogleGeocoder.send(:submit_url, 'address=New+York')
+    Geokit::Geocoders.secure = true
+    assert_equal 'http://maps.google.com/maps/api/geocode/json?sensor=false&address=New+York', url
   end
 
   def test_google_full_address
     VCR.use_cassette('google_full_short') do
-    url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+    url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
     TestHelper.expects(:last_url).with(url)
     res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
     assert_equal "CA", res.state
@@ -52,7 +66,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_google_full_address_with_geo_loc
      VCR.use_cassette('google_full') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
      TestHelper.expects(:last_url).with(url)
      res=Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
      assert_equal "CA", res.state
@@ -66,7 +80,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_google_full_address_accuracy
      VCR.use_cassette('google_full') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
      TestHelper.expects(:last_url).with(url)
      res=Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
 
@@ -76,7 +90,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_google_city
      VCR.use_cassette('google_city') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
      TestHelper.expects(:last_url).with(url)
      res=Geokit::Geocoders::GoogleGeocoder.do_geocode(@address)
      assert_nil res.street_address
@@ -91,7 +105,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_google_city_accuracy
      VCR.use_cassette('google_city') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
      TestHelper.expects(:last_url).with(url)
      res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
      assert_equal 4, res.accuracy
@@ -100,7 +114,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_google_city_with_geo_loc
      VCR.use_cassette('google_city') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
      TestHelper.expects(:last_url).with(url)
      res=Geokit::Geocoders::GoogleGeocoder.geocode(@google_city_loc)
      assert_equal "CA", res.state
@@ -115,7 +129,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_google_suggested_bounds
      VCR.use_cassette('google_full') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
      TestHelper.expects(:last_url).with(url)
      res = Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
      assert_instance_of Geokit::Bounds, res.suggested_bounds
@@ -129,21 +143,21 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
        Geokit::LatLng.new(33.7036917, -118.6681759),
        Geokit::LatLng.new(34.3373061, -118.1552891)
      )
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=Winnetka&bounds=33.7036917%2C-118.6681759%7C34.3373061%2C-118.1552891"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=Winnetka&bounds=33.7036917%2C-118.6681759%7C34.3373061%2C-118.1552891"
      Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url)
      Geokit::Geocoders::GoogleGeocoder.geocode('Winnetka', :bias => bounds)
   end
 
    def test_service_unavailable
      response = MockFailure.new
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
      Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
      assert !Geokit::Geocoders::GoogleGeocoder.geocode(@google_city_loc).success
    end
 
    def test_multiple_results
      VCR.use_cassette('google_multi') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape('via Sandro Pertini 8, Ossona, MI')}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape('via Sandro Pertini 8, Ossona, MI')}"
      TestHelper.expects(:last_url).with(url)
      res=Geokit::Geocoders::GoogleGeocoder.geocode('via Sandro Pertini 8, Ossona, MI')
      assert_equal 5, res.all.size
@@ -171,7 +185,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
      VCR.use_cassette('google_reverse_madrid') do
      madrid = Geokit::GeoLoc.new
      madrid.lat, madrid.lng = "40.4167413", "-3.7032498"
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&latlng=#{Geokit::Inflector::url_escape(madrid.ll)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&latlng=#{Geokit::Inflector::url_escape(madrid.ll)}"
      TestHelper.expects(:last_url).with(url)
      res=Geokit::Geocoders::GoogleGeocoder.do_reverse_geocode(madrid.ll)
 
@@ -191,7 +205,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_reverse_geocode_language
      VCR.use_cassette('google_reverse_madrid_es') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&latlng=40.416%2C-3.703&language=es"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&latlng=40.416%2C-3.703&language=es"
      TestHelper.expects(:last_url).with(url)
      language_result = Geokit::Geocoders::GoogleGeocoder.reverse_geocode('40.416,-3.703', :language => 'es')
 
@@ -202,7 +216,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_country_code_biasing
      VCR.use_cassette('google_country_code_biased_result') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=Syracuse&region=it"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=Syracuse&region=it"
      TestHelper.expects(:last_url).with(url)
      biased_result = Geokit::Geocoders::GoogleGeocoder.geocode('Syracuse', :bias => 'it')
 
@@ -213,7 +227,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
    def test_language_response
      VCR.use_cassette('google_language_response_fr') do
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=Hanoi&language=FR"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=Hanoi&language=FR"
      TestHelper.expects(:last_url).with(url)
      language_result = Geokit::Geocoders::GoogleGeocoder.geocode('Hanoi', :language => 'FR')
 
@@ -225,7 +239,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
    def test_too_many_queries
      response = MockSuccess.new
      response.expects(:body).returns %q/{"status": "OVER_QUERY_LIMIT"}/
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape(@address)}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape(@address)}"
      Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
      assert_raise Geokit::Geocoders::TooManyQueriesError do
        res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
@@ -235,7 +249,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
    def test_invalid_request
      response = MockSuccess.new
      response.expects(:body).returns %q/{"results" : [], "status" : "INVALID_REQUEST"}/
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape("3961 V\u00EDa Marisol")}"
+     url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape("3961 V\u00EDa Marisol")}"
      Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
      assert_raise Geokit::Geocoders::GeocodeError do
        Geokit::Geocoders::GoogleGeocoder.geocode("3961 V\u00EDa Marisol")