p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reordered GeoIP docs be consistent with GDAL/GEOS ordering.

This commit is contained in:
Nick Pope 2017-08-23 11:25:42 +01:00 committed by Tim Graham
parent 49017dc13a
commit cbb27d603b
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
docs/ref/contrib/gis/geoip2.txt
View File

@ -48,34 +48,6 @@ Here is an example of its usage::
>>> g.geos('24.124.1.80').wkt >>> g.geos('24.124.1.80').wkt
'POINT (-97 38)' 'POINT (-97 38)'
Settings
========
.. setting:: GEOIP_PATH
``GEOIP_PATH``
--------------
A string specifying the directory where the GeoIP data files are
located. This setting is *required* unless manually specified
with ``path`` keyword when initializing the :class:`GeoIP2` object.
.. setting:: GEOIP_COUNTRY
``GEOIP_COUNTRY``
-----------------
The basename to use for the GeoIP country data file. Defaults to
``'GeoLite2-Country.mmdb'``.
.. setting:: GEOIP_CITY
``GEOIP_CITY``
--------------
The basename to use for the GeoIP city data file. Defaults to
``'GeoLite2-City.mmdb'``.
API Reference API Reference
============= =============
@ -168,5 +140,33 @@ Returns a coordinate tuple of (latitude, longitude),
Returns a :class:`~django.contrib.gis.geos.Point` object corresponding to the Returns a :class:`~django.contrib.gis.geos.Point` object corresponding to the
query. query.
Settings
========
.. setting:: GEOIP_PATH
``GEOIP_PATH``
--------------
A string specifying the directory where the GeoIP data files are
located. This setting is *required* unless manually specified
with ``path`` keyword when initializing the :class:`GeoIP2` object.
.. setting:: GEOIP_COUNTRY
``GEOIP_COUNTRY``
-----------------
The basename to use for the GeoIP country data file. Defaults to
``'GeoLite2-Country.mmdb'``.
.. setting:: GEOIP_CITY
``GEOIP_CITY``
--------------
The basename to use for the GeoIP city data file. Defaults to
``'GeoLite2-City.mmdb'``.
.. rubric:: Footnotes .. rubric:: Footnotes
.. [#] GeoIP(R) is a registered trademark of MaxMind, Inc. .. [#] GeoIP(R) is a registered trademark of MaxMind, Inc.