Merge pull request #242 from laughing0li/master

AUS-3889 Improve labelling in popups
AuScope · Mar 9, 2023 · 220c465 · 220c465
2 parents 4e1d03a + 3fd6bd1
commit 220c465
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/app/modalwindow/querier/querier.modal.component.html b/src/app/modalwindow/querier/querier.modal.component.html
@@ -30,8 +30,11 @@ <h2 style="margin-top:10px;">No results found, try zooming to improve accuracy</
 					<!-- BEGIN card-header -->
 					<div class="card-header">
 						<h4 class="card-title">
-							<a (click)="transformToHtml(doc)" class="accordion-link" data-toggle="collapse" href="#doc-collapse{{i}}">
-								{{doc.key}}&nbsp;<i *ngIf="transformingToHtml[doc.key] && doc.expanded" class="fa fa-spinner fa-spin"></i>
+							<a (click)="transformToHtml(doc)" *ngIf="doc.node_name != null" class="accordion-link" data-toggle="collapse" href="#doc-collapse{{i}}">
+								{{doc.layer.name}} : {{doc.node_name}}&nbsp;<i *ngIf="transformingToHtml[doc.key] && doc.expanded" class="fa fa-spinner fa-spin"></i>
+							</a>
+							<a (click)="transformToHtml(doc)" *ngIf="doc.node_name == null" class="accordion-link" data-toggle="collapse" href="#doc-collapse{{i}}">
+								{{doc.layer.name}}&nbsp;<i *ngIf="transformingToHtml[doc.key] && doc.expanded" class="fa fa-spinner fa-spin"></i>
 							</a>
 						</h4>
 					</div>

diff --git a/src/app/modalwindow/querier/querier.modal.component.ts b/src/app/modalwindow/querier/querier.modal.component.ts
@@ -183,6 +183,34 @@ export class QuerierModalComponent  implements OnInit {
 
   // Look for changes and update UI after brief delay
   public onDataChange(): void {
+    let htmldata = []
+    let Expression=/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/;
+    let objExp=new RegExp(Expression);
+    for (let  i = 0; i < this.docs.length; i++) {
+      var doc = new DOMParser().parseFromString(this.docs[i].raw, "text/xml");
+      console.log(doc)
+      if (doc.getElementsByTagName('gml:name').length != 0) {
+        for (let html in doc.getElementsByTagName('gml:name')) {
+          if(!objExp.test(doc.getElementsByTagName('gml:name')[html].innerHTML)) {
+            htmldata.push(doc.getElementsByTagName('gml:name')[html].innerHTML)
+          }
+        }
+      } else if (doc.getElementsByTagName('gsmlp:name').length != 0) {
+        for (let html in doc.getElementsByTagName('gsmlp:name')) {
+          if(!objExp.test(doc.getElementsByTagName('gsmlp:name')[html].innerHTML)) {
+            htmldata.push(doc.getElementsByTagName('gsmlp:name')[html].innerHTML)
+          }
+        }
+      } else if (doc.getElementsByTagName('null:name').length != 0) {
+        for (let html in doc.getElementsByTagName('null:name')) {
+          if(!objExp.test(doc.getElementsByTagName('null:name')[html].innerHTML)) {
+            htmldata.push(doc.getElementsByTagName('null:name')[html].innerHTML)
+          }
+        }
+      }
+      this.docs[i]['node_name'] = htmldata[i]
+
+    }
     setTimeout(() => {
       this.changeDetectorRef.detectChanges();
     }, 50);