Merge pull request #465 from AuScope/AUS-4295

Aus 4295
AuScope · Dec 11, 2024 · 93d9607 · 93d9607
2 parents 15f69cc + 2c9f5ce
commit 93d9607
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/app/cesium-map/csmap.component.ts b/src/app/cesium-map/csmap.component.ts
@@ -20,6 +20,7 @@ import { GeoJsonQuerierHandler } from './custom-querier-handler/geojson-querier-
 import { Observable, forkJoin, throwError } from 'rxjs';
 import { catchError, finalize, tap, timeout } from 'rxjs/operators';
 import { ToolbarComponent } from 'app/menupanel/toolbar/toolbar.component';
+import { NVCLBoreholeAnalyticService } from 'app/modalwindow/layeranalytic/nvcl/nvcl.boreholeanalytic.service';
 
 declare var Cesium: any;
 
@@ -44,7 +45,7 @@ declare var Cesium: any;
       </ac-map>
     </div>
     `,
-  providers: [ViewerConfiguration], // Don't forget to Provide it
+  providers: [ViewerConfiguration,NVCLBoreholeAnalyticService], // Don't forget to Provide it
   styleUrls: ['./csmap.component.scss']
   // The "#" (template reference variable) matters to access the map element with the ViewChild decorator!
 })
@@ -78,7 +79,8 @@ export class CsMapComponent implements AfterViewInit {
   constructor(private csMapObject: CsMapObject, private csMapService: CsMapService, private modalService: BsModalService,
     private queryWMSService: QueryWMSService, private gmlParserService: GMLParserService,
     private manageStateService: ManageStateService, private advancedMapComponentService: AdvancedComponentService,
-    private userStateService: UserStateService, private viewerConf: ViewerConfiguration, private ngZone: NgZone) {
+    private userStateService: UserStateService,  private nvclBoreholeAnalyticService: NVCLBoreholeAnalyticService,
+    private viewerConf: ViewerConfiguration, private ngZone: NgZone) {
     this.csMapService.getClickedLayerListBS().subscribe((mapClickInfo) => {
       this.handleLayerClick(mapClickInfo);
     });
@@ -178,6 +180,19 @@ export class CsMapComponent implements AfterViewInit {
 
   ngAfterViewInit() {
     this.csMapService.init();
+    // This code is used to display the map for nvclanid job's urlLink
+    const nvclanid = UtilitiesService.getUrlParameterByName('nvclanid');
+    if (nvclanid) {
+      const me = this;
+      this.nvclBoreholeAnalyticService.getNVCLGeoJson(nvclanid).subscribe(results => {
+        if (typeof results === 'object') {
+          window.alert('This analytical job could not be found!\n the nvclanid = ' + nvclanid);
+        } else {
+          const jsonData = results;
+          me.nvclBoreholeAnalyticService.addGeoJsonLayer(nvclanid,jsonData);
+        }
+      });
+    }
 
     // This code is used to display the map state stored in a permanent link
     const stateId = UtilitiesService.getUrlParameterByName('state');

diff --git a/src/app/menupanel/common/filterpanel/filterpanel.component.ts b/src/app/menupanel/common/filterpanel/filterpanel.component.ts
@@ -95,16 +95,6 @@ export class FilterPanelComponent implements OnInit, AfterViewInit {
     // Add any layer specific advanced filter components
     this.advancedComponentService.addAdvancedFilterComponents(this.layer, this.advancedFilterComponents);
 
-    // LJ: nvclAnalyticalJob external link
-    const nvclanid = UtilitiesService.getUrlParameterByName('nvclanid');
-    if (nvclanid) {
-      if (this.layer.id === 'nvcl-v2-borehole') {
-        this.layer.filterCollection['mandatoryFilters'][0].value = nvclanid;
-        setTimeout(() => {
-          this.addLayer(this.layer);
-        });
-      }
-    }
   }
 
   /**