mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-23 12:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed #30166 -- Dropped support for GDAL 1.11.

Browse source
This commit is contained in:
Tim Graham 2019-02-07 19:10:34 -05:00
parent 6eb4996672
commit e7fd69d051
7 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
django/contrib/gis/gdal/geometries.py
View file

@ -46,7 +46,6 @@ from django.contrib.gis.gdal.base import GDALBase
from django.contrib.gis.gdal.envelope import Envelope, OGREnvelope
from django.contrib.gis.gdal.error import GDALException, SRSException
from django.contrib.gis.gdal.geomtype import OGRGeomType
from django.contrib.gis.gdal.libgdal import GDAL_VERSION
from django.contrib.gis.gdal.prototypes import geom as capi, srs as srs_api
from django.contrib.gis.gdal.srs import CoordTransform, SpatialReference
from django.contrib.gis.geometry import hex_regex, json_regex, wkt_regex
@ -140,14 +139,7 @@ class OGRGeometry(GDALBase):
@staticmethod
def _from_json(geom_input):
ptr = capi.from_json(geom_input)
if GDAL_VERSION < (2, 0):
try:
capi.get_geom_srs(ptr)
except SRSException:
srs = SpatialReference(4326)
capi.assign_srs(ptr, srs.ptr)
return ptr
return capi.from_json(geom_input)
@classmethod
def from_bbox(cls, bbox):