dtable-statistic 4.1.4 → 4.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -314,10 +314,6 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
|
|
|
314
314
|
summary_type = chart.summary_type,
|
|
315
315
|
summary_column = chart.summary_column,
|
|
316
316
|
summary_method = chart.summary_method;
|
|
317
|
-
var geolocationGranularity = null;
|
|
318
|
-
if (type && !type.includes('world')) {
|
|
319
|
-
geolocationGranularity = fixMapGeoGranularity(chart);
|
|
320
|
-
}
|
|
321
317
|
var table = TableUtils.getTableById(value.tables, table_id);
|
|
322
318
|
var view = table && Views.getViewById(table.views, view_id);
|
|
323
319
|
if (!view) {
|
|
@@ -327,6 +323,12 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
|
|
|
327
323
|
if (!geoColumn) {
|
|
328
324
|
return;
|
|
329
325
|
}
|
|
326
|
+
var geolocationGranularity = null;
|
|
327
|
+
if (type && type.includes('world')) {
|
|
328
|
+
geolocationGranularity = geoColumn.type === CellType.GEOLOCATION ? chart.geolocation_granularity : null;
|
|
329
|
+
} else {
|
|
330
|
+
geolocationGranularity = fixMapGeoGranularity(chart);
|
|
331
|
+
}
|
|
330
332
|
var summaryColumn = TableUtils.getTableColumnByKey(table, summary_column);
|
|
331
333
|
var statRows = Views.getViewRows(view, table, value, username, userId);
|
|
332
334
|
var formulaRows = Views.getTableFormulaResults(table, statRows, value);
|