@cognite/reveal 4.4.3-dev.20231003 → 4.4.3-dev.20231005

package/dist/packages/360-images/index.d.ts

@@ -1,9 +1,9 @@
 /*!
  * Copyright 2022 Cognite AS
  */
-export { Image360 } from './src/entity/Image360';
+export { Image360, Image360IconStyle } from './src/entity/Image360';
 export { Image360Revision } from './src/entity/Image360Revision';
-export { Image360Collection, Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult } from './src/collection/Image360Collection';
+export { Image360Collection, Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult, AssetAnnotationImage360Info } from './src/collection/Image360Collection';
 export { Image360Facade } from './src/Image360Facade';
 export { Image360CollectionFactory } from './src/collection/Image360CollectionFactory';
 export { Image360Entity } from './src/entity/Image360Entity';

package/dist/packages/360-images/src/collection/DefaultImage360Collection.d.ts

@@ -2,7 +2,7 @@
  * Copyright 2023 Cognite AS
  */
 import { EventTrigger } from '../../../utilities';
-import { Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult, Image360Collection } from './Image360Collection';
+import { AssetAnnotationImage360Info, Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult, Image360Collection } from './Image360Collection';
 import { Image360Entity } from '../entity/Image360Entity';
 import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 import { IconCollection, IconCullingScheme } from '../icons/IconCollection';
@@ -84,4 +84,7 @@ export declare class DefaultImage360Collection implements Image360Collection {
     setDefaultAnnotationStyle(defaultStyle: Image360AnnotationAppearance): void;
     findImageAnnotations(filter: Image360AnnotationAssetFilter): Promise<Image360AnnotationAssetQueryResult[]>;
     getAssetIds(): Promise<IdEither[]>;
+    getAnnotationsInfo(): Promise<AssetAnnotationImage360Info[]>;
+    private getAllFileDescriptors;
+    private createFileIdToEntityRevisionMap;
 }

package/dist/packages/360-images/src/collection/Image360Collection.d.ts

@@ -7,6 +7,7 @@ import { Image360AnnotationAppearance } from '../annotation/types';
 import { Image360Revision } from '../entity/Image360Revision';
 import { IdEither } from '@cognite/sdk';
 import { Image360Annotation } from '../annotation/Image360Annotation';
+import { ImageAssetLinkAnnotationInfo } from '../../../data-providers';
 /**
  * Filter for finding annotations related to an asset
  */
@@ -16,6 +17,23 @@ export type Image360AnnotationAssetFilter = {
      */
     assetRef: IdEither;
 };
+/**
+ * Asset search return type, including information about the image in which the asset is found
+ */
+export type AssetAnnotationImage360Info = {
+    /**
+     * Reference to the relevant asset
+     */
+    annotationInfo: ImageAssetLinkAnnotationInfo;
+    /**
+     * The image entity in which the asset was found
+     */
+    imageEntity: Image360;
+    /**
+     * The image revision in which the asset was found
+     */
+    imageRevision: Image360Revision;
+};
 /**
  * Result item from an asset annotation query
  */
@@ -97,6 +115,15 @@ export interface Image360Collection {
     findImageAnnotations(filter: Image360AnnotationAssetFilter): Promise<Image360AnnotationAssetQueryResult[]>;
     /**
      * Get IDs of all CDF assets associated with this 360 image collection through CDF annotations
+     *
+     * @deprecated Use {@link Image360Collection.getAnnotationsInfo}
      */
     getAssetIds(): Promise<IdEither[]>;
+    /**
+     * Get IDs of all CDF assets and related image/revision associated with this
+     * 360 image collection through CDF annotations
+     *
+     * @param assets What source data to pull the annotation info from
+     */
+    getAnnotationsInfo(source: 'assets'): Promise<AssetAnnotationImage360Info[]>;
 }

package/dist/packages/360-images/src/entity/Image360.d.ts

@@ -3,6 +3,16 @@
  */
 import { Image360Revision } from './Image360Revision';
 import { Image360Visualization } from './Image360Visualization';
+import { Color } from 'three';
+/**
+ * Image360 icon style
+ */
+export type Image360IconStyle = {
+    /**
+     * A color tint to apply to the 360 icon
+     */
+    color?: Color;
+};
 /**
  * A single 360 image "station", which may consist of several revisions
  * captured in approximately the same location
@@ -39,4 +49,14 @@ export interface Image360 {
      * @returns The active revision.
      */
     getActiveRevision(): Image360Revision;
+    /**
+     * Get a copy of the color assigned to the icon of this entity
+     *
+     * @returns The currently assign color, or 'default' if none is assigned
+     */
+    getIconColor(): Color | 'default';
+    /**
+     * Assign a color to the icon of this entity
+     */
+    setIconColor(color: Color | 'default'): void;
 }

package/dist/packages/360-images/src/entity/Image360Entity.d.ts

@@ -10,6 +10,7 @@ import { Image360VisualizationBox } from './Image360VisualizationBox';
 import { ImageAnnotationObject } from '../annotation/ImageAnnotationObject';
 import { Overlay3DIcon } from '../../../3d-overlays';
 import { Image360AnnotationFilter } from '../annotation/Image360AnnotationFilter';
+import { Color } from 'three';
 export declare class Image360Entity implements Image360 {
     private readonly _revisions;
     private readonly _imageMetadata;
@@ -17,6 +18,7 @@ export declare class Image360Entity implements Image360 {
     private readonly _image360Icon;
     private readonly _image360VisualizationBox;
     private _activeRevision;
+    private _iconColor;
     /**
      * Get a copy of the model-to-world transformation matrix
      * of the given 360 image.
@@ -68,6 +70,8 @@ export declare class Image360Entity implements Image360 {
      * Drops the GPU resources for the 360 image
      */
     unloadImage(): void;
+    getIconColor(): Color | 'default';
+    setIconColor(color: Color | 'default'): void;
     activateAnnotations(): void;
     deactivateAnnotations(): void;
     /**

package/dist/packages/3d-overlays/src/Overlay3DIcon.d.ts

@@ -34,6 +34,7 @@ export declare class Overlay3DIcon<ContentType = DefaultOverlay3DContentType> im
     private readonly _hoverSprite?;
     private readonly _content;
     private readonly _raycastBoundingSphere;
+    private readonly _defaultColor;
     private _adaptiveScale;
     private _visible;
     private _culled;
@@ -54,7 +55,7 @@ export declare class Overlay3DIcon<ContentType = DefaultOverlay3DContentType> im
         camera: PerspectiveCamera;
         domElement: HTMLElement;
     }): void;
-    setColor(color: Color): void;
+    setColor(color: Color | 'default'): void;
     getColor(): Color;
     getContent(): ContentType;
     get adaptiveScale(): number;

package/dist/packages/cad-geometry-loaders/src/CadManager.d.ts

@@ -20,6 +20,7 @@ export declare class CadManager {
     private _needsRedraw;
     private readonly _markNeedsRedrawBound;
     private readonly _materialsChangedListener;
+    private readonly _sectorBufferTime;
     get materialManager(): CadMaterialManager;
     get budget(): CadModelBudget;
     set budget(budget: CadModelBudget);

package/dist/packages/cad-geometry-loaders/src/CadModelUpdateHandler.d.ts

@@ -15,6 +15,7 @@ export declare class CadModelUpdateHandler {
     private readonly _modelStateHandler;
     private _budget;
     private _lastSpent;
+    private readonly _determineSectorsHandler;
     private readonly _cameraSubject;
     private readonly _clippingPlaneSubject;
     private readonly _loadingHintsSubject;
@@ -36,6 +37,7 @@ export declare class CadModelUpdateHandler {
     private updatePrioritizedAreas;
     consumedSectorObservable(): Observable<ConsumedSector>;
     getLoadingStateObserver(): Observable<LoadingState>;
+    reportNewSectorsLoaded(loadedCountChange: number): void;
     /**
      * When loading hints of a CAD model changes, propagate the event down to the stream and either add or remove
      * the {@link CadModelMetadata} from the array and push the new array down stream

package/dist/packages/cad-geometry-loaders/src/sector/SectorLoader.d.ts

@@ -16,7 +16,7 @@ import { ModelStateHandler } from './ModelStateHandler';
  */
 export declare class SectorLoader {
     private readonly _modelStateHandler;
-    private readonly _progressCallback;
+    private readonly _progressHelper;
     private readonly _collectStatisticsCallback;
     private readonly _sectorCuller;
     private readonly _continuousModelStreaming;
@@ -24,6 +24,7 @@ export declare class SectorLoader {
     private _batchId;
     constructor(sectorCuller: SectorCuller, modelStateHandler: ModelStateHandler, collectStatisticsCallback: (spent: SectorLoadingSpent) => void, progressCallback: (sectorsLoaded: number, sectorsScheduled: number, sectorsCulled: number) => void, continuousModelStreaming: boolean);
     loadSectors(input: DetermineSectorsPayload): AsyncIterable<ConsumedSector>;
+    reportNewSectorsLoaded(loadedCountChange: number): void;
     private shouldLoad;
     private getSectorCuller;
     private filterSectors;

package/dist/packages/data-providers/index.d.ts

@@ -18,4 +18,4 @@ export { StylableObject, SerializableStylableObject } from './src/pointcloud-sty
 export { CdfPointCloudStylableObjectProvider } from './src/pointcloud-stylable-object-providers/CdfPointCloudStylableObjectProvider';
 export { DummyPointCloudStylableObjectProvider } from './src/pointcloud-stylable-object-providers/DummyPointCloudStylableObjectProvider';
 export { Image360Provider, Image360DataProvider } from './src/Image360Provider';
-export { BinaryFileProvider, JsonFileProvider, File3dFormat, BlobOutputMetadata, Image360Descriptor, Image360FileProvider, Image360Face, Image360Texture, Image360FileDescriptor } from './src/types';
+export { BinaryFileProvider, JsonFileProvider, File3dFormat, BlobOutputMetadata, Image360Descriptor, Image360FileProvider, Image360Face, Image360Texture, Image360FileDescriptor, ImageAssetLinkAnnotationInfo } from './src/types';

package/dist/packages/data-providers/src/image-360-data-providers/Cdf360ImageEventProvider.d.ts

@@ -2,7 +2,7 @@
  * Copyright 2022 Cognite AS
  */
 import { AnnotationModel, CogniteClient, IdEither, Metadata, CogniteInternalId } from '@cognite/sdk';
-import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360Face, Image360FileDescriptor } from '../types';
+import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360Face, Image360FileDescriptor, ImageAssetLinkAnnotationInfo } from '../types';
 import { Image360Provider } from '../Image360Provider';
 export declare class Cdf360ImageEventProvider implements Image360Provider<Metadata> {
     private readonly _client;
@@ -24,6 +24,6 @@ export declare class Cdf360ImageEventProvider implements Image360Provider<Metada
     }[], abortSignal?: AbortSignal): Promise<ArrayBuffer[]>;
     private getDownloadUrls;
     private parseEventMetadata;
-    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[], annotationFilter: Image360AnnotationFilterDelegate): Promise<IdEither[]>;
+    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[], annotationFilter: Image360AnnotationFilterDelegate): Promise<ImageAssetLinkAnnotationInfo[]>;
     private listFileAnnotations;
 }

package/dist/packages/data-providers/src/image-360-data-providers/Local360ImageProvider.d.ts

@@ -1,5 +1,5 @@
 import { Image360Provider } from '../Image360Provider';
-import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360Face, Image360FileDescriptor } from '../types';
+import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360Face, Image360FileDescriptor, ImageAssetLinkAnnotationInfo } from '../types';
 import { AnnotationModel, CogniteInternalId, IdEither } from '@cognite/sdk';
 export declare class Local360ImageProvider implements Image360Provider<unknown> {
     private readonly _modelUrl;
@@ -9,5 +9,5 @@ export declare class Local360ImageProvider implements Image360Provider<unknown>
     get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getFilesByAssetRef(_assetId: IdEither): Promise<CogniteInternalId[]>;
-    get360ImageAssets(_image360FileDescriptors: Image360FileDescriptor[], _annotationFilter: Image360AnnotationFilterDelegate): Promise<IdEither[]>;
+    get360ImageAssets(_image360FileDescriptors: Image360FileDescriptor[], _annotationFilter: Image360AnnotationFilterDelegate): Promise<ImageAssetLinkAnnotationInfo[]>;
 }

package/dist/packages/data-providers/src/types.d.ts

@@ -1,7 +1,7 @@
 /*!
  * Copyright 2021 Cognite AS
  */
-import { AnnotationModel, CogniteInternalId, IdEither } from '@cognite/sdk';
+import { AnnotationModel, AnnotationsCogniteAnnotationTypesImagesAssetLink, CogniteInternalId, IdEither } from '@cognite/sdk';
 import * as THREE from 'three';
 export type Image360AnnotationFilterDelegate = (annotation: AnnotationModel) => boolean;
 export interface JsonFileProvider {
@@ -21,8 +21,17 @@ export interface Image360FileProvider {
     get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
 }
+/**
+ * A CDF AnnotationModel with a narrower type representing an image asset link
+ */
+export type ImageAssetLinkAnnotationInfo = Omit<AnnotationModel, 'data'> & {
+    /**
+     * The data associated with the image asset link
+     */
+    data: AnnotationsCogniteAnnotationTypesImagesAssetLink;
+};
 export interface Image360AssetProvider {
-    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[], annotationFilter: Image360AnnotationFilterDelegate): Promise<IdEither[]>;
+    get360ImageAssets(image360FileDescriptors: Image360FileDescriptor[], annotationFilter: Image360AnnotationFilterDelegate): Promise<ImageAssetLinkAnnotationInfo[]>;
 }
 export type Historical360ImageSet = Image360EventDescriptor & {
     imageRevisions: Image360Descriptor[];

package/dist/packages/utilities/src/indexset/IndexSet.d.ts

@@ -19,7 +19,8 @@ export declare class IndexSet {
     invertedRanges(): NumericRange[];
     unionWith(otherSet: IndexSet): IndexSet;
     differenceWith(otherSet: IndexSet): IndexSet;
-    hasIntersectionWith(otherSet: IndexSet | Map<number, number> | Set<number>): boolean;
+    hasIntersectionWith(otherSet: IndexSet | Set<number>): boolean;
+    hasIntersectionWithMap(otherMap: Map<number, number>): boolean;
     intersectWith(otherSet: IndexSet): IndexSet;
     clear(): void;
     clone(): IndexSet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.4.3-dev.20231003",
+  "version": "4.4.3-dev.20231005",
   "description": "WebGL based 3D viewer for CAD and point clouds processed in Cognite Data Fusion.",
   "homepage": "https://github.com/cognitedata/reveal/tree/master/viewer",
   "repository": {
@@ -79,7 +79,7 @@
   },
   "devDependencies": {
     "@azure/msal-browser": "2.38.2",
-    "@cognite/sdk": "8.2.0",
+    "@cognite/sdk": "8.3.0",
     "@microsoft/api-extractor": "^7.33.6",
     "@types/dat.gui": "0.7.10",
     "@types/gl": "^6.0.2",
@@ -90,7 +90,7 @@
     "@types/jsdom": "21.1.3",
     "@types/lodash": "4.14.199",
     "@types/mixpanel-browser": "2.47.3",
-    "@types/node": "18.17.19",
+    "@types/node": "18.18.1",
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.5",
     "@types/stats": "0.16.30",
@@ -124,7 +124,7 @@
     "nock": "13.3.3",
     "prettier": "3.0.3",
     "process": "0.11.10",
-    "puppeteer": "21.3.4",
+    "puppeteer": "21.3.6",
     "random-seed": "0.3.0",
     "raw-loader": "4.0.2",
     "remove-files-webpack-plugin": "1.5.0",