diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/gis/db/backends/base/models.py | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/django/contrib/gis/db/backends/base/models.py b/django/contrib/gis/db/backends/base/models.py index 589c872da6..38309f0e5d 100644 --- a/django/contrib/gis/db/backends/base/models.py +++ b/django/contrib/gis/db/backends/base/models.py @@ -1,4 +1,5 @@ from django.contrib.gis import gdal +from django.utils.functional import cached_property class SpatialRefSysMixin: @@ -7,35 +8,26 @@ class SpatialRefSysMixin: SpatialRefSys objects to reduce redundant code. """ - @property + @cached_property def srs(self): """ Return a GDAL SpatialReference object. """ - # TODO: Is caching really necessary here? Is complexity worth it? - if hasattr(self, "_srs"): - # Returning a clone of the cached SpatialReference object. - return self._srs.clone() - else: - # Attempting to cache a SpatialReference object. - - # Trying to get from WKT first. - try: - self._srs = gdal.SpatialReference(self.wkt) - return self.srs - except Exception as e: - msg = e + try: + return gdal.SpatialReference(self.wkt) + except Exception as e: + wkt_error = e - try: - self._srs = gdal.SpatialReference(self.proj4text) - return self.srs - except Exception as e: - msg = e + try: + return gdal.SpatialReference(self.proj4text) + except Exception as e: + proj4_error = e - raise Exception( - "Could not get OSR SpatialReference from WKT: %s\nError:\n%s" - % (self.wkt, msg) - ) + raise Exception( + "Could not get OSR SpatialReference.\n" + f"Error for WKT '{self.wkt}': {wkt_error}\n" + f"Error for PROJ.4 '{self.proj4text}': {proj4_error}" + ) @property def ellipsoid(self): |