From 48548d1a473a40adeaf292b63857efdd00a034be Mon Sep 17 00:00:00 2001
From: Daniel Wiesmann <daniel.wiesmann@gmail.com>
Date: Wed, 28 Oct 2015 12:05:22 +0000
Subject: [PATCH] Refs #25588 -- Added the srid property to GDALRaster

Geometry objects have an srid property, so this addition makes the raster api
more similar to the geometries api.
---
 django/contrib/gis/gdal/raster/source.py  | 14 ++++++++++++++
 docs/ref/contrib/gis/gdal.txt             | 15 +++++++++++++++
 tests/gis_tests/gdal_tests/test_raster.py | 10 ++++++++++
 3 files changed, 39 insertions(+)

diff --git a/django/contrib/gis/gdal/raster/source.py b/django/contrib/gis/gdal/raster/source.py
index 3b4eb183b1..0f3a3a2744 100644
--- a/django/contrib/gis/gdal/raster/source.py
+++ b/django/contrib/gis/gdal/raster/source.py
@@ -214,6 +214,20 @@ class GDALRaster(GDALBase):
         capi.set_ds_projection_ref(self._ptr, srs.wkt.encode())
         self._flush()
 
+    @property
+    def srid(self):
+        """
+        Shortcut to access the srid of this GDALRaster.
+        """
+        return self.srs.srid
+
+    @srid.setter
+    def srid(self, value):
+        """
+        Shortcut to set this GDALRaster's srs from an srid.
+        """
+        self.srs = value
+
     @property
     def geotransform(self):
         """
diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index 3aea16ad36..afddcad094 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -1204,6 +1204,21 @@ blue.
             >>> rst.srs.srid
             3086
 
+    .. attribute:: srid
+
+        The Spatial Reference System Identifier (SRID) of the raster. This
+        property is a shortcut to getting or setting the SRID through the
+        :attr:`srs` attribute.
+
+            >>> rst = GDALRaster({'width': 10, 'height': 20, 'srid': 4326})
+            >>> rst.srid
+            4326
+            >>> rst.srid = 3086
+            >>> rst.srid
+            3086
+            >>> rst.srs.srid  # This is equivalent
+            3086
+
     .. attribute:: geotransform
 
         The affine transformation matrix used to georeference the source, as a
diff --git a/tests/gis_tests/gdal_tests/test_raster.py b/tests/gis_tests/gdal_tests/test_raster.py
index 257296a07d..8b9021bfc7 100644
--- a/tests/gis_tests/gdal_tests/test_raster.py
+++ b/tests/gis_tests/gdal_tests/test_raster.py
@@ -83,6 +83,16 @@ class GDALRasterTests(unittest.TestCase):
         self.assertEqual(self.rs.srs.srid, 3086)
         self.assertEqual(self.rs.srs.units, (1.0, 'metre'))
 
+    def test_rs_srid(self):
+        rast = GDALRaster({
+            'width': 16,
+            'height': 16,
+            'srid': 4326,
+        })
+        self.assertEqual(rast.srid, 4326)
+        rast.srid = 3086
+        self.assertEqual(rast.srid, 3086)
+
     def test_geotransform_and_friends(self):
         # Assert correct values for file based raster
         self.assertEqual(self.rs.geotransform,