Skip to content

Commit

Permalink
Use strict mode
Browse files Browse the repository at this point in the history
  • Loading branch information
dgaubert committed Oct 24, 2018
1 parent ca2e2da commit 2c63bbe
Show file tree
Hide file tree
Showing 109 changed files with 227 additions and 15 deletions.
2 changes: 2 additions & 0 deletions lib/windshaft/backends/attributes.js
@@ -1,3 +1,5 @@
'use strict';

const PSQL = require('cartodb-psql');

const RendererParams = require('../renderers/renderer_params');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/backends/index.js
@@ -1,3 +1,5 @@
'use strict';

module.exports = {
Attributes: require('./attributes'),
Map: require('./map'),
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/backends/map_validator.js
@@ -1,3 +1,5 @@
'use strict';

var queue = require('queue-async');
var _ = require('underscore');

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/backends/preview.js
@@ -1,3 +1,5 @@
'use strict';

var abaculus = require('abaculus');
var SphericalMercator = require('sphericalmercator');

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/backends/tile.js
@@ -1,3 +1,5 @@
'use strict';

const _ = require('underscore');
const Timer = require('../stats/timer');

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/cache/cache_entry.js
@@ -1,3 +1,5 @@
'use strict';

const debug = require('debug')('windshaft:cache-entry');

function CacheEntry(cacheBuster, key = 'key-not-provided') {
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/cache/renderer_cache.js
@@ -1,3 +1,5 @@
'use strict';

// Current {RendererCache} responsibilities:
// - Caches (adapted) renderer objects
// - Purges the renderer objects after `{Number} options.timeout` ms of inactivity since the last cache entry access
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/index.js
@@ -1,3 +1,5 @@
'use strict';

var version = require('../../package.json').version;
var grainstore = require('grainstore');
var mapnik = require('@carto/mapnik');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/models/datasource.js
@@ -1,3 +1,5 @@
'use strict';

/**
* @param {Array} layersDbParams
* @constructor
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/models/mapconfig.js
@@ -1,3 +1,5 @@
'use strict';

var Crypto = require('crypto');
var semver = require('semver');

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/models/providers/dummy_mapconfig_provider.js
@@ -1,3 +1,5 @@
'use strict';

var util = require('util');
var MapStoreMapConfigProvider = require('./mapstore_mapconfig_provider');

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/models/providers/mapconfig_provider_proxy.js
@@ -1,3 +1,5 @@
'use strict';

var _ = require('underscore');

function MapConfigProviderProxy(mapConfigProvider, params) {
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/models/providers/mapstore_mapconfig_provider.js
@@ -1,3 +1,5 @@
'use strict';

var _ = require('underscore');

function MapStoreMapConfigProvider(mapStore, params) {
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/base_adaptor.js
@@ -1,3 +1,5 @@
'use strict';

/**
* Base adaptor
* Wraps any renderer that does not require adapting its interface
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/blend/factory.js
@@ -1,3 +1,5 @@
'use strict';

var mapnik = require('@carto/mapnik');
var queue = require('queue-async');
var _ = require('underscore');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/blend/index.js
@@ -1,2 +1,4 @@
'use strict';

module.exports.factory = require('./factory');
module.exports.adaptor = require('../base_adaptor');
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/blend/renderer.js
@@ -1,3 +1,5 @@
'use strict';

var blend = require('@carto/mapnik').blend;
var queue = require('queue-async');
var Timer = require('../../stats/timer');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/http/factory.js
@@ -1,3 +1,5 @@
'use strict';

var Renderer = require('./renderer');
var FallbackRenderer = require('./fallback_renderer');
var BaseAdaptor = require('../base_adaptor');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/http/fallback_renderer.js
@@ -1,3 +1,5 @@
'use strict';

var fs = require('fs');
var requestImage = require('./renderer').requestImage;

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/http/index.js
@@ -1,2 +1,4 @@
'use strict';

module.exports.factory = require('./factory');
module.exports.adaptor = require('../base_adaptor');
12 changes: 7 additions & 5 deletions lib/windshaft/renderers/http/renderer.js
@@ -1,3 +1,5 @@
'use strict';

var request = require('request');
var Timer = require('../../stats/timer');
var mapnik = require('@carto/mapnik');
Expand Down Expand Up @@ -80,20 +82,20 @@ function ensureBufferIs256px(buffer, callback) {
}
if (image.height() === 256) {
return callback(null, buffer);
}
}
resizeImageTo256px(image, function(err, resizedImage) {
resizedImage.encode('png', callback);
});
});
});
}

//image: mapnick image
//callback(err, image)
function resizeImageTo256px(image, callback) {
image.premultiply(function() {
// bilinear method has the best tradeoff between quality and CPU (lanczos has the best quality)
image.resize(256, 256, {scaling_method: mapnik.imageScaling.bilinear}, callback);
});
// bilinear method has the best tradeoff between quality and CPU (lanczos has the best quality)
image.resize(256, 256, {scaling_method: mapnik.imageScaling.bilinear}, callback);
});
}

Renderer.prototype.getMetadata = function(callback) {
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/mapnik/adaptor.js
@@ -1,3 +1,5 @@
'use strict';

var wrap = require('../base_adaptor').wrap;

const METRIC_PREFIX = "Mk_";
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/mapnik/factory.js
@@ -1,3 +1,5 @@
'use strict';

var tilelive = require('tilelive');
var grainstore = require('grainstore');
var _ = require('underscore');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/mapnik/index.js
@@ -1,2 +1,4 @@
'use strict';

module.exports.adaptor = require('./adaptor');
module.exports.factory = require('./factory');
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/pg-mvt/factory.js
@@ -1,3 +1,5 @@
'use strict';

const _ = require('underscore');
const layersFilter = require('../../utils/layer_filter');

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/pg-mvt/index.js
@@ -1,2 +1,4 @@
'use strict';

module.exports.factory = require('./factory');
module.exports.adaptor = require('../base_adaptor');
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/pg-mvt/renderer.js
@@ -1,3 +1,5 @@
'use strict';

const debug = require('debug')('windshaft:renderer:pg_mvt');
const PSQL = require('cartodb-psql');
const SubstitutionTokens = require('../../utils/substitution_tokens');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/plain/color_renderer.js
@@ -1,3 +1,5 @@
'use strict';

var mapnik = require('@carto/mapnik');
var Timer = require('../../stats/timer');

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/plain/factory.js
@@ -1,3 +1,5 @@
'use strict';

var mapnik = require('@carto/mapnik');
var ColorRenderer = require('./color_renderer');
var ImageRenderer = require('./image_renderer');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/plain/image_renderer.js
@@ -1,3 +1,5 @@
'use strict';

var mapnik = require('@carto/mapnik');
var blend = mapnik.blend;
var Timer = require('../../stats/timer');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/plain/index.js
@@ -1,2 +1,4 @@
'use strict';

module.exports.factory = require('./factory');
module.exports.adaptor = require('../base_adaptor');
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/renderer_factory.js
@@ -1,3 +1,5 @@
'use strict';

var HttpRenderer = require('./http');
var BlendRenderer = require('./blend');
var TorqueRenderer = require('./torque');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/renderer_params.js
@@ -1,3 +1,5 @@
'use strict';

var RendererParams = {
dbParamsFromReqParams: function(params) {
var dbParams = {};
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/torque/factory.js
@@ -1,3 +1,5 @@
'use strict';

var carto = require('carto');
var debug = require('debug')('windshaft:renderer:torque_factory');
var _ = require('underscore');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/torque/index.js
@@ -1,2 +1,4 @@
'use strict';

module.exports.factory = require('./factory');
module.exports.adaptor = require('../base_adaptor');
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/torque/png_renderer.js
@@ -1,3 +1,5 @@
'use strict';

var Renderer = require('./renderer');
var torque = require('torque.js');
var Canvas = require('canvas');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/torque/psql_adaptor.js
@@ -1,3 +1,5 @@
'use strict';

function PSQLAdaptor(PSQLClass, poolParams) {
var ctor = function(params) {
this._psql = new PSQLClass(params, poolParams);
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/renderers/torque/renderer.js
@@ -1,3 +1,5 @@
'use strict';

var format = require('../../utils/format');
var Timer = require('../../stats/timer');
var debug = require('debug')('windshaft:renderer:torque');
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/stats/timer.js
@@ -1,3 +1,5 @@
'use strict';

function Timer() {
this.times = {};
}
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/storages/mapstore.js
@@ -1,3 +1,5 @@
'use strict';

// Map configuration storage

var RedisPool = require('redis-mpool');
Expand Down
1 change: 1 addition & 0 deletions lib/windshaft/utils/cartocss_utils.js
@@ -1,4 +1,5 @@
'use strict';

var carto = require('carto');
var torque_reference = require('torque.js').cartocss_reference;

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/utils/default_query_rewriter.js
@@ -1,3 +1,5 @@
'use strict';

// Dummy query-rewriter which doesn't alter queries

// This class implements the Windshaft query rewriting API:
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/utils/format.js
@@ -1,3 +1,5 @@
'use strict';

function format(str) {
var replacements = Array.prototype.slice.call(arguments, 1);

Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/utils/sql.js
@@ -1,3 +1,5 @@
'use strict';

var debug = require('debug')('windshaft:utils');

function sql(dbParams, SQLClass) {
Expand Down
2 changes: 2 additions & 0 deletions lib/windshaft/utils/substitution_tokens.js
@@ -1,3 +1,5 @@
'use strict';

var SUBSTITUTION_TOKENS = {
bbox: /!bbox!/g,
scale_denominator: /!scale_denominator!/g,
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/attributes.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/blend.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/blend_filtering.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/blend_http_fallback.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/blend_http_timeout.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/cartocss-transformations.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
3 changes: 2 additions & 1 deletion test/acceptance/external_resources.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var fs = require('fs');
Expand Down Expand Up @@ -134,4 +136,3 @@ describe('external resources', function() {
});

});

2 changes: 2 additions & 0 deletions test/acceptance/layer-filtering-regressions.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

const mapnik = require('@carto/mapnik');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/layer_filtering.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/limits.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var fs = require('fs');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/maknik_render_time_variables.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/mapnik_meta_layergroup.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/mapnik_render_by_format_quality.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var _ = require('underscore');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/markers_symbolizer_caches_config.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/metrics.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/multilayer.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down
2 changes: 2 additions & 0 deletions test/acceptance/multilayer_error_cases.js
@@ -1,3 +1,5 @@
'use strict';

require('../support/test_helper');

var assert = require('../support/assert');
Expand Down

0 comments on commit 2c63bbe

Please sign in to comment.