dtable-statistic 4.1.3 → 4.1.5

package/es/calculator/workers/basic-chart-calculator-worker.js

@@ -307,13 +307,13 @@ function getGroupbyNumericColumnsChartResults(rows, formulaRows, groupbyColumn,
   return getGroupChartStatResult(table, value, groupbyColumn, numericSummaryColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
 }
 function calculateGeolocationBasicChart(chart, value, username, userId) {
-  var table_id = chart.table_id,
+  var type = chart.type,
+    table_id = chart.table_id,
     view_id = chart.view_id,
     geo_column = chart.geo_column,
     summary_type = chart.summary_type,
     summary_column = chart.summary_column,
     summary_method = chart.summary_method;
-  var geolocationGranularity = fixMapGeoGranularity(chart);
   var table = TableUtils.getTableById(value.tables, table_id);
   var view = table && Views.getViewById(table.views, view_id);
   if (!view) {
@@ -323,6 +323,12 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
   if (!geoColumn) {
     return;
   }
+  var geolocationGranularity = null;
+  if (type && type.includes('world')) {
+    geolocationGranularity = geoColumn.type === CellType.GEOLOCATION ? chart.geolocation_granularity : null;
+  } else {
+    geolocationGranularity = fixMapGeoGranularity(chart);
+  }
   var summaryColumn = TableUtils.getTableColumnByKey(table, summary_column);
   var statRows = Views.getViewRows(view, table, value, username, userId);
   var formulaRows = Views.getTableFormulaResults(table, statRows, value);

package/es/calculator/world-map-calculator.js

@@ -8,6 +8,7 @@ import { filter2SqlCondition, TableUtils } from 'dtable-store';
 import BaseCalculator from './base-calculator';
 import { formatNumericValue, getSummaryColumnMethod } from '../utils/common-utils';
 import { DTABLE_DB_SUMMARY_METHOD } from '../constants';
+import StatUtils from '../utils/stat-utils';
 var WorldMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
   _inherits(WorldMapCalculator, _BaseCalculator);
   var _super = _createSuper(WorldMapCalculator);
@@ -149,14 +150,17 @@ var WorldMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 data.results.forEach(function (item) {
                   var currentValue = item[column];
                   var value = item[valueKey];
+                  var formatted_value = value;
                   if (isAdvanced) {
                     value = formatNumericValue(value, summaryColumn);
+                    formatted_value = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
                   }
                   if (currentValue) {
                     var name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
                     newResult.push({
                       name: name,
-                      value: value
+                      value: value,
+                      formatted_value: formatted_value
                     });
                   }
                 });