Merge pull request #258 from ochriste/fix-dimension-aggregation

We want the product of the dimensions
camptocamp · Sep 28, 2016 · 169afd4 · 169afd4
2 parents 00d6f08 + 67aa2b0
commit 169afd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/tilecloud_chain/__init__.py b/tilecloud_chain/__init__.py
@@ -17,6 +17,7 @@
 from fractions import Fraction
 from datetime import datetime
 from tilecloud import consume
+from itertools import product
 
 try:
     from PIL import Image
@@ -429,10 +430,10 @@ def get_all_dimensions(self, layer=None):
             if dim['name'] not in options_dimensions
         ]
         all_dimensions += [[p] for p in options_dimensions.items()]
-        all_dimensions = zip(*all_dimensions)
+        all_dimensions = product(*all_dimensions)
         return [dict(d) for d in all_dimensions]
 
-    def get_store(self, cache, layer, dimensions=None, read_only=False):
+    def get_store(self, cache, layer, dimensions={}, read_only=False):
         # build layout
         grid = layer['grid_ref'] if 'grid_ref' in layer else None
         layout = WMTSTileLayout(

diff --git a/tilecloud_chain/copy_.py b/tilecloud_chain/copy_.py
@@ -18,11 +18,8 @@ def copy(self, options, gene, layer, source, dest, task_name):
         if gene.layers[layer]['type'] == 'wms':
             all_dimensions = gene.get_all_dimensions(gene.layers[layer])
 
-            if len(all_dimensions) == 0:
-                self._copy(options, gene, layer, source, dest, task_name)
-            else:  # pragma: no cover
-                for dimensions in all_dimensions:
-                    self._copy(options, gene, layer, source, dest, task_name, dimensions)
+            for dimensions in all_dimensions:
+                self._copy(options, gene, layer, source, dest, task_name, dimensions)
         else:  # pragma: no cover
             self._copy(options, gene, layer, source, dest, task_name)