fix(details): Display detail fields when service returns alias instea…

…d of field name (Canadian-Geospatial-Platform#2658) Fixes some of Canadian-Geospatial-Platform#2596, info is displayed properly, but icons are not fixed.
jolevesq · Dec 13, 2024 · 0041cbf · 0041cbf
1 parent dfdadc5
commit 0041cbf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/geoview-core/src/geo/layer/gv-layers/abstract-gv-layer.ts b/packages/geoview-core/src/geo/layer/gv-layers/abstract-gv-layer.ts
@@ -579,11 +579,14 @@ export abstract class AbstractGVLayer extends AbstractBaseLayer {
               dictFieldTypes[fieldName] = this.getFieldType(fieldName);
             }
             const fieldType = dictFieldTypes[fieldName];
-            const fieldEntry = outfields?.find((outfield) => outfield.name === fieldName);
+            const fieldEntry = outfields?.find((outfield) => outfield.name === fieldName || outfield.alias === fieldName);
             if (fieldEntry) {
-              featureInfoEntry.fieldInfo[fieldName] = {
+              featureInfoEntry.fieldInfo[fieldEntry.name] = {
                 fieldKey: fieldKeyCounter++,
-                value: this.getFieldValue(feature, fieldName, fieldEntry!.type as 'string' | 'number' | 'date'),
+                value:
+                  // If fieldName is the alias for the entry, we will not get a value, so we try the fieldEntry name.
+                  this.getFieldValue(feature, fieldName, fieldEntry!.type as 'string' | 'number' | 'date') ||
+                  this.getFieldValue(feature, fieldEntry.name, fieldEntry!.type as 'string' | 'number' | 'date'),
                 dataType: fieldEntry!.type,
                 alias: fieldEntry!.alias,
                 domain: fieldDomain,

diff --git a/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-esri-dynamic.ts b/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-esri-dynamic.ts
@@ -283,6 +283,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
         logger.logInfo('There is a problem with this query: ', identifyUrl);
         throw new Error(`Error code = ${jsonResponse.error.code} ${jsonResponse.error.message}` || '');
       }
+
       const features = new EsriJSON().readFeatures(
         { features: jsonResponse.results },
         { dataProjection: Projection.PROJECTION_NAMES.LNGLAT, featureProjection: mapViewer.getProjection().getCode() }

diff --git a/packages/geoview-core/src/geo/utils/renderer/geoview-renderer.ts b/packages/geoview-core/src/geo/utils/renderer/geoview-renderer.ts
@@ -1260,7 +1260,7 @@ function searchUniqueValueEntry(fields: string[], uniqueValueStyleInfo: TypeLaye
       // For obscure reasons, it seems that sometimes the field names in the feature do not have the same case as those in the
       // unique value definition.
       const fieldName = feature.getKeys().find((key) => {
-        return key.toLowerCase() === fields?.[j]?.toLowerCase();
+        return key.toLowerCase() === fields[j]?.toLowerCase();
       });
       if (fieldName) {
         // TODO: info - explain why we need to use == instead of ===