Merge tag 'AW-3412' into develop

# Conflicts:
#	package.json
#	projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts
#	src/configuration.json

Jenkinsfile

@@ -8,13 +8,13 @@ pipeline {
     stage('npm install'){
       steps {
         sh '''rm -rf node_modules/
-        npm install
+        npm install --legacy-peer-deps
         cd projects/common
-        npm install
+        npm install --legacy-peer-deps
         cd ../common-map
-        npm install
+        npm install --legacy-peer-deps
         cd ../common-map3d
-        npm install
+        npm install --legacy-peer-deps
         '''
       }
     }

projects/common-map/src/fm-map/common-map.module.ts

@@ -164,7 +164,8 @@ export {
   ITemporalItemLayer,
   TemporalItemLayer,
   ifZoomToShowDirective,
-  ZoomToShowAlert
+  ZoomToShowAlert,
+  IClickedFeature
 }
 
 @NgModule({

projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit,ViewChild } from '@angular/core';
+import { Component, Input, AfterViewInit, ViewChild } from '@angular/core';
 import { Feature} from 'ol';
 import { Geometry,Polygon,MultiPolygon } from 'ol/geom';
 import * as extent from 'ol/extent';
@@ -10,51 +10,86 @@ import * as style from 'ol/style';
   templateUrl: './feature-thumbnail.component.html',
   styleUrls: ['./feature-thumbnail.component.scss']
 })
-export class GeometryThumbnailComponent implements OnInit {
+export class GeometryThumbnailComponent implements AfterViewInit {
+
 
   constructor() { }
 
   @ViewChild('canvas') canvas;
   @ViewChild('container') container;
-  @Input('feature') feature:Feature<Geometry>;
 
-  ngOnInit(): void {
+  private geometry:Geometry = null;
+  @Input() set feature(value:Feature<Geometry>) {
+    if(value) {
+      this.geometry = value.getGeometry();
+    } else {
+      this.geometry = null;
+    }
+    this.render(this.canvas,
+      this.geometryStyle,
+      this.geometry,
+      this.width, 
+      this.height);
+  };
+
+  private defaultStyle:style.Style = new style.Style({
+    stroke: new style.Stroke({ color: 'black',width:1.5 })
+  });  
+  private geometryStyle:style.Style = this.defaultStyle;
+  @Input() set fillColor(value:string) {
+    if(style) {
+      this.geometryStyle = new style.Style({
+        stroke: new style.Stroke({ color: 'black',width:1.5 }),
+        fill: new style.Fill({color: value})
+      });  
+    } else {
+      this.geometryStyle = this.defaultStyle
+    }
+    this.render(this.canvas,
+      this.geometryStyle,
+      this.geometry,
+      this.width, 
+      this.height);
   }
 
-  render(canvas,width,height,geometry:Geometry) {  
+  private width:number = 0;
-    let renderContext = render.toContext(canvas.getContext( '2d'),{ size: [width, height] });  
+  private height:number = 0;
 
-    let strokeStyle  = new style.Style({
+  render(canvas,style:style.Style,geometry:Geometry,width:number,height:number) {  
-      stroke: new style.Stroke({ color: 'black',width:1.5 })
+    if(canvas && canvas.nativeElement && geometry && style) {
-    });
+      let renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] });  
 
-    let geom   = geometry.clone() as Polygon,
+      let geom   = geometry.clone(),
-        line   = geom.getCoordinates()[0],
+      line   = geom.getCoordinates()[0],
-        e = extent.boundingExtent( line );
+      e = extent.boundingExtent( line );
   
-    let dxy = extent.getCenter(e),
+      let dxy = extent.getCenter(e),
-        sxy = [ 
+      sxy = [ 
-            (width - 2 ) / extent.getWidth(e),
+          (width - 2 ) / extent.getWidth(e),
-            (height - 2 ) / extent.getHeight(e)
+          (height - 2 ) / extent.getHeight(e)
-        ];
+      ];
   
-    let dx = dxy[0], 
+      let dx = dxy[0], 
-        dy = dxy[1],
+          dy = dxy[1],
-        sx = sxy[0],
+          sx = sxy[0],
-        sy = sxy[1];
+          sy = sxy[1];
   
-    geom.translate( -dx, -dy );
+      geom.translate( -dx, -dy );
-    geom.scale( Math.min(sx, sy), -Math.min(sx, sy));
+      geom.scale( Math.min(sx, sy), -Math.min(sx, sy));
-    geom.translate( width / 2, height / 2 );
+      geom.translate(width / 2,height / 2 );
-
+      renderContext.setStyle( style );  
-    renderContext.setStyle( strokeStyle );  
+      renderContext.drawGeometry( geom );
-    renderContext.drawGeometry( geom );
+    }
   }
 
   ngAfterViewInit() {
-    this.render(this.canvas.nativeElement,
+    this.width = this.container.nativeElement.offsetWidth;
-      this.container.nativeElement.offsetWidth, 
+    this.height = this.container.nativeElement.offsetHeight;
-      this.container.nativeElement.offsetHeight,
+    this.render(this.canvas,
-      this.feature.getGeometry());
+      this.geometryStyle,
+      this.geometry,
+      this.width, 
+      this.height);
   }  
+
 }