Do not use underscore
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
var _ = require('underscore');
|
||||
var crypto = require('crypto');
|
||||
var dot = require('dot');
|
||||
var MapConfig = require('windshaft').model.MapConfig;
|
||||
@@ -62,16 +61,17 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function (callback) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
const { owner, rendererParams } = this;
|
||||
|
||||
var templateParams = {};
|
||||
|
||||
if (this.config) {
|
||||
try {
|
||||
templateParams = _.isString(this.config) ? JSON.parse(this.config) : this.config;
|
||||
templateParams = Object.prototype.toString.call(this.config) === '[object String]' ?
|
||||
JSON.parse(this.config) :
|
||||
this.config;
|
||||
} catch (e) {
|
||||
const error = new Error('malformed config parameter, should be a valid JSON');
|
||||
this.err = error;
|
||||
|
||||
return callback(err);
|
||||
}
|
||||
}
|
||||
@@ -93,6 +93,8 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function (callback) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
const { owner, rendererParams } = this;
|
||||
|
||||
this.mapConfigAdapter.getMapConfig(owner, requestMapConfig, rendererParams, context, (err, mapConfig) => {
|
||||
if (err) {
|
||||
this.err = err;
|
||||
@@ -236,7 +238,7 @@ var baseKeyTpl = dot.template(baseKey);
|
||||
var rendererKeyTpl = dot.template(rendererKey);
|
||||
|
||||
NamedMapMapConfigProvider.prototype.createKey = function(base) {
|
||||
var tplValues = _.defaults({}, this.params, {
|
||||
var tplValues = Object.assign({
|
||||
dbname: '',
|
||||
owner: this.owner,
|
||||
templateName: this.templateName,
|
||||
@@ -244,7 +246,8 @@ NamedMapMapConfigProvider.prototype.createKey = function(base) {
|
||||
configHash: configHash(this.config),
|
||||
layer: '',
|
||||
scale_factor: 1
|
||||
});
|
||||
}, this.params);
|
||||
|
||||
return (base) ? baseKeyTpl(tplValues) : rendererKeyTpl(tplValues);
|
||||
};
|
||||
|
||||
@@ -258,9 +261,7 @@ function configHash(config) {
|
||||
module.exports.configHash = configHash;
|
||||
|
||||
NamedMapMapConfigProvider.prototype.getDBParams = function(cdbuser, callback) {
|
||||
const dbParams = _.extend({}, this.params, {
|
||||
user: this.owner
|
||||
});
|
||||
const dbParams = Object.assign({ user: this.owner }, this.params);
|
||||
|
||||
this.pgConnection.getDatabaseParams(cdbuser, (err, databaseParams) => {
|
||||
if (err) {
|
||||
|
||||
Reference in New Issue
Block a user