Fix Set style Geometry

projects/common-map/src/fm-map/actions/map.actions.ts

@@ -207,7 +207,7 @@ export class DoQuery implements Action {
 export class SetStyle implements Action {
   readonly type = SETSTYLE;
 
-  constructor(public itemType:string,public style:Style) { }
+  constructor(public itemType:string,public style: Style | (Feature)) { }
 }
 
 export type Actions = SetMapState

projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts

@@ -120,8 +120,17 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
           key = 'file';
         }
       } 
+      let evaluatedStyle =null;
       var styleEntry = this.stylesCache[key];    
-      return styleEntry;
+      if(typeof styleEntry === 'function')  {
+        evaluatedStyle = styleEntry(feature);
+      } else {
+        evaluatedStyle = styleEntry;
+      }
+      if(evaluatedStyle.geometry_ == null) {
+        evaluatedStyle.setGeometry((feature) => this.geometry(feature));
+      } 
+      return evaluatedStyle;
     });
   }
 
@@ -155,11 +164,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
       let styles = changes["styles"].currentValue;
       for (const key in styles) {
         if (styles.hasOwnProperty(key)) {
-          let style = styles[key];
+          this.stylesCache[key]=styles[key]; 
-          if(style.geometry_ == null) {
-            style.setGeometry((feature) => this.geometry(feature));
-          }          
-          this.stylesCache[key]=style;
         }
       }
     }

projects/common-map/src/fm-map/models/style.cache.ts

@@ -1,5 +1,5 @@
-import {Style} from 'ol';
+import {Style,Feature} from 'ol';
 
 export interface IStyles{
-  [id: string]: Style;
+  [id: string]: Style | (Feature);
 };