Ticket #19678: 19678-2.diff

django/contrib/gis/db/backends/spatialite/models.py

@@ -1 +1 @@
 """
  The GeometryColumns and SpatialRefSys models for the SpatiaLite backend.
 """
-from django.db import models
+from django.db import connection, models
 from django.contrib.gis.db.backends.base import SpatialRefSysMixin
 from django.utils.encoding import python_2_unicode_compatible
 
@@ -53 +53 @@
     auth_srid = models.IntegerField()
     ref_sys_name = models.CharField(max_length=256)
     proj4text = models.CharField(max_length=2048)
+    if connection.ops.spatial_version[0] >= 4:
+        srtext = models.CharField(max_length=2048)
 
     @property
     def wkt(self):
+        if hasattr(self, 'srtext'):
+            return self.srtext
         from django.contrib.gis.gdal import SpatialReference
         return SpatialReference(self.proj4text).wkt
 

django/contrib/gis/tests/test_spatialrefsys.py

@@ -12 +12 @@
              # Only the beginning, because there are differences depending on installed libs
              'srtext': 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84"',
              # +ellps=WGS84 has been removed in the 4326 proj string in proj-4.8
-             'proj4_re': r'\+proj=longlat (\+ellps=WGS84 )?\+datum=WGS84 \+no_defs ',
+             'proj4_re': r'\+proj=longlat (\+ellps=WGS84 )?(\+datum=WGS84 |\+towgs84=0,0,0,0,0,0,0 )\+no_defs ',
              'spheroid': 'WGS 84', 'name': 'WGS 84',
              'geographic': True, 'projected': False, 'spatialite': True,
              'ellipsoid': (6378137.0, 6356752.3, 298.257223563),  # From proj's "cs2cs -le" and Wikipedia (semi-minor only)