geokit 1.8.4 → 1.8.5

data/fixtures/vcr_cassettes/google_reverse_madrid_es.yml

@@ -2,48 +2,42 @@
 http_interactions:
 - request:
     method: get
-    uri: http://maps.google.com/maps/api/geocode/json?language=es&latlng=40.416,-3.703&sensor=false
+    uri: https://maps.google.com/maps/api/geocode/json?language=es&latlng=40.416,-3.703&sensor=false
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - '*/*'
       User-Agent:
       - Ruby
   response:
     status:
       code: 200
-      message: !binary |-
-        T0s=
+      message: OK
     headers:
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD1VVEYtOA==
-      !binary "RGF0ZQ==":
-      - !binary |-
-        RnJpLCAyNyBEZWMgMjAxMyAxMToyNDoyMyBHTVQ=
-      !binary "RXhwaXJlcw==":
-      - !binary |-
-        U2F0LCAyOCBEZWMgMjAxMyAxMToyNDoyMyBHTVQ=
-      !binary "Q2FjaGUtQ29udHJvbA==":
-      - !binary |-
-        cHVibGljLCBtYXgtYWdlPTg2NDAw
-      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
-      - !binary |-
-        Kg==
-      !binary "U2VydmVy":
-      - !binary |-
-        bWFmZQ==
-      !binary "WC1Yc3MtUHJvdGVjdGlvbg==":
-      - !binary |-
-        MTsgbW9kZT1ibG9jaw==
-      !binary "WC1GcmFtZS1PcHRpb25z":
-      - !binary |-
-        U0FNRU9SSUdJTg==
-      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
-      - !binary |-
-        Y2h1bmtlZA==
+      Content-Type:
+      - application/json; charset=UTF-8
+      Date:
+      - Sun, 26 Jan 2014 05:46:39 GMT
+      Expires:
+      - Mon, 27 Jan 2014 05:46:39 GMT
+      Cache-Control:
+      - public, max-age=86400
+      Access-Control-Allow-Origin:
+      - '*'
+      Server:
+      - mafe
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - SAMEORIGIN
+      Alternate-Protocol:
+      - 443:quic
+      Transfer-Encoding:
+      - chunked
     body:
       encoding: ASCII-8BIT
       string: !binary |-
@@ -459,5 +453,5 @@ http_interactions:
         dHlwZXMiIDogWyAiY291bnRyeSIsICJwb2xpdGljYWwiIF0KICAgICAgfQog
         ICBdLAogICAic3RhdHVzIiA6ICJPSyIKfQo=
     http_version: 
-  recorded_at: Fri, 27 Dec 2013 11:24:21 GMT
+  recorded_at: Sun, 26 Jan 2014 05:46:40 GMT
 recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/map_quest_full.yml

@@ -0,0 +1,53 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://www.mapquestapi.com/geocoding/v1/address?key=Fmjtd%7Cluur2d0125,2s=o5-9a8lhz&location=100%20Spear%20St%20Apt.%205,%20San%20Francisco,%20CA,%2094105,%20US
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      Set-Cookie:
+      - JSESSIONID=A737A4684852AE01983F5AA9FA4321C4; Path=/; HttpOnly
+      Expires:
+      - Mon, 20 Dec 1998 01:00:00 GMT
+      Last-Modified:
+      - Thu, 29 May 2014 13:38:05 GMT
+      Cache-Control:
+      - no-cache, must-revalidate
+      Pragma:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - OPTIONS,GET,POST
+      Content-Type:
+      - application/json;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Thu, 29 May 2014 13:38:04 GMT
+    body:
+      encoding: UTF-8
+      string: "{\"info\":{\"statuscode\":0,\"copyright\":{\"text\":\"\\u00A9 2014
+        MapQuest, Inc.\",\"imageUrl\":\"https://api.mqcdn.com/res/mqlogo.gif\",\"imageAltText\":\"\\u00A9
+        2014 MapQuest, Inc.\"},\"messages\":[]},\"options\":{\"maxResults\":-1,\"thumbMaps\":true,\"ignoreLatLngInput\":false},\"results\":[{\"providedLocation\":{\"location\":\"100
+        Spear St Apt. 5, San Francisco, CA, 94105, US\"},\"locations\":[{\"street\":\"100
+        Spear St, APT 5\",\"adminArea5\":\"San Francisco\",\"adminArea5Type\":\"City\",\"adminArea4\":\"San
+        Francisco\",\"adminArea4Type\":\"County\",\"adminArea3\":\"CA\",\"adminArea3Type\":\"State\",\"adminArea1\":\"US\",\"adminArea1Type\":\"Country\",\"postalCode\":\"94105-1500\",\"geocodeQualityCode\":\"P1AAA\",\"geocodeQuality\":\"POINT\",\"dragPoint\":false,\"sideOfStreet\":\"R\",\"linkId\":\"68400005996374\",\"unknownInput\":\"\",\"type\":\"s\",\"latLng\":{\"lat\":37.792305,\"lng\":-122.393776},\"displayLatLng\":{\"lat\":37.79215,\"lng\":-122.394},\"mapUrl\":\"https://www.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luur2d0125,2s=o5-9a8lhz&type=map&size=225,160&pois=purple-1,37.792305,-122.393776,0,0,|&center=37.792305,-122.393776&zoom=15&rand=-150371976\"}]}]}"
+    http_version: 
+  recorded_at: Thu, 29 May 2014 13:38:05 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/map_quest_reverse_madrid.yml

@@ -0,0 +1,52 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://www.mapquestapi.com/geocoding/v1/reverse?key=Fmjtd%7Cluur2d0125,2s=o5-9a8lhz&location=40.4167413,-3.7032498
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      Set-Cookie:
+      - JSESSIONID=3BC67F1FAE87C7DA0C84F86919DF3E1E; Path=/; HttpOnly
+      Expires:
+      - Mon, 20 Dec 1998 01:00:00 GMT
+      Last-Modified:
+      - Thu, 29 May 2014 13:38:06 GMT
+      Cache-Control:
+      - no-cache, must-revalidate
+      Pragma:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - OPTIONS,GET,POST
+      Content-Type:
+      - application/json;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Thu, 29 May 2014 13:38:06 GMT
+    body:
+      encoding: UTF-8
+      string: "{\"info\":{\"statuscode\":0,\"copyright\":{\"text\":\"\\u00A9 2014
+        MapQuest, Inc.\",\"imageUrl\":\"https://api.mqcdn.com/res/mqlogo.gif\",\"imageAltText\":\"\\u00A9
+        2014 MapQuest, Inc.\"},\"messages\":[]},\"options\":{\"maxResults\":1,\"thumbMaps\":true,\"ignoreLatLngInput\":false},\"results\":[{\"providedLocation\":{\"latLng\":{\"lat\":40.4167413,\"lng\":-3.7032498}},\"locations\":[{\"street\":\"\",\"adminArea5\":\"Madrid\",\"adminArea5Type\":\"City\",\"adminArea4\":\"\\u00C1rea
+        metropolitana de Madrid y Corredor del Henares\",\"adminArea4Type\":\"County\",\"adminArea3\":\"Comunidad
+        de Madrid\",\"adminArea3Type\":\"State\",\"adminArea1\":\"ES\",\"adminArea1Type\":\"Country\",\"postalCode\":\"28014\",\"geocodeQualityCode\":\"Z1XAA\",\"geocodeQuality\":\"ZIP\",\"dragPoint\":false,\"sideOfStreet\":\"N\",\"linkId\":\"0\",\"unknownInput\":\"\",\"type\":\"s\",\"latLng\":{\"lat\":40.41686,\"lng\":-3.70348},\"displayLatLng\":{\"lat\":40.41686,\"lng\":-3.70348},\"mapUrl\":\"https://www.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luur2d0125,2s=o5-9a8lhz&type=map&size=225,160&pois=purple-1,40.41685975,-3.70348049982096,0,0,|&center=40.41685975,-3.70348049982096&zoom=15&rand=-639817840\"}]}]}"
+    http_version: 
+  recorded_at: Thu, 29 May 2014 13:38:06 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/ripe_geocode_45.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://stat.ripe.net/data/geoloc/data.json?resource=45.45.45.45
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Vary:
+      - Cookie, Accept-Encoding
+      Content-Length:
+      - '274'
+      Content-Type:
+      - application/json; charset=utf-8
+      Set-Cookie:
+      - stat-session=31cebc7bc2ff5c195bcad049a37ab4b2; expires=Wed, 11-Jun-2014 10:59:59
+        GMT; httponly; Max-Age=1209600; Path=/
+      Date:
+      - Wed, 28 May 2014 10:59:59 GMT
+      Server:
+      - lighttpd/1.4.32
+    body:
+      encoding: UTF-8
+      string: "{\n    \"cached\": true, \n    \"data\": {\n        \"locations\":
+        [], \n        \"query_time\": \"2014-05-01T00:00:00\", \n        \"resource\":
+        \"45.45.45.45\", \n        \"unknown_percentage\": 100.0\n    }, \n    \"data_call_status\":
+        \"supported\", \n    \"messages\": [], \n    \"process_time\": 7, \n    \"query_id\":
+        \"35d010ee-e657-11e3-adde-782bcb346712\", \n    \"see_also\": [], \n    \"server_id\":
+        \"stat-app2\", \n    \"status\": \"ok\", \n    \"status_code\": 200, \n    \"time\":
+        \"2014-05-28T10:59:59.069345\", \n    \"version\": \"2.0\"\n}"
+    http_version: 
+  recorded_at: Wed, 28 May 2014 10:59:59 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/yahoo_city.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://yboss.yahooapis.com/geo/placefinder?flags=J&oauth_consumer_key=dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--&oauth_nonce=731410e6df&oauth_signature=%2Bde/2eYXvMPhoRu5MUdjhPct3xY=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1384355278&oauth_version=1.0&q=San%20Francisco,%20CA
+    uri: https://yboss.yahooapis.com/geo/placefinder?flags=J&oauth_consumer_key=dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--&oauth_nonce=731410e6df&oauth_signature=%2Bde/2eYXvMPhoRu5MUdjhPct3xY=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1384355278&oauth_version=1.0&q=San%20Francisco,%20CA
     body:
       encoding: US-ASCII
       string: ''

data/fixtures/vcr_cassettes/yahoo_full.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://yboss.yahooapis.com/geo/placefinder?flags=J&oauth_consumer_key=dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--&oauth_nonce=7a0ce94e38&oauth_signature=aTamhmDusxM4xYZXWocDEb5YmyE=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1384355278&oauth_version=1.0&q=100%20Spear%20St,%20San%20Francisco,%20CA,%2094105-1522,%20US
+    uri: https://yboss.yahooapis.com/geo/placefinder?flags=J&oauth_consumer_key=dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--&oauth_nonce=7a0ce94e38&oauth_signature=aTamhmDusxM4xYZXWocDEb5YmyE=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1384355278&oauth_version=1.0&q=100%20Spear%20St,%20San%20Francisco,%20CA,%2094105-1522,%20US
     body:
       encoding: US-ASCII
       string: ''

data/fixtures/vcr_cassettes/yahoo_no_results.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://yboss.yahooapis.com/geo/placefinder?flags=J&oauth_consumer_key=dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--&oauth_nonce=2c5ad2f846&oauth_signature=h2eR3b0GSWsgqU2nJhd1jPP8ihI=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1384355895&oauth_version=1.0&q=ZZ,%20ZZ,%20ZZ
+    uri: https://yboss.yahooapis.com/geo/placefinder?flags=J&oauth_consumer_key=dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--&oauth_nonce=2c5ad2f846&oauth_signature=h2eR3b0GSWsgqU2nJhd1jPP8ihI=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1384355895&oauth_version=1.0&q=ZZ,%20ZZ,%20ZZ
     body:
       encoding: US-ASCII
       string: ''

data/lib/geokit/geocoders.rb

@@ -40,6 +40,8 @@ module Geokit
     @@logger.level=Logger::INFO
     @@domain = nil
     @@net_adapter = Geokit::NetAdapter::NetHttp
+    @@secure = true
+    @@ssl_verify_mode = OpenSSL::SSL::VERIFY_PEER
 
     def self.__define_accessors
       class_variables.each do |v|
@@ -87,8 +89,9 @@ module Geokit
         do_geocode(address, *args) || GeoLoc.new
       rescue TooManyQueriesError, GeocodeError
         raise
-      rescue
+      rescue => e
         logger.error "Caught an error during #{provider_name} geocoding call: #{$!}"
+        logger.error e.backtrace.join("\n")
         GeoLoc.new
       end
       # Main method which calls the do_reverse_geocode template method which subclasses
@@ -121,6 +124,10 @@ module Geokit
         end
       end
 
+      def self.inherited(base)
+        base.config :secure
+      end
+
       def self.new_loc
         loc = GeoLoc.new
         loc.provider = Geokit::Inflector.underscore(provider_name)
@@ -142,6 +149,14 @@ module Geokit
         GeoLoc.new
       end
 
+      def self.use_https?
+        self.secure && Geokit::Geocoders.secure
+      end
+
+      def self.protocol
+        use_https? ? 'https' : 'http'
+      end
+
       # Wraps the geocoder call around a proxy if necessary.
       def self.do_get(url)
         net_adapter.do_get(url)

data/lib/geokit/geocoders/bing.rb

@@ -4,6 +4,7 @@ module Geokit
     # contain a Bing Maps API key.  Conforms to the interface set by the Geocoder class.
     class BingGeocoder < Geocoder
       config :key, :options
+      self.secure = true
 
       private
 
@@ -20,7 +21,7 @@ module Geokit
         culture = options && options[:culture]
         culture_string = culture ? "&c=#{culture}" : ''
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
-        "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address_str)}?key=#{key}#{culture_string}&o=xml"
+        "#{protocol}://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address_str)}?key=#{key}#{culture_string}&o=xml"
       end
 
       def self.parse_xml(xml)
@@ -61,28 +62,31 @@ module Geokit
         set_mappings(loc, xml, XML_MAPPINGS)
       end
 
+      ACCURACY_MAP = {
+        'High'   => 8,
+        'Medium' => 5,
+        'Low'    => 2
+      }
+
+      PRECISION_MAP = {
+        'Sovereign'      => 'country',
+        'CountryRegion'  => 'country',
+        'AdminDivision1' => 'state',
+        'AdminDivision2' => 'state',
+        'PopulatedPlace' => 'city',
+        'Postcode1'      => 'zip',
+        'Postcode2'      => 'zip',
+        'RoadBlock'      => 'street',
+        'Address'        => 'address'
+      }
+
       def self.set_precision(loc, xml)
         if xml.elements['.//Confidence']
-          loc.accuracy      = case xml.elements['.//Confidence'].text
-          when 'High'    then 8
-          when 'Medium'  then 5
-          when 'Low'     then 2
-          else             0
-          end
+          loc.accuracy = ACCURACY_MAP[xml.elements['.//Confidence'].text] || 0
         end
 
         if xml.elements['.//EntityType']
-          loc.precision     = case xml.elements['.//EntityType'].text
-          when 'Sovereign'      then 'country'
-          when 'AdminDivision1' then 'state'
-          when 'AdminDivision2' then 'state'
-          when 'PopulatedPlace' then 'city'
-          when 'Postcode1'      then 'zip'
-          when 'Postcode2'      then 'zip'
-          when 'RoadBlock'      then 'street'
-          when 'Address'        then 'address'
-          else                    'unkown'
-          end
+          loc.precision = PRECISION_MAP[xml.elements['.//EntityType'].text] || 'unknown'
         end
       end
 

data/lib/geokit/geocoders/fcc.rb

@@ -1,12 +1,13 @@
 module Geokit
   module Geocoders
     class FCCGeocoder < Geocoder
+      self.secure = true
 
       private
       # Template method which does the reverse-geocode lookup.
       def self.do_reverse_geocode(latlng)
         latlng=LatLng.normalize(latlng)
-        url = "http://data.fcc.gov/api/block/find?format=json&latitude=#{Geokit::Inflector::url_escape(latlng.lat.to_s)}&longitude=#{Geokit::Inflector::url_escape(latlng.lng.to_s)}"
+        url = "#{protocol}://data.fcc.gov/api/block/find?format=json&latitude=#{Geokit::Inflector::url_escape(latlng.lat.to_s)}&longitude=#{Geokit::Inflector::url_escape(latlng.lng.to_s)}"
         process :json, url
       end
 

data/lib/geokit/geocoders/geocodio.rb

@@ -0,0 +1,59 @@
+module Geokit
+  module Geocoders
+    class GeocodioGeocoder < Geocoder
+      config :key
+
+      private
+
+      def self.do_geocode(address)
+        process :json, submit_url(address)
+      end
+
+      def self.submit_url(address)
+        params = [
+          "q=#{Geokit::Inflector::url_escape(address)}",
+          "api_key=#{key}"
+        ].join('&')
+
+        ['http://api.geocod.io/v1/geocode', params].join('?')
+      end
+
+      def self.parse_json(json)
+        loc = nil
+
+        json['results'].each do |address|
+          if loc.nil?
+            loc = create_new_loc(address)
+          else
+            loc.all.push(create_new_loc(address))
+          end
+        end
+
+        loc
+      end
+
+      def self.create_new_loc(json)
+        loc = new_loc
+        set_address_components(json, loc)
+        set_coordinates(json, loc)
+        loc
+      end
+
+      def self.set_address_components(json, loc)
+        loc.street_address  = json['address_components']['street']
+        loc.street_number   = json['address_components']['number']
+        loc.sub_premise     = json['address_components']['suffix']
+        loc.street_name     = json['address_components']['street']
+        loc.city            = json['address_components']['city']
+        loc.state           = json['address_components']['state']
+        loc.zip             = json['address_components']['zip']
+        loc.full_address    = json['formatted_address']
+      end
+
+      def self.set_coordinates(json, loc)
+        loc.lat = json['location']['lat']
+        loc.lng = json['location']['lng']
+      end
+    end
+  end
+end