blinkster: comparison web/lib/django/contrib/gis/measure.py

equal deleted inserted replaced

-:b758351d191f
+:cc9b7e14412b
 # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 """
 Distance and Area objects to allow for sensible and convienient calculation
 and conversions.
 Authors: Robert Coup, Justin Bronn
 Inspired by GeoPy (http://exogen.case.edu/projects/geopy/)
 return val, default_unit
 @classmethod
 def unit_attname(cls, unit_str):
 """
 Retrieves the unit attribute name for the given unit string.
 For example, if the given unit string is 'metre', 'm' would be returned.
 An exception is raised if an attribute cannot be found.
 """
 lower = unit_str.lower()
 if unit_str in cls.UNITS:
 def __init__(self, default_unit=None, **kwargs):
 # The base unit is in meters.
 self.m, self._default_unit = self.default_units(kwargs)
 if default_unit and isinstance(default_unit, str):
 self._default_unit = default_unit
 def __getattr__(self, name):
 if name in self.UNITS:
 return self.m / self.UNITS[name]
 else:
 raise AttributeError('Unknown unit type: %s' % name)
 def __repr__(self):
 return 'Distance(%s=%s)' % (self._default_unit, getattr(self, self._default_unit))
 def __str__(self):
 return '%s %s' % (getattr(self, self._default_unit), self._default_unit)
 def __cmp__(self, other):
 if isinstance(other, Distance):
 return cmp(self.m, other.m)
 else:
 return NotImplemented
 def __add__(self, other):
 if isinstance(other, Distance):
 return Distance(default_unit=self._default_unit, m=(self.m + other.m))
 else:
 raise TypeError('Distance must be added with Distance')
 def __iadd__(self, other):
 if isinstance(other, Distance):
 self.m += other.m
 return self
 else:
 raise TypeError('Distance must be added with Distance')
 def __sub__(self, other):
 if isinstance(other, Distance):
 return Distance(default_unit=self._default_unit, m=(self.m - other.m))
 else:
 raise TypeError('Distance must be subtracted from Distance')
 def __isub__(self, other):
 if isinstance(other, Distance):
 self.m -= other.m
 return self
 else:
 raise TypeError('Distance must be subtracted from Distance')
 def __mul__(self, other):
 if isinstance(other, (int, float, long, Decimal)):
 return Distance(default_unit=self._default_unit, m=(self.m * float(other)))
 elif isinstance(other, Distance):
 return Area(default_unit='sq_' + self._default_unit, sq_m=(self.m * other.m))
 else:
 raise TypeError('Distance must be multiplied with number or Distance')
 def __imul__(self, other):
 if isinstance(other, (int, float, long, Decimal)):
 self.m *= float(other)
 return self
 else:
 raise TypeError('Distance must be multiplied with number')
+def __rmul__(self, other):
+return self * other
 def __div__(self, other):
 if isinstance(other, (int, float, long, Decimal)):
 return Distance(default_unit=self._default_unit, m=(self.m / float(other)))
 else:
 raise TypeError('Distance must be divided with number')
 def __init__(self, default_unit=None, **kwargs):
 self.sq_m, self._default_unit = self.default_units(kwargs)
 if default_unit and isinstance(default_unit, str):
 self._default_unit = default_unit
 def __getattr__(self, name):
 if name in self.UNITS:
 return self.sq_m / self.UNITS[name]
 else:
 raise AttributeError('Unknown unit type: ' + name)
 def __repr__(self):
 return 'Area(%s=%s)' % (self._default_unit, getattr(self, self._default_unit))
 def __str__(self):
 return '%s %s' % (getattr(self, self._default_unit), self._default_unit)
 def __cmp__(self, other):
 if isinstance(other, Area):
 return cmp(self.sq_m, other.sq_m)
 else:
 return NotImplemented
 def __add__(self, other):
 if isinstance(other, Area):
 return Area(default_unit=self._default_unit, sq_m=(self.sq_m + other.sq_m))
 else:
 raise TypeError('Area must be added with Area')
 def __iadd__(self, other):
 if isinstance(other, Area):
 self.sq_m += other.sq_m
 return self
 else:
 raise TypeError('Area must be added with Area')
 def __sub__(self, other):
 if isinstance(other, Area):
 return Area(default_unit=self._default_unit, sq_m=(self.sq_m - other.sq_m))
 else:
 raise TypeError('Area must be subtracted from Area')
 def __isub__(self, other):
 if isinstance(other, Area):
 self.sq_m -= other.sq_m
 return self
 else:
 raise TypeError('Area must be subtracted from Area')
 def __mul__(self, other):
 if isinstance(other, (int, float, long, Decimal)):
 return Area(default_unit=self._default_unit, sq_m=(self.sq_m * float(other)))
 else:
 raise TypeError('Area must be multiplied with number')
 def __imul__(self, other):
 if isinstance(other, (int, float, long, Decimal)):
 self.sq_m *= float(other)
 return self
 else:
 raise TypeError('Area must be multiplied with number')
+def __rmul__(self, other):
+return self * other
 def __div__(self, other):
 if isinstance(other, (int, float, long, Decimal)):
 return Area(default_unit=self._default_unit, sq_m=(self.sq_m / float(other)))
 else:
 raise TypeError('Area must be divided with number')
 else:
 raise TypeError('Area must be divided with number')
 def __nonzero__(self):
 return bool(self.sq_m)
 # Shortcuts
 D = Distance
 A = Area

changeset 29	cc9b7e14412b
parent 0	0d40e90630ef