Changeset 7013

Timestamp:

01/10/08 11:11:02 (8 months ago)

Author:

jbronn

Message:

gis: LayerMapping: Added the fid_range and step keywords to save(); moved the silent, strict, and pipe (now stream) keywords from __init__() to save().

Files:

• django/branches/gis/django/contrib/gis/tests/layermap/tests.py (modified) (6 diffs)
• django/branches/gis/django/contrib/gis/utils/layermapping.py (modified) (9 diffs)

django/branches/gis/django/contrib/gis/tests/layermap/tests.py

@@ -11 +11 @@
-co_shp = os.path.join(shp_path, 'counties/counties.shp')
-inter_shp = os.path.join(shp_path, 'interstates/interstates.shp')
+
+# Dictionaries to hold what's expected in the county shapefile.  
+NAMES  = ['Bexar', 'Galveston', 'Harris', 'Honolulu', 'Pueblo']
+NUMS   = [1, 2, 1, 19, 1] # Number of polygons for each.                                                                                                                                                  
+STATES = ['Texas', 'Texas', 'Texas', 'Hawaii', 'Colorado']
-
-class LayerMapTest(unittest.TestCase):
@@ -78 +83 @@
-        # the importation to stop.
-        try:
-
-
-
+
+
-        except InvalidDecimal:
-            pass
@@ -87 +91 @@
-
-        # This LayerMapping should work b/c `strict` is not set.
-, silent=True
-
+
+silent=True
-
-        # Two interstate should have imported correctly.
@@ -112 +116 @@
-                self.assertAlmostEqual(p1[1], p2[1], 6)
-
+    def county_helper(self, county_feat=True):
+        "Helper function for ensuring the integrity of the mapped County models."
+        
+        for name, n, st in zip(NAMES, NUMS, STATES):
+            # Should only be one record b/c of `unique` keyword.
+            c = County.objects.get(name=name)
+            self.assertEqual(n, len(c.mpoly))
+            self.assertEqual(st, c.state.name) # Checking ForeignKey mapping.
+            
+            # Multiple records because `unique` was not set.
+            if county_feat:
+                qs = CountyFeat.objects.filter(name=name)
+                self.assertEqual(n, qs.count())
+
-    def test04_layermap_unique_multigeometry_fk(self):
-        "Testing the `unique`, and `transform`, geometry collection conversion, and ForeignKey mappings."
@@ -146 +164 @@
-        # a MissingForeignKey exception (this error would be ignored if the `strict`
-        # keyword is not set).
-, silent=True, strict=True
-
+
+, silent=True, strict=True
-
-        # Now creating the state models so the ForeignKey mapping may work.
@@ -166 +184 @@
-        #    all of the various islands in Honolulu county will be in in one
-        #    database record with a MULTIPOLYGON type.
-, silent=True, strict=True
-
+
+silent=True, strict=True
-
-        # A reference that doesn't use the unique keyword; a new database record will
-        # created for each polygon.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-def suite():
-    s = unittest.TestSuite()

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

@@ -44 +44 @@
-   For example, 'latin-1', 'utf-8', and 'cp437' are all valid
-   encoding parameters.
-
-  check:
-   Due to optimizations, this keyword argument is deprecated and will
-   be removed in future revisions.
-
-  pipe:
-   Status information will be written to this file handle.  Defaults
-   to using `sys.stdout`, but any object with a `write` method is 
-   supported.
-
-  silent:
-   By default, non-fatal error notifications are printed to stdout; this
-   keyword may be set in order to disable these notifications.
-
-  strict:
-   Setting this keyword to True will instruct the save() method to
-   cease execution on the first error encountered.  The default behavior
-   is to attempt to continue even if errors are encountered.
-
-  transaction_mode:
@@ -176 +158 @@
-
-    def __init__(self, model, data, mapping, layer=0, 
-
-
-
-
+
+
+
-        """
-        A LayerMapping object is initialized using the given Model (not an instance),
@@ -214 +195 @@
-        # things don't check out before hand.
-        self.check_layer()
-
-        # The strict flag -- if it is set, exceptions will be propagated up.
-        self.strict = strict
-
-        # Setting the keyword arguments related to status printing.
-        self.silent = silent
-        self.progress = progress
-        self.pipe = pipe
-        self.interval = interval
-
-        # Setting the encoding for OFTString fields, if specified.
@@ -250 +222 @@
-    
-    #### Checking routines used during initialization ####
+    def check_fid_range(self, fid_range):
+        "This checks the `fid_range` keyword."
+        if fid_range:
+            if isinstance(fid_range, (tuple, list)):
+                return slice(*fid_range)
+            elif isinstance(fid_range, slice):
+                return fid_range
+            else:
+                raise TypeError
+        else:
+            return None
+
-    def check_layer(self):
-        """
@@ -368 +352 @@
-        """
-        Given an OGR Feature, this will return a dictionary of keyword arguments
-
-
-
+
-        """
-        # The keyword arguments for model construction.
-        kwargs = {}
-
-        # The all_prepped flagged, will be set to False if there's a
-        # problem w/a ForeignKey that doesn't exist.
-        all_prepped = True
-
-        # Incrementing through each model field and OGR field in the
@@ -391 +369 @@
-                # another mapping for the related Model.
-                val = self.verify_fk(feat, model_field, ogr_name)
-                if not val: all_prepped = False
-            else:
-                # Otherwise, verify OGR Field type.
@@ -400 +377 @@
-            kwargs[field_name] = val
-            
-, all_prepped
+
-
-    def unique_kwargs(self, kwargs):
@@ -481 +458 @@
-            return rel_model.objects.get(**fk_kwargs)
-        except ObjectDoesNotExist:
-
-
-
+
+
-    def verify_geom(self, geom, model_field):
-        """
@@ -537 +513 @@
-                model_field.__class__.__name__ == 'Multi%s' % geom_type.django)
-
-
+
+
-        """
-        Saves the contents from the OGR DataSource Layer into the database
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        # Defining the 'real' save method, utilizing the transaction 
-        # decorator created during initialization.
-        @self.transaction_decorator
-
-
-
-
-
+
+
+
+
+
+
+
-                num_feat += 1
-                # Getting the keyword arguments
-                try:
-, all_prepped
+
-                except LayerMapError, msg:
-                    # Something borked the validation
-elf.s
-elf.s
-elf.pipe
+
+
+tream
-                else:
-                    # Constructing the model using the keyword args
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            m = self.model(**kwargs)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            raise
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                # Printing progress information, if requested.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+