geocoder 1.4.3 → 1.6.1

data/lib/geocoder/results/pickpoint.rb

@@ -0,0 +1,6 @@
+require 'geocoder/results/nominatim'
+
+module Geocoder::Result
+  class Pickpoint < Nominatim
+  end
+end

data/lib/geocoder/results/postcodes_io.rb

@@ -0,0 +1,40 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class PostcodesIo < Base
+
+    def coordinates
+      [@data['latitude'].to_f, @data['longitude'].to_f]
+    end
+
+    def quality
+      @data['quality']
+    end
+
+    def postal_code
+      @data['postcode']
+    end
+    alias address postal_code
+
+    def city
+      @data['admin_ward']
+    end
+
+    def county
+      @data['admin_county']
+    end
+    alias state county
+
+    def state_code
+      @data['codes']['admin_county']
+    end
+
+    def country
+      'United Kingdom'
+    end
+
+    def country_code
+      'UK'
+    end
+  end
+end

data/lib/geocoder/results/smarty_streets.rb

@@ -3,57 +3,89 @@ require 'geocoder/lookups/base'
 module Geocoder::Result
   class SmartyStreets < Base
     def coordinates
-      %w(latitude longitude).map do |i|
+      result = %w(latitude longitude).map do |i|
         zipcode_endpoint? ? zipcodes.first[i] : metadata[i]
       end
+
+      if result.compact.empty?
+        nil
+      else
+        result
+      end
     end
 
     def address
-      [
-        delivery_line_1,
-        delivery_line_2,
-        last_line
-      ].select{ |i| i.to_s != "" }.join(" ")
+      parts =
+        if international_endpoint?
+          (1..12).map { |i| @data["address#{i}"] }
+        else
+          [
+            delivery_line_1,
+            delivery_line_2,
+            last_line
+          ]
+        end
+      parts.select{ |i| i.to_s != "" }.join(" ")
     end
 
     def state
-      zipcode_endpoint? ?
-        city_states.first['state'] :
+      if international_endpoint?
+        components['administrative_area']
+      elsif zipcode_endpoint?
+        city_states.first['state']
+      else
         components['state_abbreviation']
+      end
     end
 
     def state_code
-      zipcode_endpoint? ?
-        city_states.first['state_abbreviation'] :
+      if international_endpoint?
+        components['administrative_area']
+      elsif zipcode_endpoint?
+        city_states.first['state_abbreviation']
+      else
         components['state_abbreviation']
+      end
     end
 
     def country
-      # SmartyStreets returns results for USA only
-      "United States"
+      international_endpoint? ?
+        components['country_iso_3'] :
+        "United States"
     end
 
     def country_code
-      # SmartyStreets returns results for USA only
-      "US"
+      international_endpoint? ?
+        components['country_iso_3'] :
+        "US"
     end
 
     ## Extra methods not in base.rb ------------------------
 
     def street
-      components['street_name']
+      international_endpoint? ?
+        components['thoroughfare_name'] :
+        components['street_name']
     end
 
     def city
-      zipcode_endpoint? ?
-        city_states.first['city'] :
+      if international_endpoint?
+        components['locality']
+      elsif zipcode_endpoint?
+        city_states.first['city']
+      else
         components['city_name']
+      end
     end
 
     def zipcode
-      zipcode_endpoint? ?
-        zipcodes.first['zipcode'] :
+      if international_endpoint?
+        components['postal_code']
+      elsif zipcode_endpoint?
+        zipcodes.first['zipcode']
+      else
         components['zipcode']
+      end
     end
     alias_method :postal_code, :zipcode
 
@@ -72,6 +104,10 @@ module Geocoder::Result
       zipcodes.any?
     end
 
+    def international_endpoint?
+      !@data['address1'].nil?
+    end
+
     [
       :delivery_line_1,
       :delivery_line_2,

data/lib/geocoder/results/telize.rb

@@ -3,11 +3,6 @@ require 'geocoder/results/base'
 module Geocoder::Result
   class Telize < Base
 
-    def address(format = :full)
-      s = state_code.to_s == "" ? "" : ", #{state_code}"
-      "#{city}#{s} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
-    end
-
     def city
       @data['city']
     end

data/lib/geocoder/results/tencent.rb

@@ -0,0 +1,72 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Tencent < Base
+
+    def coordinates
+      ['lat', 'lng'].map{ |i| @data['location'][i] }
+    end
+
+    def address
+      "#{province}#{city}#{district}#{street}#{street_number}"
+
+      #@data['title'] or @data['address']
+    end
+
+    # NOTE: The Tencent reverse geocoding API has the field named
+    # 'address_component' compared to 'address_components' in the 
+    # regular geocoding API.
+    def province
+      @data['address_components'] and (@data['address_components']['province']) or 
+      (@data['address_component'] and @data['address_component']['province']) or
+      ""
+    end
+
+    alias_method :state, :province
+
+    def city
+      @data['address_components'] and (@data['address_components']['city']) or 
+      (@data['address_component'] and @data['address_component']['city']) or
+      ""
+    end
+
+    def district
+      @data['address_components'] and (@data['address_components']['district']) or 
+      (@data['address_component'] and @data['address_component']['district']) or
+      ""
+    end
+
+    def street
+      @data['address_components'] and (@data['address_components']['street']) or 
+      (@data['address_component'] and @data['address_component']['street']) or
+      ""
+    end
+
+    def street_number
+      @data['address_components'] and (@data['address_components']['street_number']) or 
+      (@data['address_component'] and @data['address_component']['street_number']) or
+      ""
+    end
+
+    def address_components
+      @data['address_components'] or @data['address_component']
+    end
+
+    def state_code
+      ""
+    end
+
+    def postal_code
+      ""
+    end
+
+    def country
+      "China"
+    end
+
+    def country_code
+      "CN"
+    end
+
+  end
+end

data/lib/geocoder/results/test.rb

@@ -15,7 +15,7 @@ module Geocoder
         end
       end
 
-      %w[latitude longitude neighborhood city state state_code sub_state
+      %w[coordinates neighborhood city state state_code sub_state
       sub_state_code province province_code postal_code country
       country_code address street_address street_number route geometry].each do |attr|
         add_result_attribute(attr)

data/lib/geocoder/sql.rb

@@ -44,13 +44,13 @@ module Geocoder
     end
 
     def within_bounding_box(sw_lat, sw_lng, ne_lat, ne_lng, lat_attr, lon_attr)
-      spans = "#{lat_attr} BETWEEN #{sw_lat} AND #{ne_lat} AND "
+      spans = "#{lat_attr} BETWEEN #{sw_lat.to_f} AND #{ne_lat.to_f} AND "
       # handle box that spans 180 longitude
       if sw_lng.to_f > ne_lng.to_f
-        spans + "#{lon_attr} BETWEEN #{sw_lng} AND 180 OR " +
-        "#{lon_attr} BETWEEN -180 AND #{ne_lng}"
+        spans + "(#{lon_attr} BETWEEN #{sw_lng.to_f} AND 180 OR " +
+        "#{lon_attr} BETWEEN -180 AND #{ne_lng.to_f})"
       else
-        spans + "#{lon_attr} BETWEEN #{sw_lng} AND #{ne_lng}"
+        spans + "#{lon_attr} BETWEEN #{sw_lng.to_f} AND #{ne_lng.to_f}"
       end
     end
 

data/lib/geocoder/stores/active_record.rb

@@ -60,7 +60,7 @@ module Geocoder::Store
         # corner followed by the northeast corner of the box
         # (<tt>[[sw_lat, sw_lon], [ne_lat, ne_lon]]</tt>).
         #
-        scope :within_bounding_box, lambda{ |bounds|
+        scope :within_bounding_box, lambda{ |*bounds|
           sw_lat, sw_lng, ne_lat, ne_lng = bounds.flatten if bounds
           if sw_lat && sw_lng && ne_lat && ne_lng
             where(Geocoder::Sql.within_bounding_box(
@@ -87,8 +87,6 @@ module Geocoder::Store
         end
       end
 
-      private # ----------------------------------------------------------------
-
       ##
       # Get options hash suitable for passing to ActiveRecord.find to get
       # records within a radius (in kilometers) of the given point.
@@ -131,7 +129,11 @@ module Geocoder::Store
         distance_column = options.fetch(:distance_column) { 'distance' }
         bearing_column = options.fetch(:bearing_column)  { 'bearing' }
 
-        b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
+        # If radius is a DB column name, bounding box should include
+        # all rows within the maximum radius appearing in that column.
+        # Note: performance is dependent on variability of radii.
+        bb_radius = radius.is_a?(Symbol) ? maximum(radius) : radius
+        b = Geocoder::Calculations.bounding_box([latitude, longitude], bb_radius, options)
         args = b + [
           full_column_name(latitude_attribute),
           full_column_name(longitude_attribute)
@@ -142,7 +144,16 @@ module Geocoder::Store
           conditions = bounding_box_conditions
         else
           min_radius = options.fetch(:min_radius, 0).to_f
-          conditions = [bounding_box_conditions + " AND (#{distance}) BETWEEN ? AND ?", min_radius, radius]
+          # if radius is a DB column name,
+          # find rows between min_radius and value in column
+          if radius.is_a?(Symbol)
+            c = "BETWEEN ? AND #{radius}"
+            a = [min_radius]
+          else
+            c = "BETWEEN ? AND ?"
+            a = [min_radius, radius]
+          end
+          conditions = [bounding_box_conditions + " AND (#{distance}) " + c] + a
         end
         {
           :select => select_clause(options[:select],

data/lib/geocoder/stores/base.rb

@@ -90,7 +90,7 @@ module Geocoder
           return
         end
 
-        query_options = [:lookup, :ip_lookup, :language].inject({}) do |hash, key|
+        query_options = [:lookup, :ip_lookup, :language, :params].inject({}) do |hash, key|
           if options.has_key?(key)
             val = options[key]
             hash[key] = val.respond_to?(:call) ? val.call(self) : val
@@ -113,4 +113,3 @@ module Geocoder
     end
   end
 end
-

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.4.3"
+  VERSION = "1.6.1"
 end

data/lib/hash_recursive_merge.rb

@@ -60,9 +60,8 @@ module HashRecursiveMerge
   #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
   # 
   def rmerge(other_hash)
-    r = {}
     merge(other_hash) do |key, oldval, newval|
-      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
+      oldval.class == self.class ? oldval.rmerge(newval) : newval
     end
   end
 

data/lib/maxmind_database.rb

@@ -96,9 +96,9 @@ module Geocoder
 
     def archive_url_path(package)
       {
-        geolite_country_csv: "GeoIPCountryCSV.zip",
-        geolite_city_csv: "GeoLiteCity_CSV/GeoLiteCity-latest.zip",
-        geolite_asn_csv: "asnum/GeoIPASNum2.zip"
+        geolite_country_csv: "GeoLite2-Country-CSV.zip",
+        geolite_city_csv: "GeoLite2-City-CSV.zip",
+        geolite_asn_csv: "GeoLite2-ASN-CSV.zip"
       }[package]
     end
 

data/lib/tasks/geocoder.rake

@@ -1,4 +1,4 @@
-require "geocoder/models/mongoid" 
+require "geocoder/models/mongoid"
 
 namespace :geocode do
   desc "Geocode all objects without coordinates."
@@ -7,6 +7,7 @@ namespace :geocode do
     sleep_timer = ENV['SLEEP'] || ENV['sleep']
     batch = ENV['BATCH'] || ENV['batch']
     reverse = ENV['REVERSE'] || ENV['reverse']
+    limit = ENV['LIMIT'] || ENV['limit']
     raise "Please specify a CLASS (model)" unless class_name
     klass = class_from_string(class_name)
     batch = (batch.to_i unless batch.nil?) || 1000
@@ -20,13 +21,20 @@ namespace :geocode do
     }
 
     scope = reverse ? klass.not_reverse_geocoded : klass.not_geocoded
+    scope = scope.limit(limit) if limit
     if orm == 'mongoid'
       scope.each do |obj|
         geocode_record.call(obj)
       end
     elsif orm == 'active_record'
-      scope.find_each(batch_size: batch) do |obj|
-        geocode_record.call(obj)
+      if limit
+        scope.each do |obj|
+          geocode_record.call(obj)
+        end
+      else
+        scope.find_each(batch_size: batch) do |obj|
+          geocode_record.call(obj)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.6.1
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2020-01-23 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,
@@ -35,6 +35,7 @@ files:
 - lib/generators/geocoder/maxmind/geolite_country_generator.rb
 - lib/generators/geocoder/maxmind/templates/migration/geolite_city.rb
 - lib/generators/geocoder/maxmind/templates/migration/geolite_country.rb
+- lib/generators/geocoder/migration_version.rb
 - lib/geocoder.rb
 - lib/geocoder/cache.rb
 - lib/geocoder/calculations.rb
@@ -47,16 +48,17 @@ files:
 - lib/geocoder/kernel_logger.rb
 - lib/geocoder/logger.rb
 - lib/geocoder/lookup.rb
+- lib/geocoder/lookups/amap.rb
 - lib/geocoder/lookups/baidu.rb
 - lib/geocoder/lookups/baidu_ip.rb
 - lib/geocoder/lookups/ban_data_gouv_fr.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
+- lib/geocoder/lookups/db_ip_com.rb
 - lib/geocoder/lookups/dstk.rb
 - lib/geocoder/lookups/esri.rb
 - lib/geocoder/lookups/freegeoip.rb
 - lib/geocoder/lookups/geocoder_ca.rb
-- lib/geocoder/lookups/geocoder_us.rb
 - lib/geocoder/lookups/geocodio.rb
 - lib/geocoder/lookups/geoip2.rb
 - lib/geocoder/lookups/geoportail_lu.rb
@@ -65,25 +67,31 @@ files:
 - lib/geocoder/lookups/google_places_search.rb
 - lib/geocoder/lookups/google_premier.rb
 - lib/geocoder/lookups/here.rb
+- lib/geocoder/lookups/ip2location.rb
 - lib/geocoder/lookups/ipapi_com.rb
+- lib/geocoder/lookups/ipdata_co.rb
+- lib/geocoder/lookups/ipgeolocation.rb
 - lib/geocoder/lookups/ipinfo_io.rb
+- lib/geocoder/lookups/ipregistry.rb
+- lib/geocoder/lookups/ipstack.rb
 - lib/geocoder/lookups/latlon.rb
 - lib/geocoder/lookups/location_iq.rb
 - lib/geocoder/lookups/mapbox.rb
 - lib/geocoder/lookups/mapquest.rb
-- lib/geocoder/lookups/mapzen.rb
 - lib/geocoder/lookups/maxmind.rb
 - lib/geocoder/lookups/maxmind_geoip2.rb
 - lib/geocoder/lookups/maxmind_local.rb
 - lib/geocoder/lookups/nominatim.rb
-- lib/geocoder/lookups/okf.rb
 - lib/geocoder/lookups/opencagedata.rb
-- lib/geocoder/lookups/ovi.rb
+- lib/geocoder/lookups/osmnames.rb
 - lib/geocoder/lookups/pelias.rb
+- lib/geocoder/lookups/pickpoint.rb
 - lib/geocoder/lookups/pointpin.rb
 - lib/geocoder/lookups/postcode_anywhere_uk.rb
+- lib/geocoder/lookups/postcodes_io.rb
 - lib/geocoder/lookups/smarty_streets.rb
 - lib/geocoder/lookups/telize.rb
+- lib/geocoder/lookups/tencent.rb
 - lib/geocoder/lookups/test.rb
 - lib/geocoder/lookups/yandex.rb
 - lib/geocoder/models/active_record.rb
@@ -94,16 +102,17 @@ files:
 - lib/geocoder/query.rb
 - lib/geocoder/railtie.rb
 - lib/geocoder/request.rb
+- lib/geocoder/results/amap.rb
 - lib/geocoder/results/baidu.rb
 - lib/geocoder/results/baidu_ip.rb
 - lib/geocoder/results/ban_data_gouv_fr.rb
 - lib/geocoder/results/base.rb
 - lib/geocoder/results/bing.rb
+- lib/geocoder/results/db_ip_com.rb
 - lib/geocoder/results/dstk.rb
 - lib/geocoder/results/esri.rb
 - lib/geocoder/results/freegeoip.rb
 - lib/geocoder/results/geocoder_ca.rb
-- lib/geocoder/results/geocoder_us.rb
 - lib/geocoder/results/geocodio.rb
 - lib/geocoder/results/geoip2.rb
 - lib/geocoder/results/geoportail_lu.rb
@@ -112,25 +121,31 @@ files:
 - lib/geocoder/results/google_places_search.rb
 - lib/geocoder/results/google_premier.rb
 - lib/geocoder/results/here.rb
+- lib/geocoder/results/ip2location.rb
 - lib/geocoder/results/ipapi_com.rb
+- lib/geocoder/results/ipdata_co.rb
+- lib/geocoder/results/ipgeolocation.rb
 - lib/geocoder/results/ipinfo_io.rb
+- lib/geocoder/results/ipregistry.rb
+- lib/geocoder/results/ipstack.rb
 - lib/geocoder/results/latlon.rb
 - lib/geocoder/results/location_iq.rb
 - lib/geocoder/results/mapbox.rb
 - lib/geocoder/results/mapquest.rb
-- lib/geocoder/results/mapzen.rb
 - lib/geocoder/results/maxmind.rb
 - lib/geocoder/results/maxmind_geoip2.rb
 - lib/geocoder/results/maxmind_local.rb
 - lib/geocoder/results/nominatim.rb
-- lib/geocoder/results/okf.rb
 - lib/geocoder/results/opencagedata.rb
-- lib/geocoder/results/ovi.rb
+- lib/geocoder/results/osmnames.rb
 - lib/geocoder/results/pelias.rb
+- lib/geocoder/results/pickpoint.rb
 - lib/geocoder/results/pointpin.rb
 - lib/geocoder/results/postcode_anywhere_uk.rb
+- lib/geocoder/results/postcodes_io.rb
 - lib/geocoder/results/smarty_streets.rb
 - lib/geocoder/results/telize.rb
+- lib/geocoder/results/tencent.rb
 - lib/geocoder/results/test.rb
 - lib/geocoder/results/yandex.rb
 - lib/geocoder/sql.rb
@@ -147,7 +162,9 @@ files:
 homepage: http://www.rubygeocoder.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/alexreisner/geocoder
+  changelog_uri: https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -156,15 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Complete geocoding solution for Ruby.