@smarterplan/ngx-smarterplan-locations 0.4.19 → 0.4.21

package/lib/components/detail-location/detail-location.component.d.ts

@@ -43,6 +43,10 @@ export declare class DetailLocationComponent implements OnInit, OnDestroy {
     selectedTarget3dModel: string | null;
     sourceVisits: Visit[];
     visits: Visit[];
+    /** The capture a visitor opens by default, of any viewer type. Null means none chosen. */
+    defaultCaptureID: string | null;
+    savingDefaultCapture: boolean;
+    defaultCaptureError: string | null;
     landmarkSourceA: Vec3 | null;
     landmarkTargetA: Vec3 | null;
     landmarkSourceB: Vec3 | null;
@@ -69,6 +73,15 @@ export declare class DetailLocationComponent implements OnInit, OnDestroy {
     onCancel(): void;
     onErase(): Promise<void>;
     onGetDpeData(): Promise<void>;
+    /**
+     * Stores which capture a visitor opens by default.
+     *
+     * One field on the space, not a flag per capture, so the two admin screens cannot disagree:
+     * setting it from either one writes the same place, and there is nothing to clear elsewhere.
+     */
+    onDefaultCaptureChange(): Promise<void>;
+    /** Label for a visit in the default picker, naming the viewer it opens in. */
+    visitLabel(visit: Visit): string;
     /** Toggles visibility of the admin "copy POIs from another location" form. */
     toggleCopyPoisForm(): void;
     onSourceLandmarkPicked(slot: 'A' | 'B', point: Vec3): void;

package/lib/components/locations/locations.component.d.ts

@@ -41,6 +41,16 @@ export declare class LocationsComponent implements OnInit {
     onAddLocation(): void;
     handleImageInput(files: FileList): void;
     onFormChange(event: any): void;
+    /**
+     * The visits shown under a location.
+     *
+     * Everyone gets the first one, which is the location's main entry point. Managers also get the
+     * rest, so a site carrying both a Matterport tour and one or more 3D models can be opened in
+     * either without going through the admin screens.
+     */
+    visitsToShow(loc: Space): Visit[];
+    /** True when this visit opens in the Three.js viewer rather than Matterport. */
+    isThreeJsVisit(visit: Visit): boolean;
     onVisitClick(loc: Space, visit: Visit): Promise<void>;
     applyResultsSearchBar(results: Space[]): void;
     getSearchType(): SearchObjectType;

package/lib/components/locations/map/map.component.d.ts

@@ -7,9 +7,9 @@ export declare class MapComponent implements OnChanges, AfterViewInit {
     spaces: Space[];
     popupContainer: ViewContainerRef;
     options: {
-        layers: import("leaflet").TileLayer[];
+        layers: any[];
         zoom: number;
-        center: import("leaflet").LatLng;
+        center: any;
     };
     layers: any[];
     map: any;

package/lib/components/models3d/models3d.component.d.ts

@@ -0,0 +1,84 @@
+import { OnInit } from '@angular/core';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Visit, MenuItem, ThreeJsImportService, CaptureService, NodeService, SpaceService, VisitService, Space, ValidatorsService } from '@smarterplan/ngx-smarterplan-core';
+import { TranslateService } from '@ngx-translate/core';
+import { Subject } from 'rxjs';
+import * as i0 from "@angular/core";
+/**
+ * Admin screen for the 3D models a site can be visited with.
+ *
+ * These are stored the same way Matterport visits are - a Capture plus a Node - with the viewer set
+ * to THREEJS and the .glb's S3 key in the node's model3D. Sharing the storage is what lets a site
+ * carry several models and what makes tags follow the same POI records in either viewer; the split
+ * here is only in the form: a 3D model is a name and a file, where a Matterport visit is a model ID
+ * and capture details. Placement and alignment are not asked for here - the viewer's alignment tool
+ * writes them into the capture's metadata once someone calibrates against a real scene.
+ */
+export declare class Models3dComponent implements OnInit {
+    private fb;
+    private route;
+    private router;
+    private modalService;
+    private spaceService;
+    private visitService;
+    private captureService;
+    private nodeService;
+    private threejsImportService;
+    validatorsService: ValidatorsService;
+    private translate;
+    content: any;
+    menuItems: MenuItem[];
+    currentSpace: Space;
+    spaceId: string;
+    /** Only the visits captured as 3D models; Matterport ones stay on the Virtual Visits screen. */
+    models: Visit[];
+    modelForm: UntypedFormGroup;
+    modelIndexDetails: number;
+    isEditing: boolean;
+    isProcessing: boolean;
+    submitted: boolean;
+    errorMessage: string | null;
+    modalReference: any;
+    destroy$: Subject<unknown>;
+    constructor(fb: UntypedFormBuilder, route: ActivatedRoute, router: Router, modalService: NgbModal, spaceService: SpaceService, visitService: VisitService, captureService: CaptureService, nodeService: NodeService, threejsImportService: ThreeJsImportService, validatorsService: ValidatorsService, translate: TranslateService);
+    ngOnInit(): Promise<void>;
+    ngOnDestroy(): void;
+    reload(): Promise<void>;
+    setupMenuItems(): void;
+    onGoBack(): void;
+    onToggleDetail(index: number): void;
+    onAdd(): void;
+    onEdit(model: Visit): void;
+    onCancel(): void;
+    initForm(input?: Visit): void;
+    /** Upload progress as a percentage, or null when nothing is uploading. */
+    uploadPercent: number | null;
+    uploadedFileName: string | null;
+    /**
+     * Uploads the chosen .glb and puts the resulting key on the form.
+     *
+     * Storage.put authenticates with the signed-in user's session rather than separate S3
+     * credentials, so anyone who can reach this screen can upload - which is what makes picking a
+     * file a better ask than typing a key someone else had to produce.
+     */
+    onFileSelected(event: Event): Promise<void>;
+    /** Validation error for the .glb key, or null. */
+    get modelKeyError(): string | null;
+    onSubmit(): Promise<void>;
+    /** Creates the capture, its node, and the zone/plan/navigation the viewer needs. */
+    private createModel;
+    onDelete(model: Visit): Promise<void>;
+    /**
+     * Turns whatever was thrown into something readable.
+     *
+     * AppSync rejections arrive as { errors: [{ message }] } with no `message` of their own, so the
+     * obvious `error.message ?? String(error)` renders them as "[object Object]" - which hides
+     * exactly the cases worth reading, like the backend refusing an enum value it does not know.
+     */
+    private describeError;
+    getDismissReason(reason: any): string;
+    static ɵfac: i0.ɵɵFactoryDeclaration<Models3dComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<Models3dComponent, "lib-models3d", never, {}, {}, never, never, false, never>;
+}

package/lib/components/visits/visits.component.d.ts

@@ -2,13 +2,14 @@ import { OnInit } from '@angular/core';
 import { UntypedFormGroup, UntypedFormBuilder, AbstractControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Visit, MenuItem, MatterportImportService, CaptureService, NodeService, SpaceService, VisitService, ValidatorsService, NavigatorService } from '@smarterplan/ngx-smarterplan-core';
+import { Visit, MenuItem, MatterportImportService, ThreeJsImportService, CaptureService, NodeService, SpaceService, VisitService, CaptureViewer, ValidatorsService, NavigatorService } from '@smarterplan/ngx-smarterplan-core';
 import { TranslateService } from '@ngx-translate/core';
 import { Subject } from 'rxjs';
 import * as i0 from "@angular/core";
 export declare class VisitsComponent implements OnInit {
     private fb;
     private matterportImportService;
+    private threejsImportService;
     private captureService;
     private nodeService;
     private spaceService;
@@ -38,13 +39,17 @@ export declare class VisitsComponent implements OnInit {
     errorForm: boolean;
     isProcessing: boolean;
     destroy$: Subject<unknown>;
-    constructor(fb: UntypedFormBuilder, matterportImportService: MatterportImportService, captureService: CaptureService, nodeService: NodeService, spaceService: SpaceService, route: ActivatedRoute, modalService: NgbModal, visitService: VisitService, validatorsService: ValidatorsService, translate: TranslateService, navigatorService: NavigatorService, router: Router);
+    constructor(fb: UntypedFormBuilder, matterportImportService: MatterportImportService, threejsImportService: ThreeJsImportService, captureService: CaptureService, nodeService: NodeService, spaceService: SpaceService, route: ActivatedRoute, modalService: NgbModal, visitService: VisitService, validatorsService: ValidatorsService, translate: TranslateService, navigatorService: NavigatorService, router: Router);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     setupMenuItems(): void;
     onGoBack(): void;
     resetVisits(): Promise<void>;
     initVisitForm(input?: Visit): void;
+    /** True while the form is set to create a Three.js visit, which asks for different fields. */
+    get isThreeJsVisit(): boolean;
+    /** Validation error for the 3D model field, or null. Only meaningful for Three.js visits. */
+    get modelKeyError(): string | null;
     onToggleDetail(index: any): Promise<void>;
     onAddVisit(): void;
     onEdit(visit: any): void;
@@ -54,7 +59,7 @@ export declare class VisitsComponent implements OnInit {
     onCancel(): void;
     onDelete(visit: Visit, needPermission?: boolean): Promise<void>;
     private getDismissReason;
-    launchImport(model3D: any, surface: any, node: any, imagesOnly?: boolean, overrideExisting?: boolean): Promise<void>;
+    launchImport(model3D: any, surface: any, node: any, viewerType: CaptureViewer, imagesOnly?: boolean, overrideExisting?: boolean, placementMetadata?: string): Promise<void>;
     private cancelImport;
     onImportImages(visit: Visit, overrideExisting: any): void;
     isFormError(control: any): boolean;

package/lib/components/zones/add-zone/sweep-plan-selection/sweep-plan-selection.component.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="projects/ngx-smarterplan-locations/node_modules/panzoom" />
 import { EventEmitter, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Navigation, NavigationService, Plan, Zone, ZoneService, PlanService } from '@smarterplan/ngx-smarterplan-core';

package/lib/ngx-smarterplan-locations.module.d.ts

@@ -5,33 +5,34 @@ import * as i3 from "./components/landmark-picker/landmark-picker.component";
 import * as i4 from "./components/plans/calibration/calibration.component";
 import * as i5 from "./components/plans/plans.component";
 import * as i6 from "./components/visits/visits.component";
-import * as i7 from "./components/zones/zones.component";
-import * as i8 from "./components/images/images.component";
-import * as i9 from "./components/plans/edit-plan/edit-plan.component";
-import * as i10 from "./components/tab-navigation/tab-navigation.component";
-import * as i11 from "./components/locations/map/map.component";
-import * as i12 from "./components/locations/map/map-popup/map-popup.component";
-import * as i13 from "./components/form-location/form-location.component";
-import * as i14 from "./components/chevron/chevron.component";
-import * as i15 from "./components/zones/add-zone/add-zone.component";
-import * as i16 from "./components/zones/add-zone/selection/selection.component";
-import * as i17 from "./components/carousel/carousel.component";
-import * as i18 from "./components/zones/add-zone/sweep-plan-selection/sweep-plan-selection.component";
-import * as i19 from "./components/zones/add-audio-zone/add-audio-zone.component";
-import * as i20 from "./radio-button/radio-button.component";
-import * as i21 from "./components/plan-legend/plan-legend.component";
-import * as i22 from "./pipes/count-audio-sweeps.pipe";
-import * as i23 from "ng2-pdf-viewer";
-import * as i24 from "@angular/cdk/clipboard";
-import * as i25 from "@ng-bootstrap/ng-bootstrap";
-import * as i26 from "@angular/common";
-import * as i27 from "@ngx-translate/core";
-import * as i28 from "@asymmetrik/ngx-leaflet";
-import * as i29 from "@angular/forms";
-import * as i30 from "@smarterplan/ngx-smarterplan-core";
-import * as i31 from "./ngx-smarterplan-location-routing.module";
+import * as i7 from "./components/models3d/models3d.component";
+import * as i8 from "./components/zones/zones.component";
+import * as i9 from "./components/images/images.component";
+import * as i10 from "./components/plans/edit-plan/edit-plan.component";
+import * as i11 from "./components/tab-navigation/tab-navigation.component";
+import * as i12 from "./components/locations/map/map.component";
+import * as i13 from "./components/locations/map/map-popup/map-popup.component";
+import * as i14 from "./components/form-location/form-location.component";
+import * as i15 from "./components/chevron/chevron.component";
+import * as i16 from "./components/zones/add-zone/add-zone.component";
+import * as i17 from "./components/zones/add-zone/selection/selection.component";
+import * as i18 from "./components/carousel/carousel.component";
+import * as i19 from "./components/zones/add-zone/sweep-plan-selection/sweep-plan-selection.component";
+import * as i20 from "./components/zones/add-audio-zone/add-audio-zone.component";
+import * as i21 from "./radio-button/radio-button.component";
+import * as i22 from "./components/plan-legend/plan-legend.component";
+import * as i23 from "./pipes/count-audio-sweeps.pipe";
+import * as i24 from "ng2-pdf-viewer";
+import * as i25 from "@angular/cdk/clipboard";
+import * as i26 from "@ng-bootstrap/ng-bootstrap";
+import * as i27 from "@angular/common";
+import * as i28 from "@ngx-translate/core";
+import * as i29 from "@asymmetrik/ngx-leaflet";
+import * as i30 from "@angular/forms";
+import * as i31 from "@smarterplan/ngx-smarterplan-core";
+import * as i32 from "./ngx-smarterplan-location-routing.module";
 export declare class NgxSmarterplanLocationsModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<NgxSmarterplanLocationsModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<NgxSmarterplanLocationsModule, [typeof i1.LocationsComponent, typeof i2.DetailLocationComponent, typeof i3.LandmarkPickerComponent, typeof i4.CalibrationComponent, typeof i5.PlansComponent, typeof i6.VisitsComponent, typeof i7.ZonesComponent, typeof i8.ImagesComponent, typeof i9.EditPlanComponent, typeof i10.TabNavigationComponent, typeof i11.MapComponent, typeof i12.MapPopupComponent, typeof i13.FormLocationComponent, typeof i14.ChevronComponent, typeof i15.AddZoneComponent, typeof i16.SelectionComponent, typeof i17.CarouselComponent, typeof i18.SweepPlanSelectionComponent, typeof i19.AddAudioZoneComponent, typeof i20.RadioButtonComponent, typeof i21.PlanLegendComponent, typeof i22.CountAudioSweepsPipe], [typeof i23.PdfViewerModule, typeof i24.ClipboardModule, typeof i25.NgbModule, typeof i25.NgbAlertModule, typeof i26.CommonModule, typeof i27.TranslateModule, typeof i28.LeafletModule, typeof i29.FormsModule, typeof i29.ReactiveFormsModule, typeof i30.NgxSmarterplanCoreModule, typeof i31.LocationsRoutingModule], [typeof i11.MapComponent, typeof i10.TabNavigationComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<NgxSmarterplanLocationsModule, [typeof i1.LocationsComponent, typeof i2.DetailLocationComponent, typeof i3.LandmarkPickerComponent, typeof i4.CalibrationComponent, typeof i5.PlansComponent, typeof i6.VisitsComponent, typeof i7.Models3dComponent, typeof i8.ZonesComponent, typeof i9.ImagesComponent, typeof i10.EditPlanComponent, typeof i11.TabNavigationComponent, typeof i12.MapComponent, typeof i13.MapPopupComponent, typeof i14.FormLocationComponent, typeof i15.ChevronComponent, typeof i16.AddZoneComponent, typeof i17.SelectionComponent, typeof i18.CarouselComponent, typeof i19.SweepPlanSelectionComponent, typeof i20.AddAudioZoneComponent, typeof i21.RadioButtonComponent, typeof i22.PlanLegendComponent, typeof i23.CountAudioSweepsPipe], [typeof i24.PdfViewerModule, typeof i25.ClipboardModule, typeof i26.NgbModule, typeof i26.NgbAlertModule, typeof i27.CommonModule, typeof i28.TranslateModule, typeof i29.LeafletModule, typeof i30.FormsModule, typeof i30.ReactiveFormsModule, typeof i31.NgxSmarterplanCoreModule, typeof i32.LocationsRoutingModule], [typeof i12.MapComponent, typeof i11.TabNavigationComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<NgxSmarterplanLocationsModule>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smarterplan/ngx-smarterplan-locations",
-  "version": "0.4.19",
+  "version": "0.4.21",
   "dependencies": {
     "tslib": "^2.4.0"
   },
@@ -11,7 +11,7 @@
     "@asymmetrik/ngx-leaflet": "^17.0.0",
     "@ng-bootstrap/ng-bootstrap": "^16.0.0",
     "@ngx-translate/core": "^17.0.0",
-    "@smarterplan/ngx-smarterplan-core": "^1.4.15",
+    "@smarterplan/ngx-smarterplan-core": "^1.4.17",
     "leaflet": "^1.9.4",
     "ng2-pdf-viewer": "^10.0.0",
     "panzoom": "^9.4.1"