fix(ogc-filter, style): better handling grouped layers (#581)

* fix(*) better handling grouped layers * refactor(share-map) Rollback for grouped layers
infra-geo-ouverte · May 11, 2020 · f0c33d5 · f0c33d5
1 parent 4e53a8d
commit f0c33d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.ts b/packages/geo/src/lib/filter/shared/ogc-filter.ts
@@ -536,6 +536,7 @@ export class OgcFilterWriter {
         appliedFilter = `${appliedFilter}(${processedFilter.replace('filter=', '')})`;
       });
     }
+    appliedFilter = appliedFilter.replace(/\(\)/g, '');
     const filterValue = appliedFilter.length > 0 ? appliedFilter.replace('filter=', '') : undefined;
     return filterValue;
   }

diff --git a/packages/geo/src/lib/layer/layer-legend/layer-legend.component.ts b/packages/geo/src/lib/layer/layer-legend/layer-legend.component.ts
@@ -172,7 +172,12 @@ export class LayerLegendComponent implements OnInit, OnDestroy {
 
   onChangeStyle() {
     this.updateLegend();
-    this.layer.dataSource.ol.updateParams({STYLES: this.currentStyle});
+    let STYLES = '';
+    this.layer.dataSource.ol.getParams().LAYERS.split(',').map(layer =>
+      STYLES += this.currentStyle + ','
+    );
+    STYLES = STYLES.slice(0, -1);
+    this.layer.dataSource.ol.updateParams({STYLES});
   }
 
   onLoadImage(id: string) {