fix(imagearcgisrest/layer-legend): release 1.7 various fix (#848)

* fix(layer-legend/imageArcGISRest): various fix 1.7 release

* fix(imagerest-datasource)

* Update imagearcgisrest-datasource.ts

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>

packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.ts

@@ -29,8 +29,7 @@ export class ImageArcGISRestDataSource extends DataSource {
   }
 
   protected createOlSource(): ImageArcGISRest {
-
-    const params = !this.options.layer ? this.options.params : Object.assign(
+    const params = this.options.layer === undefined ? this.options.params : Object.assign(
       {LAYERS: `show:${this.options.layer}`},
       this.options.params
     );
@@ -47,9 +46,9 @@ export class ImageArcGISRestDataSource extends DataSource {
   }
 
   getLegend(): Legend[] {
-    const legendInfo = this.options.options.legendInfo;
+    const legendInfo = this.options.options?.legendInfo || this.params?.legendInfo;
     const legend = super.getLegend();
-    if (legendInfo === undefined || !this.options.layer || legend.length > 0) {
+    if (legendInfo === undefined || this.options.layer === undefined || legend.length > 0) {
       return legend;
     }
 

packages/geo/src/lib/layer/layer-legend/layer-legend.component.ts

@@ -135,10 +135,12 @@ export class LayerLegendComponent implements OnInit, OnDestroy {
     const secureIMG = new SecureImagePipe(this.http);
     secureIMG.transform(item.url).pipe(
       catchError((err) => {
-        err.error.caught = true;
-        this.getLegend = false;
-        this.cdRef.detectChanges();
-        return err;
+        if (err.error) {
+          err.error.caught = true;
+          this.getLegend = false;
+          this.cdRef.detectChanges();
+          return err;
+        }
       })
     ).subscribe((legend: string) => {
       this.legendGraphic = legend;