use maxmind v2 db format if needed

GeoNode · May 8, 2018 · 38db65e · 38db65e
1 parent 602e1a0
commit 38db65e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/geonode/base/management/commands/updategeoip.py b/geonode/base/management/commands/updategeoip.py
@@ -33,7 +33,12 @@
 
 logger = logging.getLogger(__name__)
 
-URL = 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz'
+try:
+    from django.contrib.gis.geoip2 import GeoIP2 as GeoIP
+    URL = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz'
+except ImportError:
+    from django.contrib.gis.geoip import GeoIP
+    URL = 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz'
 
 
 class Command(BaseCommand):