mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
gis: Changed the inches attribute name from in
(a Python reserved keyword) to inch
. Thanks, andre_pl.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
b33e709981
commit
25cfbd6d66
@ -30,7 +30,7 @@
|
|||||||
Distance and Area objects to allow for sensible and convienient calculation
|
Distance and Area objects to allow for sensible and convienient calculation
|
||||||
and conversions.
|
and conversions.
|
||||||
|
|
||||||
Author: Robert Coup, Justin Bronn
|
Authors: Robert Coup, Justin Bronn
|
||||||
|
|
||||||
Inspired by GeoPy (http://exogen.case.edu/projects/geopy/)
|
Inspired by GeoPy (http://exogen.case.edu/projects/geopy/)
|
||||||
and Geoff Biggs' PhD work on dimensioned units for robotics.
|
and Geoff Biggs' PhD work on dimensioned units for robotics.
|
||||||
@ -101,7 +101,7 @@ class Distance(MeasureBase):
|
|||||||
'german_m' : 1.0000135965,
|
'german_m' : 1.0000135965,
|
||||||
'gold_coast_ft' : 0.304799710181508,
|
'gold_coast_ft' : 0.304799710181508,
|
||||||
'indian_yd' : 0.914398530744,
|
'indian_yd' : 0.914398530744,
|
||||||
'in' : 0.0254,
|
'inch' : 0.0254,
|
||||||
'km': 1000.0,
|
'km': 1000.0,
|
||||||
'link' : 0.201168,
|
'link' : 0.201168,
|
||||||
'link_benoit' : 0.20116782,
|
'link_benoit' : 0.20116782,
|
||||||
@ -122,7 +122,7 @@ class Distance(MeasureBase):
|
|||||||
ALIAS = {
|
ALIAS = {
|
||||||
'centimeter' : 'cm',
|
'centimeter' : 'cm',
|
||||||
'foot' : 'ft',
|
'foot' : 'ft',
|
||||||
'inches' : 'in',
|
'inches' : 'inch',
|
||||||
'kilometer' : 'km',
|
'kilometer' : 'km',
|
||||||
'kilometre' : 'km',
|
'kilometre' : 'km',
|
||||||
'meter' : 'm',
|
'meter' : 'm',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user