2608 geo core initial settings

packages/geoview-core/src/core/components/layers/left-panel/add-new-layer/add-new-layer.tsx

@@ -429,7 +429,7 @@ export function AddNewLayer(): JSX.Element {
 
       const geoCoreGeoviewLayerInstance = new GeoCore(mapId, api.maps[mapId].getDisplayLanguage());
       const layers = await geoCoreGeoviewLayerInstance.createLayersFromUUID(layerURL);
-      if (layers.length === 1) {
+      if (layers.length >= 1) {
         if (layers.length === 1) {
           setLayerName(layers[0].geoviewLayerName!);
           setLayerEntries(layers);
@@ -883,8 +883,15 @@ export function AddNewLayer(): JSX.Element {
         });
       } else if (layerEntries.length > 0) {
         (layerEntries as TypeGeoviewLayerConfig[]).forEach((geoviewLayerConfig) => {
-          const addedLayer = api.maps[mapId].layer.addGeoviewLayer(geoviewLayerConfig);
-          if (addedLayer) addedLayers.push(addedLayer);
+          if (layerName !== geoviewLayerConfig.geoviewLayerName) {
+            const tempConfig = geoviewLayerConfig;
+            tempConfig.listOfLayerEntryConfig[0].layerName = layerName;
+            const addedLayer = api.maps[mapId].layer.addGeoviewLayer(tempConfig);
+            if (addedLayer) addedLayers.push(addedLayer);
+          } else {
+            const addedLayer = api.maps[mapId].layer.addGeoviewLayer(geoviewLayerConfig);
+            if (addedLayer) addedLayers.push(addedLayer);
+          }
         });
       }
 

packages/geoview-core/src/geo/layer/layer.ts

@@ -24,6 +24,7 @@ import {
   mapConfigLayerEntryIsGeoCore,
   layerEntryIsGroupLayer,
   TypeLayerStatus,
+  GeoCoreLayerConfig,
 } from '@/geo/map/map-schema-types';
 import { GeoJSON, layerConfigIsGeoJSON } from '@/geo/layer/geoview-layers/vector/geojson';
 import { GeoPackage, layerConfigIsGeoPackage } from '@/geo/layer/geoview-layers/vector/geopackage';
@@ -449,7 +450,9 @@ export class LayerApi {
         const geoCore = new GeoCore(this.getMapId(), this.mapViewer.getDisplayLanguage());
 
         // Create the layers from the UUID
-        promisesOfGeoCoreGeoviewLayers.push(geoCore.createLayersFromUUID(geoviewLayerConfig.geoviewLayerId));
+        promisesOfGeoCoreGeoviewLayers.push(
+          geoCore.createLayersFromUUID(geoviewLayerConfig.geoviewLayerId, geoviewLayerConfig as GeoCoreLayerConfig)
+        );
       } else {
         // Add a resolved promise for a regular Geoview Layer Config
         promisesOfGeoCoreGeoviewLayers.push(Promise.resolve([geoviewLayerConfig as TypeGeoviewLayerConfig]));

packages/geoview-core/src/geo/layer/other/geocore.ts

@@ -6,7 +6,7 @@ import { GeochartEventProcessor } from '@/api/event-processors/event-processor-c
 import { logger } from '@/core/utils/logger';
 import { MapEventProcessor } from '@/api/event-processors/event-processor-children/map-event-processor';
 
-import { TypeGeoviewLayerConfig } from '@/geo/map/map-schema-types';
+import { GeoCoreLayerConfig, TypeGeoviewLayerConfig } from '@/geo/map/map-schema-types';
 import { TypeJsonValue } from '@/core/types/global-types';
 import { api } from '@/app';
 
@@ -32,11 +32,11 @@ export class GeoCore {
 
   /**
    * Gets GeoView layer configurations list from the UUIDs of the list of layer entry configurations.
-   *
-   * @param {GeoCoreLayerEntryConfig} geocoreLayerConfig the layer configuration
+   * @param {string} uuid the UUID of the layer
+   * @param {GeoCoreLayerConfig} layerConfig the layer configuration
    * @returns {Promise<TypeGeoviewLayerConfig[]>} list of layer configurations to add to the map
    */
-  async createLayersFromUUID(uuid: string): Promise<TypeGeoviewLayerConfig[]> {
+  async createLayersFromUUID(uuid: string, layerConfig?: GeoCoreLayerConfig): Promise<TypeGeoviewLayerConfig[]> {
     // Get the map config
     const mapConfig = MapEventProcessor.getGeoViewMapConfig(this.#mapId);
 
@@ -50,6 +50,24 @@ export class GeoCore {
       // Validate the generated Geoview Layer Config
       ConfigValidation.validateListOfGeoviewLayerConfig(this.#displayLanguage, response.layers);
 
+      // Set the Layer Name for the main layer
+      if (layerConfig?.geoviewLayerName) response.layers[0].listOfLayerEntryConfig[0].layerName = layerConfig.geoviewLayerName;
+
+      // Set the initialSettings parameter if present
+      if (layerConfig?.initialSettings) {
+        for (let i = 0; i < response.layers.length; i++) {
+          response.layers[i].initialSettings = { ...response.layers[i].initialSettings, ...layerConfig.initialSettings };
+          // Need to set the initial settings of the LayerConfigs. Only applies to top layers.
+          // Visibility is passed down to children, but other values may not.
+          for (let j = 0; j < response.layers[i].listOfLayerEntryConfig.length; j++) {
+            response.layers[i].listOfLayerEntryConfig[j].initialSettings = {
+              ...response.layers[i].listOfLayerEntryConfig[j].initialSettings,
+              ...layerConfig.initialSettings,
+            };
+          }
+        }
+      }
+
       // For each found geochart associated with the Geocore UUIDs
       response.geocharts?.forEach((geochartConfig) => {
         // Add a GeoChart

packages/geoview-core/src/geo/map/map-schema-types.ts

@@ -404,6 +404,9 @@ export type GeoCoreLayerConfig = {
   // TO.DOCONT: For this we will need a little trick because when we create the config the setting are set at the root level and in our config it will take it from the layerID.
   // TO.DOCONT: There is refactor to do to make this work for all layer type. Global setting should be cascade to child of the root layer.
   geoviewLayerName: string;
+
+  /** Initial settings to apply to the GeoCore layer at creation time. */
+  initialSettings?: TypeLayerInitialSettings;
 };
 
 /**