@cognite/reveal 4.22.0-dev.20250117 → 4.22.0-dev.20250121

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

@@ -7,7 +7,7 @@ import { Image360Entity } from '../entity/Image360Entity';
 import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 import { IconCollection, IconCullingScheme } from '../icons/IconCollection';
 import { Image360AnnotationAppearance } from '../annotation/types';
-import { DataSourceType, Image360FileDescriptor, Image360Provider } from '../../../data-providers';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType, Image360FileDescriptor, Image360Provider } from '../../../data-providers';
 import { Image360AnnotationFilter } from '../annotation/Image360AnnotationFilter';
 import { Matrix4 } from 'three';
 import { InstanceReference } from '../../../data-providers/src/types';
@@ -95,6 +95,8 @@ export declare class DefaultImage360Collection<T extends DataSourceType> impleme
     setDefaultAnnotationStyle(defaultStyle: Image360AnnotationAppearance): void;
     findImageAnnotations(filter: Image360AnnotationAssetFilter<T>): Promise<Image360AnnotationAssetQueryResult<T>[]>;
     getAssetIds(): Promise<InstanceReference<T>[]>;
-    getAnnotationsInfo(): Promise<AssetAnnotationImage360Info<T>[]>;
+    getAnnotationsInfo(source: 'assets'): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAnnotationsInfo(source: 'cdm'): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    getAnnotationsInfo(source: 'all'): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
     getAllFileDescriptors(): Image360FileDescriptor[];
 }

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

@@ -7,9 +7,9 @@ import { Image360AnnotationAppearance } from '../annotation/types';
 import { Image360Revision } from '../entity/Image360Revision';
 import { IdEither } from '@cognite/sdk';
 import { Image360Annotation } from '../annotation/Image360Annotation';
-import { ClassicDataSourceType, DataSourceType } from '../../../data-providers';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../../../data-providers';
 import { Matrix4 } from 'three';
-import { ImageAssetLinkAnnotationInfo, InstanceReference } from '../../../data-providers/src/types';
+import { ImageAssetLinkAnnotationInfo, InstanceReference } from '../../../data-providers';
 /**
  * Annotation type that may be linked to assets. Only relevant for classic annotations, where some
  * annotation types are visible in Reveal, but not linkable to assets
@@ -171,10 +171,22 @@ export interface Image360Collection<T extends DataSourceType = ClassicDataSource
      */
     getAssetIds(): Promise<IdEither[]>;
     /**
-     * Get IDs of all CDF assets and related image/revision associated with this
-     * 360 image collection through CDF annotations
+     * Fetches annotations from all available sources
+     */
+    getAnnotationsInfo(source: 'all'): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
+    /**
+     * Fetches annotations from the CDF Annotation APIs, which are linked to CDF assets
+     */
+    getAnnotationsInfo(source: 'assets'): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    /**
+     * Fetches annotations from the CDF Core Data Model
+     */
+    getAnnotationsInfo(source: 'cdm'): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    /**
+     * Get info of assets and annotations associated with this
+     * 360 image collection through various sources
      *
-     * @param source What source data to pull the annotation info from
+     * @param source What source data to pull the annotation info from. Must be `'asset'`, `'cdm'` or `'all'`
      */
-    getAnnotationsInfo(source: 'assets'): Promise<AssetAnnotationImage360Info<T>[]>;
+    getAnnotationsInfo(source: 'assets' | 'cdm' | 'all'): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[] | AssetAnnotationImage360Info<DMDataSourceType> | AssetAnnotationImage360Info<DataSourceType>[]>;
 }

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

@@ -2,7 +2,7 @@
  * Copyright 2025 Cognite AS
  */
 import { Image360Provider } from './Image360Provider';
-import { DataSourceType } from './DataSourceType';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from './DataSourceType';
 import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, Image360DescriptorProvider, Image360Face, Image360FileDescriptor, Image360FileProvider, InstanceReference } from './types';
 import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../360-images';
 export declare class Image360ProviderCombiner<T extends DataSourceType> implements Image360Provider<T> {
@@ -15,5 +15,7 @@ export declare class Image360ProviderCombiner<T extends DataSourceType> implemen
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<T>): Promise<T['image360AnnotationType'][]>;
     findImageAnnotationsForInstance(instanceFilter: InstanceReference<T>, collection: DefaultImage360Collection<T>): Promise<Image360AnnotationAssetQueryResult<T>[]>;
-    getAllImage360AnnotationInfos(collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<T>[]>;
+    getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'cdm', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'all', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
 }

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

@@ -3,7 +3,7 @@
  */
 import { CogniteClient } from '@cognite/sdk';
 import { Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, InstanceReference } from '../types';
-import { ClassicDataSourceType } from '../DataSourceType';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
 import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
 export declare class Cdf360ImageAnnotationProvider implements Image360AnnotationProvider<ClassicDataSourceType> {
     private readonly _client;
@@ -11,7 +11,9 @@ export declare class Cdf360ImageAnnotationProvider implements Image360Annotation
     findImageAnnotationsForInstance(asset: InstanceReference<ClassicDataSourceType>, collection: DefaultImage360Collection<ClassicDataSourceType>): Promise<Image360AnnotationAssetQueryResult<ClassicDataSourceType>[]>;
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<ClassicDataSourceType>): Promise<ClassicDataSourceType['image360AnnotationType'][]>;
     private getFilesByAssetRef;
-    getAllImage360AnnotationInfos(collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'cdm', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'all', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
     private createFileIdToEntityRevisionMap;
     private fetchAllAnnotations;
     private listFileAnnotations;

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

@@ -1,7 +1,7 @@
 /*!
  * Copyright 2025 Cognite AS
  */
-import { DMDataSourceType } from '../DataSourceType';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
 import { Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, InstanceReference } from '../types';
 import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
 import { CogniteClient } from '@cognite/sdk/dist/src';
@@ -10,5 +10,7 @@ export declare class CoreDm360ImageAnnotationProvider implements Image360Annotat
     constructor(client: CogniteClient);
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<DMDataSourceType>): Promise<DMDataSourceType['image360AnnotationType'][]>;
     findImageAnnotationsForInstance(instanceFilter: InstanceReference<DMDataSourceType>, collection: DefaultImage360Collection<DMDataSourceType>): Promise<Image360AnnotationAssetQueryResult<DMDataSourceType>[]>;
-    getAllImage360AnnotationInfos(collection: DefaultImage360Collection<DMDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<DMDataSourceType>): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<DMDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<DMDataSourceType>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'cdm', collection: DefaultImage360Collection<DMDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<DMDataSourceType>): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'all', collection: DefaultImage360Collection<DMDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<DMDataSourceType>): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
 }

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

@@ -1,7 +1,7 @@
 import { Image360Provider } from '../Image360Provider';
 import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360AnnotationSpecifier, Image360Face, Image360FileDescriptor, InstanceReference } from '../types';
 import { CogniteInternalId, IdEither } from '@cognite/sdk';
-import { ClassicDataSourceType } from '../DataSourceType';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
 import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
 export declare class Local360ImageProvider implements Image360Provider<ClassicDataSourceType> {
     private readonly _modelUrl;
@@ -12,5 +12,7 @@ export declare class Local360ImageProvider implements Image360Provider<ClassicDa
     get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getFilesByAssetRef(_assetId: IdEither): Promise<CogniteInternalId[]>;
-    getAllImage360AnnotationInfos(_collection: DefaultImage360Collection<ClassicDataSourceType>, _annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info[]>;
+    getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'cdm', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'all', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
 }

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

@@ -32,7 +32,10 @@ export type InstanceReference<T extends DataSourceType> = T extends ClassicDataS
 export interface Image360AnnotationProvider<T extends DataSourceType> {
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<T>): Promise<T['image360AnnotationType'][]>;
     findImageAnnotationsForInstance(instanceFilter: InstanceReference<T>, collection: DefaultImage360Collection<T>): Promise<Image360AnnotationAssetQueryResult<T>[]>;
-    getAllImage360AnnotationInfos(collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<T>[]>;
+    getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'cdm', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'all', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'assets' | 'cdm' | 'all', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[] | AssetAnnotationImage360Info<DMDataSourceType>[] | AssetAnnotationImage360Info<DataSourceType>[]>;
 }
 export interface Image360DescriptorProvider<T extends DataSourceType> {
     get360ImageDescriptors(metadataFilter: T['image360Identifier'], preMultipliedRotation: boolean): Promise<Historical360ImageSet<T>[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.22.0-dev.20250117",
+  "version": "4.22.0-dev.20250121",
   "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": {