fix(cesium): Add missing Injectable, add GUI essentials

hslayers · Mar 4, 2024 · a772023 · a772023
1 parent 386b0b8
commit a772023
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/projects/cesium-test-app/src/app/app.component.ts b/projects/cesium-test-app/src/app/app.component.ts
@@ -9,6 +9,10 @@ import {transform} from 'ol/proj';
 import {HsCesiumConfig} from 'hslayers-cesium/src/hscesium-config.service';
 import {HsConfig} from 'hslayers-ng/config';
 import {HsLayoutService} from 'hslayers-ng/shared/layout';
+import {
+  HsOverlayConstructorService,
+  HsPanelConstructorService,
+} from 'hslayers-ng/shared/panel-constructor';
 import {HslayersCesiumComponent} from 'hslayers-cesium/src/hscesium.component';
 
 @Component({
@@ -18,9 +22,11 @@ import {HslayersCesiumComponent} from 'hslayers-cesium/src/hscesium.component';
 })
 export class AppComponent implements OnInit {
   constructor(
-    public HsConfig: HsConfig,
-    private HsCesiumConfig: HsCesiumConfig,
-    private HsLayoutService: HsLayoutService,
+    public hsConfig: HsConfig,
+    private hsCesiumConfig: HsCesiumConfig,
+    private hsLayoutService: HsLayoutService,
+    private hsOverlayConstructorService: HsOverlayConstructorService,
+    private hsPanelConstructorService: HsPanelConstructorService,
   ) {
     const geojsonObject = {
       'type': 'FeatureCollection',
@@ -118,7 +124,7 @@ export class AppComponent implements OnInit {
       visible: false,
       opacity: 1,
     });
-    this.HsConfig.update({
+    this.hsConfig.update({
       datasources: [
         {
           title: 'Layman',
@@ -243,13 +249,22 @@ export class AppComponent implements OnInit {
         opticalMap,
       ],
     });
-    if (!this.HsCesiumConfig.cesiumBase) {
-      this.HsCesiumConfig.cesiumBase = '/assets/cesium/';
+    if (!this.hsCesiumConfig.cesiumBase) {
+      this.hsCesiumConfig.cesiumBase = '/assets/cesium/';
     }
   }
   title = 'hslayers-workspace';
 
   ngOnInit(): void {
-    this.HsLayoutService.addMapVisualizer(HslayersCesiumComponent);
+    /**
+     * Create panel components
+     */
+    this.hsPanelConstructorService.createActivePanels();
+
+    /**
+     * Create GUI overlay
+     */
+    this.hsOverlayConstructorService.createGuiOverlay();
+    this.hsLayoutService.addMapVisualizer(HslayersCesiumComponent);
   }
 }
diff --git a/projects/hslayers-cesium/src/hscesium-config.service.ts b/projects/hslayers-cesium/src/hscesium-config.service.ts
@@ -21,7 +21,9 @@ export class HsCesiumConfigObject {
   cesiumTime?: JulianDate;
   constructor() {}
 }
-@Injectable()
+@Injectable({
+  providedIn: 'root',
+})
 export class HsCesiumConfig extends HsCesiumConfigObject {
   /**
    * Triggered when cesiumConfig is updated using 'update' function of HsCesiumService.

diff --git a/projects/hslayers-cesium/src/hscesium.component.ts b/projects/hslayers-cesium/src/hscesium.component.ts
@@ -46,6 +46,7 @@ export class HslayersCesiumComponent implements AfterViewInit {
       description: 'Switch between 3D (Cesium) and 2D (OpenLayers)',
       icon: 'icon-globealt',
       click: () => this.toggleCesiumMap(),
+      order: -1,
     });
 
     this.HsEventBusService.layermanagerDimensionChanges.subscribe((data) =>