Merge branch 'coordinateSizeColorFeature'

# Conflicts:
#	eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/maps-dialog/mapedit-dialog.component.ts

Author: jortilles

eda/eda_app/src/app/module/components/eda-map/eda-geoJsonMap.component.ts

@@ -970,12 +970,15 @@ export class EdaBlankPanelComponent implements OnInit {
         this.tableController = undefined;
     }
 
-    public onCloseMapProperties(event, response: { color: string, logarithmicScale: boolean, legendPosition: string, draggable: boolean }): void {
+    public onCloseMapProperties(event, response: { color: string, logarithmicScale: boolean, legendPosition: string, draggable: boolean, zoom:number, coordinates: Array<Array<number>> }): void {
         if (!_.isEqual(event, EdaDialogCloseEvent.NONE)) {
             this.panel.content.query.output.config.color = response.color;
             this.panel.content.query.output.config.logarithmicScale = response.logarithmicScale;
             this.panel.content.query.output.config.legendPosition = response.legendPosition;
             this.panel.content.query.output.config.draggable = response.draggable;
+            this.panel.content.query.output.config.zoom = response.zoom;
+            this.panel.content.query.output.config.coordinates =
+              response.coordinates;
             const config = new ChartConfig(this.panel.content.query.output.config);
             this.renderChart(this.currentQuery, this.chartLabels, this.chartData, this.graficos.chartType, this.graficos.edaChart, config);
             this.dashboardService._notSaved.next(true);

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.ts

@@ -1,17 +1,17 @@
 <eda-dialog [inject]="dialog">
 
-  <div body class="grid">
-    <div class="col-8">
+  <div body class="grid" style=" height: 100%;">
+    <div class="col-9">
 
-        <div class="eda-chart-panel" style="margin-left: 6em; margin-top: 2em; width: 60%; background-color: var(--panel-color);">
-          <panel-chart *ngIf="display" #PanelChartComponent [props]="panelChartConfig"  style="height: 90%; width: 90%; display:block;  margin-top:5em">
+        <div class="eda-chart-panel" style=" width: 100%; background-color: var(--panel-color);">
+          <panel-chart *ngIf="display" #PanelChartComponent [props]="panelChartConfig"  style="height: 100%; width: 100%; display:block;  margin-top:1em">
           </panel-chart>
         </div>
 
     </div>
 
 
-    <div class="col-4">
+    <div class="col-3">
 
 
       <h6 i18n="@@colorsChartH6" class="custom-border-b1">

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/maps-dialog/mapedit-dialog.component.html

@@ -2,36 +2,40 @@ import { EdaDialogAbstract, EdaDialogCloseEvent, EdaDialog } from '@eda/shared/c
 import { Component, ViewChild } from '@angular/core';
 import { PanelChartComponent } from '../panel-charts/panel-chart.component';
 import { PanelChart } from '../panel-charts/panel-chart';
+import { MapUtilsService } from "@eda/services/service.index";
+
 
 
 
 @Component({
-  selector: 'app-mapedit-dialog',
-  templateUrl: './mapedit-dialog.component.html'
+  selector: "app-mapedit-dialog",
+  templateUrl: "./mapedit-dialog.component.html",
 })
-
 export class MapEditDialogComponent extends EdaDialogAbstract {
-
-  @ViewChild('PanelChartComponent', { static: false }) myPanelChartComponent: PanelChartComponent;
+  @ViewChild("PanelChartComponent", { static: false })
+  myPanelChartComponent: PanelChartComponent;
 
   public dialog: EdaDialog;
   public panelChartConfig: PanelChart = new PanelChart();
 
-  public color:string = '';
-  public logarithmicScale :boolean = false;
-  public draggable : boolean;
-  public legendPosition : string;
+  public color: string = "";
+  public logarithmicScale: boolean = false;
+  public draggable: boolean;
+  public legendPosition: string;
 
-  public display:boolean=false;
+  //Marc
+  public zoom: number;
+  public coordinates: Array<Array<number>>;
 
-  constructor() {
+  public display: boolean = false;
 
+  constructor(private mapUtilsService: MapUtilsService) {
     super();
 
     this.dialog = new EdaDialog({
       show: () => this.onShow(),
       hide: () => this.onClose(EdaDialogCloseEvent.NONE),
-      title: $localize`:@@ChartProps:PROPIEDADES DEL GRAFICO`
+      title: $localize`:@@ChartProps:PROPIEDADES DEL GRAFICO`,
     });
     this.dialog.style = {
       width: "80%",
@@ -43,33 +47,45 @@ export class MapEditDialogComponent extends EdaDialogAbstract {
 
   ngOnInit() {
     this.mapUtilsService.mapEditOpen();
+    console.log(this.mapUtilsService.getZoom());
+    console.log(this.mapUtilsService.getCoordinates());
   }
   ngOnDestroy(): void {
     this.mapUtilsService.mapEditClose();
   }
 
   saveChartConfig() {
-    this.onClose(EdaDialogCloseEvent.UPDATE, {color:this.color, logarithmicScale : this.logarithmicScale, legendPosition : this.legendPosition, draggable : this.draggable});
+    this.onClose(EdaDialogCloseEvent.UPDATE, {
+      color: this.color,
+      logarithmicScale: this.logarithmicScale,
+      legendPosition: this.legendPosition,
+      draggable: this.draggable,
+      zoom: this.myPanelChartComponent.componentRef.instance.inject.zoom,
+      coordinates:
+        this.myPanelChartComponent.componentRef.instance.inject.coordinates,
+    });
+    this.mapUtilsService.setCoordinates(null);
+    this.mapUtilsService.setZoom(null);
   }
 
   handleInputColor() {
-    if(this.color.length > 6){
+    if (this.color.length > 6) {
       const leafletMap = this.myPanelChartComponent.componentRef.instance;
       leafletMap.reStyleGeoJsonLayer(this.color);
     }
   }
 
-  renderMap(){
+  renderMap() {
     const leafletMap = this.myPanelChartComponent.componentRef.instance;
     leafletMap.changeScale(this.logarithmicScale);
   }
-  
+
   nullMouseOptions() {
     const leafletMap = this.myPanelChartComponent.componentRef.instance;
     leafletMap.switchNoMouse(this.draggable);
   }
 
-  changeLegend(){
+  changeLegend() {
     const leafletMap = this.myPanelChartComponent.componentRef.instance;
     leafletMap.changeLegend(this.legendPosition);
   }
@@ -79,8 +95,11 @@ export class MapEditDialogComponent extends EdaDialogAbstract {
   }
 
   onShow(): void {
+    //Funcion llamada al abrir el mapa edit
+    this.zoom = this.controller.params.zoom;
+    this.coordinates = this.controller.params.coordinates;
     this.legendPosition = this.controller.params.legendPosition;
-    this.color= this.controller.params.color;
+    this.color = this.controller.params.color;
     this.logarithmicScale = this.controller.params.logarithmicScale;
     this.draggable = this.controller.params.draggable;
     this.panelChartConfig = this.controller.params.panelChart;
@@ -90,22 +109,24 @@ export class MapEditDialogComponent extends EdaDialogAbstract {
     return this.controller.close(event, response);
   }
 
-
   rgb2hex(rgb): string {
-    rgb = rgb.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);
-    return (rgb && rgb.length === 4) ? '#' +
-      ('0' + parseInt(rgb[1], 10).toString(16)).slice(-2) +
-      ('0' + parseInt(rgb[2], 10).toString(16)).slice(-2) +
-      ('0' + parseInt(rgb[3], 10).toString(16)).slice(-2) : '';
+    rgb = rgb.match(
+      /^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i
+    );
+    return rgb && rgb.length === 4
+      ? "#" +
+          ("0" + parseInt(rgb[1], 10).toString(16)).slice(-2) +
+          ("0" + parseInt(rgb[2], 10).toString(16)).slice(-2) +
+          ("0" + parseInt(rgb[3], 10).toString(16)).slice(-2)
+      : "";
   }
 
   hex2rgb(hex, opacity = 100): string {
-    hex = hex.replace('#', '');
+    hex = hex.replace("#", "");
     const r = parseInt(hex.substring(0, 2), 16);
     const g = parseInt(hex.substring(2, 4), 16);
     const b = parseInt(hex.substring(4, 6), 16);
 
-    return 'rgba(' + r + ',' + g + ',' + b + ',' + opacity / 100 + ')';
+    return "rgba(" + r + "," + g + "," + b + "," + opacity / 100 + ")";
   }
-
 }

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/maps-dialog/mapedit-dialog.component.ts

@@ -594,18 +594,26 @@ export class PanelChartComponent implements OnInit, OnChanges, OnDestroy {
         inject.maps = this.props.maps;
         inject.query = this.props.query;
         inject.draggable = this.props.draggable;
-        try{
-            inject.coordinates = this.props.config['config']['coordinates'];
+        //Marc
+        inject.zoom = this.props.zoom;
+        inject.coordinates = this.props.coordinates;
+
+
+
+        try {
+            inject.coordinates = this.props.config['config']['coordinates'];                
         }catch{
             inject.coordinates = null ;
         }
-        try{
-            inject.zoom = this.props.config['config']['zoom'];
+        try {
+            if (true) {
+                inject.zoom = this.props.config["config"]["zoom"];
+            } else {}
         }catch{
-            inject.zoom =  null ;
+            inject.zoom =  1 ;
         }
         try{
-            inject.color = this.props.config['config']['color']  ;
+            inject.color = this.props.config['config']['color'];
         }catch{
             inject.color =  '#006400';
         }

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/panel-charts/panel-chart.component.ts

@@ -4,17 +4,19 @@ import { ChartConfig } from './chart-configuration-models/chart-config';
 
 
 export class PanelChart {
-  public data : {labels:any[], values:any[]};
-  public query : any;
-  public chartType : string;
-  public config : ChartConfig;
-  public edaChart : string;
-  public maps : Array<string>;
-  public size : {x:number, y:number};
-  public linkedDashboardProps : LinkedDashboardProps;
+  public data: { labels: any[]; values: any[] };
+  public query: any;
+  public chartType: string;
+  public config: ChartConfig;
+  public edaChart: string;
+  public maps: Array<string>;
+  public size: { x: number; y: number };
+  public linkedDashboardProps: LinkedDashboardProps;
   public addTrend: boolean;
   public noRepetitions: boolean;
   public draggable: boolean;
+  public coordinates: Array<Array<number>>;
+  public zoom: number;
 
   constructor(init?: Partial<PanelChart>) {
     Object.assign(this, init);

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/panel-charts/panel-chart.ts

@@ -67,7 +67,9 @@ export const PanelOptions = {
                 color: panelComponent.panelChart.componentRef.instance.color,
                 logarithmicScale: panelComponent.panelChart.componentRef.instance.logarithmicScale,
                 legendPosition: panelComponent.panelChart.componentRef.instance.legendPosition,
-                draggable: panelComponent.panelChart.componentRef.instance.draggable
+                draggable: panelComponent.panelChart.componentRef.instance.draggable,
+                zoom: panelComponent.panelChart.componentRef.instance.inject.zoom,
+                coordinates: panelComponent.panelChart.componentRef.instance.inject.coordinates,
               },
               close: (event, response) => { panelComponent.onCloseMapProperties(event, response) }
             });