mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

gis: LayerMapping: OGR string fields may now be coerced into Django IntegerField; added support for more Django field types.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2008-03-10 21:13:52 +00:00
parent ae0e583510
commit 34df2c0da9
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
django/contrib/gis/utils/layermapping.py
View File

@ -8,8 +8,7 @@
converting to another coordinate system (e.g. WGS84), and then inserting converting to another coordinate system (e.g. WGS84), and then inserting
into a GeoDjango model. into a GeoDjango model.
This utility is still in early stages of development, so its usage Please report any bugs encountered using this utility.
is subject to change -- please report any bugs.
Requirements: OGR C Library (from GDAL) required. Requirements: OGR C Library (from GDAL) required.
@ -111,7 +110,7 @@ import sys
from datetime import date, datetime from datetime import date, datetime
from decimal import Decimal from decimal import Decimal
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.contrib.gis.db.models.fields import GeometryField from django.contrib.gis.db.models import GeometryField
from django.contrib.gis.db.backend import SpatialBackend from django.contrib.gis.db.backend import SpatialBackend
from django.contrib.gis.gdal import CoordTransform, DataSource, \ from django.contrib.gis.gdal import CoordTransform, DataSource, \
OGRException, OGRGeometry, OGRGeomType, SpatialReference OGRException, OGRGeometry, OGRGeomType, SpatialReference
@ -140,16 +139,21 @@ class LayerMapping(object):
# counterparts. # counterparts.
FIELD_TYPES = { FIELD_TYPES = {
models.AutoField : OFTInteger, models.AutoField : OFTInteger,
models.IntegerField : (OFTInteger, OFTReal), models.IntegerField : (OFTInteger, OFTReal, OFTString),
models.FloatField : (OFTInteger, OFTReal), models.FloatField : (OFTInteger, OFTReal),
models.DateField : OFTDate, models.DateField : OFTDate,
models.DateTimeField : OFTDateTime, models.DateTimeField : OFTDateTime,
models.EmailField : OFTString,
models.TimeField : OFTTime, models.TimeField : OFTTime,
models.DecimalField : (OFTInteger, OFTReal), models.DecimalField : (OFTInteger, OFTReal),
models.CharField : OFTString, models.CharField : OFTString,
models.SlugField : OFTString,
models.TextField : OFTString, models.TextField : OFTString,
models.SmallIntegerField : (OFTInteger, OFTReal), models.URLField : OFTString,
models.PositiveSmallIntegerField : (OFTInteger, OFTReal), models.USStateField : OFTString,
models.XMLField : OFTString,
models.SmallIntegerField : (OFTInteger, OFTReal, OFTString),
models.PositiveSmallIntegerField : (OFTInteger, OFTReal, OFTString),
} }
# The acceptable transaction modes. # The acceptable transaction modes.
@ -310,11 +314,12 @@ class LayerMapping(object):
# Is the OGR field in the Layer? # Is the OGR field in the Layer?
idx = check_ogr_fld(ogr_name) idx = check_ogr_fld(ogr_name)
ogr_field = ogr_field_types[idx]
# Can the OGR field type be mapped to the Django field type? # Can the OGR field type be mapped to the Django field type?
if not issubclass(ogr_field_types[idx], self.FIELD_TYPES[model_field.__class__]): if not issubclass(ogr_field, self.FIELD_TYPES[model_field.__class__]):
raise LayerMapError('OGR field "%s" (of type %s) cannot be mapped to Django %s.' % raise LayerMapError('OGR field "%s" (of type %s) cannot be mapped to Django %s.' %
(ogr_field, ogr_field_types[idx].__name__, fld_name)) (ogr_field, ogr_field.__name__, fld_name))
fields_val = model_field fields_val = model_field
self.fields[field_name] = fields_val self.fields[field_name] = fields_val
@ -397,7 +402,8 @@ class LayerMapping(object):
model field. If they are, the verified value is returned, model field. If they are, the verified value is returned,
otherwise the proper exception is raised. otherwise the proper exception is raised.
""" """
if isinstance(ogr_field, OFTString): if (isinstance(ogr_field, OFTString) and
isinstance(model_field, (models.CharField, models.TextField))):
if self.encoding: if self.encoding:
# The encoding for OGR data sources may be specified here # The encoding for OGR data sources may be specified here
# (e.g., 'cp437' for Census Bureau boundary files). # (e.g., 'cp437' for Census Bureau boundary files).
@ -435,9 +441,8 @@ class LayerMapping(object):
raise InvalidDecimal('A DecimalField with max_digits %d, decimal_places %d must round to an absolute value less than 10^%d.' % raise InvalidDecimal('A DecimalField with max_digits %d, decimal_places %d must round to an absolute value less than 10^%d.' %
(model_field.max_digits, model_field.decimal_places, max_prec)) (model_field.max_digits, model_field.decimal_places, max_prec))
val = d val = d
elif isinstance(ogr_field, OFTReal) and isinstance(model_field, models.IntegerField): elif isinstance(ogr_field, (OFTReal, OFTString)) and isinstance(model_field, models.IntegerField):
# If there's an OFTReal field with precision greater than 0 is mapped to # Attempt to convert any OFTReal and OFTString value to an OFTInteger.
# an IntegerField, the decimal places will be truncated.
try: try:
val = int(ogr_field.value) val = int(ogr_field.value)
except: except: