geocoder 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35c6a6d57b8ff3818e9d1b616558a8bbdc3b4b51db2b2c7dadb720eccafd27b4
-  data.tar.gz: 8e8fe1ba7cb9da58131a965d3d85589084f4d5dd70409990f49b89b83923f4e3
+  metadata.gz: 447dfedeffcb5c111f6441badccf6d1c25c38a3a0fed32aaeb31151d27425a3d
+  data.tar.gz: 89b7f5b123d125ccb329d66f0172ef0a46d3176d6e215cc1a884b0a2249ae4cd
 SHA512:
-  metadata.gz: 0bbf04cc8488a533038783e2d250706fb2d2439de8ea1e5bf4b89950d1dd51d5e9393454540a23cb4e7fbc33b58f54fec1c71c14c98d6fbe8bb8e5caad786989
-  data.tar.gz: 92b8f5933a421b47cdededea9c8e8df8d2ec6f45cb25c8726b343a773b315929529fe821cae08868576ae2e8c5cdbc5fd1782bd2bfc8c56f36afdc1514f52b58
+  metadata.gz: a90b21dfcc3aeb50ac94fad6eafeec0141ba320bb638912b2e0091f80beb30b306f58cc104db8a55ab47cf8a5543edbabe9372dbda7c63dcbeb560c42b92a957
+  data.tar.gz: c0489e8f2b3c4d98cf40235e2b60fc5c8d129cd74aecc65f57bfd9adee7549db804fb0bcdf6b68c14933478fd3a0ea06124350208987a575c916a0992c28adb7

data/CHANGELOG.md

@@ -3,6 +3,17 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.8.3 (2024 May  2)
+-------------------
+* Add support for IP2Location LITE lookup (thanks github.com/ip2location).
+* Add support for PDOK NL lookup (thanks github.com/opensourceame).
+* Remove support for Data Science Toolkit lookup (defunct).
+
+1.8.2 (2023 Jul  4)
+-------------------
+* Add support for PC Miler lookup (thanks github.com/alexdean).
+* Minor fixes for :maxmind_local, :esri, and :ban_data_gouv_fr lookups.
+
 1.8.1 (2022 Sep 23)
 -------------------
 * Add support for IPBase lookup (thanks github.com/jonallured).

data/README.md

@@ -5,7 +5,6 @@ Geocoder
 
 [![Gem Version](https://badge.fury.io/rb/geocoder.svg)](http://badge.fury.io/rb/geocoder)
 [![Code Climate](https://codeclimate.com/github/alexreisner/geocoder/badges/gpa.svg)](https://codeclimate.com/github/alexreisner/geocoder)
-[![Build Status](https://travis-ci.com/alexreisner/geocoder.svg?branch=master)](https://travis-ci.com/alexreisner/geocoder)
 
 Key features:
 
@@ -368,7 +367,7 @@ If you need to expire cached content:
 ```ruby
 Geocoder::Lookup.get(Geocoder.config[:lookup]).cache.expire(:all)  # expire cached results for current Lookup
 Geocoder::Lookup.get(:nominatim).cache.expire("http://...")        # expire cached result for a specific URL
-Geocoder::Lookup.get(:nominatim).cache.expire(:all)                # expire cached results for Google Lookup
+Geocoder::Lookup.get(:nominatim).cache.expire(:all)                # expire cached results for Nominatim
 # expire all cached results for all Lookups.
 # Be aware that this methods spawns a new Lookup object for each Service
 Geocoder::Lookup.all_services.each{|service| Geocoder::Lookup.get(service).cache.expire(:all)}
@@ -376,10 +375,9 @@ Geocoder::Lookup.all_services.each{|service| Geocoder::Lookup.get(service).cache
 
 Do *not* include the prefix when passing a URL to be expired. Expiring `:all` will only expire keys with the configured prefix -- it will *not* expire every entry in your key/value store.
 
-For an example of a cache store with URL expiry, please see examples/autoexpire_cache.rb
-
 _Before you implement caching in your app please be sure that doing so does not violate the Terms of Service for your geocoding service._
 
+Not all services support caching, [check the service limitations in the API guide for more information](https://github.com/alexreisner/geocoder/blob/master/README_API_GUIDE.md).
 
 Advanced Model Configuration
 ----------------------------
@@ -736,8 +734,34 @@ you should check your Gemfile to make sure the Mongoid gem is listed _before_ Ge
 
 A lot of debugging time can be saved by understanding how Geocoder works with ActiveRecord. When you use the `near` scope or the `nearbys` method of a geocoded object, Geocoder creates an ActiveModel::Relation object which adds some attributes (eg: distance, bearing) to the SELECT clause. It also adds a condition to the WHERE clause to check that distance is within the given radius. Because the SELECT clause is modified, anything else that modifies the SELECT clause may produce strange results, for example:
 
-* using the `pluck` method (selects only a single column)
-* specifying another model through `includes` (selects columns from other tables)
+* using [`select` method (selects one or more columns)](https://api.rubyonrails.org/classes/ActiveRecord/QueryMethods.html#method-i-select)
+* using the [`pluck` method (gets an array with selecting one or more columns)](https://api.rubyonrails.org/classes/ActiveRecord/Calculations.html#method-i-pluck)
+  * The same problem will appear with [ActiveRecord's `ids` method](https://api.rubyonrails.org/classes/ActiveRecord/Calculations.html#method-i-ids).
+* specifying another model through [`includes` (selects columns from other tables)](https://api.rubyonrails.org/classes/ActiveRecord/QueryMethods.html#method-i-includes)
+  * See also Known Issues [using-near-with-includes](#using-near-with-select) section.
+
+If you get an error in the above cases, try the following:
+
+```ruby
+# Use the :select option with the near scope to get the columns you want.
+# Instead of City.near(...).select(:id, :name), try:
+City.near("Omaha, NE", 20, select: "id, name")
+
+# Pass a :select option to the near scope to get the columns you want.
+# Then, Ruby's built-in pluck method gets arrays you want.
+# Instead of City.near(...).pluck(:id) or City.near(...).ids,, try:
+City.near("Omaha, NE", 20, select: "id, name").to_a.pluck(:id, :name)
+City.near("Omaha, NE", 20, select: "id").to_a.pluck(:id)
+
+# Pass a :select option to the near scope to get the columns you want.
+# Instead of City.near(...).includes(:venues), try:
+City.near("Omaha, NE", 20, select: "cities.*, venues.*").joins(:venues)
+
+# This preload call will normally trigger two queries regardless of the
+# number of results; one query on hotels, and one query on administrators.
+# Instead of Hotel.near(...).includes(:administrator), try:
+Hotel.near("London, UK", 50).joins(:administrator).preload(:administrator)
+```
 
 ### Geocoding is Slow
 

data/lib/geocoder/cache.rb

@@ -4,7 +4,7 @@ module Geocoder
   class Cache
 
     def initialize(store, config)
-      @class = (Object.const_get("Geocoder::CacheStore::#{store.class}") rescue Geocoder::CacheStore::Generic)
+      @class = (Geocoder::CacheStore.const_get("#{store.class}", false) rescue Geocoder::CacheStore::Generic)
       @store_service = @class.new(store, config)
     end
 

data/lib/geocoder/ip_address.rb

@@ -9,8 +9,11 @@ module Geocoder
 
     def initialize(ip)
       ip = ip.to_string if ip.is_a?(IPAddr)
-
-      super(ip)
+      if ip.is_a?(Hash)
+        super(**ip)
+      else
+        super(ip)
+      end
     end
 
     def internal?

data/lib/geocoder/lookup.rb

@@ -23,7 +23,7 @@ module Geocoder
     # For example, Amazon Location Service uses the AWS gem, not HTTP REST requests, to fetch data.
     #
     def all_services_with_http_requests
-      all_services_except_test - [:amazon_location_service]
+      all_services_except_test - [:amazon_location_service, :maxmind_local, :geoip2, :ip2location_lite]
     end
 
     ##
@@ -32,7 +32,6 @@ module Geocoder
     def street_services
       @street_services ||= [
         :location_iq,
-        :dstk,
         :esri,
         :google,
         :google_premier,
@@ -48,6 +47,7 @@ module Geocoder
         :uk_ordnance_survey_names,
         :opencagedata,
         :pelias,
+        :pdok_nl,
         :pickpoint,
         :here,
         :baidu,
@@ -66,7 +66,8 @@ module Geocoder
         :amazon_location_service,
         :geoapify,
         :photon,
-        :twogis
+        :twogis,
+        :pc_miler
       ]
     end
 
@@ -93,7 +94,9 @@ module Geocoder
         :ip2location,
         :ipgeolocation,
         :ipqualityscore,
-        :ipbase
+        :ipbase,
+        :ip2location_io,
+        :ip2location_lite
       ]
     end
 

data/lib/geocoder/lookups/amazon_location_service.rb

@@ -19,7 +19,7 @@ module Geocoder::Lookup
         client.search_place_index_for_text(params.merge(text: query.text))
       end
       
-      resp.results.map(&:place)
+      resp.results
     end
 
     private
@@ -29,10 +29,11 @@ module Geocoder::Lookup
       require_sdk
       keys = configuration.api_key
       if keys
-        @client = Aws::LocationService::Client.new(
+        @client = Aws::LocationService::Client.new(**{
+          region: keys[:region],
           access_key_id: keys[:access_key_id],
-          secret_access_key: keys[:secret_access_key],
-        )
+          secret_access_key: keys[:secret_access_key]
+        }.compact)
       else
         @client = Aws::LocationService::Client.new
       end

data/lib/geocoder/lookups/ban_data_gouv_fr.rb

@@ -125,7 +125,7 @@ module Geocoder::Lookup
     end
 
     def type_param_is_valid?(param)
-      %w(housenumber street locality village town city).include?(param.downcase)
+      %w(housenumber street locality municipality).include?(param.downcase)
     end
 
     def code_param_is_valid?(param)

data/lib/geocoder/lookups/esri.rb

@@ -23,15 +23,28 @@ module Geocoder::Lookup
     def results(query)
       return [] unless doc = fetch_data(query)
 
-      if (!query.reverse_geocode?)
-        return [] if !doc['locations'] || doc['locations'].empty?
-      end
-
       if (doc['error'].nil?)
+        if (!query.reverse_geocode?)
+          return [] if !doc['locations'] || doc['locations'].empty?
+        end
         return [ doc ]
       else
-        return []
+        case [ doc['error']['code'] ]
+        when [498]
+          raise_error(Geocoder::InvalidApiKey, doc['error']['message']) ||
+            Geocoder.log(:warn, "#{self.name} Geocoding API error: #{doc['error']['message']}")
+        when [ 403 ]
+          raise_error(Geocoder::RequestDenied, 'ESRI request denied') ||
+            Geocoder.log(:warn, "#{self.name} ESRI request denied: #{doc['error']['message']}")
+        when [ 500 ], [501]
+          raise_error(Geocoder::ServiceUnavailable, 'ESRI service unavailable') ||
+            Geocoder.log(:warn, "#{self.name} ESRI service error: #{doc['error']['message']}")
+        else
+          raise_error(Geocoder::Error, doc['error']['message']) ||
+            Geocoder.log(:warn, "#{self.name} Geocoding error: #{doc['error']['message']}")
+        end
       end
+      return []
     end
 
     def query_url_params(query)

data/lib/geocoder/lookups/google_places_search.rb

@@ -49,12 +49,11 @@ module Geocoder
       end
 
       def default_fields
-        legacy = %w[id reference]
         basic = %w[business_status formatted_address geometry icon name 
           photos place_id plus_code types]
         contact = %w[opening_hours]
         atmosphere = %W[price_level rating user_ratings_total]
-        format_fields(legacy, basic, contact, atmosphere)
+        format_fields(basic, contact, atmosphere)
       end
 
       def format_fields(*fields)

data/lib/geocoder/lookups/ip2location_io.rb

@@ -0,0 +1,62 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/ip2location_io'
+
+module Geocoder::Lookup
+  class Ip2locationIo < Base
+
+    def name
+      "IP2LocationIOApi"
+    end
+
+    def required_api_key_parts
+      ['key']
+    end
+
+    def supported_protocols
+      [:http, :https]
+    end
+
+    private # ----------------------------------------------------------------
+
+    def base_query_url(query)
+      "#{protocol}://api.ip2location.io/?"
+    end
+
+    def query_url_params(query)
+      super.merge(
+        key: configuration.api_key,
+        ip: query.sanitized_text,
+      )
+    end
+
+    def results(query)
+      # don't look up a loopback or private address, just return the stored result
+      return [reserved_result(query.text)] if query.internal_ip_address?
+      return [] unless doc = fetch_data(query)
+      if doc["response"] == "INVALID ACCOUNT"
+        raise_error(Geocoder::InvalidApiKey) || Geocoder.log(:warn, "INVALID ACCOUNT")
+        return []
+      else
+        return [doc]
+      end
+    end
+
+    def reserved_result(query)
+      {
+        "ip"           => "-",
+        "country_code" => "-",
+        "country_name" => "-",
+        "region_name"  => "-",
+        "city_name"    => "-",
+        "latitude"     => null,
+        "longitude"    => null,
+        "zip_code"     => "-",
+        "time_zone"    => "-",
+        "asn"          => "-",
+        "as"           => "-",
+        "is_proxy"     => false
+      }
+    end
+
+  end
+end

data/lib/geocoder/lookups/ip2location_lite.rb

@@ -0,0 +1,40 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/ip2location_lite'
+
+module Geocoder
+  module Lookup
+    class Ip2locationLite < Base
+      attr_reader :gem_name
+
+      def initialize
+        unless configuration[:file].nil?
+          begin
+            @gem_name = 'ip2location_ruby'
+            require @gem_name
+          rescue LoadError
+            raise "Could not load IP2Location DB dependency. To use the IP2LocationLite lookup you must add the #{@gem_name} gem to your Gemfile or have it installed in your system."
+          end
+        end
+        super
+      end
+
+      def name
+        'IP2LocationLite'
+      end
+
+      def required_api_key_parts
+        []
+      end
+
+      private
+
+      def results(query)
+        return [] unless configuration[:file]
+
+        i2l = Ip2location.new.open(configuration[:file].to_s)
+        result = i2l.get_all(query.to_s)
+        result.nil? ? [] : [result]
+      end
+    end
+  end
+end

data/lib/geocoder/lookups/pc_miler.rb

@@ -0,0 +1,85 @@
+require 'geocoder/lookups/base'
+require "geocoder/results/pc_miler"
+require 'cgi' unless defined?(CGI) && defined?(CGI.escape)
+
+module Geocoder::Lookup
+  class PcMiler < Base
+
+    # https://developer.trimblemaps.com/restful-apis/location/single-search/single-search-api/#test-the-api-now
+    def valid_region_codes
+      # AF: Africa
+      # AS: Asia
+      # EU: Europe
+      # NA: North America
+      # OC: Oceania
+      # SA: South America
+      %w[AF AS EU NA OC SA]
+    end
+
+    def name
+      "PCMiler"
+    end
+
+    private # ---------------------------------------------------------------
+
+    def base_query_url(query)
+      region_code = region(query)
+      if !valid_region_codes.include?(region_code)
+        raise "region_code '#{region_code}' is invalid. use one of #{valid_region_codes}." \
+          "https://developer.trimblemaps.com/restful-apis/location/single-search/single-search-api/#test-the-api-now"
+      end
+
+      "#{protocol}://singlesearch.alk.com/#{region_code}/api/search?"
+    end
+
+    def results(query)
+      return [] unless data = fetch_data(query)
+      if data['Locations']
+        add_metadata_to_locations!(data)
+        data['Locations']
+      else
+        []
+      end
+    end
+
+    def add_metadata_to_locations!(data)
+      confidence = data['QueryConfidence']
+      data['Locations'].each do |location|
+        location['QueryConfidence'] = confidence
+      end
+    end
+
+    def query_url_params(query)
+      if query.reverse_geocode?
+        lat,lon = query.coordinates
+        formatted_query = "#{CGI.escape(lat)},#{CGI.escape(lon)}"
+      else
+        formatted_query = query.text.to_s
+      end
+
+      {
+        authToken: configuration.api_key,
+        query: formatted_query,
+        # to add additional metadata to response such as QueryConfidence
+        include: 'Meta'
+      }.merge(super(query))
+    end
+
+    def region(query)
+      query.options[:region] || query.options['region'] || configuration[:region] || "NA"
+    end
+
+    def check_response_for_errors!(response)
+      if response.code.to_i == 403
+        raise_error(Geocoder::RequestDenied) ||
+          Geocoder.log(:warn, "Geocoding API error: 403 API key does not exist")
+      else
+        super(response)
+      end
+    end
+
+    def supported_protocols
+      [:https]
+    end
+  end
+end

data/lib/geocoder/lookups/pdok_nl.rb

@@ -0,0 +1,43 @@
+require 'geocoder/lookups/base'
+require "geocoder/results/pdok_nl"
+
+module Geocoder::Lookup
+  class PdokNl < Base
+
+    def name
+      'pdok NL'
+    end
+
+    def supported_protocols
+      [:https]
+    end
+
+    private # ---------------------------------------------------------------
+
+    def cache_key(query)
+      base_query_url(query) + hash_to_query(query_url_params(query))
+    end
+
+    def base_query_url(query)
+      "#{protocol}://api.pdok.nl/bzk/locatieserver/search/v3_1/free?"
+    end
+
+    def valid_response?(response)
+      json   = parse_json(response.body)
+      super(response) if json
+    end
+
+    def results(query)
+      return [] unless doc = fetch_data(query)
+      return doc['response']['docs']
+    end
+
+    def query_url_params(query)
+      {
+        fl: '*',
+        q:  query.text,
+        wt: 'json'
+      }.merge(super)
+    end
+  end
+end

data/lib/geocoder/results/amazon_location_service.rb

@@ -3,7 +3,8 @@ require 'geocoder/results/base'
 module Geocoder::Result
   class AmazonLocationService < Base
     def initialize(result)
-      @place = result
+      @place = result.place
+      super
     end
 
     def coordinates
@@ -53,5 +54,9 @@ module Geocoder::Result
     def country_code
       @place.country
     end
+
+    def place_id
+      data.place_id if data.respond_to?(:place_id)
+    end
   end
 end

data/lib/geocoder/results/ban_data_gouv_fr.rb

@@ -275,7 +275,7 @@ module Geocoder::Result
     private
 
     def city?(result_type)
-      %w(village town city).include?(result_type)
+      result_type == 'municipality'
     end
 
   end

data/lib/geocoder/results/ip2location_io.rb

@@ -0,0 +1,21 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Ip2locationIo < Base
+
+    def address(format = :full)
+      "#{city_name} #{zip_code}, #{country_name}".sub(/^[ ,]*/, '')
+    end
+
+    def self.response_attributes
+      %w[ip country_code country_name region_name city_name latitude longitude
+        zip_code time_zone asn as is_proxy]
+    end
+
+    response_attributes.each do |attr|
+      define_method attr do
+        @data[attr] || ""
+      end
+    end
+  end
+end

data/lib/geocoder/results/ip2location_lite.rb

@@ -0,0 +1,47 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Ip2locationLite < Base
+
+    def coordinates
+      [@data[:latitude], @data[:longitude]]
+    end
+
+    def city
+      @data[:city]
+    end
+
+    def state
+      @data[:region]
+    end
+
+    def state_code
+      "" # Not available in Maxmind's database
+    end
+
+    def country
+      @data[:country_long]
+    end
+
+    def country_code
+      @data[:country_short]
+    end
+
+    def postal_code
+      @data[:zipcode]
+    end
+
+    def self.response_attributes
+      %w[country_short country_long region latitude longitude isp
+        domain netspeed areacode iddcode timezone zipcode weatherstationname
+        weatherstationcode mcc mnc mobilebrand elevation usagetype addresstype
+        category district asn as]
+    end
+
+    response_attributes.each do |a|
+      define_method a do
+        @data[a] || ""
+      end
+    end
+  end
+end

data/lib/geocoder/results/pc_miler.rb

@@ -0,0 +1,98 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class PcMiler < Base
+    # sample response:
+    # https://singlesearch.alk.com/na/api/search?authToken=<TOKEN>&include=Meta&query=Feasterville
+    #
+    #   {
+    #     "Err": 0,
+    #     "ErrString": "OK",
+    #     "QueryConfidence": 1,
+    #     "TimeInMilliseconds": 93,
+    #     "GridDataVersion": "GRD_ALK.NA.2023.01.18.29.1.1",
+    #     "CommitID": "pcmws-22.08.11.0-1778-g586da49bd1b: 05/30/2023 20:14",
+    #     "Locations": [
+    #       {
+    #         "Address": {
+    #           "StreetAddress": "",
+    #           "LocalArea": "",
+    #           "City": "Feasterville",
+    #           "State": "PA",
+    #           "StateName": "Pennsylvania",
+    #           "Zip": "19053",
+    #           "County": "Bucks",
+    #           "Country": "US",
+    #           "CountryFullName": "United States",
+    #           "SPLC": null
+    #         },
+    #         "Coords": {
+    #           "Lat": "40.150025",
+    #           "Lon": "-75.002511"
+    #         },
+    #         "StreetCoords": {
+    #           "Lat": "40.150098",
+    #           "Lon": "-75.002827"
+    #         },
+    #         "Region": 4,
+    #         "POITypeID": 0,
+    #         "PersistentPOIID": -1,
+    #         "SiteID": -1,
+    #         "ResultType": 4,
+    #         "ShortString": "Feasterville",
+    #         "GridID": 37172748,
+    #         "LinkID": 188,
+    #         "Percent": 6291,
+    #         "TimeZone": "GMT-4:00 EDT"
+    #       }
+    #     ]
+    #   }
+
+    def address(format=:unused)
+      [street, city, state, postal_code, country]
+      .map { |i| i == '' ? nil : i }
+      .compact
+      .join(', ')
+    end
+
+    def coordinates
+      coords = data["Coords"] || {}
+      [coords["Lat"].to_f, coords["Lon"].to_f]
+    end
+
+    def street
+      address_data["StreetAddress"]
+    end
+
+    def city
+      address_data["City"]
+    end
+
+    def state
+      address_data["StateName"]
+    end
+
+    def state_code
+      address_data["State"]
+    end
+
+    def postal_code
+      address_data["Zip"]
+    end
+
+    def country
+      address_data["CountryFullName"]
+    end
+
+    def country_code
+      address_data["Country"]
+    end
+
+    private
+
+    def address_data
+      data["Address"] || {}
+    end
+  end
+end
+

data/lib/geocoder/results/pdok_nl.rb

@@ -0,0 +1,62 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class PdokNl < Base
+
+    def response_attributes
+      @data
+    end
+
+    def coordinates
+      @data['centroide_ll'][6..-2].split(' ').map(&:to_f).reverse
+    end
+
+    def formatted_address
+      @data['weergavenaam']
+    end
+
+    alias_method :address, :formatted_address
+
+    def province
+      @data['provincienaam']
+    end
+
+    alias_method :state, :province
+
+    def city
+      @data['woonplaatsnaam']
+    end
+
+    def district
+      @data['gemeentenaam']
+    end
+
+    def street
+      @data['straatnaam']
+    end
+
+    def street_number
+      @data['huis_nlt']
+    end
+
+    def address_components
+      @data
+    end
+
+    def state_code
+      @data['provinciecode']
+    end
+
+    def postal_code
+      @data['postcode']
+    end
+
+    def country
+      "Netherlands"
+    end
+
+    def country_code
+      "NL"
+    end
+  end
+end

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.8.1"
+  VERSION = "1.8.3"
 end

data/lib/maxmind_database.rb

@@ -6,9 +6,9 @@ module Geocoder
     extend self
 
     def download(package, dir = "tmp")
-      filepath = File.expand_path(File.join(dir, archive_filename(package)))
+      filepath = File.expand_path(File.join(dir, "#{archive_edition(package)}.zip"))
       open(filepath, 'wb') do |file|
-        uri = URI.parse(archive_url(package))
+        uri = URI.parse(base_url(package))
         Net::HTTP.start(uri.host, uri.port) do |http|
           http.request_get(uri.path) do |resp|
             # TODO: show progress
@@ -35,6 +35,14 @@ module Geocoder
       p[s..-1]
     end
 
+    def archive_edition(package)
+      {
+        geolite_country_csv: "GeoLite2-Country-CSV",
+        geolite_city_csv: "GeoLite2-City-CSV",
+        geolite_asn_csv: "GeoLite2-ASN-CSV"
+      }[package]
+    end
+
     private # -------------------------------------------------------------
 
     def table_columns(table_name)
@@ -94,16 +102,8 @@ module Geocoder
       base_url + archive_url_path(package)
     end
 
-    def archive_url_path(package)
-      {
-        geolite_country_csv: "GeoLite2-Country-CSV.zip",
-        geolite_city_csv: "GeoLite2-City-CSV.zip",
-        geolite_asn_csv: "GeoLite2-ASN-CSV.zip"
-      }[package]
-    end
-
-    def base_url
-      "http://geolite.maxmind.com/download/geoip/database/"
+    def base_url(edition)
+      "https://download.maxmind.com/app/geoip_download?edition_id=#{edition}&license_key=#{ENV['LICENSE_KEY']}&suffix=zip"
     end
   end
 end

data/lib/tasks/maxmind.rake

@@ -54,7 +54,7 @@ module MaxmindTask
     end
     require 'fileutils'
     p = "geolite_#{package}_csv".intern
-    archive_filename = Geocoder::MaxmindDatabase.archive_filename(p)
+    archive_filename = "#{Geocoder::MaxmindDatabase.archive_edition(p)}.zip"
     Zip::File.open(File.join(options[:dir], archive_filename)).each do |entry|
       filepath = File.join(options[:dir], entry.name)
       if File.exist? filepath

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.3
 platform: ruby
 authors:
 - Alex Reisner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
-dependencies: []
+date: 2024-05-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Object geocoding (by street or IP address), reverse geocoding (coordinates
   to street address), distance queries for ActiveRecord and Mongoid, result caching,
   and more. Designed for Rails but works with Sinatra and other Rack frameworks too.
@@ -60,7 +88,6 @@ files:
 - 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/geoapify.rb
@@ -74,6 +101,8 @@ files:
 - lib/geocoder/lookups/google_premier.rb
 - lib/geocoder/lookups/here.rb
 - lib/geocoder/lookups/ip2location.rb
+- lib/geocoder/lookups/ip2location_io.rb
+- lib/geocoder/lookups/ip2location_lite.rb
 - lib/geocoder/lookups/ipapi_com.rb
 - lib/geocoder/lookups/ipbase.rb
 - lib/geocoder/lookups/ipdata_co.rb
@@ -94,6 +123,8 @@ files:
 - lib/geocoder/lookups/nominatim.rb
 - lib/geocoder/lookups/opencagedata.rb
 - lib/geocoder/lookups/osmnames.rb
+- lib/geocoder/lookups/pc_miler.rb
+- lib/geocoder/lookups/pdok_nl.rb
 - lib/geocoder/lookups/pelias.rb
 - lib/geocoder/lookups/photon.rb
 - lib/geocoder/lookups/pickpoint.rb
@@ -124,7 +155,6 @@ files:
 - 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/geoapify.rb
@@ -138,6 +168,8 @@ files:
 - lib/geocoder/results/google_premier.rb
 - lib/geocoder/results/here.rb
 - lib/geocoder/results/ip2location.rb
+- lib/geocoder/results/ip2location_io.rb
+- lib/geocoder/results/ip2location_lite.rb
 - lib/geocoder/results/ipapi_com.rb
 - lib/geocoder/results/ipbase.rb
 - lib/geocoder/results/ipdata_co.rb
@@ -158,6 +190,8 @@ files:
 - lib/geocoder/results/nominatim.rb
 - lib/geocoder/results/opencagedata.rb
 - lib/geocoder/results/osmnames.rb
+- lib/geocoder/results/pc_miler.rb
+- lib/geocoder/results/pdok_nl.rb
 - lib/geocoder/results/pelias.rb
 - lib/geocoder/results/photon.rb
 - lib/geocoder/results/pickpoint.rb
@@ -188,7 +222,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/alexreisner/geocoder
   changelog_uri: https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,8 +237,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Complete geocoding solution for Ruby.
 test_files: []

data/lib/geocoder/lookups/dstk.rb

@@ -1,22 +0,0 @@
-# More information about the Data Science Toolkit can be found at:
-# http://www.datasciencetoolkit.org/. The provided APIs mimic the
-# Google geocoding api.
-
-require 'geocoder/lookups/google'
-require 'geocoder/results/dstk'
-
-module Geocoder::Lookup
-  class Dstk < Google
-
-    def name
-      "Data Science Toolkit"
-    end
-
-    private # ----------------------------------------------------------------
-
-    def base_query_url(query)
-      host = configuration[:host] || "www.datasciencetoolkit.org"
-      "#{protocol}://#{host}/maps/api/geocode/json?"
-    end
-  end
-end

data/lib/geocoder/results/dstk.rb

@@ -1,6 +0,0 @@
-require 'geocoder/results/google'
-
-module Geocoder::Result
-  class Dstk < Google
-  end
-end