fix(trip-planner): Define structure of mapClicked event

hslayers · Jun 12, 2024 · 76541fa · 76541fa
1 parent 607fd47
commit 76541fa
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/projects/hslayers/components/trip-planner/trip-planner.service.ts b/projects/hslayers/components/trip-planner/trip-planner.service.ts
@@ -80,7 +80,7 @@ export class HsTripPlannerService {
       features: this.movable_features,
     });
 
-    this.HsEventBusService.mapClicked.subscribe((coordinates) => {
+    this.HsEventBusService.mapClicked.subscribe(({coordinates}) => {
       if (this.HsLayoutService.mainpanel != 'tripPlanner') {
         return;
       }

diff --git a/projects/hslayers/services/event-bus/event-bus.service.ts b/projects/hslayers/services/event-bus/event-bus.service.ts
@@ -1,13 +1,14 @@
 import {BehaviorSubject, ReplaySubject, Subject} from 'rxjs';
 import {Injectable} from '@angular/core';
 
-import {Feature, Map} from 'ol';
+import {Feature, Map, MapBrowserEvent} from 'ol';
 import {Geometry} from 'ol/geom';
 import {Layer} from 'ol/layer';
 import {Select} from 'ol/interaction';
 import {Source} from 'ol/source';
 
 import {
+  ClickedCoordinates,
   HsBaseLayerDescriptor,
   HsLayerDescriptor,
   HsLayerLoadProgress,
@@ -155,7 +156,8 @@ export class HsEventBusService {
   /**
    * replaces 'mapClicked'
    */
-  mapClicked: Subject<any> = new Subject();
+  mapClicked: Subject<MapBrowserEvent<any> & ClickedCoordinates> =
+    new Subject();
   /**
    * Fires when layerSelected parameter is found in the URL
    */

diff --git a/projects/hslayers/services/query/query-base.service.ts b/projects/hslayers/services/query/query-base.service.ts
@@ -3,10 +3,8 @@ import {Injectable, NgZone} from '@angular/core';
 import {Subject} from 'rxjs';
 
 import {Circle as CircleStyle, Fill, Stroke, Style} from 'ol/style';
-// eslint-disable-next-line import/named
 import {Coordinate, createStringXY, toStringHDMS} from 'ol/coordinate';
 import {Feature, Map} from 'ol';
-// eslint-disable-next-line import/named
 import {FeatureLike} from 'ol/Feature';
 import {Geometry, Point} from 'ol/geom';
 import {Select} from 'ol/interaction';

diff --git a/projects/hslayers/types/clicked-coordinates.type.ts b/projects/hslayers/types/clicked-coordinates.type.ts
@@ -0,0 +1,10 @@
+import {Coordinate} from 'ol/coordinate';
+
+export type ClickedCoordinates = {
+  coordinates: {
+    name: string;
+    mapProjCoordinate: Coordinate;
+    epsg4326Coordinate: Coordinate;
+    projections: {name: string; value: any}[];
+  };
+};
diff --git a/projects/hslayers/types/public-api.ts b/projects/hslayers/types/public-api.ts
@@ -1,10 +1,11 @@
-export * from './dom-feature-link.type';
-export * from './type-intersection.type';
 export * from './access-rights.model';
 export * from './bounding-box-object.type';
-export * from './endpoint.interface';
 export * from './button.interface';
+export * from './clicked-coordinates.type';
+export * from './dom-feature-link.type';
+export * from './endpoint.interface';
 export * from './map-swipe.type';
+export * from './type-intersection.type';
 
 export * from './layer-manager/base-layer-descriptor.interface';
 export * from './layer-manager/layer-descriptor.interface';

diff --git a/projects/test-app/src/hslayers-app/hslayers-app.component.ts b/projects/test-app/src/hslayers-app/hslayers-app.component.ts
@@ -359,6 +359,7 @@ export class HslayersAppComponent {
         draw: true,
         mapSwipe: true,
         language: true,
+        tripPlanner: true,
       },
       componentsEnabled: {
         basemapGallery: true,