@regionerne/gis-komponent 0.0.67 → 0.0.68

package/fesm2022/regionerne-gis-komponent.mjs

@@ -1291,28 +1291,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
                 type: Input
             }] } });
 
-// interface namedStyle {
-//     styleName: string;
-//     sldFeatureStyle: any;
-// }
 class KomponentSettingsHelperService {
     _httpClient = inject(HttpClient);
     styles = {};
-    // loadNamedStyleObjects(styleNames: string[], workspace: string, geoserver: GeoServer): Observable<namedStyle[]>  {
-    //     const headerstring = `${geoserver.userName}:${geoserver.password}`;
-    //     const encoded = btoa(headerstring);        
-    //     const headers = new HttpHeaders().set('Authorization', `Basic ${encoded}`);
-    //     const result$ = styleNames.map(styleName => 
-    //             this._httpClient.get(`${geoserver.url}/rest/workspaces/${workspace}/styles/${styleName}.sld`, { headers, responseType: 'text' })
-    //                 .pipe(map(loadedStyle => {  
-    //                     const sldObject = SLDReader.Reader(loadedStyle);
-    //                     const sldLayer = SLDReader.getLayer(sldObject);
-    //                     const sldStyles = SLDReader.getStyle(sldLayer);
-    //                     const sldFeatureStyle = sldStyles.featuretypestyles[0];
-    //                     return { styleName, sldFeatureStyle } as namedStyle
-    //                 })));
-    //     return combineLatest(result$);
-    // }
     _getSldStyleObject$(styleName, workspace, geoserver) {
         return this.styles[styleName] ? of(this.styles[styleName]) :
             this._loadStyleFromGeoServer$(styleName, workspace, geoserver)
@@ -1336,7 +1317,14 @@ class KomponentSettingsHelperService {
     getStyle(styleName, workspace, geoserver, styleType) {
         return this._getSldStyleObject$(styleName, workspace, geoserver)
             .pipe(map(loadedStyle => {
-            return SLDReader.createOlStyle(loadedStyle.rules[0], styleType);
+            // I always create the style function but only use it if I cant create a style object.
+            const func = SLDReader.createOlStyleFunction(loadedStyle);
+            try {
+                return SLDReader.createOlStyle(loadedStyle.rules[0], styleType);
+            }
+            catch {
+                return func;
+            }
         }));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: KomponentSettingsHelperService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
@@ -5039,8 +5027,8 @@ class FeatureLoaderService {
             next: styles => {
                 styles.forEach((s, i) => {
                     const feature = allTheFeatures[i];
-                    if (feature.get('showlabelfrom')) {
-                        const styles = Array.isArray(s) ? s : [s];
+                    if (feature.get('showlabelfrom') && s) {
+                        const styles = [s];
                         const textStyle = new Text({
                             font: '14px Calibri,sans-serif',
                             fill: new Fill({ color: '#000' }),