From fb6353a816b7757607320ad718a31e5f8cfbae31 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Fri, 1 Apr 2016 09:16:56 +0200
Subject: [PATCH] Fix olx.source.CartoDBOptions definition

---
 externs/olx.js                            | 10 +++++++++-
 src/ol/source/cartodb.js                  |  2 ++
 test/spec/ol/source/cartodbsource.test.js |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/externs/olx.js b/externs/olx.js
index f3ddf4c7eb..93613fe6d1 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -6219,7 +6219,7 @@ olx.source.XYZOptions.prototype.wrapX;
  *     wrapX: (boolean|undefined),
  *     config: (Object|undefined),
  *     map: (string|undefined),
- *     account: (string|undefined)}}
+ *     account: string}}
  * @api
  */
 olx.source.CartoDBOptions;
@@ -6269,6 +6269,14 @@ olx.source.CartoDBOptions.prototype.projection;
 olx.source.CartoDBOptions.prototype.maxZoom;
 
 
+/**
+ * Minimum zoom.
+ * @type {number|undefined}
+ * @api
+ */
+olx.source.CartoDBOptions.prototype.minZoom;
+
+
 /**
  * Whether to wrap the world horizontally. Default is `true`.
  * @type {boolean|undefined}
diff --git a/src/ol/source/cartodb.js b/src/ol/source/cartodb.js
index afb9c8c262..2a8a0ae2f1 100644
--- a/src/ol/source/cartodb.js
+++ b/src/ol/source/cartodb.js
@@ -111,6 +111,7 @@ ol.source.CartoDB.prototype.handleInitResponse_ = function(paramHash, event) {
   }
 };
 
+
 /**
  * @private
  * @param {Event} event Event.
@@ -119,6 +120,7 @@ ol.source.CartoDB.prototype.handleInitError_ = function(event) {
   this.setState(ol.source.State.ERROR);
 }
 
+
 /**
  * Apply the new tile urls returned by carto db
  * @param {Object} data Result of carto db call.
diff --git a/test/spec/ol/source/cartodbsource.test.js b/test/spec/ol/source/cartodbsource.test.js
index 9f62f6981c..201d276d84 100644
--- a/test/spec/ol/source/cartodbsource.test.js
+++ b/test/spec/ol/source/cartodbsource.test.js
@@ -8,7 +8,7 @@ describe('ol.source.CartoDB', function() {
   describe('constructor', function() {
     it('returns a CartoDB source', function() {
       var source = new ol.source.CartoDB({
-        map: 'example',
+        account: 'documentation',
         config: {}
       });
       expect(source).to.be.a(ol.source.XYZ);