@smarterplan/ngx-smarterplan-core 1.4.16 → 1.4.18

package/lib/services/viewer.service.d.ts

@@ -4,9 +4,11 @@ import { ThreeJsService } from './threejs.service';
 import { BaseTagService } from './tag.service';
 import { DbObjectType, POI, PoiType, Comment, Equipment, Ticket, Feature, SpModule } from '../types.service';
 import { PoiService } from './models/poi.service';
+import { Config } from '../config';
 import * as i0 from "@angular/core";
 export declare class ViewerService {
     private readonly sdkKey;
+    private readonly config;
     private poiService;
     private matterportService;
     private threeJsService;
@@ -25,6 +27,14 @@ export declare class ViewerService {
     dataIsLoaded: Subject<boolean>;
     isLoaded: boolean;
     showingViewer: boolean;
+    /**
+     * The space being viewed, whichever viewer is showing it.
+     *
+     * MatterportService carries its own copy, set while its SDK connects - which never happens in
+     * Three.js mode. Anything that reads only that one silently does nothing for a 3D model, and the
+     * lists that feed tags are exactly that.
+     */
+    currentSpaceID: string | null;
     sweepToMove: string | null;
     rotationToMove: {
         x: number;
@@ -52,7 +62,7 @@ export declare class ViewerService {
         };
     };
     private isObjectLoaded;
-    constructor(sdkKey: string, poiService: PoiService, matterportService: MatterportService, threeJsService: ThreeJsService);
+    constructor(sdkKey: string, config: Config, poiService: PoiService, matterportService: MatterportService, threeJsService: ThreeJsService);
     checkMode(indexMode: string): boolean;
     setMode(indexMode: string): void;
     setTourUrl(options: {
@@ -92,6 +102,16 @@ export declare class ViewerService {
      * of the pipeline that already drives Matterport.
      */
     private addThreeJsTagFromPOI;
+    /**
+     * The image to draw a tag with, mirroring what Matterport shows for the same POI.
+     *
+     * Matterport registers one texture per type (`icon-ticket`, `icon-equipment`...) from the same
+     * config entries used here, and overrides it with the POI's own icon when it has one. Reading the
+     * same two sources is what keeps a tag looking like itself across the two viewers.
+     */
+    private resolveTagIconUrl;
+    /** The configured icon for a POI type, or null when that type has none. */
+    private defaultTagIconUrl;
     /** Moves the Three.js camera to frame a tag, mirroring Matterport's goToTag. */
     goToThreeJsTag(elementId: string): void;
     /** Shows only tags of the given POI types; null clears the filter. */
@@ -124,6 +144,11 @@ export declare class ViewerService {
     get threeJsModelLoadCancelled$(): Subject<void>;
     /** Stops the Three.js model download in progress. */
     cancelThreeJsModelLoad(): void;
+    /** Emits a tag's label while the pointer is over it in the Three.js scene. */
+    get threeJsTagHovered$(): Subject<{
+        label: string;
+        event: MouseEvent;
+    }>;
     /** Emits the element id of a tag clicked in the Three.js scene. */
     get threeJsTagClicked$(): Subject<import("./threejs.service").ThreeJsTagClick>;
     /**
@@ -161,8 +186,21 @@ export declare class ViewerService {
      * a tag created here show up in the right place there - and the other way round.
      */
     private commitThreeJsTagPlacement;
+    /**
+     * Creates the POI for an element just placed in the Three.js scene.
+     *
+     * The Matterport path reaches the same result through its tag dictionary - the tag exists first
+     * and carries the coordinates. Three.js has no such object, so the placement captured at click
+     * time is the only record of where the user pointed, and it has to become a POI here or it is
+     * lost when the form closes.
+     *
+     * Returns null when there is no pending placement, which is the normal case in Matterport mode.
+     */
+    createPoiForThreeJsPlacement(element: DbObjectType, poiType: PoiType): Promise<POI | null>;
     /** Emits when a tag is dropped on the model in the Three.js scene. */
     get threeJsTagPlaced$(): Subject<import("./threejs.service").ThreeJsTagPlacement>;
+    /** Emits when the calibration walkthrough is abandoned, including via Escape. */
+    get threeJsAlignmentCancelled$(): Subject<void>;
     /** Leaves Three.js tag placement mode without placing anything. */
     cancelThreeJsTagPlacement(): void;
     editOnlyTagStyleForPoi(poi: POI, object: DbObjectType): void;

package/lib/services/zoneChange.service.d.ts

@@ -8,6 +8,15 @@ import * as i0 from "@angular/core";
 export declare class ZoneChangeService {
     zoneChange: Subject<Zone | null>;
     zonesForUserChange: Subject<Zone[] | null>;
+    /**
+     * Emits the space opened by a viewer that has no zone navigation (Three.js), or null when it
+     * closes.
+     *
+     * Zones are defined by the sweeps they contain, so they only mean something in a Matterport tour.
+     * A 3D model has no sweeps: it shows the whole space at once, and the services that load data
+     * listen here instead of to `zoneChange` to know which space they are looking at.
+     */
+    spaceWithoutZones: Subject<string | null>;
     private currentZone;
     private currentZones;
     floorHasChanged: EventEmitter<Zone>;

package/lib/types.service.d.ts

@@ -570,6 +570,14 @@ export type Space = {
     status?: SpaceStatus | null;
     guestLink?: string | null;
     signedImageUrl?: string | null;
+    /**
+     * The capture a visitor opens by default, of any viewer type.
+     *
+     * Kept on the space rather than as a flag on each capture: there is one field, so there can only
+     * be one answer, whichever screen set it. A flag per capture would let two of them claim the
+     * default and put the choice back where it started - undefined.
+     */
+    defaultCaptureID?: string | null;
     zones?: {
         __typename?: 'ModelZoneConnection';
         items?: Array<Zone | null> | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smarterplan/ngx-smarterplan-core",
-  "version": "1.4.16",
+  "version": "1.4.18",
   "dependencies": {
     "tslib": "^2.5.0"
   },

package/src/assets/vs-app.json

@@ -1,67 +1,67 @@
-{
-  "version": "1.0",
-  "payload": {
-    "objects": [
-      {
-        "name": "slot_camera",
-        "position": {
-          "x": 2.8,
-          "y": 2.4,
-          "z": 10.71
-        },
-        "rotation": {
-          "x": 0,
-          "y": -22,
-          "z": 0
-        },
-        "scale": {
-          "x": 1,
-          "y": 1,
-          "z": 1
-        },
-        "components": [
-          {
-            "type": "mp.gltfLoader",
-            "inputs": {
-              "url": "https://static.matterport.com/showcase-sdk/examples/assets-1.0-2-g6b74572/assets/models/camera-1/scene.gltf",
-              "localScale": { "x": 0.0008, "y": 0.0008, "z": 0.0008 },
-              "localRotation": { "x": 0, "y": 90, "z": 0 }
-            },
-            "events": {
-              "INTERACTION.CLICK": false,
-              "INTERACTION.HOVER": false,
-              "INTERACTION.DRAG": false
-            }
-          },
-          {
-            "type": "mp.securityCamera",
-            "inputs": {
-              "nearPlane": 0.1,
-              "farPlane": 10,
-              "horizontalFOV": 52,
-              "aspect": 1.7777777777777777,
-              "localPosition": {
-                "x": 0,
-                "y": 0.18,
-                "z": -0.3
-              },
-              "localRotation": {
-                "x": -15,
-                "y": 0,
-                "z": 0
-              },
-              "color": 65280,
-              "panPeriod": 5,
-              "panAngle": -45
-            },
-            "events": {
-              "INTERACTION.CLICK": false,
-              "INTERACTION.HOVER": false,
-              "INTERACTION.DRAG": false
-            }
-          }
-        ]
-      }
-    ]
-  }
-}
+{
+  "version": "1.0",
+  "payload": {
+    "objects": [
+      {
+        "name": "slot_camera",
+        "position": {
+          "x": 2.8,
+          "y": 2.4,
+          "z": 10.71
+        },
+        "rotation": {
+          "x": 0,
+          "y": -22,
+          "z": 0
+        },
+        "scale": {
+          "x": 1,
+          "y": 1,
+          "z": 1
+        },
+        "components": [
+          {
+            "type": "mp.gltfLoader",
+            "inputs": {
+              "url": "https://static.matterport.com/showcase-sdk/examples/assets-1.0-2-g6b74572/assets/models/camera-1/scene.gltf",
+              "localScale": { "x": 0.0008, "y": 0.0008, "z": 0.0008 },
+              "localRotation": { "x": 0, "y": 90, "z": 0 }
+            },
+            "events": {
+              "INTERACTION.CLICK": false,
+              "INTERACTION.HOVER": false,
+              "INTERACTION.DRAG": false
+            }
+          },
+          {
+            "type": "mp.securityCamera",
+            "inputs": {
+              "nearPlane": 0.1,
+              "farPlane": 10,
+              "horizontalFOV": 52,
+              "aspect": 1.7777777777777777,
+              "localPosition": {
+                "x": 0,
+                "y": 0.18,
+                "z": -0.3
+              },
+              "localRotation": {
+                "x": -15,
+                "y": 0,
+                "z": 0
+              },
+              "color": 65280,
+              "panPeriod": 5,
+              "panAngle": -45
+            },
+            "events": {
+              "INTERACTION.CLICK": false,
+              "INTERACTION.HOVER": false,
+              "INTERACTION.DRAG": false
+            }
+          }
+        ]
+      }
+    ]
+  }
+}