gamma-app-controller 2.0.17 → 2.0.19

package/fesm2020/gamma-app-controller.mjs

@@ -3637,7 +3637,6 @@ class GammaGeoChartComponent {
                         if (chartConfig.isDataAggregation) {
                             const aggreationData = this.getGroupDataForChart(value.kpiConfig.dataSource, chartConfig['dataAggregationConfig']['dataAggregateColumes'], chartConfig['dataAggregationConfig']['aggregateFields']);
                             value.kpiConfig.dataSource = aggreationData;
-                            console.log(aggreationData);
                         }
                         this.choroplethMapDataSource = new Map();
                         this.choroplethTooltipDataSource = new Map();
@@ -4034,7 +4033,6 @@ class GammaGeoChartComponent {
     }
     addBubbleMarkers() {
         this.prepareBubbleData();
-        console.log(this.locations);
         this.locations.forEach((location) => {
             const marker = new google.maps.Marker({
                 position: {
@@ -4112,11 +4110,16 @@ class GammaGeoChartComponent {
     initChoroplethMap(chartConfig, tootTipColumn) {
         this.isLoader = true;
         this.map = new google.maps.Map(document.getElementById("googlemap"), {
-            center: { lat: parseFloat(chartConfig.centerLat), lng: parseFloat(chartConfig.centerLng) },
+            center: {
+                lat: parseFloat(chartConfig.centerLat),
+                lng: parseFloat(chartConfig.centerLng)
+            },
             zoom: parseInt(chartConfig.zoom)
         });
+        google.maps.event.addListenerOnce(this.map.data, 'addfeature', () => {
+            this.applyChoroplethStyles(chartConfig);
+        });
         this.map.data.loadGeoJson(chartConfig.gjsonFilePath);
-        this.map.data.setStyle(feature => this.getFeatureStyle(feature, chartConfig, this.minChoroplethMapCnt, this.maxChoroplethMapCnt));
         const infoWindow = new google.maps.InfoWindow();
         this.map.data.addListener('mouseover', (event) => {
             const district = event.feature.getProperty('d');
@@ -4126,9 +4129,12 @@ class GammaGeoChartComponent {
             infoWindow.setPosition(event.latLng);
             infoWindow.open(this.map);
         });
-        this.isLoader = false;
         this.map.data.addListener('mouseout', () => infoWindow.close());
     }
+    applyChoroplethStyles(chartConfig) {
+        this.map.data.setStyle(feature => this.getFeatureStyle(feature, chartConfig, this.minChoroplethMapCnt, this.maxChoroplethMapCnt));
+        this.isLoader = false;
+    }
     buildInfoWindowContent(district, row, tootTipColumn) {
         const rows = tootTipColumn.map(c => `
     <div style="display:flex; justify-content:space-between;">
@@ -4178,7 +4184,6 @@ class GammaGeoChartComponent {
     getFeatureStyle(feature, chartConfig, minCount, maxCount) {
         const districtName = feature.getProperty('d')?.toUpperCase();
         const cnt = this.choroplethMapDataSource.get(districtName);
-        console.log(districtName, cnt, this.getColor(cnt, chartConfig.colorOne, chartConfig.colorTwo, minCount, maxCount));
         return {
             fillColor: this.getColor(cnt, chartConfig.colorOne, chartConfig.colorTwo, minCount, maxCount),
             strokeColor: '#555',
@@ -4403,6 +4408,11 @@ class GeoMapComponent {
                     this.tableDataConfig.chart_config = value.selectedWidgetConfig.dataConfig.chart_config;
                 }
                 else if (this.mapType == 'choroplethMap') {
+                    if (value.selectedWidgetConfig['dataConfig']['isDataAggregation']) {
+                        this.dataAggregationContainer = value.selectedWidgetConfig['dataConfig']['dataAggregationConfig']['dataAggregateColumes'];
+                        this.dataAggregateGroupByColume = value.selectedWidgetConfig['dataConfig']['dataAggregationConfig']['aggregateFields'];
+                        this.saveAggregationColume();
+                    }
                     this.choroplethMapConfig = value.selectedWidgetConfig.dataConfig;
                     this.choroplethMapConfig.chart_config = value.selectedWidgetConfig.dataConfig.chart_config;
                     this.tableDataConfig.chart_config = value.selectedWidgetConfig.dataConfig.chart_config;