notusefull

camptocamp · Apr 5, 2016 · 37781bc · 37781bc
1 parent 3823d71
commit 37781bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tilecloud_chain/__init__.py b/tilecloud_chain/__init__.py
@@ -431,7 +431,7 @@ def __init__(self, config_file, options=None, layer_name=None):
         ) or error
         error = self.validate(
             self.config['generation'], 'generation', 'default_layers',
-            is_array=True, attribute_type=str, default=[k for k in self.layers.keys()]
+            is_array=True, attribute_type=str, default=self.layers.keys()
         ) or error
         error = self.validate(
             self.config['generation'], 'generation', 'log_format', attribute_type=str,

diff --git a/tilecloud_chain/openlayers_js.py b/tilecloud_chain/openlayers_js.py
@@ -50,7 +50,7 @@
         var capabilities = format.read(doc);
         {% for layer in layers %}
         map.addLayer(format.createLayer(capabilities, {
-            layer: "{{layer['name']}}",
+            layer: "{{layer.name}}",
             maxExtent: {{layer.maxExtent}},{%
 if layer.grid %}
             isBaseLayer: false,

diff --git a/tilecloud_chain/tests/test_multihost.py b/tilecloud_chain/tests/test_multihost.py
@@ -103,13 +103,13 @@ def test_time_multihost(self):
             expected="""==== Sync and build code ====
 ==== Time results ====
 A tile is generated in: [0-9\.]* \[ms\]
-Then mean generated tile size: 0.82[0-9] \[kb\]
+Then mean generated tile size: 0.82[67] \[kb\]
 config:
     cost:
         tileonly_generation_time: [0-9\.]*
         tile_generation_time: [0-9\.]*
         metatile_generation_time: 0
-        tile_size: 0.82[0-9]
+        tile_size: 0.82[67]
 """, regex=True)
 
         self.assert_cmd_equals(