fix(arcgisREST): fix forced title and legend for arcgis layer (#819)

infra-geo-ouverte · Mar 9, 2021 · abdd881 · abdd881
1 parent 9c2826d
commit abdd881
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/geo/src/lib/catalog/shared/catalog.service.ts b/packages/geo/src/lib/catalog/shared/catalog.service.ts
@@ -615,7 +615,6 @@ export class CatalogService {
           baseSourceOptions,
           catalog.sourceOptions
         ) as ArcGISRestDataSourceOptions;
-
         return ObjectUtils.removeUndefined({
           id: generateIdFromSourceOptions(sourceOptions),
           type: CatalogItemType.Layer,
@@ -630,7 +629,8 @@ export class CatalogService {
               extern: undefined,
               abstract,
               type: baseSourceOptions.type
-            }
+            },
+            title: forcedTitle !== undefined ? forcedTitle : layer.name
           }
         });
       })

diff --git a/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.ts
@@ -14,4 +14,5 @@ export interface ArcGISRestImageDataSourceOptions extends DataSourceOptions {
   url?: string;
   ol?: ImageArcGISRest;
   idColumn?: string;
+  options?: any;
 }
diff --git a/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.ts
@@ -38,7 +38,8 @@ export class ImageArcGISRestDataSource extends DataSource {
   }
 
   getLegend(): Legend[] {
-    const legendInfo = this.options.params.legendInfo;
+    let legendInfo;
+    this.params ? legendInfo = this.options.params.legendInfo : legendInfo = this.options.options.legendInfo;
     const legend = super.getLegend();
     if (legendInfo === undefined || legend.length > 0) {
       return legend;