fix: Set group property in details component to not interfere with lo…

…ading of service without layer
hslayers · Feb 13, 2024 · 1a5a394 · 1a5a394
1 parent ea65154
commit 1a5a394
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/projects/hslayers/components/add-data/common/url/details/details.component.html b/projects/hslayers/components/add-data/common/url/details/details.component.html
@@ -8,7 +8,7 @@
 
     <div class="hs-add-url-wms-addas d-flex flex-row justify-content-start align-items-baseline my-2">
       <span class="control-label input-group-text">{{'COMMON.addAs' | translateHs }}</span>
-      <div class="d-flex flex-fill gap-2 justify-content-end align-items-center mx-2 ">
+      <div class="d-flex flex-fill gap-2 justify-content-end align-items-center">
         <div class="btn-group ">
           <button type="button" class="btn btn-sm btn-outline-secondary" (click)="setBase(true)"
             [ngClass]="{'active':data.base}">
@@ -34,7 +34,7 @@
     </div>
   </div>
 
-  <button type="button" class="btn w-100 btn-outline-secondary dropdown-toggle dropdown-toggle-split"
+  <button type="button" class="btn w-100 btn-outline-secondary dropdown-toggle dropdown-toggle-split mb-2"
     (click)="advancedPanelVisible = !advancedPanelVisible">
     {{'COMMON.advancedOptions' | translateHs }}
   </button>

diff --git a/projects/hslayers/components/add-data/common/url/details/details.component.ts b/projects/hslayers/components/add-data/common/url/details/details.component.ts
@@ -23,6 +23,9 @@ export class HsUrlDetailsComponent implements AfterContentInit {
   constructor(public hsAddDataCommonService: HsAddDataCommonService) {}
   ngAfterContentInit(): void {
     this.data = this.injectedService.data;
+    if (this.type == 'wms') {
+      this.data.group = true;
+    }
     this.getDimensionValues = this.hsAddDataCommonService.getDimensionValues;
   }
 

diff --git a/projects/hslayers/shared/add-data/url/wms.service.ts b/projects/hslayers/shared/add-data/url/wms.service.ts
@@ -70,7 +70,6 @@ export class HsUrlWmsService implements HsUrlTypeServiceModel {
         trackBy: 'Name',
         nameProperty: 'Title',
       },
-      group: true,
     };
   }
 

diff --git a/projects/hslayers/shared/layer-manager/layer-manager-metadata.service.ts b/projects/hslayers/shared/layer-manager/layer-manager-metadata.service.ts
@@ -342,7 +342,7 @@ export class HsLayerManagerMetadataService {
    * Helper used in to get usable extent from layers capabilities object
    */
   private getCapsExtent(layerObj: any, layerCaps: HsWmsLayer): Extent {
-    // Extent of selected layer or service in case its missing
+    // Extent of selected layer or service in case it's missing
     let extent =
       (layerObj.EX_GeographicBoundingBox || layerObj.BoundingBox) ??
       (layerCaps.EX_GeographicBoundingBox || layerCaps.BoundingBox);

diff --git a/projects/hslayers/src/assets/locales/cs.json b/projects/hslayers/src/assets/locales/cs.json
@@ -316,7 +316,6 @@
     "Tile": "Dlaždice",
     "done": "Hotovo",
     "group": "skupina",
-    "single": "singl",
     "separateLayers": "samostatné vrstvy"
   },
   "COMPOSITIONS": {

diff --git a/projects/hslayers/src/assets/locales/en.json b/projects/hslayers/src/assets/locales/en.json
@@ -316,7 +316,6 @@
     "Tile": "Tile",
     "done": "Done",
     "group": "group",
-    "single": "single",
     "separateLayers": "separate layers"
   },
   "COMPOSITIONS": {

diff --git a/projects/hslayers/src/assets/locales/sk.json b/projects/hslayers/src/assets/locales/sk.json
@@ -316,7 +316,6 @@
     "Tile": "Dlaždica",
     "done": "Hotovo",
     "group": "skupina",
-    "single": "slobodný",
     "separateLayers": "samostatné vrstvy"
   },
   "COMPOSITIONS": {
-Original file line number
+Diff line change
@@ Expand Up @@
             trackBy: 'Name',
             nameProperty: 'Title',
           },
-          group: true,
         };
       }
@@ Expand Down @@