diff --git a/packages/geoview-core/public/templates/layers/layerlib.js b/packages/geoview-core/public/templates/layers/layerlib.js
index 19edc18b8bf..888d210dafc 100644
--- a/packages/geoview-core/public/templates/layers/layerlib.js
+++ b/packages/geoview-core/public/templates/layers/layerlib.js
@@ -351,37 +351,35 @@ const createTableOfFilter = (mapId) => {
mapButtonsDiv.appendChild(br);
}
}
- if (geoviewLayer.getLayerFilter(layerPath)) {
- const layerFilterText = document.createElement('p');
- layerFilterText.innerText = `Extra filter: `;
- mapButtonsDiv.appendChild(layerFilterText);
- const layerFilterInput = document.createElement('input');
- layerFilterInput.id = `filter-input-${mapId}-${geoviewLayer.getGeoviewLayerId()}`;
- layerFilterInput.style.width = '50%';
- layerFilterText.appendChild(layerFilterInput);
- layerFilterInput.value = geoviewLayer.getLayerFilter(layerPath) || '';
- const layerFilterButton = document.createElement('button');
- layerFilterButton.addEventListener('click', (e) => {
- const checkbox = document.getElementById(`checkbox-${mapId}-${geoviewLayer.getGeoviewLayerId()}`);
- geoviewLayer.applyViewFilter(layerPath, layerFilterInput.value, checkbox.value !== 'true');
- });
- layerFilterButton.innerText = 'Apply';
- layerFilterText.style.width = 'max-content';
- layerFilterText.appendChild(layerFilterButton);
+ const layerFilterText = document.createElement('p');
+ layerFilterText.innerText = `Extra filter: `;
+ mapButtonsDiv.appendChild(layerFilterText);
+ const layerFilterInput = document.createElement('input');
+ layerFilterInput.id = `filter-input-${mapId}-${geoviewLayer.getGeoviewLayerId()}`;
+ layerFilterInput.style.width = '50%';
+ layerFilterText.appendChild(layerFilterInput);
+ layerFilterInput.value = geoviewLayer.getLayerFilter(layerPath) || '';
+ const layerFilterButton = document.createElement('button');
+ layerFilterButton.addEventListener('click', (e) => {
+ const checkbox = document.getElementById(`checkbox-${mapId}-${geoviewLayer.getGeoviewLayerId()}`);
+ geoviewLayer.applyViewFilter(layerPath, layerFilterInput.value, checkbox.value !== 'true');
+ });
+ layerFilterButton.innerText = 'Apply';
+ layerFilterText.style.width = 'max-content';
+ layerFilterText.appendChild(layerFilterButton);
- const checkboxInput = document.createElement('input');
- checkboxInput.type = 'checkbox';
- checkboxInput.value = 'false';
- checkboxInput.id = `checkbox-${mapId}-${geoviewLayer.getGeoviewLayerId()}`;
- checkboxInput.addEventListener('click', (e) => {
- checkboxInput.value = checkboxInput.value === 'true' ? 'false' : 'true';
- geoviewLayer.applyViewFilter(layerPath, layerFilterInput.value, checkboxInput.value !== 'true');
- });
- mapButtonsDiv.appendChild(checkboxInput);
- const checkboxText = document.createElement('label');
- checkboxText.innerText = `apply only the extra filter`;
- mapButtonsDiv.appendChild(checkboxText);
- }
+ const checkboxInput = document.createElement('input');
+ checkboxInput.type = 'checkbox';
+ checkboxInput.value = 'false';
+ checkboxInput.id = `checkbox-${mapId}-${geoviewLayer.getGeoviewLayerId()}`;
+ checkboxInput.addEventListener('click', (e) => {
+ checkboxInput.value = checkboxInput.value === 'true' ? 'false' : 'true';
+ geoviewLayer.applyViewFilter(layerPath, layerFilterInput.value, checkboxInput.value !== 'true');
+ });
+ mapButtonsDiv.appendChild(checkboxInput);
+ const checkboxText = document.createElement('label');
+ checkboxText.innerText = `apply only the extra filter`;
+ mapButtonsDiv.appendChild(checkboxText);
});
}
});
diff --git a/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-esri-layer-config.ts b/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-esri-layer-config.ts
index f7bc681bc2b..9d114b2d986 100644
--- a/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-esri-layer-config.ts
+++ b/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-esri-layer-config.ts
@@ -235,15 +235,15 @@ export abstract class AbstractGeoviewEsriLayerConfig extends AbstractGeoviewLaye
};
// #endregion PRIVATE
- // =================
- // #region PROTECTED
+ // ==============
+ // #region STATIC
/**
* Converts an esri geometry type string to a TypeStyleGeometry.
* @param {string} esriGeometryType - The esri geometry type to convert
* @returns {TypeStyleGeometry} The corresponding TypeStyleGeometry
- * @protected @static
+ * @static
*/
- protected static convertEsriGeometryTypeToOLGeometryType(esriGeometryType: string): TypeStyleGeometry {
+ static convertEsriGeometryTypeToOLGeometryType(esriGeometryType: string): TypeStyleGeometry {
switch (esriGeometryType) {
case 'esriGeometryPoint':
case 'esriGeometryMultipoint':
@@ -260,7 +260,7 @@ export abstract class AbstractGeoviewEsriLayerConfig extends AbstractGeoviewLaye
throw new Error(`Unsupported geometry type: ${esriGeometryType}`);
}
}
- // #endregion PROTECTED
+ // #endregion STATIC
// #endregion METHODS
// #endregion CLASS HEADER
}
diff --git a/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-layer-config.ts b/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-layer-config.ts
index 614cccfdd3c..33295f438ab 100644
--- a/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-layer-config.ts
+++ b/packages/geoview-core/src/api/config/types/classes/geoview-config/abstract-geoview-layer-config.ts
@@ -279,7 +279,9 @@ export abstract class AbstractGeoviewLayerConfig {
if (layerTreeFilter !== undefined) {
// When the filter is an empty array, we create the layer tree for all the metadata in the service metadata.
if (layerTreeFilter.length === 0) {
- this.setMetadataLayerTree(this.processListOfLayerEntryConfig(this.createLayerTreeFromServiceMetadata()));
+ const layerTree = this.processListOfLayerEntryConfig(this.createLayerTreeFromServiceMetadata());
+ await this.fetchListOfLayerMetadata(layerTree);
+ this.setMetadataLayerTree(layerTree);
} else {
// When the filter contains one or many layer identifiers, we create the layer tree using only the specified layers.
// If the filter contains several layer identifiers, we create a group layer, as the root of the tree must contain
@@ -312,7 +314,7 @@ export abstract class AbstractGeoviewLayerConfig {
/**
* A recursive method to process the listOfLayerEntryConfig. The goal is to process each valid sublayer, searching the service's
* metadata to verify the layer's existence and whether it is a layer group, in order to determine the node's final structure.
- * If it is a layer group, it will be created.
+ * If the metadata indicate the node is a layer group, it will be created by the createLayerEntryNode.
*
* @param {EntryConfigBaseClass[]} listOfLayerEntryConfig the list of sublayers to process.
*
diff --git a/packages/geoview-core/src/api/config/types/classes/geoview-config/raster-config/wms-config.ts b/packages/geoview-core/src/api/config/types/classes/geoview-config/raster-config/wms-config.ts
index 6934cbb3aaf..85214d2e32c 100644
--- a/packages/geoview-core/src/api/config/types/classes/geoview-config/raster-config/wms-config.ts
+++ b/packages/geoview-core/src/api/config/types/classes/geoview-config/raster-config/wms-config.ts
@@ -276,7 +276,8 @@ export class WmsLayerConfig extends AbstractGeoviewLayerConfig {
const response = await fetch(metadataUrl);
const capabilitiesString = await response.text();
this.setServiceMetadata(parser.read(capabilitiesString));
- if (this.getServiceMetadata()) {
+ // GV: If this.getServiceMetadata() returns {}, we need to verify if the object is empty to conclude there is no metadata.
+ if (Object.keys(this.getServiceMetadata()).length) {
this.#processMetadataInheritance();
this.metadataAccessPath = this.getServiceMetadata().Capability.Request.GetMap.DCPType[0].HTTP.Get.OnlineResource as string;
} else throw new GeoviewLayerConfigError('Unable to read the metadata, value returned is empty.');
diff --git a/packages/geoview-core/src/api/config/types/classes/geoview-config/vector-config/geojson-config.ts b/packages/geoview-core/src/api/config/types/classes/geoview-config/vector-config/geojson-config.ts
index 10ca706a0cc..e050e29cdb8 100644
--- a/packages/geoview-core/src/api/config/types/classes/geoview-config/vector-config/geojson-config.ts
+++ b/packages/geoview-core/src/api/config/types/classes/geoview-config/vector-config/geojson-config.ts
@@ -48,7 +48,7 @@ export class GeoJsonLayerConfig extends AbstractGeoviewLayerConfig {
const pathItemLength = metadataAccessPathItems.length;
const lastPathItem = metadataAccessPathItems[pathItemLength - 1];
if (lastPathItem.toLowerCase().endsWith('.json') || lastPathItem.toLowerCase().endsWith('.geojson')) {
- // The metadataAccessPath ends with a layer index. It is therefore a path to a data layer rather than a path to service metadata.
+ // The metadataAccessPath ends with a layer reference. It is therefore a path to a data layer rather than a path to service metadata.
// We therefore need to correct the configuration by separating the layer index and the path to the service metadata.
this.metadataAccessPath = metadataAccessPathItems.slice(0, -1).join('/');
if (this.listOfLayerEntryConfig.length) {
@@ -134,17 +134,12 @@ export class GeoJsonLayerConfig extends AbstractGeoviewLayerConfig {
const fetchResponse = await fetch(this.metadataAccessPath);
if (fetchResponse.status === 404) throw new GeoviewLayerConfigError('The service metadata fetch returned a 404 status (Not Found)');
const layerMetadata = (await fetchResponse.json()) as TypeJsonObject;
- const metadataAccessPathElements = this.metadataAccessPath.split('/');
- this.metadataAccessPath = metadataAccessPathElements.slice(0, metadataAccessPathElements.length - 1).join('/');
if (layerMetadata) this.setServiceMetadata(layerMetadata);
else throw new GeoviewLayerConfigError('The metadata object returned is undefined');
- } else {
- await this.createLayerTree();
- return;
- }
- this.listOfLayerEntryConfig = this.processListOfLayerEntryConfig(this.listOfLayerEntryConfig);
- await this.fetchListOfLayerMetadata();
+ this.listOfLayerEntryConfig = this.processListOfLayerEntryConfig(this.listOfLayerEntryConfig);
+ await this.fetchListOfLayerMetadata();
+ }
await this.createLayerTree();
} catch (error) {
@@ -166,13 +161,15 @@ export class GeoJsonLayerConfig extends AbstractGeoviewLayerConfig {
* @protected @override
*/
protected override createLayerEntryNode(layerId: string, parentNode: EntryConfigBaseClass | undefined): EntryConfigBaseClass {
- if (this.getServiceMetadata())
+ // GV: To determine if service metadata exists, we must verify that the object is not empty.
+ if (Object.keys(this.getServiceMetadata()).length === 0)
return this.createLeafNode(
toJsonObject({ layerId, layerName: createLocalizedString(layerId) }),
this.getLanguage(),
this,
parentNode
)!;
+
// If we cannot find the layerId in the layer definitions, throw an error.
const layerFound = this.findLayerMetadataEntry(layerId);
if (!layerFound) {
diff --git a/packages/geoview-core/src/api/config/types/classes/sub-layer-config/entry-config-base-class.ts b/packages/geoview-core/src/api/config/types/classes/sub-layer-config/entry-config-base-class.ts
index 792ab7e373d..96c777b6a34 100644
--- a/packages/geoview-core/src/api/config/types/classes/sub-layer-config/entry-config-base-class.ts
+++ b/packages/geoview-core/src/api/config/types/classes/sub-layer-config/entry-config-base-class.ts
@@ -148,6 +148,12 @@ export abstract class EntryConfigBaseClass {
*/
abstract fetchLayerMetadata(): Promise