Merge pull request #414 from AuScope/Release-6.5.2

Release 6.5.2
AuScope · Jul 4, 2024 · 7783b1b · 7783b1b
2 parents 934f90c + 565a79b
commit 7783b1b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/src/app/cesium-map/csmap.component.ts b/src/app/cesium-map/csmap.component.ts
@@ -593,12 +593,14 @@ export class CsMapComponent implements AfterViewInit {
    */
   private setModal(layerId: string, result: string, feature: any, clickCoord: { x: number, y: number, z: number } | null, gmlid?: string) {
     let treeCollections = [];
+
     // Some layers return JSON
     if (config.wmsGetFeatureJSON.indexOf(layerId) !== -1) {
       treeCollections = this.parseJSONResponse(result, feature);
     } else {
       treeCollections = SimpleXMLService.parseTreeCollection(this.gmlParserService.getRootNode(result), feature);
     }
+
     let featureCount = 0;
     for (const treeCollection of treeCollections) {
       this.displayModal(clickCoord);
@@ -610,6 +612,12 @@ export class CsMapComponent implements AfterViewInit {
         break;
       }
       treeCollection.raw = result;
+      // AUS-4207 Filter out "Serious Error"
+      if (treeCollection.key.indexOf('Server Error') >= 0) {
+        console.log('FeatureInfo:Server Error:' + treeCollection.key);
+        continue;
+      }
+
       this.bsModalRef.content.docs.push(treeCollection);
       if (this.bsModalRef.content.uniqueLayerNames.indexOf(feature.layer.name) === -1) {
         this.bsModalRef.content.uniqueLayerNames.push(feature.layer.name);

diff --git a/src/app/menupanel/activelayers/activelayerspanel.component.html b/src/app/menupanel/activelayers/activelayerspanel.component.html
@@ -3,7 +3,7 @@
 </div>
 
 <div class="activeLayersBoundary" cdkDropList (cdkDropListDropped)="layerDropped($event)">
-    <div class="activeLayerItem" *ngFor="let layer of getActiveLayers()" cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".activeLayersBoundary" [cdkDragDisabled]="getActiveLayers().length <= 1">
+    <div class="activeLayerItem" *ngFor="let layer of getActiveLayers(); let j = index" cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".activeLayersBoundary" [cdkDragDisabled]="getActiveLayers().length <= 1">
         <!-- Active layer info column -->
         <div class="activeLayerContent">
             <div class="activeLayerTitleBar" cdkDragHandle>
@@ -50,9 +50,9 @@
             </div>
             <!-- Filter panel -->
             <div class="activeLayerFilterPanel"> <!--  this div seems unnecessary, but remove it and drag breaks (more) -->
-                <div style="position: inherit;" class="card card-info card-with-tabs layer-card">
+                <div style="position: inherit;" class="card  card-with-tabs layer-card">
                     <div class="rh_info_wrap">
-                        <div class="card-header">
+                        <div class="active-header">
                             <ul id="card-tab">
                                 <!-- Layer Styling tab -->
                                 <li *ngIf="hasFilters(layer.id)" (click)="selectTabPanel(layer.id,'filterpanel')" [ngClass]="{'active': !getUILayerModel(layer.id)?.tabpanel.downloadpanel.expanded}" class="tab-item">
@@ -61,7 +61,7 @@
                                     </a>
                                 </li>
                                 <!-- Layer Download tab -->
-                                <li *ngIf="isMapSupportedLayer(layer) && isDownloadSupportedLayer(layer)" (click)="selectTabPanel(layer.id,'downloadpanel')" [ngClass]="{'active': getUILayerModel(layer.id)?.tabpanel.downloadpanel.expanded}" class="tab-item">
+                                <li *ngIf="isMapSupportedLayer(layer) && isDownloadSupportedLayer(layer)" (click)="selectTabPanel(layer.id,'downloadpanel')" [ngClass]="{'active': !hasFilters(layer.id) || getUILayerModel(layer.id)?.tabpanel.downloadpanel.expanded}" class="tab-item">
                                     <a>
                                         <span class="d-none tab-link d-sm-inline ml-2" >Download</span>
                                     </a>
@@ -97,6 +97,7 @@
             <div class="activeLayerDragMessagePanel">
                 Drag layer to change layer order.
             </div>
+            <hr *ngIf="j < getActiveLayers().length - 1" class="nav-divider active-divider">
         </div>
     </div>
 </div>
diff --git a/src/app/menupanel/activelayers/activelayerspanel.component.scss b/src/app/menupanel/activelayers/activelayerspanel.component.scss
@@ -233,4 +233,20 @@ u {
 #card-tab {
     padding: 11px;
     display: flex;
+}
+
+.active-divider {
+  border-color: purple;
+}
+
+#card-tab {
+  padding: 0px;
+}
+
+#active-header {
+  padding: 0px;
+}
+
+.tab-item {
+  padding: 11px;
 }
diff --git a/src/app/menupanel/common/filterpanel/filterpanel.component.html b/src/app/menupanel/common/filterpanel/filterpanel.component.html
@@ -152,7 +152,7 @@ <h5>Optional Filters</h5>
 			class="btn btn-primary btn-sm unclickable-btn" style="position:absolute;left:0;"><i
 				class="fa fa-spinner fa-spin" style="cursor:default;"></i>&nbsp;&nbsp;Querying time</button>
 		<div ngbDropdown id="timeDropdown" *ngIf="layerTimes && layerTimes.currentTime" dropdownClass="time-dropdown"
-			style="left:0;" container="body">
+			style="position:absolute;" container="body">
 			<button *ngIf="!layerTimes.loadingTimeExtent && layerTimes.timeExtent.length === 1" type="button"
 				class="btn btn-primary btn-sm date-btn unclickable-btn" style="cursor:default;"><i
 					class="fa fa-calendar"></i>&nbsp;&nbsp;{{ layerTimes.currentTime | date }}</button>

diff --git a/src/app/menupanel/common/filterpanel/filterpanel.component.scss b/src/app/menupanel/common/filterpanel/filterpanel.component.scss
@@ -57,4 +57,8 @@ div.red {
 
 .analytic-btn {
     margin-left: 0;
+}
+
+.date-btn {
+    margin-left: 0px;
 }