fix(addlayers): wfs style loading

Author: FilipLeitner

projects/hslayers/services/add-data/catalogue/catalogue.service.ts

@@ -20,6 +20,7 @@ import {
   HsAddDataMickaLayerDescriptor,
   HsEndpoint,
   WhatToAddDescriptor,
+  OwsConnection,
 } from 'hslayers-ng/types';
 import {HsAddDataCatalogueMapService} from './catalogue-map.service';
 import {HsAddDataOwsService} from '../url/add-data-ows.service';
@@ -548,7 +549,6 @@ export class HsAddDataCatalogueService extends HsAddDataCatalogueParams {
         whatToAdd.abstract,
         whatToAdd.projection,
         {
-          extractStyles: whatToAdd.extractStyles,
           workspace: whatToAdd.workspace,
           style: whatToAdd.style,
           saveToLayman: true,
@@ -558,17 +558,25 @@ export class HsAddDataCatalogueService extends HsAddDataCatalogueParams {
       this.datasetSelect('catalogue');
     } else {
       // Layman layers without write access
-      await this.hsAddDataOwsService.connectToOWS({
+      const params: OwsConnection = {
         type: 'wfs',
         uri: whatToAdd.link,
         layer: whatToAdd.layer, // basically not used in this case
-        layerOptions: {
-          style: whatToAdd.style,
-        },
+        layerOptions: {},
         connectOptions: {
           laymanLayer: whatToAdd,
         },
-      });
+      };
+      //Set property sld/qml based on the type - conent is fetched style string
+      if (whatToAdd.styleType) {
+        params.layerOptions[whatToAdd.styleType] = whatToAdd.style;
+      }
+      //Unexpected as layman whatToAdd is expected to have styleType
+      //keeping for backwards compatibility and as fallback
+      else {
+        params.layerOptions.style = whatToAdd.style;
+      }
+      await this.hsAddDataOwsService.connectToOWS(params);
     }
   }
 

projects/hslayers/services/add-data/catalogue/layman.service.ts

@@ -292,6 +292,7 @@ export class HsLaymanBrowserService {
         dsType: ds.type,
         extent: bounding_box,
         style,
+        styleType: lyr.style?.type,
         name,
         title,
         editable,

projects/hslayers/services/add-data/url/add-data-ows.service.ts

@@ -109,7 +109,10 @@ export class HsAddDataOwsService {
           ? this.hsAddDataWmsLaymanService
           : this.hsAddDataWfsLaymanService;
       const {laymanLayer, ...rest} = options.connectOptions;
-      response = await service.getLayer(laymanLayer, rest);
+      response = await service.getLayer(laymanLayer, {
+        ...rest,
+        ...options?.layerOptions,
+      });
       this.typeService.finalizeLayerRetrieval(response, options?.layerOptions);
     } else {
       /**

projects/hslayers/services/add-data/vector/vector.service.ts

@@ -4,6 +4,7 @@ import {Feature} from 'ol';
 import {Layer, Vector as VectorLayer} from 'ol/layer';
 import {Source, Vector as VectorSource} from 'ol/source';
 import {get as getProjection} from 'ol/proj';
+import {createDefaultStyle} from 'ol/style/Style';
 
 import {HsAddDataCommonFileService} from '../common-file.service';
 import {HsAddDataService} from '../add-data.service';
@@ -16,7 +17,7 @@ import {
 } from 'hslayers-ng/common/layman';
 import {HsLaymanService} from 'hslayers-ng/services/save-map';
 import {HsMapService} from 'hslayers-ng/services/map';
-import {HsStylerService} from 'hslayers-ng/services/styler';
+import {defaultStyle, HsStylerService} from 'hslayers-ng/services/styler';
 import {
   OverwriteResponse,
   UpsertLayerObject,
@@ -166,12 +167,26 @@ export class HsAddDataVectorService {
         ? new sourceDescriptor.sourceClass(sourceDescriptor.sourceParams)
         : new sourceDescriptor.sourceClass(sourceDescriptor);
     descriptor.layerParams.source = src;
-    Object.assign(
-      descriptor.layerParams,
-      await this.hsStylerService.parseStyle(
-        (options.sld || options.qml) ?? options.style,
-      ),
-    );
+
+    /**
+     * Same as with parseStyle but we want to prevent
+     * passing SLD/QML with already parsed style to not interfere with initLayerStyle
+     * and to not parse it twice
+     */
+    const style = (options.sld || options.qml) ?? options.style;
+    const styleType = this.hsStylerService.guessStyleFormat(style);
+
+    if (style) {
+      if (typeof styleType == 'string') {
+        descriptor.layerParams[styleType] = style as string;
+        descriptor.layerParams.style = undefined;
+      } else {
+        descriptor.layerParams.style = {style};
+      }
+    } else {
+      descriptor.layerParams.style = createDefaultStyle;
+      descriptor.layerParams.sld = defaultStyle;
+    }
     return new VectorLayer(descriptor.layerParams);
   }
 

projects/hslayers/services/compositions/layer-parser.service.ts

@@ -55,21 +55,25 @@ export class HsCompositionsLayerParserService {
         : {name: lyr_def.name, workspace: lyr_def.workspace};
 
       const style = (lyr_def.sld || lyr_def.qml) ?? lyr_def.style;
+      const styleType = this.hsStylerService.guessStyleFormat(style);
+
+      const layerOptions = {
+        path: lyr_def.path,
+        fromComposition: true,
+        minResolution: lyr_def.minResolution || 0,
+        maxResolution: lyr_def.maxResolution || Infinity,
+        opacity: parseFloat(lyr_def.opacity) ?? 1,
+      };
+      layerOptions[styleType] = style;
+
       const uri = lyr_def.protocol.url.split('?')[0];
       const newLayer = await this.hsAddDataOwsService.connectToOWS({
         type: 'wfs',
         uri,
         layer: lyr_def.name,
         owrCache: false,
         getOnly: true,
-        layerOptions: {
-          style: style,
-          path: lyr_def.path,
-          fromComposition: true,
-          minResolution: lyr_def.minResolution || 0,
-          maxResolution: lyr_def.maxResolution || Infinity,
-          opacity: parseFloat(lyr_def.opacity) ?? 1,
-        },
+        layerOptions,
         connectOptions: {
           laymanLayer: this.hsCommonLaymanService.isLaymanUrl(
             uri,
@@ -455,9 +459,7 @@ export class HsCompositionsLayerParserService {
           }
         }
         // Parse the style definition (SLD, QML, or standard style object)
-        const styleType = await this.hsStylerService.guessStyleFormat(
-          lyr_def.style,
-        );
+        const styleType = this.hsStylerService.guessStyleFormat(lyr_def.style);
         // Assign the appropriate style property to options
         if (styleType == 'sld') {
           options.sld = lyr_def.style;

projects/hslayers/services/styler/styler.service.ts

@@ -338,7 +338,7 @@ export class HsStylerService {
     return {style};
   }
 
-  guessStyleFormat(style: any): 'qml' | 'sld' {
+  guessStyleFormat(style: any): 'qml' | 'sld' | undefined {
     if (typeof style == 'string') {
       if ((style as string).includes('StyledLayerDescriptor')) {
         return 'sld';
@@ -347,6 +347,7 @@ export class HsStylerService {
         return 'qml';
       }
     }
+    return undefined;
   }
 
   /**

projects/hslayers/types/add-data/whatToAddDescriptor.ts

@@ -10,6 +10,7 @@ export type WhatToAddDescriptorBase = {
   editable?: boolean;
   workspace?: string;
   style?: string;
+  styleType?: 'sld' | 'qml';
   recordType?: string;
   //Layman layer descriptor only
   extent?: number[];

projects/hslayers/types/layman/layman-layer-descriptor.interface.ts

@@ -70,7 +70,7 @@ export interface HsLaymanLayerDescriptor extends HsLaymanLayerBase {
   };
   style?: {
     url?: string;
-    type?: string;
+    type?: 'sld' | 'qml';
     status?: StatusStateType;
     error?: any;
   };