fix: Check either for a feature or coordinate to show feature info panel

hslayers · May 17, 2021 · 3d4de73 · 3d4de73
1 parent a90b43a
commit 3d4de73
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 55 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/projects/hslayers/src/components/add-data/catalogue/add-data-list-item.component.ts b/projects/hslayers/src/components/add-data/catalogue/add-data-list-item.component.ts
@@ -24,7 +24,6 @@ export class HsAddDataListItemComponent {
 
   explanationsVisible: boolean;
   metadata;
-  metadataModalVisible: boolean;
   selected_ds;
   selected_layer;
   selectedType: string; //do not rename to 'type', would clash in the template
@@ -67,7 +66,6 @@ export class HsAddDataListItemComponent {
       this.selectTypeToAddLayerVisible = false;
       this.selectedType = null;
     }
-    this.metadataModalVisible = false;
     this.explanationsVisible = false;
   }
 

diff --git a/projects/hslayers/src/components/query/partials/default-info-panel-body.html b/projects/hslayers/src/components/query/partials/default-info-panel-body.html
@@ -1,4 +1,4 @@
-<div [hidden]="!(HsQueryBaseService.data.features.length > 0)" class="card hs-main-panel">
+<div *ngIf="(HsQueryBaseService.data.features.length > 0) || (HsQueryBaseService.data.coordinates.length > 0)" class="card hs-main-panel">
     <div class="card-body">
         <div class="dropdown" [hidden]="!(HsQueryBaseService.data.featureInfoHtmls.length > 0)">
             <button class="btn btn-light w-100 dropdown-toggle rounded-0" data-toggle="dropdown" [aria-expanded]="featureInfoExpanded" (click)="featureInfoExpanded = !featureInfoExpanded">

diff --git a/projects/hslayers/src/components/query/partials/infopanel.html b/projects/hslayers/src/components/query/partials/infopanel.html
@@ -1,5 +1,5 @@
 <hs-panel-header name="info" [title]="'PANEL_HEADER.INFO' | translate"></hs-panel-header>
-<div class="card hs-main-panel" *ngIf="HsQueryBaseService.data.features.length == 0">
+<div class="card hs-main-panel" *ngIf="noFeatureSelected()">
     <div class="d-flex flex-column align-items-center p-4">
         <i class="icon-cursor bg-primary p-3 text-white rounded " style="font-size: x-large; color:hsl(208, 100%, 97%)"></i>
         <p class="h4">No features selected</p>

diff --git a/projects/hslayers/src/components/query/query.component.ts b/projects/hslayers/src/components/query/query.component.ts
@@ -126,6 +126,13 @@ export class HsQueryComponent implements OnDestroy {
       );
     });
   }
+  noFeatureSelected(): boolean {
+    return (
+      this.HsQueryBaseService.data.features.length == 0 &&
+      (this.HsQueryBaseService.data.coordinates === undefined ||
+        this.HsQueryBaseService.data.coordinates.length == 0)
+    );
+  }
   showQueryDialog(ev) {
     //TODO Rewrite this to new material design
     /* this.$mdDialog