geocoder 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581d1e425470b88287f22a34b3290577ae9b2f3c
-  data.tar.gz: bec7133e542e5da09e6f66828fce5b793c599db3
+  metadata.gz: dab954ab0ccd1f5c7829f019e78b754a950939c1
+  data.tar.gz: 8dd3db6e80446b91d9c35f9b2ad0f73a5bc28f0b
 SHA512:
-  metadata.gz: b81c979316bfafed7ccc6806ac7eb0441a4a94103769132f01a4614c5629ac2c0ae555cc2cfa6311bca85c4f9791636db2d62eeafd1a031722ca1b2cb6fec28a
-  data.tar.gz: 68e7fd710e2b3558dc25f5714cf8d69b9ed3fbcfc1ab7811a1c692e4a1533bdc0192efd121ae4812c91294d269f123fdd96793cf1ecac1930e8101236b6a1eef
+  metadata.gz: f796a95c55636b84fd46a58dd7c5e8c96ffea757270d6b8aba584abcc2634e3c30d6cce30fa6d1abf7d8ed683fecf43db6e0f1ec9512ed4b1f607786ba0289cc
+  data.tar.gz: f87b1b4860241b21a2ecebfeb8345660acf6c51d92483957eb9ec84999752588c75b4e3248366ecf591919859b8c1880c6d7d0fd29dbd67253443945cfce99a2

data/CHANGELOG.md

@@ -3,6 +3,10 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.4.7 (2018 Mar 13)
+-------------------
+* Allow HTTP protocol for Nominatim.
+
 1.4.6 (2018 Feb 28)
 -------------------
 * Add support for :ipdata_co lookup (thanks github.com/roschaefer).

data/README.md

@@ -156,10 +156,10 @@ Please use MongoDB's [geospatial query language](https://docs.mongodb.org/manual
 
 To find objects by location, use the following scopes:
 
-    Venue.near('Omaha, NE, US', 20)    # venues within 20 miles of Omaha
-    Venue.near([40.71, -100.23], 20)    # venues within 20 miles of a point
-    Venue.near([40.71, -100.23], 20, :units => :km)
-                                       # venues within 20 kilometres of a point
+    Venue.near('Omaha, NE, US')        # venues within 20 (default) miles of Omaha
+    Venue.near([40.71, -100.23], 50)   # venues within 50 miles of a point
+    Venue.near([40.71, -100.23], 50, :units => :km)
+                                       # venues within 50 kilometres of a point
     Venue.geocoded                     # venues with coordinates
     Venue.not_geocoded                 # venues without coordinates
 

data/lib/geocoder/lookups/location_iq.rb

@@ -13,15 +13,15 @@ module Geocoder::Lookup
     
     def query_url(query)
       method = query.reverse_geocode? ? "reverse" : "search"
-      "#{protocol}://locationiq.org/v1/#{method}.php?key=#{configuration.api_key}&" + url_query_string(query)
-    end
-
-    def supported_protocols
-      [:http, :https]
+      "#{protocol}://#{configured_host}/v1/#{method}.php?key=#{configuration.api_key}&" + url_query_string(query)
     end
 
     private
 
+    def configured_host
+      configuration[:host] || "locationiq.org"
+    end
+
     def results(query)
       return [] unless doc = fetch_data(query)
 

data/lib/geocoder/lookups/nominatim.rb

@@ -14,15 +14,23 @@ module Geocoder::Lookup
 
     def query_url(query)
       method = query.reverse_geocode? ? "reverse" : "search"
-      host = configuration[:host] || "nominatim.openstreetmap.org"
-      "#{protocol}://#{host}/#{method}?" + url_query_string(query)
+      "#{protocol}://#{configured_host}/#{method}?" + url_query_string(query)
     end
 
-    def supported_protocols
-      [:https]
+    private # ---------------------------------------------------------------
+
+    def configured_host
+      configuration[:host] || "nominatim.openstreetmap.org"
     end
 
-    private # ---------------------------------------------------------------
+    def use_ssl?
+      # nominatim.openstreetmap.org redirects HTTP requests to HTTPS
+      if configured_host == "nominatim.openstreetmap.org"
+        true
+      else
+        super
+      end
+    end
 
     def results(query)
       return [] unless doc = fetch_data(query)

data/lib/geocoder/results/google.rb

@@ -120,19 +120,30 @@ module Geocoder::Result
     def precision
       geometry['location_type'] if geometry
     end
-    
+
     def partial_match
       @data['partial_match']
     end
-    
+
     def place_id
       @data['place_id']
-    end  
+    end
 
     def viewport
       viewport = geometry['viewport'] || fail
-      south, west = %w(lat lng).map { |c| viewport['southwest'][c] }
-      north, east = %w(lat lng).map { |c| viewport['northeast'][c] }
+      bounding_box_from viewport
+    end
+
+    def bounds
+      bounding_box_from geometry['bounds']
+    end
+
+    private
+
+    def bounding_box_from(box)
+      return nil unless box
+      south, west = %w(lat lng).map { |c| box['southwest'][c] }
+      north, east = %w(lat lng).map { |c| box['northeast'][c] }
       [south, west, north, east]
     end
   end

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies: []
 description: Provides object geocoding (by street or IP address), reverse geocoding
   (coordinates to street address), distance queries for ActiveRecord and Mongoid,