From 37781bc297b7e3f5df549cbb607004c4b6824ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 5 Apr 2016 11:20:17 +0200 Subject: [PATCH] notusefull --- tilecloud_chain/__init__.py | 2 +- tilecloud_chain/openlayers_js.py | 2 +- tilecloud_chain/tests/test_multihost.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tilecloud_chain/__init__.py b/tilecloud_chain/__init__.py index 77ba73961..0c2a0f526 100644 --- 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 index 76214c940..8ea931ad8 100644 --- 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 index a38c53573..a00e24418 100644 --- 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(