mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-10 18:36:05 +00:00
Code Issues 32 Releases Wiki Activity

Refs #28024 -- Optimized GEOSCoordSeq.__setitem__() by avoiding superfluous index and dimension checks.

Browse Source
This commit is contained in:
Sergey Fedoseev 2017-04-05 19:06:37 +05:00 committed by Tim Graham
parent a296a43309
commit ebaa08b3ae
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
django/contrib/gis/geos/coordseq.py
View File

@ -54,17 +54,14 @@ class GEOSCoordSeq(GEOSBase):
# Checking the dims of the input # Checking the dims of the input
if self.dims == 3 and self._z: if self.dims == 3 and self._z:
n_args = 3 n_args = 3
set_3d = True point_setter = self._set_point_3d
else: else:
n_args = 2 n_args = 2
set_3d = False point_setter = self._set_point_2d
if len(value) != n_args: if len(value) != n_args:
raise TypeError('Dimension of value does not match.') raise TypeError('Dimension of value does not match.')
# Setting the X, Y, Z self._checkindex(index)
self.setX(index, value[0]) point_setter(index, value)
self.setY(index, value[1])
if set_3d:
self.setZ(index, value[2])
# #### Internal Routines #### # #### Internal Routines ####
def _checkindex(self, index): def _checkindex(self, index):
@ -87,6 +84,15 @@ class GEOSCoordSeq(GEOSBase):
def _get_z(self, index): def _get_z(self, index):
return capi.cs_getz(self.ptr, index, byref(c_double())) return capi.cs_getz(self.ptr, index, byref(c_double()))
def _set_x(self, index, value):
capi.cs_setx(self.ptr, index, value)
def _set_y(self, index, value):
capi.cs_sety(self.ptr, index, value)
def _set_z(self, index, value):
capi.cs_setz(self.ptr, index, value)
@property @property
def _point_getter(self): def _point_getter(self):
return self._get_point_3d if self.dims == 3 and self._z else self._get_point_2d return self._get_point_3d if self.dims == 3 and self._z else self._get_point_2d
@ -97,6 +103,17 @@ class GEOSCoordSeq(GEOSBase):
def _get_point_3d(self, index): def _get_point_3d(self, index):
return (self._get_x(index), self._get_y(index), self._get_z(index)) return (self._get_x(index), self._get_y(index), self._get_z(index))
def _set_point_2d(self, index, value):
x, y = value
self._set_x(index, x)
self._set_y(index, y)
def _set_point_3d(self, index, value):
x, y, z = value
self._set_x(index, x)
self._set_y(index, y)
self._set_z(index, z)
# #### Ordinate getting and setting routines #### # #### Ordinate getting and setting routines ####
def getOrdinate(self, dimension, index): def getOrdinate(self, dimension, index):
"Return the value for the given dimension and index." "Return the value for the given dimension and index."