@hestia-earth/ui-components 0.42.1 → 0.42.3

package/fesm2022/hestia-earth-ui-components.mjs

@@ -716,7 +716,7 @@ const HE_MAP_LOADED = new InjectionToken('Google Maps API Loaded');
  * @param libraries
  * @returns
  */
-const loadMapApi = (apiKey, libraries = ['visualization', 'drawing']) => (httpClient) => of(`${loadMapUrl}?${buildMapsUrl({ key: [apiKey], libraries })}`).pipe(mergeMap(url => httpClient.jsonp(url, 'callback')), shareReplay({ bufferSize: 1, refCount: true }), delay(100), map(() => true), catchError(e => {
+const loadMapApi = (apiKey, libraries = ['visualization']) => (httpClient) => of(`${loadMapUrl}?${buildMapsUrl({ key: [apiKey], libraries })}`).pipe(mergeMap(url => httpClient.jsonp(url, 'callback')), shareReplay({ bufferSize: 1, refCount: true }), delay(100), map(() => true), catchError(e => {
     console.error(e);
     return of(false);
 }));
@@ -2595,16 +2595,44 @@ class MapsDrawingComponent {
     loadData() {
         this.shapes = polygonsFromFeature(this.feature());
         this.shapes.forEach(polygon => polygon.setMap(this.map()?.googleMap));
-        const drawingManager = new google.maps.drawing.DrawingManager({
-            drawingControlOptions: {
-                position: google.maps.ControlPosition.TOP_CENTER,
-                drawingModes: this.modes() || [google.maps.drawing.OverlayType.POLYGON]
-            },
-            polygonOptions: strokeStyle
-        });
-        drawingManager.setMap(this.map()?.googleMap);
-        this.listeners.push(google.maps.event.addListener(drawingManager, 'polygoncomplete', polygon => this.onPolygonAdded(polygon)));
-        this.listeners.push(google.maps.event.addListener(drawingManager, 'markercomplete', marker => this.onMarkerAdded(marker)));
+        const map = this.map()?.googleMap;
+        if (!map) {
+            return;
+        }
+        const modes = this.modes() || ['polygon'];
+        const controls = modes
+            .map(mode => {
+            const m = mode.toLowerCase();
+            if (m === 'polygon')
+                return 'Polygon';
+            if (m === 'marker' || m === 'point')
+                return 'Point';
+            return null;
+        })
+            .filter(Boolean);
+        map.data.setControls(controls);
+        map.data.setControlPosition(google.maps.ControlPosition.TOP_CENTER);
+        map.data.setStyle(strokeStyle);
+        this.listeners.push(map.data.addListener('addfeature', (event) => {
+            const feature = event.feature;
+            const geometry = feature.getGeometry();
+            map.data.remove(feature);
+            if (geometry?.getType() === 'Polygon') {
+                const polygon = new google.maps.Polygon({
+                    paths: geometry.getArray().map(path => path.getArray()),
+                    ...strokeStyle
+                });
+                polygon.setMap(map);
+                this.onPolygonAdded(polygon);
+            }
+            else if (geometry?.getType() === 'Point') {
+                const marker = new google.maps.Marker({
+                    position: geometry.get(),
+                    map: map
+                });
+                this.onMarkerAdded(marker);
+            }
+        }));
     }
     mapInitialized() {
         setTimeout(() => this.loadData());
@@ -5566,23 +5594,23 @@ class HeSearchService {
         this.http = inject(HttpClient);
         this.commonService = inject(HeCommonService);
     }
-    search$(params, dataVersion) {
+    search$(params, dataVersion, searchPath = 'search') {
         return this.http
-            .post(`${this.commonService.apiBaseUrl}/search`, params, {
+            .post(`${this.commonService.apiBaseUrl}/${searchPath}`, params, {
             headers: dataVersionHeader(dataVersion)
         })
             .pipe(catchError(() => of(emptySearchResult())));
     }
-    count$(params = {}, dataVersion) {
+    count$(params = {}, dataVersion, countPath = 'count') {
         return this.http
-            .post(`${this.commonService.apiBaseUrl}/count`, params, {
+            .post(`${this.commonService.apiBaseUrl}/${countPath}`, params, {
             headers: dataVersionHeader(dataVersion)
         })
             .pipe(catchError(() => of(0)));
     }
-    get$(type, id) {
+    get$(type, id, searchPath = 'search') {
         return this.http
-            .post(`${this.commonService.apiBaseUrl}/search`, {
+            .post(`${this.commonService.apiBaseUrl}/${searchPath}`, {
             limit: 1,
             query: {
                 bool: {
@@ -5592,10 +5620,10 @@ class HeSearchService {
         })
             .pipe(catchError(() => of(emptySearchResult())), map(({ results }) => results[0] || null));
     }
-    suggest$(term, type, extraQueries = [], fullQuery, limit = 10, includes = []) {
+    suggest$(term, type, extraQueries = [], fullQuery, limit = 10, includes = [], searchPath = 'search') {
         const query = fullQuery || suggestQuery(term, type, extraQueries);
         return this.http
-            .post(`${this.commonService.apiBaseUrl}/search`, {
+            .post(`${this.commonService.apiBaseUrl}/${searchPath}`, {
             limit,
             fields: ['name', '@id', type ? '' : '@type', 'termType', 'aggregated', ...includes].filter(val => !!val),
             query