Fixed #28020 -- Made GEOSGeometry.json use OGRGeometry.json for better performance.

django/contrib/gis/geos/collections.py

@@ -15,7 +15,6 @@ from django.contrib.gis.geos.polygon import Polygon
 
 
 class GeometryCollection(GEOSGeometry):
-    _json_type = 'GeometryCollection'
     _typeid = 7
 
     def __init__(self, *args, **kwargs):
@@ -107,13 +106,11 @@ class GeometryCollection(GEOSGeometry):
 # MultiPoint, MultiLineString, and MultiPolygon class definitions.
 class MultiPoint(GeometryCollection):
     _allowed = Point
-    _json_type = 'MultiPoint'
     _typeid = 4
 
 
 class MultiLineString(LinearGeometryMixin, GeometryCollection):
     _allowed = (LineString, LinearRing)
-    _json_type = 'MultiLineString'
     _typeid = 5
 
     @property
@@ -125,7 +122,6 @@ class MultiLineString(LinearGeometryMixin, GeometryCollection):
 
 class MultiPolygon(GeometryCollection):
     _allowed = Polygon
-    _json_type = 'MultiPolygon'
     _typeid = 6
 
 

django/contrib/gis/geos/geometry.py

@@ -2,7 +2,6 @@
  This module contains the 'base' GEOSGeometry object -- all GEOS Geometries
  inherit from this object.
 """
-import json
 from ctypes import addressof, byref, c_double
 
 from django.contrib.gis import gdal
@@ -421,7 +420,7 @@ class GEOSGeometry(GEOSBase, ListMixin):
         """
         Return GeoJSON representation of this Geometry.
         """
-        return json.dumps({'type': self._json_type, 'coordinates': self.coords})
+        return self.ogr.json
     geojson = json
 
     @property

django/contrib/gis/geos/linestring.py

@@ -8,7 +8,6 @@ from django.contrib.gis.shortcuts import numpy
 
 class LineString(LinearGeometryMixin, GEOSGeometry):
     _init_func = capi.create_linestring
-    _json_type = 'LineString'
     _minlength = 2
     has_cs = True
 

django/contrib/gis/geos/point.py

@@ -7,7 +7,6 @@ from django.contrib.gis.geos.geometry import GEOSGeometry
 
 
 class Point(GEOSGeometry):
-    _json_type = 'Point'
     _minlength = 2
     _maxlength = 3
     has_cs = True

django/contrib/gis/geos/polygon.py

@@ -7,7 +7,6 @@ from django.contrib.gis.geos.linestring import LinearRing
 
 
 class Polygon(GEOSGeometry):
-    _json_type = 'Polygon'
     _minlength = 1
 
     def __init__(self, *args, **kwargs):