Changed GeoDjango GeometryField to lazily load units, units_name and _spheroid

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2009-04-10 16:58:29 +00:00
parent ec4cf19700
commit 800b6cfbbe
1 changed files with 24 additions and 1 deletions

View File

@ -46,7 +46,9 @@ class GeometryField(SpatialBackend.Field):
# Setting the SRID and getting the units. Unit information must be # Setting the SRID and getting the units. Unit information must be
# easily available in the field instance for distance queries. # easily available in the field instance for distance queries.
self.srid = srid self.srid = srid
self.units, self.units_name, self._spheroid = get_srid_info(srid)
# units_cache, units_name_cache and _spheroid_cache are lazily loaded.
self._units_cache = self._units_name_cache = self._spheroid_cache = None
# Setting the dimension of the geometry field. # Setting the dimension of the geometry field.
self.dim = dim self.dim = dim
@ -57,6 +59,27 @@ class GeometryField(SpatialBackend.Field):
super(GeometryField, self).__init__(**kwargs) # Calling the parent initializtion function super(GeometryField, self).__init__(**kwargs) # Calling the parent initializtion function
def _populate_srid_info(self):
self._units_cache, self._units_name_cache, self._spheroid_cache = get_srid_info(self.srid)
def _get_units(self):
if self._units_cache is None:
self._populate_srid_info()
return self._units_cache
units = property(_get_units)
def _get_units_name(self):
if self._units_name_cache is None:
self._populate_srid_info()
return self._units_name_cache
units_name = property(_get_units_name)
def _get_spheroid(self):
if self._spheroid_cache is None:
self._populate_srid_info()
return self._spheroid_cache
_spheroid = property(_get_spheroid)
# The following properties are for formerly private variables that are now # The following properties are for formerly private variables that are now
# public for GeometryField. Because of their use by third-party applications, # public for GeometryField. Because of their use by third-party applications,
# a deprecation warning is issued to notify them to use new attribute name. # a deprecation warning is issued to notify them to use new attribute name.