p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #28112 -- Added 'time_zone' in GeoIP2.city() dict.

This commit is contained in:
R3turnz 2017-05-23 03:07:14 +02:00 committed by Tim Graham
parent 01f658644a
commit 502f03d897
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/gis/geoip2/resources.py
View File

@ -8,6 +8,7 @@ def City(response):
'longitude': response.location.longitude, 'longitude': response.location.longitude,
'postal_code': response.postal.code, 'postal_code': response.postal.code,
'region': response.subdivisions[0].iso_code if len(response.subdivisions) else None, 'region': response.subdivisions[0].iso_code if len(response.subdivisions) else None,
'time_zone': response.location.time_zone,
} }

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

@ -39,7 +39,8 @@ Here is an example of its usage::
'latitude': 37.419200897216797, 'latitude': 37.419200897216797,
'longitude': -122.05740356445312, 'longitude': -122.05740356445312,
'postal_code': '94043', 'postal_code': '94043',
'region': 'CA'} 'region': 'CA',
'time_zone': 'America/Los_Angeles'}
>>> g.lat_lon('salon.com') >>> g.lat_lon('salon.com')
(39.0437, -77.4875) (39.0437, -77.4875)
>>> g.lon_lat('uh.edu') >>> g.lon_lat('uh.edu')

1
tests/gis_tests/test_geoip2.py
View File

@ -118,6 +118,7 @@ class GeoIPTest(unittest.TestCase):
self.assertEqual('US', d['country_code']) self.assertEqual('US', d['country_code'])
self.assertEqual('Houston', d['city']) self.assertEqual('Houston', d['city'])
self.assertEqual('TX', d['region']) self.assertEqual('TX', d['region'])
self.assertEqual('America/Chicago', d['time_zone'])
geom = g.geos(query) geom = g.geos(query)
self.assertIsInstance(geom, GEOSGeometry) self.assertIsInstance(geom, GEOSGeometry)