PR changes

This commit is contained in:
Mario de Frutos
2017-05-18 11:51:12 +02:00
parent c65518cf41
commit ed56094be2
5 changed files with 8 additions and 11 deletions
@@ -8,7 +8,7 @@ EmptyLayerStats.prototype.is = function (type) {
EmptyLayerStats.prototype.getStats =
function (layer, dbConnection, callback) {
process.nextTick(function() {
setImmediate(function() {
callback(null, {});
});
};
@@ -1,4 +1,4 @@
var d3 = require('d3-queue');
var queue = require('queue-async');
function LayerStats(layerStatsIterator) {
this.layerStatsIterator = layerStatsIterator;
@@ -11,7 +11,7 @@ LayerStats.prototype.getStats = function (mapConfig, dbConnection, callback) {
if (!mapConfig.getLayers().length) {
return callback(null, stats);
}
var metaQueue = d3.queue(mapConfig.getLayers().length);
var metaQueue = queue(mapConfig.getLayers().length);
mapConfig.getLayers().forEach(function (layer, layerId) {
var layerType = mapConfig.layerType(layerId);
@@ -1,4 +1,4 @@
var queryUtils = require('./query-utils');
var queryUtils = require('../../utils/query-utils');
function MapnikLayerStats () {
this._types = {
+4 -7
View File
@@ -166,7 +166,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
},
function afterLayergroupCreate(err, layergroup) {
assert.ifError(err);
self.afterLayergroupCreate(req, res, mapConfig, layergroup, context.analysesResults, req.params, this);
self.afterLayergroupCreate(req, res, mapConfig, layergroup, context.analysesResults, this);
},
function finish(err, layergroup) {
if (err) {
@@ -219,8 +219,6 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
var mapConfigProvider;
var mapConfig;
var rendererParams;
step(
function setupParams(){
self.req2params(req, this);
@@ -244,9 +242,8 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
);
mapConfigProvider.getMapConfig(this);
},
function createLayergroup(err, mapConfig_, _rendererParams) {
function createLayergroup(err, mapConfig_, rendererParams) {
assert.ifError(err);
rendererParams = _rendererParams;
mapConfig = mapConfig_;
self.mapBackend.createLayergroup(
mapConfig, rendererParams,
@@ -258,7 +255,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
assert.ifError(err);
self.afterLayergroupCreate(req, res, mapConfig, layergroup,
mapConfigProvider.analysesResults,
rendererParams, this);
this);
},
function finishTemplateInstantiation(err, layergroup) {
if (err) {
@@ -282,7 +279,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
};
MapController.prototype.afterLayergroupCreate =
function(req, res, mapconfig, layergroup, analysesResults, rendererParams, callback) {
function(req, res, mapconfig, layergroup, analysesResults, callback) {
var self = this;
var username = req.context.user;