From 7d5b6b08206515c7e3f7bcc9f2e12eb14eb2162e Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Tue, 9 May 2017 18:24:24 +0200 Subject: [PATCH] Lint changes and yarn.lock --- lib/cartodb/backends/stats.js | 2 +- lib/cartodb/controllers/map.js | 7 ++-- package.json | 1 + test/acceptance/multilayer.js | 2 +- test/acceptance/stats/multilayer_stats.js | 6 ++-- yarn.lock | 40 +++++++++-------------- 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/lib/cartodb/backends/stats.js b/lib/cartodb/backends/stats.js index d2e989e3..d8f83c72 100644 --- a/lib/cartodb/backends/stats.js +++ b/lib/cartodb/backends/stats.js @@ -2,7 +2,7 @@ var windshaftStats = require('windshaft-stats'); function StatsBackend(rendererCache) { this.rendererCache = rendererCache; -}; +} module.exports = StatsBackend; diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index f3211190..f52d839d 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -256,7 +256,9 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn }, function afterLayergroupCreate(err, layergroup) { assert.ifError(err); - self.afterLayergroupCreate(req, res, mapConfig, layergroup, mapConfigProvider.analysesResults, rendererParams, this); + self.afterLayergroupCreate(req, res, mapConfig, layergroup, + mapConfigProvider.analysesResults, + rendererParams, this); }, function finishTemplateInstantiation(err, layergroup) { if (err) { @@ -279,7 +281,8 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn ); }; -MapController.prototype.afterLayergroupCreate = function(req, res, mapconfig, layergroup, analysesResults, rendererParams, callback) { +MapController.prototype.afterLayergroupCreate = +function(req, res, mapconfig, layergroup, analysesResults, rendererParams, callback) { var self = this; var username = req.context.user; diff --git a/package.json b/package.json index 9bbb5125..b14b07d3 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "strftime": "~0.8.2" }, "scripts": { + "lint": "jshint lib test", "preinstall": "make pre-install", "test": "make test-all" }, diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 275ebab7..210418ac 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -1041,7 +1041,7 @@ describe(suiteName, function() { ); }); } - + // See https://github.com/CartoDB/Windshaft-cartodb/issues/91 // and https://github.com/CartoDB/Windshaft-cartodb/issues/38 it("tiles for private tables can be fetched with api_key", function(done) { diff --git a/test/acceptance/stats/multilayer_stats.js b/test/acceptance/stats/multilayer_stats.js index 4571bf6a..bfd76394 100644 --- a/test/acceptance/stats/multilayer_stats.js +++ b/test/acceptance/stats/multilayer_stats.js @@ -49,8 +49,10 @@ describe('multilayer stats disabled', function() { var cartocssVersion = '2.3.0'; var cartocss = '#layer { line-width:16; }'; - var sql = "select 1 as i, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 4326) as the_geom, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 3857) as the_geom_webmercator"; - var sqlWadus = "select 1 as wadus, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 4326) as the_geom, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 3857) as the_geom_webmercator"; + var sql = "select 1 as i, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 4326) as the_geom, " + + "st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 3857) as the_geom_webmercator"; + var sqlWadus = "select 1 as wadus, st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 4326) as the_geom, " + + "st_setsrid('LINESTRING(0 0, 1 0)'::geometry, 3857) as the_geom_webmercator"; var httpLayer = { type: 'http', diff --git a/yarn.lock b/yarn.lock index 1addd775..e8a320d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,6 +223,14 @@ carto@0.16.3: semver "^5.1.0" yargs "^4.2.0" +carto@CartoDB/carto#0.15.1-cdb1: + version "0.15.1-cdb1" + resolved "https://codeload.github.com/CartoDB/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398" + dependencies: + mapnik-reference "~6.0.2" + optimist "~0.6.0" + underscore "~1.6.0" + carto@cartodb/carto#0.15.1-cdb3: version "0.15.1-cdb3" resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" @@ -231,14 +239,6 @@ carto@cartodb/carto#0.15.1-cdb3: optimist "~0.6.0" underscore "1.8.3" -"carto@github:cartodb/carto#0.15.1-cdb1": - version "0.15.1-cdb1" - resolved "https://codeload.github.com/cartodb/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398" - dependencies: - mapnik-reference "~6.0.2" - optimist "~0.6.0" - underscore "~1.6.0" - cartocolor@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cartocolor/-/cartocolor-4.0.0.tgz#841a3222d8b5b22718d9d545b1e5b972cb26eb36" @@ -738,7 +738,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob@3.2.3: +glob@3.2.3, "glob@~ 3.2.1": version "3.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467" dependencies: @@ -777,13 +777,6 @@ glob@^7.0.5: once "^1.3.0" path-is-absolute "^1.0.0" -"glob@~ 3.2.1": - version "3.2.11" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d" - dependencies: - inherits "2" - minimatch "0.3" - graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -1227,13 +1220,6 @@ mime@~1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" -minimatch@0.3: - version "0.3.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd" - dependencies: - lru-cache "2" - sigmund "~1.0.0" - minimatch@1.0.x: version "1.0.0" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-1.0.0.tgz#e0dd2120b49e1b724ce8d714c520822a9438576d" @@ -1523,7 +1509,7 @@ pg-types@1.*: postgres-date "~1.0.0" postgres-interval "~1.0.0" -"pg@github:cartodb/node-postgres#6.1.2-cdb1": +pg@cartodb/node-postgres#6.1.2-cdb1: version "6.1.2" resolved "https://codeload.github.com/cartodb/node-postgres/tar.gz/3c81aea432ce58d20a795786c58bbb14f68f9689" dependencies: @@ -2275,6 +2261,12 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" +windshaft-stats@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/windshaft-stats/-/windshaft-stats-0.0.1.tgz#5af57a2ea71c67cdf6d8628941c88b826100d7cb" + dependencies: + debug "~2.2.0" + windshaft@cartodb/windshaft#548-vector-buffer-size: version "3.1.1" resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/09493bfff94371989532bef6dff734e4cd5cf058"