Changeset 7024

Timestamp:

01/18/08 09:52:37 (8 months ago)

Author:

jbronn

Message:

gis: LayerMapping: Fixed bug that would occur when mapping OFTReal fields with precision > 0 to an IntegerField.

Files:

• django/branches/gis/django/contrib/gis/utils/layermapping.py (modified) (3 diffs)

django/branches/gis/django/contrib/gis/utils/layermapping.py

@@ -125 +125 @@
-class InvalidString(LayerMapError): pass
-class InvalidDecimal(LayerMapError): pass
+class InvalidInteger(LayerMapError): pass
-class MissingForeignKey(LayerMapError): pass
-
@@ -407 +408 @@
-                    raise InvalidString('%s model field maximum string length is %s, given %s characters.' %
-                                        (model_field.name, model_field.max_length, len(val)))
-
+ and isinstance(model_field, models.DecimalField)
-            try:
-                # Creating an instance of the Decimal value to use.
-                d = Decimal(str(ogr_field.value))
-            except:
-
+.value
-
-            # Getting the decimal value as a tuple.
@@ -435 +436 @@
-                                     (model_field.max_digits, model_field.decimal_places, max_prec))
-            val = d
+        elif isinstance(ogr_field, OFTReal) and isinstance(model_field, models.IntegerField):
+            # If there's an OFTReal field with precision greater than 0 is mapped to
+            # an IntegerField, the decimal places will be truncated.
+            try:
+                val = int(ogr_field.value)
+            except:
+                raise InvalidInteger('Could not construct integer from: %s' % ogr_field.value)
-        else:
-            val = ogr_field.value