@dereekb/dbx-web 9.6.1 → 9.6.2

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

@@ -3,12 +3,14 @@ import { Injectable, Optional, Inject, Directive, Host, Component, ElementRef, V
 import * as i2$1 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { cleanup, filterMaybe, onTrueToFalse, SubscriptionObject } from '@dereekb/rxjs';
-import { latLngPointFunction, latLngBoundFunction, isSameLatLngPoint, isSameLatLngBound, isWithinLatLngBoundFunction, overlapsLatLngBoundFunction, diffLatLngBoundPoints, latLngBoundCenterPoint, addLatLngPoints, latLngPoint, DestroyFunctionObject } from '@dereekb/util';
+import { latLngPointFunction, latLngBoundFunction, isSameLatLngPoint, isDefaultLatLngPoint, swMostLatLngPoint, neMostLatLngPoint, isSameLatLngBound, latLngBoundWrapsMap, isWithinLatLngBoundFunction, overlapsLatLngBoundFunction, diffLatLngBoundPoints, latLngBoundCenterPoint, addLatLngPoints, latLngPoint, DestroyFunctionObject, getValueFromGetter } 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, skip } from 'rxjs';
+import { switchMap, NEVER, defaultIfEmpty, map, tap, distinctUntilChanged, shareReplay, of, combineLatest, filter, first, startWith, interval, Subject, BehaviorSubject, throttleTime } from 'rxjs';
 import * as MapboxGl from 'mapbox-gl';
 import * as i1 from 'ngx-mapbox-gl';
-import { dbxColorBackground, disableRightClickInCdkBackdrop } from '@dereekb/dbx-web';
+import { NgxMapboxGLModule } from 'ngx-mapbox-gl';
+import * as i3$1 from '@dereekb/dbx-web';
+import { dbxColorBackground, disableRightClickInCdkBackdrop, DbxRouterAnchorModule } from '@dereekb/dbx-web';
 import * as i3 from '@angular/material/sidenav';
 import { MatDrawerContainer, MatSidenavModule } from '@angular/material/sidenav';
 import * as i4 from '@angular/material/button';
@@ -25,7 +27,7 @@ class DbxMapboxConfig {
 }
 const DEFAULT_MAPBOX_STYLE = 'mapbox://styles/mapbox/streets-v11';
 const DEFAULT_MAPBOX_CENTER = [30.2690138665, -97.7408297965];
-const DEFAULT_MAPBOX_ZOOM = 12;
+const DEFAULT_MAPBOX_ZOOM = 8;
 const DEFAULT_MAPBOX_MAP_STORE_TIMER_REFRESH_PERIOD = 200;
 class DbxMapboxService {
     constructor(config) {
@@ -69,7 +71,7 @@ class DbxMapboxMapStore extends ComponentStore {
         });
         this.dbxMapboxService = dbxMapboxService;
         this.latLngPoint = latLngPointFunction();
-        this.latLngBound = latLngBoundFunction();
+        this.latLngBound = latLngBoundFunction({ pointFunction: latLngPointFunction({ wrap: false, validate: false }) });
         // MARK: Effects
         this.setMapService = this.effect((input) => {
             return input.pipe(switchMap((service) => {
@@ -310,17 +312,41 @@ class DbxMapboxMapStore extends ComponentStore {
         this.isRotating$ = this.whenInitialized$.pipe(switchMap(() => this.rotateState$.pipe(map((x) => x === 'rotating'), distinctUntilChanged(), shareReplay())));
         this._movingTimer = this.movingTimer();
         this._renderingTimer = this.lifecycleRenderTimer();
-        this.centerNow$ = this.whenInitialized$.pipe(switchMap(() => this.mapInstance$.pipe(switchMap((x) => this._movingTimer.pipe(map(() => this.latLngPoint(x.getCenter())))), shareReplay(1))));
+        this.centerNow$ = this.whenInitialized$.pipe(switchMap(() => this.mapInstance$.pipe(switchMap((x) => this._movingTimer.pipe(map(() => this.latLngPoint(x.getCenter())))), shareReplay(1))), shareReplay(1));
         this.center$ = this.whenInitialized$.pipe(switchMap(() => {
             return this.isMoving$.pipe(onTrueToFalse(), startWith(undefined), switchMap(() => this.centerNow$.pipe(first())), distinctUntilChanged(isSameLatLngPoint), shareReplay(1));
+        }), shareReplay(1));
+        this.margin$ = this.state$.pipe(map((x) => x.margin), distinctUntilChanged((a, b) => a != null && b != null && a.fullWidth === b.fullWidth && a.leftMargin === b.leftMargin && a.rightMargin === b.rightMargin), shareReplay(1));
+        this.reverseMargin$ = this.margin$.pipe(map((x) => {
+            if (x) {
+                return { leftMargin: -x.leftMargin, rightMargin: -x.rightMargin, fullWidth: x.fullWidth };
+            }
+            else {
+                return x;
+            }
         }));
+        this.centerGivenMargin$ = this.whenInitialized$.pipe(switchMap(() => {
+            return this.reverseMargin$.pipe(switchMap((x) => {
+                if (x) {
+                    return this.center$.pipe(switchMap((_) => this.calculateNextCenterOffsetWithScreenMarginChange(x)));
+                }
+                else {
+                    return this.isMoving$.pipe(filter((x) => !x), switchMap(() => this.center$));
+                }
+            }));
+        }), shareReplay(1));
         this.boundNow$ = this.whenInitialized$.pipe(switchMap(() => this.mapInstance$.pipe(switchMap((x) => this._renderingTimer.pipe(map(() => {
             const bound = x.getBounds();
-            return this.latLngBound([bound.getSouthWest(), bound.getNorthEast()]);
+            const boundSw = bound.getSouthWest();
+            const boundNe = bound.getNorthEast();
+            const sw = isDefaultLatLngPoint(boundSw) ? swMostLatLngPoint() : boundSw;
+            const ne = isDefaultLatLngPoint(boundNe) ? neMostLatLngPoint() : boundNe;
+            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.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))));
@@ -341,6 +367,7 @@ class DbxMapboxMapStore extends ComponentStore {
         this.doubleClickEvent$ = this.state$.pipe(map((x) => x.doubleClickEvent), distinctUntilChanged(), shareReplay(1));
         this.rightClickEvent$ = this.state$.pipe(map((x) => x.rightClickEvent), distinctUntilChanged(), shareReplay(1));
         // MARK: State Changes
+        this.setMargin = this.updater((state, margin) => ({ ...state, margin: margin && (margin.rightMargin !== 0 || margin.leftMargin !== 0) ? margin : undefined }));
         this._setMapService = this.updater((state, mapService) => ({ mapService, moveState: 'init', lifecycleState: 'init', zoomState: 'init', rotateState: 'init', retainContent: state.retainContent, content: state.retainContent ? state.content : undefined }));
         this._setLifecycleState = this.updater((state, lifecycleState) => ({ ...state, lifecycleState }));
         this._setMoveState = this.updater((state, moveState) => ({ ...state, moveState }));
@@ -391,23 +418,22 @@ class DbxMapboxMapStore extends ComponentStore {
         }))));
     }
     calculateNextCenterOffsetWithScreenMarginChange(sizing) {
-        return this.atNextIdle().pipe(switchMap(() => this.bound$.pipe((first(),
-            map((bounds) => {
-                const diff = diffLatLngBoundPoints(bounds);
-                const center = latLngBoundCenterPoint(bounds);
-                const offsetWidth = sizing.leftMargin + sizing.rightMargin; // 300 + 0
-                const newWidth = sizing.fullWidth - offsetWidth; // 1000 - 300 - 0
-                const newWidthRatio = newWidth / sizing.fullWidth; // 700 / 1000
-                const newCenterLongitudeWidth = diff.lng * newWidthRatio; // 70% offset
-                const effectiveOffset = {
-                    lat: 0,
-                    lng: newCenterLongitudeWidth / 2
-                };
-                const newCenter = addLatLngPoints(bounds.sw, effectiveOffset);
-                newCenter.lat = center.lat; // retain center position
-                // console.log({ sizing, bounds, effectiveOffset, newWidth, offsetWidth, diff, center, newCenter });
-                return newCenter;
-            })))));
+        return this.atNextIdle().pipe(switchMap(() => this.bound$.pipe(first(), map((bounds) => {
+            const diff = diffLatLngBoundPoints(bounds);
+            const center = latLngBoundCenterPoint(bounds);
+            const offsetWidth = sizing.leftMargin + sizing.rightMargin; // 300 + 0
+            const newWidth = sizing.fullWidth - offsetWidth; // 1000 - 300 - 0
+            const newWidthRatio = newWidth / sizing.fullWidth; // 700 / 1000
+            const newCenterLongitudeWidth = diff.lng * newWidthRatio; // 70% offset
+            const effectiveOffset = {
+                lat: 0,
+                lng: newCenterLongitudeWidth / 2
+            };
+            const newCenter = addLatLngPoints(bounds.sw, effectiveOffset);
+            newCenter.lat = center.lat; // retain center position
+            // console.log({ sizing, bounds, effectiveOffset, newWidth, offsetWidth, diff, center, newCenter });
+            return newCenter;
+        }))));
     }
 }
 DbxMapboxMapStore.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxMapStore, deps: [{ token: DbxMapboxService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -522,7 +548,8 @@ class DbxMapboxLayoutComponent extends SubscriptionObject {
                 }
             });
         });
-        this._toggleSub.subscription = combineLatest([this.opened$.pipe(distinctUntilChanged(), skip(1)), this._updateMargins]).subscribe(([opened]) => {
+        let init = false;
+        this._toggleSub.subscription = combineLatest([this.opened$.pipe(distinctUntilChanged()), this._updateMargins]).subscribe(([opened]) => {
             let { right } = this.container._contentMargins;
             this.container.updateContentMargins();
             setTimeout(() => {
@@ -533,14 +560,19 @@ class DbxMapboxLayoutComponent extends SubscriptionObject {
                 right = (right || 0) * flip;
                 const element = this.content.nativeElement;
                 const width = element.clientWidth;
-                const easeTo = this.dbxMapboxMapStore
-                    .calculateNextCenterOffsetWithScreenMarginChange({
+                const margin = {
                     leftMargin: 0,
                     rightMargin: right,
                     fullWidth: width
-                })
-                    .pipe(first(), map((center) => ({ to: { center, duration: 3200, essential: false } })));
-                this.dbxMapboxMapStore.easeTo(easeTo);
+                };
+                const easeTo = this.dbxMapboxMapStore.calculateNextCenterOffsetWithScreenMarginChange(margin).pipe(first(), map((center) => ({ to: { center, duration: 3200, essential: false } })));
+                this.dbxMapboxMapStore.setMargin(opened ? margin : undefined);
+                if (!init) {
+                    this.dbxMapboxMapStore.easeTo(easeTo);
+                }
+                else {
+                    init = true;
+                }
             });
         });
     }
@@ -738,12 +770,103 @@ function provideMapboxStoreIfParentIsUnavailable() {
     };
 }
 
+class DbxMapboxMarkerComponent {
+    constructor() { }
+    get marker() {
+        return this._marker;
+    }
+    set marker(marker) {
+        this._marker = marker;
+    }
+    get latLng() {
+        return this._marker?.latLng;
+    }
+    get anchor() {
+        return this._marker?.anchor;
+    }
+    get label() {
+        return this._marker?.label;
+    }
+    get icon() {
+        return this._marker?.icon;
+    }
+    get style() {
+        let width = 0;
+        let height = 0;
+        const size = this._marker?.size || 'medium';
+        if (typeof size === 'number') {
+            width = size;
+        }
+        else {
+            switch (size) {
+                case 'small':
+                    width = 18;
+                    break;
+                case 'medium':
+                    width = 24;
+                    break;
+                case 'large':
+                    width = 32;
+                    break;
+                case 'tall':
+                    width = 24;
+                    height = 32;
+                    break;
+            }
+        }
+        if (!height) {
+            height = width;
+        }
+        const imageInput = this._marker?.image;
+        const image = imageInput ? (typeof imageInput === 'string' ? imageInput : getValueFromGetter(imageInput, width)) : undefined;
+        let style = {
+            ...this._marker?.style,
+            width: width + 'px',
+            height: height + 'px',
+            'font-size': width + 'px',
+            'background-image': image
+        };
+        return style;
+    }
+}
+DbxMapboxMarkerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxMarkerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
+DbxMapboxMarkerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.1.2", type: DbxMapboxMarkerComponent, selector: "dbx-mapbox-marker", inputs: { marker: "marker" }, ngImport: i0, template: `
+    <mgl-marker *ngIf="marker" [lngLat]="latLng">
+      <dbx-anchor [anchor]="anchor">
+        <div class="dbx-mapbox-marker">
+          <div class="dbx-mapbox-marker-content" [ngStyle]="style">
+            <mat-icon *ngIf="icon">{{ icon }}</mat-icon>
+          </div>
+          <div class="dbx-mapbox-marker-label" *ngIf="label">{{ label }}</div>
+        </div>
+      </dbx-anchor>
+    </mgl-marker>
+  `, isInline: true, styles: [".dbx-mapbox-marker{display:flex;align-items:center;flex-direction:column;font-weight:700}.dbx-mapbox-marker .dbx-mapbox-marker-content{display:flex;align-items:center;justify-content:center}.dbx-mapbox-marker .dbx-mapbox-marker-content mat-icon{width:100%;height:100%;font-size:inherit}\n"], dependencies: [{ kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$1.NgStyle, selector: "[ngStyle]", inputs: ["ngStyle"] }, { kind: "component", type: i5.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "component", type: i3$1.DbxAnchorComponent, selector: "dbx-anchor, [dbx-anchor]", inputs: ["block"] }, { kind: "component", type: i1.MarkerComponent, selector: "mgl-marker", inputs: ["offset", "anchor", "clickTolerance", "feature", "lngLat", "draggable", "popupShown", "className", "pitchAlignment", "rotationAlignment"], outputs: ["markerDragStart", "markerDragEnd", "markerDrag", "dragStart", "dragEnd", "drag"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxMarkerComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'dbx-mapbox-marker', template: `
+    <mgl-marker *ngIf="marker" [lngLat]="latLng">
+      <dbx-anchor [anchor]="anchor">
+        <div class="dbx-mapbox-marker">
+          <div class="dbx-mapbox-marker-content" [ngStyle]="style">
+            <mat-icon *ngIf="icon">{{ icon }}</mat-icon>
+          </div>
+          <div class="dbx-mapbox-marker-label" *ngIf="label">{{ label }}</div>
+        </div>
+      </dbx-anchor>
+    </mgl-marker>
+  `, changeDetection: ChangeDetectionStrategy.OnPush, styles: [".dbx-mapbox-marker{display:flex;align-items:center;flex-direction:column;font-weight:700}.dbx-mapbox-marker .dbx-mapbox-marker-content{display:flex;align-items:center;justify-content:center}.dbx-mapbox-marker .dbx-mapbox-marker-content mat-icon{width:100%;height:100%;font-size:inherit}\n"] }]
+        }], ctorParameters: function () { return []; }, propDecorators: { marker: [{
+                type: Input
+            }] } });
+
 const declarations = [
     //
     DbxMapboxMapDirective,
     DbxMapboxLayoutComponent,
     DbxMapboxLayoutDrawerComponent,
     DbxMapboxMenuComponent,
+    DbxMapboxMarkerComponent,
     DbxMapboxMapStoreInjectionBlockDirective
 ];
 class DbxMapboxModule {
@@ -766,6 +889,7 @@ DbxMapboxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version
         DbxMapboxLayoutComponent,
         DbxMapboxLayoutDrawerComponent,
         DbxMapboxMenuComponent,
+        DbxMapboxMarkerComponent,
         DbxMapboxMapStoreInjectionBlockDirective], imports: [
         //
         CommonModule,
@@ -773,12 +897,15 @@ DbxMapboxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version
         DbxInjectionComponentModule,
         MatButtonModule,
         MatIconModule,
-        AngularResizeEventModule], exports: [
+        AngularResizeEventModule,
+        DbxRouterAnchorModule,
+        NgxMapboxGLModule], exports: [
         //
         DbxMapboxMapDirective,
         DbxMapboxLayoutComponent,
         DbxMapboxLayoutDrawerComponent,
         DbxMapboxMenuComponent,
+        DbxMapboxMarkerComponent,
         DbxMapboxMapStoreInjectionBlockDirective] });
 DbxMapboxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxModule, imports: [
         //
@@ -787,7 +914,9 @@ DbxMapboxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version
         DbxInjectionComponentModule,
         MatButtonModule,
         MatIconModule,
-        AngularResizeEventModule] });
+        AngularResizeEventModule,
+        DbxRouterAnchorModule,
+        NgxMapboxGLModule] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImport: i0, type: DbxMapboxModule, decorators: [{
             type: NgModule,
             args: [{
@@ -798,7 +927,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.2", ngImpor
                         DbxInjectionComponentModule,
                         MatButtonModule,
                         MatIconModule,
-                        AngularResizeEventModule
+                        AngularResizeEventModule,
+                        DbxRouterAnchorModule,
+                        NgxMapboxGLModule
                     ],
                     declarations,
                     exports: declarations
@@ -826,5 +957,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, DbxMapboxMenuComponent, DbxMapboxModule, DbxMapboxService, KNOWN_MAPBOX_STYLES, MAPBOX_MAX_ZOOM_LEVEL, MAPBOX_MIN_ZOOM_LEVEL, 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, DbxMapboxMenuComponent, DbxMapboxModule, DbxMapboxService, KNOWN_MAPBOX_STYLES, MAPBOX_MAX_ZOOM_LEVEL, MAPBOX_MIN_ZOOM_LEVEL, mapboxZoomLevel, provideMapboxStoreIfParentIsUnavailable };
 //# sourceMappingURL=dereekb-dbx-web-mapbox.mjs.map