diff --git a/geocoder/ip-addresses/README.md b/geocoder/ip-addresses/README.md index af7d897..9c585d7 100644 --- a/geocoder/ip-addresses/README.md +++ b/geocoder/ip-addresses/README.md @@ -11,7 +11,7 @@ SELECT geocode_ip(Array['1.0.16.0', '::ffff:1.0.16.0']) ``` # Creation steps -1. Create the `ip_address_locations` table +1. Create the `ip_address_locations` table (see `40_ipaddr.sql` file) 2. Obtain the file from http://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip 3. Uncompress it and upload the `GeoLite2-City-Blocks-IPv4.csv` file 4. Rename the uploaded table as `latest_ip_address_locations` diff --git a/geocoder/ip-addresses/sql/build_data_table.sql b/geocoder/ip-addresses/sql/build_data_table.sql index ec42d0e..92b7c80 100644 --- a/geocoder/ip-addresses/sql/build_data_table.sql +++ b/geocoder/ip-addresses/sql/build_data_table.sql @@ -4,5 +4,23 @@ -- Clear table DELETE FROM ip_address_locations; -- Updates table with new source data -INSERT INTO ip_address_locations (the_geom, network_start_ip) SELECT the_geom, network_start_ip::inet FROM latest_ip_address_locations; +INSERT INTO ip_address_locations (the_geom, network_start_ip) SELECT the_geom, ('::ffff:' || split_part(network, '/', 1))::inet FROM latest_ip_address_locations; DROP TABLE latest_ip_address_locations; + +-- Update table + +-- Assumptions (read https://github.com/CartoDB/data-services/tree/master/geocoder/ip-addresses#creation-steps) +-- - latest_ip_address_locations is the GeoLite2-City-Blocks-IPv4.csv table +-- - latest_ip6_address_locations is the GeoLite2-City-Blocks-IPv6.csv table +-- - For option B (exported file), export from valid `ip_address_locations` table with +-- \copy (select * from ip_address_locations) TO /tmp/ip_address_locations.dump; + +CREATE TABLE ip_address_locations_backup as select * from ip_address_locations; +TRUNCATE ip_address_locations; + +-- OPTION A) From scratch +INSERT INTO ip_address_locations (the_geom, network_start_ip) SELECT the_geom, ('::ffff:' || split_part(network, '/', 1))::inet FROM latest_ip_address_locations; +INSERT INTO ip_address_locations (the_geom, network_start_ip) SELECT the_geom, split_part(network, '/', 1)::inet FROM latest_ip6_address_locations; + +-- OPTION B) From exported file (took 9 minutes in staging) +\copy ip_address_locations from /tmp/ip_address_locations.dump \ No newline at end of file