cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace underscore functions by standard (ES5) equivalents

Browse Source 
Note: _.find(a,...) is not replaced by a.find(...)
because it is not available for all the collections
we need it for.
This commit is contained in:
Javier Goizueta
2016-05-18 15:43:20 +02:00
parent 48415fb1f3
commit 4c375780c7
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/backends/dataview.js
+1 -2
View File
@@ -22,7 +22,6 @@ function DataviewBackend(analysisBackend) {
module.exports = DataviewBackend;
DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, params, callback) {
var self = this;
@@ -125,7 +124,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
if ( queryRewriteData ) {
if ( node.type === 'source' ) {
var filters = node.filters; // TODO: node.getFilters() when available in camshaft
var filters_disabler = _.keys(filters).reduce(
var filters_disabler = Object.keys(filters).reduce(
function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
{}
);
lib/cartodb/models/mapconfig_overviews_adapter.js
+1 -1
View File
@@ -36,7 +36,7 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
if ( node ) {
node = node.rootNode;
filters = node.filters; // TODO: node.getFilters() when available in camshaft
var filters_disabler = _.keys(filters).reduce(
var filters_disabler = Object.keys(filters).reduce(
function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
{}
);
lib/cartodb/utils/overviews_query_rewriter.js
+3 -3
View File
@@ -161,7 +161,7 @@ function overviews_query_with_zoom_expression(query, overviews, zoom_level_expre
var replaced_query = query;
var sql = "WITH\n _vovw_scale AS ( SELECT " + zoom_level_expression + " AS _vovw_z )";
var replacement;
_.each(_.keys(overviews), function(table) {
_.each(Object.keys(overviews), function(table) {
var table_overviews = overviews[table];
var table_view = overviews_view_name(table);
var schema = table_overviews.schema;
@@ -181,7 +181,7 @@ function overviews_query_with_zoom_expression(query, overviews, zoom_level_expre
function overviews_query_with_definite_zoom(query, overviews, zoom_level) {
var replaced_query = query;
var replacement;
_.each(_.keys(overviews), function(table) {
_.each(Object.keys(overviews), function(table) {
var table_overviews = overviews[table];
var schema = table_overviews.schema;
replacement = overview_table_for_zoom_level(table_overviews, zoom_level);
@@ -196,7 +196,7 @@ function overview_table_for_zoom_level(table_overviews, zoom_level) {
if ( table_overviews ) {
overview_table = table_overviews[zoom_level];
if ( !overview_table ) {
_.every(_.keys(table_overviews).sort(function(x,y){ return x-y; }), function(overview_zoom) {
_.every(Object.keys(table_overviews).sort(function(x,y){ return x-y; }), function(overview_zoom) {
if ( +overview_zoom > +zoom_level ) {
overview_table = table_overviews[overview_zoom];
return false;