@dereekb/dbx-web 9.6.5 → 9.7.0

package/mapbox/fesm2020/dereekb-dbx-web-mapbox.mjs

@@ -2,11 +2,12 @@ import * as i0 from '@angular/core';
 import { Injectable, Optional, Inject, Directive, Host, Component, ElementRef, ViewChild, Input, ChangeDetectionStrategy, SkipSelf, Injector, NgModule } from '@angular/core';
 import * as i1$1 from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { cleanup, filterMaybe, onTrueToFalse, SubscriptionObject } from '@dereekb/rxjs';
-import { latLngPointFunction, latLngBoundFunction, isSameLatLngPoint, isDefaultLatLngPoint, swMostLatLngPoint, neMostLatLngPoint, isSameLatLngBound, latLngBoundWrapsMap, isWithinLatLngBoundFunction, overlapsLatLngBoundFunction, diffLatLngBoundPoints, latLngBoundCenterPoint, addLatLngPoints, latLngPoint, DestroyFunctionObject, getValueFromGetter } from '@dereekb/util';
+import { cleanup, filterMaybe, onTrueToFalse, SubscriptionObject, asObservable } from '@dereekb/rxjs';
+import { latLngPointFunction, latLngBoundFunction, isSameLatLngPoint, isDefaultLatLngPoint, swMostLatLngPoint, neMostLatLngPoint, isSameLatLngBound, diffLatLngBoundPoints, latLngBoundWrapsMap, isWithinLatLngBoundFunction, overlapsLatLngBoundFunction, vectorsAreEqual, latLngBoundCenterPoint, addLatLngPoints, latLngPoint, DestroyFunctionObject, getValueFromGetter, LAT_LONG_10M_PRECISION, roundNumberToStepFunction } from '@dereekb/util';
 import { ComponentStore } from '@ngrx/component-store';
-import { switchMap, NEVER, defaultIfEmpty, map, tap, distinctUntilChanged, shareReplay, of, combineLatest, filter, first, startWith, interval, Subject, BehaviorSubject, throttleTime } from 'rxjs';
+import { switchMap, NEVER, defaultIfEmpty, map, tap, distinctUntilChanged, shareReplay, of, combineLatest, filter, first, startWith, interval, Subject, BehaviorSubject, throttleTime, combineLatestWith } from 'rxjs';
 import * as MapboxGl from 'mapbox-gl';
+import { bounds } from '@mapbox/geo-viewport';
 import * as i1 from 'ngx-mapbox-gl';
 import { NgxMapboxGLModule } from 'ngx-mapbox-gl';
 import * as i3$1 from '@dereekb/dbx-web';
@@ -20,7 +21,7 @@ import { MatIconModule } from '@angular/material/icon';
 import * as i6 from 'angular-resize-event';
 import { AngularResizeEventModule } from 'angular-resize-event';
 import * as i2 from '@dereekb/dbx-core';
-import { AbstractSubscriptionDirective, safeMarkForCheck, DbxInjectionComponentModule } from '@dereekb/dbx-core';
+import { AbstractSubscriptionDirective, safeMarkForCheck, tapDetectChanges, DbxInjectionComponentModule } from '@dereekb/dbx-core';
 import * as i2$1 from '@angular/material/menu';
 
 class DbxMapboxConfig {
@@ -57,6 +58,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImpor
                     type: Optional
                 }] }]; } });
 
+function mapboxViewportBoundFunction(config) {
+    const { mapCanvasSize, tileSize = 512 } = config;
+    const dimensions = [mapCanvasSize.x, mapCanvasSize.y];
+    return ({ center, zoom }) => {
+        const boundingBox = bounds([center.lng, center.lat], zoom, dimensions, tileSize);
+        const [swLng, swLat, neLng, neLat] = boundingBox;
+        const result = {
+            sw: { lat: swLat, lng: swLng },
+            ne: { lat: neLat, lng: neLng }
+        };
+        return result;
+    };
+}
+
 /**
  * Store used for retrieving information.
  */
@@ -70,8 +85,9 @@ class DbxMapboxMapStore extends ComponentStore {
             retainContent: true
         });
         this.dbxMapboxService = dbxMapboxService;
-        this.latLngPoint = latLngPointFunction();
-        this.latLngBound = latLngBoundFunction({ pointFunction: latLngPointFunction({ wrap: false, validate: false }) });
+        this.safeLatLngPoint = latLngPointFunction();
+        this.latLngPoint = latLngPointFunction({ wrap: false, validate: false });
+        this.latLngBound = latLngBoundFunction({ pointFunction: this.latLngPoint });
         // MARK: Effects
         this.setMapService = this.effect((input) => {
             return input.pipe(switchMap((service) => {
@@ -105,6 +121,12 @@ class DbxMapboxMapStore extends ComponentStore {
                         addListener('click', (x) => this._setClickEvent(x));
                         addListener('dblclick', (x) => this._setDoubleClickEvent(x));
                         addListener('contextmenu', (x) => this._setRightClickEvent(x));
+                        const refreshForResize = () => {
+                            const { clientWidth: x, clientHeight: y } = map.getCanvas();
+                            this._setMapCanvasSize({ x, y });
+                        };
+                        addListener('resize', refreshForResize);
+                        refreshForResize();
                         const subs = [];
                         return {
                             service,
@@ -137,7 +159,7 @@ class DbxMapboxMapStore extends ComponentStore {
         });
         this.setCenter = this.effect((input) => {
             return input.pipe(switchMap((center) => {
-                const centerPoint = this.latLngPoint(center);
+                const centerPoint = this.safeLatLngPoint(center);
                 return this.mapInstance$.pipe(tap((map) => map.setCenter(centerPoint)));
             }));
         });
@@ -256,21 +278,21 @@ class DbxMapboxMapStore extends ComponentStore {
         this.jumpTo = this.effect((input) => {
             return input.pipe(switchMap((x) => {
                 const inputCenter = x.center ?? x.to?.center;
-                const center = inputCenter ? this.latLngPoint(inputCenter) : undefined;
+                const center = inputCenter ? this.safeLatLngPoint(inputCenter) : undefined;
                 return this.mapInstance$.pipe(tap((map) => map.jumpTo({ ...x.to, center }, x.eventData)));
             }));
         });
         this.easeTo = this.effect((input) => {
             return input.pipe(switchMap((x) => {
                 const inputCenter = x.center ?? x.to?.center;
-                const center = inputCenter ? this.latLngPoint(inputCenter) : undefined;
+                const center = inputCenter ? this.safeLatLngPoint(inputCenter) : undefined;
                 return this.mapInstance$.pipe(tap((map) => map.easeTo({ ...x.to, center }, x.eventData)));
             }));
         });
         this.flyTo = this.effect((input) => {
             return input.pipe(switchMap((x) => {
                 const inputCenter = x.center ?? x.to?.center;
-                const center = inputCenter ? this.latLngPoint(inputCenter) : undefined;
+                const center = inputCenter ? this.safeLatLngPoint(inputCenter) : undefined;
                 return this.mapInstance$.pipe(tap((map) => map.flyTo({ ...x.to, center }, x.eventData)));
             }));
         });
@@ -339,30 +361,34 @@ class DbxMapboxMapStore extends ComponentStore {
             const bound = x.getBounds();
             const boundSw = bound.getSouthWest();
             const boundNe = bound.getNorthEast();
-            const sw = isDefaultLatLngPoint(boundSw) ? swMostLatLngPoint() : boundSw;
-            const ne = isDefaultLatLngPoint(boundNe) ? neMostLatLngPoint() : boundNe;
+            const sw = isDefaultLatLngPoint(boundSw) ? swMostLatLngPoint() : { lat: boundSw.lat, lng: boundSw.lng };
+            const ne = isDefaultLatLngPoint(boundNe) ? neMostLatLngPoint() : { lat: boundNe.lat, lng: boundNe.lng };
             return this.latLngBound(sw, ne);
         }))), shareReplay(1))));
         this.bound$ = this.whenInitialized$.pipe(switchMap(() => {
             return this.isRendering$.pipe(onTrueToFalse(), startWith(undefined), switchMap((x) => this.boundNow$.pipe(first())), distinctUntilChanged(isSameLatLngBound), shareReplay(1));
         }));
+        this.boundSizing$ = this.bound$.pipe(map((x) => diffLatLngBoundPoints(x)), shareReplay(1));
         this.boundWrapsAroundWorld$ = this.bound$.pipe(map((x) => latLngBoundWrapsMap(x)), distinctUntilChanged(), shareReplay(1));
         this.isWithinBoundFunction$ = this.bound$.pipe(map((x) => isWithinLatLngBoundFunction(x)), shareReplay(1));
         this.overlapsBoundFunction$ = this.bound$.pipe(map((x) => overlapsLatLngBoundFunction(x)), shareReplay(1));
         this.zoomNow$ = this.whenInitialized$.pipe(switchMap(() => this.mapInstance$.pipe(switchMap((x) => this._renderingTimer.pipe(map(() => x.getZoom()))), shareReplay(1))));
         this.zoom$ = this.whenInitialized$.pipe(switchMap(() => {
-            return this.isZooming$.pipe(onTrueToFalse(), startWith(undefined), switchMap((x) => this.zoomNow$.pipe(first())), distinctUntilChanged(), shareReplay(1));
+            return this.isZooming$.pipe(onTrueToFalse(), startWith(undefined), switchMap(() => this.zoomNow$.pipe(first())), distinctUntilChanged(), shareReplay(1));
         }));
         this.pitchNow$ = this.whenInitialized$.pipe(switchMap(() => this.mapInstance$.pipe(switchMap((x) => this._movingTimer.pipe(map(() => x.getPitch()))), shareReplay(1))));
         this.pitch$ = this.whenInitialized$.pipe(switchMap(() => {
-            return this.isRotating$.pipe(onTrueToFalse(), startWith(undefined), switchMap((x) => this.pitchNow$.pipe(first())), distinctUntilChanged(), shareReplay(1));
+            return this.isRotating$.pipe(onTrueToFalse(), startWith(undefined), switchMap(() => this.pitchNow$.pipe(first())), distinctUntilChanged(), shareReplay(1));
         }));
         this.bearingNow$ = this.whenInitialized$.pipe(switchMap(() => this.mapInstance$.pipe(switchMap((x) => this._movingTimer.pipe(map(() => x.getBearing()))), shareReplay(1))));
         this.bearing$ = this.whenInitialized$.pipe(switchMap(() => {
-            return this.isRotating$.pipe(onTrueToFalse(), startWith(undefined), switchMap((x) => this.bearingNow$.pipe(first())), distinctUntilChanged(), shareReplay(1));
+            return this.isRotating$.pipe(onTrueToFalse(), startWith(undefined), switchMap(() => this.bearingNow$.pipe(first())), distinctUntilChanged(), shareReplay(1));
         }));
         this.content$ = this.state$.pipe(map((x) => x.content), distinctUntilChanged(), shareReplay(1));
         this.hasContent$ = this.content$.pipe(map(Boolean));
+        this.currentMapCanvasSize$ = this.state$.pipe(map((x) => x.mapCanvasSize), distinctUntilChanged((a, b) => a != null && b != null && vectorsAreEqual(a, b)), shareReplay(1));
+        this.mapCanvasSize$ = this.currentMapCanvasSize$.pipe(filterMaybe());
+        this.viewportBoundFunction$ = this.mapCanvasSize$.pipe(map((x) => mapboxViewportBoundFunction({ mapCanvasSize: x })), shareReplay(1));
         this.clickEvent$ = this.state$.pipe(map((x) => x.clickEvent), distinctUntilChanged(), shareReplay(1));
         this.doubleClickEvent$ = this.state$.pipe(map((x) => x.doubleClickEvent), distinctUntilChanged(), shareReplay(1));
         this.rightClickEvent$ = this.state$.pipe(map((x) => x.rightClickEvent), distinctUntilChanged(), shareReplay(1));
@@ -373,6 +399,7 @@ class DbxMapboxMapStore extends ComponentStore {
         this._setMoveState = this.updater((state, moveState) => ({ ...state, moveState }));
         this._setZoomState = this.updater((state, zoomState) => ({ ...state, zoomState }));
         this._setRotateState = this.updater((state, rotateState) => ({ ...state, rotateState }));
+        this._setMapCanvasSize = this.updater((state, mapCanvasSize) => ({ ...state, mapCanvasSize }));
         this._setClickEvent = this.updater((state, clickEvent) => ({ ...state, clickEvent }));
         this._setDoubleClickEvent = this.updater((state, doubleClickEvent) => ({ ...state, doubleClickEvent }));
         this._setRightClickEvent = this.updater((state, rightClickEvent) => ({ ...state, rightClickEvent }));
@@ -419,7 +446,7 @@ class DbxMapboxMapStore extends ComponentStore {
     }
     calculateNextCenterOffsetWithScreenMarginChange(sizing) {
         return this.atNextIdle().pipe(switchMap(() => this.bound$.pipe(first(), map((bounds) => {
-            const diff = diffLatLngBoundPoints(bounds);
+            const diff = diffLatLngBoundPoints(bounds, true);
             const center = latLngBoundCenterPoint(bounds);
             const offsetWidth = sizing.leftMargin + sizing.rightMargin; // 300 + 0
             const newWidth = sizing.fullWidth - offsetWidth; // 1000 - 300 - 0
@@ -889,7 +916,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImpor
  * Component used to render a set of DbxMapboxMarker values from the input data and marker factory.
  */
 class DbxMapboxMarkersComponent {
-    constructor() {
+    constructor(cdRef) {
+        this.cdRef = cdRef;
         this._data = new BehaviorSubject(undefined);
         this._markerFactory = new BehaviorSubject(undefined);
         this.markers$ = combineLatest([this._data.pipe(distinctUntilChanged()), this._markerFactory.pipe(distinctUntilChanged())]).pipe(map(([data, markerFactory]) => {
@@ -899,7 +927,7 @@ class DbxMapboxMarkersComponent {
             else {
                 return [];
             }
-        }), shareReplay(1));
+        }), tapDetectChanges(this.cdRef), shareReplay(1));
     }
     get data() {
         return this._data.value;
@@ -918,19 +946,20 @@ class DbxMapboxMarkersComponent {
         this._markerFactory.complete();
     }
 }
-DbxMapboxMarkersComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxMarkersComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
+DbxMapboxMarkersComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxMarkersComponent, deps: [{ token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
 DbxMapboxMarkersComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.1.2", type: DbxMapboxMarkersComponent, selector: "dbx-mapbox-markers", inputs: { data: "data", markerFactory: "markerFactory" }, ngImport: i0, template: `
     <dbx-mapbox-marker *ngFor="let marker of markers$ | async" [marker]="marker"></dbx-mapbox-marker>
-  `, isInline: true, dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: DbxMapboxMarkerComponent, selector: "dbx-mapbox-marker", inputs: ["marker"] }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }] });
+  `, isInline: true, dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: DbxMapboxMarkerComponent, selector: "dbx-mapbox-marker", inputs: ["marker"] }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxMarkersComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'dbx-mapbox-markers',
                     template: `
     <dbx-mapbox-marker *ngFor="let marker of markers$ | async" [marker]="marker"></dbx-mapbox-marker>
-  `
+  `,
+                    changeDetection: ChangeDetectionStrategy.OnPush
                 }]
-        }], propDecorators: { data: [{
+        }], ctorParameters: function () { return [{ type: i0.ChangeDetectorRef }]; }, propDecorators: { data: [{
                 type: Input
             }], markerFactory: [{
                 type: Input
@@ -1031,6 +1060,56 @@ function dbxMapboxColoredDotStyle(background, color) {
     };
 }
 
+/**
+ * Filters the input objects based on their center and zoom values.
+ *
+ * This function caches the bounds computations for each of the input values.
+ *
+ * @param config
+ * @returns
+ */
+function filterByMapboxViewportBound(config) {
+    const { boundDecisionObs: inputBoundDecisionObs, boundFunctionObs: inputBoundFunctionObs, defaultZoom: inputDefaultZoom = 17, readValue, zoomRounding, precision = LAT_LONG_10M_PRECISION } = config;
+    const _latLngPoint = latLngPointFunction({ wrap: false, validate: false, precision });
+    const _roundZoom = roundNumberToStepFunction(zoomRounding || { step: 0.5, round: 'floor' });
+    const boundDecisionObs = asObservable(inputBoundDecisionObs);
+    const boundFunctionObs = asObservable(inputBoundFunctionObs);
+    return (input) => {
+        return boundFunctionObs.pipe(distinctUntilChanged(), switchMap((viewportBoundFunction) => {
+            const cache = new Map();
+            return input.pipe(map((values) => {
+                return values.map((value) => {
+                    const item = readValue(value);
+                    const centerLatLng = _latLngPoint(item.center);
+                    const zoomStep = _roundZoom(item.zoom || inputDefaultZoom);
+                    const cacheKey = `${zoomStep}_${centerLatLng.lat}_${centerLatLng.lng}`;
+                    const cachedValue = cache.get(cacheKey);
+                    let bound;
+                    if (!cachedValue) {
+                        bound = viewportBoundFunction({ center: centerLatLng, zoom: zoomStep });
+                        cache.set(cacheKey, bound);
+                    }
+                    else {
+                        bound = cachedValue;
+                    }
+                    return {
+                        value,
+                        bound
+                    };
+                });
+            }), combineLatestWith(boundDecisionObs), map(([items, boundFunction]) => {
+                let valuesInBounds = [];
+                items.forEach((item) => {
+                    if (boundFunction(item.bound)) {
+                        valuesInBounds.push(item.value);
+                    }
+                });
+                return valuesInBounds;
+            }));
+        }), shareReplay(1));
+    };
+}
+
 const KNOWN_MAPBOX_STYLES = [
     //
     'mapbox://styles/mapbox/streets-v11',
@@ -1052,5 +1131,5 @@ function mapboxZoomLevel(input) {
  * Generated bundle index. Do not edit.
  */
 
-export { DEFAULT_MAPBOX_CENTER, DEFAULT_MAPBOX_MAP_STORE_TIMER_REFRESH_PERIOD, DEFAULT_MAPBOX_STYLE, DEFAULT_MAPBOX_ZOOM, DbxMapboxConfig, DbxMapboxLayoutComponent, DbxMapboxLayoutDrawerComponent, DbxMapboxMapDirective, DbxMapboxMapStore, DbxMapboxMapStoreInjectionBlockDirective, DbxMapboxMapStoreProviderBlock, DbxMapboxMarkerComponent, DbxMapboxMarkersComponent, DbxMapboxMenuComponent, DbxMapboxModule, DbxMapboxService, KNOWN_MAPBOX_STYLES, MAPBOX_MAX_ZOOM_LEVEL, MAPBOX_MIN_ZOOM_LEVEL, dbxMapboxColoredDotStyle, mapboxZoomLevel, provideMapboxStoreIfParentIsUnavailable };
+export { DEFAULT_MAPBOX_CENTER, DEFAULT_MAPBOX_MAP_STORE_TIMER_REFRESH_PERIOD, DEFAULT_MAPBOX_STYLE, DEFAULT_MAPBOX_ZOOM, DbxMapboxConfig, DbxMapboxLayoutComponent, DbxMapboxLayoutDrawerComponent, DbxMapboxMapDirective, DbxMapboxMapStore, DbxMapboxMapStoreInjectionBlockDirective, DbxMapboxMapStoreProviderBlock, DbxMapboxMarkerComponent, DbxMapboxMarkersComponent, DbxMapboxMenuComponent, DbxMapboxModule, DbxMapboxService, KNOWN_MAPBOX_STYLES, MAPBOX_MAX_ZOOM_LEVEL, MAPBOX_MIN_ZOOM_LEVEL, dbxMapboxColoredDotStyle, filterByMapboxViewportBound, mapboxViewportBoundFunction, mapboxZoomLevel, provideMapboxStoreIfParentIsUnavailable };
 //# sourceMappingURL=dereekb-dbx-web-mapbox.mjs.map