@cognite/reveal 4.27.1-dev.20251105 → 4.28.0-dev.20251106

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

@@ -3,14 +3,14 @@
  */
 export { Image360, Image360IconStyle } from './src/entity/Image360';
 export { Image360Revision } from './src/entity/Image360Revision';
-export { Image360Collection, Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult, InstanceLinkable360ImageAnnotationType, AssetAnnotationImage360Info } from './src/collection/Image360Collection';
+export { Image360Collection, Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult, InstanceLinkable360ImageAnnotationType, AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info } from './src/collection/Image360Collection';
 export { Image360Facade } from './src/Image360Facade';
 export { Image360CollectionFactory } from './src/collection/Image360CollectionFactory';
 export { Image360Entity } from './src/entity/Image360Entity';
 export { Image360RevisionEntity } from './src/entity/Image360RevisionEntity';
 export { Image360Visualization } from './src/entity/Image360Visualization';
 export { Image360EnteredDelegate, Image360ExitedDelegate } from './src/types';
-export { Image360AnnotationAppearance, Image360AnnotationFilterOptions } from './src/annotation/types';
+export { Image360AnnotationAppearance, Image360AnnotationFilterOptions, Image360AnnotationInstanceReference } from './src/annotation/types';
 export { Image360AnnotationIntersection } from './src/annotation/Image360AnnotationIntersection';
 export { Image360Annotation } from './src/annotation/Image360Annotation';
 export { DefaultImage360Collection } from './src/collection/DefaultImage360Collection';

package/dist/packages/360-images/src/annotation/ImageAnnotationObject.d.ts

@@ -19,6 +19,7 @@ export declare class ImageAnnotationObject<T extends DataSourceType> implements
     private static createObjectData;
     private static createObjectDetectionAnnotationGeometry;
     private static createAssetLinkAnnotationData;
+    private static createInstanceLinkAnnotationData;
     private static createFdmAnnotationData;
     private constructor();
     private getRotationFromFace;

package/dist/packages/360-images/src/annotation/getInstanceId.d.ts

@@ -3,4 +3,4 @@
  */
 import { DataSourceType } from '../../../data-providers';
 import { InstanceReference } from '../../../data-providers/src/types';
-export declare function getInstanceIdFromAnnotation<T extends DataSourceType>(annotation: T['image360AnnotationType']): InstanceReference<T> | undefined;
+export declare function getClassicInstanceRef<T extends DataSourceType>(annotation: T['image360AnnotationType']): InstanceReference<T> | undefined;

package/dist/packages/360-images/src/annotation/typeGuards.d.ts

@@ -1,8 +1,11 @@
 /*!
  * Copyright 2025 Cognite AS
  */
-import { AnnotationData, AnnotationsObjectDetection, AnnotationsTypesImagesAssetLink, AnnotationType } from '@cognite/sdk';
-import { DataSourceType, DMDataSourceType } from '../../../data-providers';
+import { AnnotationData, AnnotationModel, AnnotationsObjectDetection, AnnotationsTypesImagesAssetLink, AnnotationsTypesImagesInstanceLink, AnnotationType } from '@cognite/sdk';
+import { DataSourceType, DMDataSourceType, ImageAssetLinkAnnotationInfo, ImageInstanceLinkAnnotationInfo } from '../../../data-providers';
 export declare function isCoreDmImage360Annotation(annotation: DataSourceType['image360AnnotationType']): annotation is DMDataSourceType['image360AnnotationType'];
 export declare function isAnnotationsObjectDetection(annotationType: AnnotationType, annotation: AnnotationData): annotation is AnnotationsObjectDetection;
-export declare function isAnnotationAssetLink(annotationType: AnnotationType, annotation: AnnotationData): annotation is AnnotationsTypesImagesAssetLink;
+export declare function isImageAssetLinkAnnotation(annotation: AnnotationModel): annotation is ImageAssetLinkAnnotationInfo;
+export declare function isAssetLinkAnnotationData(annotationData: AnnotationData): annotationData is AnnotationsTypesImagesAssetLink;
+export declare function isImageInstanceLinkAnnotation(annotation: AnnotationModel): annotation is ImageInstanceLinkAnnotationInfo;
+export declare function isAnnotationsTypesImagesInstanceLink(annotationData: AnnotationData): annotationData is AnnotationsTypesImagesInstanceLink;

package/dist/packages/360-images/src/annotation/types.d.ts

@@ -2,6 +2,7 @@
  * Copyright 2023 Cognite AS
  */
 import { AnnotationStatus } from '@cognite/sdk';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType, InstanceReference } from '../../../data-providers';
 import { Color } from 'three';
 /**
  * The appearance of a 360 image annotation
@@ -26,3 +27,7 @@ export type Image360AnnotationFilterOptions = {
      */
     status?: 'all' | AnnotationStatus | AnnotationStatus[];
 };
+/**
+ * Instance reference type for image 360 annotations
+ */
+export type Image360AnnotationInstanceReference<T extends DataSourceType> = T extends ClassicDataSourceType ? InstanceReference<ClassicDataSourceType | DMDataSourceType> : InstanceReference<DMDataSourceType>;

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

@@ -2,7 +2,7 @@
  * Copyright 2023 Cognite AS
  */
 import { EventTrigger } from '../../../utilities';
-import { AssetAnnotationImage360Info, Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult, Image360Collection } from './Image360Collection';
+import { AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info, Image360AnnotationAssetFilter, Image360AnnotationAssetQueryResult, Image360Collection } from './Image360Collection';
 import { Image360Entity } from '../entity/Image360Entity';
 import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
 import { IconCollection, IconCullingScheme } from '../icons/IconCollection';
@@ -98,5 +98,6 @@ export declare class DefaultImage360Collection<T extends DataSourceType> impleme
     getAnnotationsInfo(source: 'assets'): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
     getAnnotationsInfo(source: 'cdm'): Promise<AssetAnnotationImage360Info<DMDataSourceType>[]>;
     getAnnotationsInfo(source: 'all'): Promise<AssetAnnotationImage360Info<DataSourceType>[]>;
+    getAnnotationsInfo(source: 'hybrid'): Promise<AssetHybridAnnotationImage360Info[]>;
     getAllFileDescriptors(): Image360FileDescriptor[];
 }

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

@@ -3,13 +3,13 @@
  */
 import { Image360 } from './../entity/Image360';
 import { Image360EnteredDelegate, Image360ExitedDelegate } from '../types';
-import { Image360AnnotationAppearance } from '../annotation/types';
+import { Image360AnnotationAppearance, Image360AnnotationInstanceReference } from '../annotation/types';
 import { Image360Revision } from '../entity/Image360Revision';
 import { IdEither } from '@cognite/sdk';
 import { Image360Annotation } from '../annotation/Image360Annotation';
-import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../../../data-providers';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType, ImageInstanceLinkAnnotationInfo } from '../../../data-providers';
 import { Matrix4 } from 'three';
-import { ImageAssetLinkAnnotationInfo, InstanceReference } from '../../../data-providers';
+import { ImageAssetLinkAnnotationInfo } 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
@@ -22,7 +22,7 @@ export type Image360AnnotationAssetFilter<T extends DataSourceType = ClassicData
     /**
      * Reference to the wanted asset
      */
-    assetRef: InstanceReference<T>;
+    assetRef: Image360AnnotationInstanceReference<T>;
 };
 /**
  * Asset search return type, including information about the image in which the asset is found
@@ -41,6 +41,23 @@ export type AssetAnnotationImage360Info<T extends DataSourceType = ClassicDataSo
      */
     imageRevision: Image360Revision<T>;
 };
+/**
+ * Asset search return type, including information about the image in which the asset is found
+ */
+export type AssetHybridAnnotationImage360Info = {
+    /**
+     * Reference to the relevant asset
+     */
+    annotationInfo: ImageAssetLinkAnnotationInfo | ImageInstanceLinkAnnotationInfo;
+    /**
+     * The image entity in which the asset was found
+     */
+    imageEntity: Image360<ClassicDataSourceType>;
+    /**
+     * The image revision in which the asset was found
+     */
+    imageRevision: Image360Revision<ClassicDataSourceType>;
+};
 /**
  * Result item from an asset annotation query
  */
@@ -178,6 +195,10 @@ export interface Image360Collection<T extends DataSourceType = ClassicDataSource
      * 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: 'hybrid'): Promise<AssetHybridAnnotationImage360Info[]>;
     /**
      * Fetches annotations from the CDF Core Data Model
      */
@@ -188,5 +209,5 @@ export interface Image360Collection<T extends DataSourceType = ClassicDataSource
      *
      * @param source What source data to pull the annotation info from. Must be `'asset'`, `'cdm'` or `'all'`
      */
-    getAnnotationsInfo(source: 'assets' | 'cdm' | 'all'): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[] | AssetAnnotationImage360Info<DMDataSourceType> | AssetAnnotationImage360Info<DataSourceType>[]>;
+    getAnnotationsInfo(source: 'assets' | 'hybrid' | 'cdm' | 'all'): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[] | AssetAnnotationImage360Info<DMDataSourceType> | AssetAnnotationImage360Info<DataSourceType>[] | AssetHybridAnnotationImage360Info[]>;
 }

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

@@ -10,7 +10,7 @@ export { CoreDm360ImageAnnotationProvider } from './src/image-360-data-providers
 export { Cdf360CdmDescriptorProvider } from './src/image-360-data-providers/descriptor-providers/datamodels/cdm/Cdf360CdmDescriptorProvider';
 export { Cdf360ImageFileProvider } from './src/image-360-data-providers/Cdf360ImageFileProvider';
 export { Cdf360DataModelsDescriptorProvider, Image360DataModelIdentifier, Image360CoreDataModelIdentifier, Image360LegacyDataModelIdentifier, Image360BaseIdentifier } from './src/image-360-data-providers/descriptor-providers/datamodels/system-space/Cdf360DataModelsDescriptorProvider';
-export { isClassic360Identifier, isCoreDmImage360Identifier, isLegacyDM360Identifier, isFdm360ImageCollectionIdentifier, isImageAssetLinkAnnotation, isClassicMetadata360Identifier } from './src/image-360-data-providers/shared';
+export { isClassic360Identifier, isCoreDmImage360Identifier, isLegacyDM360Identifier, isFdm360ImageCollectionIdentifier, isClassicMetadata360Identifier } from './src/image-360-data-providers/shared';
 export { CoreDmImage360Annotation } from './src/image-360-data-providers/cdm/types';
 export { LocalModelDataProvider } from './src/model-data-providers/LocalModelDataProvider';
 export { LocalModelIdentifier } from './src/model-identifiers/LocalModelIdentifier';
@@ -28,7 +28,7 @@ export { CdfPointCloudDMStylableObjectProvider } from './src/pointcloud-stylable
 export { DummyPointCloudDMStylableObjectProvider } from './src/pointcloud-stylable-object-providers/pointcloud-volume-data-providers/DummyPointCloudDMStylableObjectProvider';
 export { Image360Provider, Image360ProviderMap, getImage360ProviderFromMap } from './src/Image360Provider';
 export { Image360ProviderCombiner } from './src/Image360ProviderCombiner';
-export { BinaryFileProvider, JsonFileProvider, File3dFormat, BlobOutputMetadata, Image360Descriptor, Image360FileProvider, Image360Face, Image360Texture, Image360FileDescriptor, ImageAssetLinkAnnotationInfo, InstanceReference, Image360Id, Image360RevisionId } from './src/types';
+export { BinaryFileProvider, JsonFileProvider, File3dFormat, BlobOutputMetadata, Image360Descriptor, Image360FileProvider, Image360Face, Image360Texture, Image360FileDescriptor, ImageAssetLinkAnnotationInfo, ImageInstanceLinkAnnotationInfo, InstanceReference, Image360Id, Image360RevisionId } from './src/types';
 export { fetchDMModelIdFromRevisionId } from './src/requests/fetchDMModelIdFromRevisionId';
 export { isDMPointCloudVolumeObject, isClassicPointCloudVolumeObject, isDMPointCloudVolume, isClassicPointCloudVolume } from './src/utilities/utils';
 export { DataSourceType, ClassicDataSourceType, DMDataSourceType, ClassicModelIdentifierType, DMModelIdentifierType, isClassicIdentifier, isDMIdentifier, InternalDataSourceType, LocalDataSourceType, LocalModelIdentifierType, isLocalIdentifier, GenericDataSourceType } from './src/DataSourceType';

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

@@ -3,8 +3,9 @@
  */
 import { Image360Provider } from './Image360Provider';
 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';
+import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, Image360DescriptorProvider, Image360Face, Image360FileDescriptor, Image360FileProvider } from './types';
+import { AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../360-images';
+import { Image360AnnotationInstanceReference } from '../../360-images/src/annotation/types';
 export declare class Image360ProviderCombiner<T extends DataSourceType> implements Image360Provider<T> {
     private readonly _descriptorProvider;
     private readonly _fileProvider;
@@ -14,8 +15,9 @@ export declare class Image360ProviderCombiner<T extends DataSourceType> implemen
     get360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<T>): Promise<T['image360AnnotationType'][]>;
-    findImageAnnotationsForInstance(instanceFilter: InstanceReference<T>, collection: DefaultImage360Collection<T>): Promise<Image360AnnotationAssetQueryResult<T>[]>;
+    findImageAnnotationsForInstance(instanceFilter: Image360AnnotationInstanceReference<T>, collection: DefaultImage360Collection<T>): Promise<Image360AnnotationAssetQueryResult<T>[]>;
     getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'hybrid', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetHybridAnnotationImage360Info[]>;
     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

@@ -4,14 +4,16 @@
 import { CogniteClient } from '@cognite/sdk';
 import { Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, InstanceReference } from '../types';
 import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
-import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
+import { AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
 export declare class Cdf360ImageAnnotationProvider implements Image360AnnotationProvider<ClassicDataSourceType> {
     private readonly _client;
     constructor(client: CogniteClient);
-    findImageAnnotationsForInstance(asset: InstanceReference<ClassicDataSourceType>, collection: DefaultImage360Collection<ClassicDataSourceType>): Promise<Image360AnnotationAssetQueryResult<ClassicDataSourceType>[]>;
+    findImageAnnotationsForInstance(asset: InstanceReference<DataSourceType>, collection: DefaultImage360Collection<ClassicDataSourceType>): Promise<Image360AnnotationAssetQueryResult<ClassicDataSourceType>[]>;
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<ClassicDataSourceType>): Promise<ClassicDataSourceType['image360AnnotationType'][]>;
     private getFilesByAssetRef;
+    private getAnnotationDataByAssetRefType;
     getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'hybrid', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetHybridAnnotationImage360Info[]>;
     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;

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

@@ -3,7 +3,7 @@
  */
 import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
 import { Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, InstanceReference } from '../types';
-import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
+import { AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
 import { CogniteClient } from '@cognite/sdk';
 export declare class CoreDm360ImageAnnotationProvider implements Image360AnnotationProvider<DMDataSourceType> {
     private readonly _client;
@@ -11,6 +11,7 @@ export declare class CoreDm360ImageAnnotationProvider implements Image360Annotat
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<DMDataSourceType>): Promise<DMDataSourceType['image360AnnotationType'][]>;
     findImageAnnotationsForInstance(instanceFilter: InstanceReference<DMDataSourceType>, collection: DefaultImage360Collection<DMDataSourceType>): Promise<Image360AnnotationAssetQueryResult<DMDataSourceType>[]>;
     getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<DMDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<DMDataSourceType>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'hybrid', collection: DefaultImage360Collection<DMDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<DMDataSourceType>): Promise<AssetHybridAnnotationImage360Info[]>;
     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

@@ -2,7 +2,7 @@ import { Image360Provider } from '../Image360Provider';
 import { Historical360ImageSet, Image360AnnotationFilterDelegate, Image360AnnotationSpecifier, Image360Face, Image360FileDescriptor, InstanceReference } from '../types';
 import { CogniteInternalId, IdEither } from '@cognite/sdk';
 import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
-import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
+import { AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
 export declare class Local360ImageProvider implements Image360Provider<ClassicDataSourceType> {
     private readonly _modelUrl;
     constructor(modelUrl: string);
@@ -13,6 +13,7 @@ export declare class Local360ImageProvider implements Image360Provider<ClassicDa
     getLowResolution360ImageFiles(image360FaceDescriptors: Image360FileDescriptor[], abortSignal?: AbortSignal): Promise<Image360Face[]>;
     getFilesByAssetRef(_assetId: IdEither): Promise<CogniteInternalId[]>;
     getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'hybrid', collection: DefaultImage360Collection<ClassicDataSourceType>, annotationFilter: Image360AnnotationFilterDelegate<ClassicDataSourceType>): Promise<AssetHybridAnnotationImage360Info[]>;
     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/image-360-data-providers/shared.d.ts

@@ -1,9 +1,9 @@
 /*!
  * Copyright 2025 Cognite AS
  */
-import { Image360RevisionId, ImageAssetLinkAnnotationInfo } from '../types';
+import { Image360RevisionId } from '../types';
 import { DataSourceType } from '../DataSourceType';
-import { AnnotationModel, Metadata } from '@cognite/sdk';
+import { Metadata } from '@cognite/sdk';
 import { Image360DataModelIdentifier, Image360LegacyDataModelIdentifier } from './descriptor-providers/datamodels/system-space/Cdf360DataModelsDescriptorProvider';
 export declare function isClassicMetadata360Identifier(id: DataSourceType['image360Identifier']): id is Metadata & {
     site_id: string;
@@ -15,4 +15,3 @@ export declare function isLegacyDM360Identifier(id: DataSourceType['image360Iden
 export declare function isCoreDmImage360Identifier(id: DataSourceType['image360Identifier']): id is Image360DataModelIdentifier;
 export declare function isFdm360ImageCollectionIdentifier(id: DataSourceType['image360Identifier']): id is Image360DataModelIdentifier;
 export declare function isSameImage360RevisionId<T extends DataSourceType>(id0: Image360RevisionId<T>, id1: Image360RevisionId<T>): boolean;
-export declare function isImageAssetLinkAnnotation(annotation: AnnotationModel): annotation is ImageAssetLinkAnnotationInfo;

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

@@ -1,11 +1,12 @@
 /*!
  * Copyright 2021 Cognite AS
  */
-import { AnnotationModel, AnnotationsTypesImagesAssetLink, IdEither } from '@cognite/sdk';
+import { AnnotationModel, AnnotationsTypesImagesAssetLink, AnnotationsTypesImagesInstanceLink, IdEither } from '@cognite/sdk';
 import * as THREE from 'three';
 import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from './DataSourceType';
-import { AssetAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../360-images';
+import { AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../360-images';
 import { DMInstanceRef } from '../../utilities';
+import { Image360AnnotationInstanceReference } from '../../360-images/src/annotation/types';
 export type Image360AnnotationFilterDelegate<T extends DataSourceType> = (annotation: T['image360AnnotationType']) => boolean;
 export interface JsonFileProvider {
     getJsonFile(baseUrl: string, fileName: string): Promise<any>;
@@ -31,11 +32,12 @@ export type Image360AnnotationSpecifier<T extends DataSourceType> = {
 export type InstanceReference<T extends DataSourceType> = T extends ClassicDataSourceType ? IdEither : DMInstanceRef;
 export interface Image360AnnotationProvider<T extends DataSourceType> {
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<T>): Promise<T['image360AnnotationType'][]>;
-    findImageAnnotationsForInstance(instanceFilter: InstanceReference<T>, collection: DefaultImage360Collection<T>): Promise<Image360AnnotationAssetQueryResult<T>[]>;
+    findImageAnnotationsForInstance(instanceFilter: Image360AnnotationInstanceReference<T>, collection: DefaultImage360Collection<T>): Promise<Image360AnnotationAssetQueryResult<T>[]>;
     getAllImage360AnnotationInfos(source: 'assets', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[]>;
+    getAllImage360AnnotationInfos(source: 'hybrid', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetHybridAnnotationImage360Info[]>;
     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>[]>;
+    getAllImage360AnnotationInfos(source: 'assets' | 'hybrid' | 'cdm' | 'all', collection: DefaultImage360Collection<T>, annotationFilter: Image360AnnotationFilterDelegate<T>): Promise<AssetAnnotationImage360Info<ClassicDataSourceType>[] | AssetAnnotationImage360Info<DMDataSourceType>[] | AssetAnnotationImage360Info<DataSourceType>[] | AssetHybridAnnotationImage360Info[]>;
 }
 export interface Image360DescriptorProvider<T extends DataSourceType> {
     get360ImageDescriptors(metadataFilter: T['image360Identifier'], preMultipliedRotation: boolean): Promise<Historical360ImageSet<T>[]>;
@@ -53,6 +55,15 @@ export type ImageAssetLinkAnnotationInfo = Omit<AnnotationModel, 'data'> & {
      */
     data: AnnotationsTypesImagesAssetLink;
 };
+/**
+ * A CDF AnnotationModel with a narrower type representing an image instance link
+ */
+export type ImageInstanceLinkAnnotationInfo = Omit<AnnotationModel, 'data'> & {
+    /**
+     * The data associated with the image instance link
+     */
+    data: AnnotationsTypesImagesInstanceLink;
+};
 export type Historical360ImageSet<T extends DataSourceType> = Image360RevisionDescriptor<T> & {
     imageRevisions: Image360Descriptor<T>[];
 };
@@ -136,6 +147,7 @@ export type NodeResultSetExpression = {
         from?: any;
         through?: any;
         chainTo?: any;
+        direction?: 'outwards' | 'inwards';
     };
 };
 export type EdgeResultSetExpression = {

package/dist/packages/data-providers/src/utilities/constants.d.ts

@@ -33,3 +33,16 @@ export declare const COGNITE_360_IMAGE_SOURCE: {
     readonly version: "v1";
     readonly type: "view";
 };
+export declare const COGNITE_360_IMAGE_COLLECTION_SOURCE: {
+    readonly externalId: "Cognite360ImageCollection";
+    readonly space: "cdf_cdm";
+    readonly version: "v1";
+    readonly type: "view";
+};
+export declare const COGNITE_360_IMAGE_STATION_SOURCE: {
+    readonly externalId: "Cognite360ImageStation";
+    readonly space: "cdf_cdm";
+    readonly version: "v1";
+    readonly type: "view";
+};
+export declare const MAX_DMS_QUERY_LIMIT = 10000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.27.1-dev.20251105",
+  "version": "4.28.0-dev.20251106",
   "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": {
@@ -80,7 +80,7 @@
   },
   "devDependencies": {
     "@azure/msal-browser": "^3.13.0",
-    "@cognite/sdk": "^10.0.0",
+    "@cognite/sdk": "^10.1.3",
     "@microsoft/api-extractor": "^7.43.1",
     "@types/dat.gui": "^0.7.13",
     "@types/gl": "^6.0.5",