Update geoip

Author: ayeowch

geoip/COPYRIGHT.txt

@@ -1,10 +1,16 @@
 #!/bin/bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-USER_AGENT="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36"
+USER_AGENT="Mozilla/5.0"
 
 cd $DIR
 
+if [ ! -f ".maxmind_license_key" ]; then
+    echo "Missing .maxmind_license_key file. Please make sure it exists in $DIR and contains your MaxMind license key: https://support.maxmind.com/hc/en-us/sections/1260801610490-Manage-my-License-Keys"
+    exit 1
+fi
+
 MAXMIND_LICENSE_KEY=$(<.maxmind_license_key)
 wget --quiet --user-agent="$USER_AGENT" "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&suffix=tar.gz&license_key=$MAXMIND_LICENSE_KEY" -O GeoLite2-City.tar.gz && tar --strip-components=1 -zxf GeoLite2-City.tar.gz && rm GeoLite2-City.tar.gz
 wget --quiet --user-agent="$USER_AGENT" "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&suffix=tar.gz&license_key=$MAXMIND_LICENSE_KEY" -O GeoLite2-Country.tar.gz && tar --strip-components=1 -zxf GeoLite2-Country.tar.gz && rm GeoLite2-Country.tar.gz
 wget --quiet --user-agent="$USER_AGENT" "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&suffix=tar.gz&license_key=$MAXMIND_LICENSE_KEY" -O GeoLite2-ASN.tar.gz && tar --strip-components=1 -zxf GeoLite2-ASN.tar.gz && rm GeoLite2-ASN.tar.gz
+rm *.txt

geoip/GeoLite2-ASN.mmdb

@@ -47,8 +47,8 @@ def test_export(mock_strict_redis, mock_get_heights, mock_write_json_file):
         None,
         "Singapore",
         "SG",
-        1.3036,
-        103.8554,
+        1.2868,
+        103.8503,
         "Asia/Singapore",
         "AS16509",
         "AMAZON-02",

geoip/GeoLite2-City.mmdb

@@ -79,10 +79,10 @@ def test_raw_geoip():
     geoip = Resolve().raw_geoip("2606:4700:4700::1111")
     assert geoip == (
         None,
-        "US",
-        37.751,
-        -97.822,
-        "America/Chicago",
+        None,
+        0.0,
+        0.0,
+        None,
         "AS13335",
         "CLOUDFLARENET",
     )