Ensure subdomains are provided to the renderer from the http factory

fixes #321
CartoDB · Apr 21, 2015 · da268f4 · da268f4
1 parent 15e791c
commit da268f4
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 1 deletion.
diff --git a/lib/windshaft/renderers/http/factory.js b/lib/windshaft/renderers/http/factory.js
@@ -36,12 +36,18 @@ HttpFactory.prototype.getRenderer = function(mapConfig, format, options, callbac
             return callback(new Error('Invalid "urlTemplate" for http layer'));
         }
     }
+
+    var subdomains = layer.options.subdomains;
+    if (!subdomains) {
+        subdomains = urlTemplate.match(/\{ *([s]+) *\}/g) ? ['a', 'b', 'c'] : [];
+    }
+
     var rendererOptions = {
         tms: layer.options.tms || false,
         timeout: this.timeout,
         proxy: this.proxy
     };
-    return callback(null, new Renderer(urlTemplate, layer.options.subdomains, rendererOptions));
+    return callback(null, new Renderer(urlTemplate, subdomains, rendererOptions));
 };
 
 function isValidUrlTemplate(urlTemplate, whitelist) {

diff --git a/test/integration/renderers/http_factory.js b/test/integration/renderers/http_factory.js
@@ -108,4 +108,57 @@ describe('renderer_http_factory_getRenderer', function() {
             done();
         });
     });
+
+    describe('when subdomains are not provided', function() {
+
+        var noSubdomainsUrlTemplate = 'http://wadus.example.com/{z}/{x}/{y}.png';
+        var subdomainsUrlTemplate = 'http://{s}.wadus.example.com/{z}/{x}/{y}.png';
+
+        it('returns a renderer with valid subdomains for a subdomain template', function(done) {
+            var whitelistAnyUrl = ['.*'];
+            var factoryWithFallbackImage = new HttpRendererFactory(whitelistAnyUrl, 2000);
+            var mapConfig = MapConfig.create({
+                layers: [
+                    {
+                        type: 'http',
+                        options: {
+                            urlTemplate: subdomainsUrlTemplate
+                        }
+                    }
+                ]
+            });
+            factoryWithFallbackImage.getRenderer(mapConfig, 'png', layerZeroOptions, function(err, renderer) {
+                assert.ok(!err);
+                assert.ok(renderer);
+                assert.equal(renderer.constructor, Renderer);
+                assert.equal(renderer.subdomains.length, 3);
+                assert.deepEqual(renderer.subdomains, ['a', 'b', 'c']);
+                done();
+            });
+        });
+
+        it('returns a renderer with valid subdomains for a NON subdomain template', function(done) {
+            var whitelistAnyUrl = ['.*'];
+            var factoryWithFallbackImage = new HttpRendererFactory(whitelistAnyUrl, 2000);
+            var mapConfig = MapConfig.create({
+                layers: [
+                    {
+                        type: 'http',
+                        options: {
+                            urlTemplate: noSubdomainsUrlTemplate
+                        }
+                    }
+                ]
+            });
+            factoryWithFallbackImage.getRenderer(mapConfig, 'png', layerZeroOptions, function(err, renderer) {
+                assert.ok(!err);
+                assert.ok(renderer);
+                assert.equal(renderer.constructor, Renderer);
+                assert.equal(renderer.subdomains.length, 0);
+                assert.deepEqual(renderer.subdomains, []);
+                done();
+            });
+        });
+
+    });
 });