@cognite/reveal 4.29.3 → 4.29.4

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

@@ -32,5 +32,6 @@ export { Image360ProviderCombiner } from './src/Image360ProviderCombiner';
 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 { getExternalIdFromDescriptor } from './src/utilities/getExternalIdFromDescriptor';
 export { DataSourceType, ClassicDataSourceType, DMDataSourceType, ClassicModelIdentifierType, DMModelIdentifierType, isClassicIdentifier, isDMIdentifier, InternalDataSourceType, LocalDataSourceType, LocalModelIdentifierType, isLocalIdentifier, GenericDataSourceType } from './src/DataSourceType';
 export { LocalAddModelOptions, CommonModelOptions, InternalAddModelOptions, AddModelOptionsWithModelRevisionId } from './src/utilities/internalAddModelOptions';

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

@@ -15,6 +15,7 @@ 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'][]>;
+    resolveFileIdToExternalIdMapping(annotations: T['image360AnnotationType'][], descriptors: Image360FileDescriptor[]): Promise<Map<number, string>>;
     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[]>;

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

@@ -1,23 +1,47 @@
 /*!
  * Copyright 2022 Cognite AS
  */
-import { CogniteClient } from '@cognite/sdk';
-import { Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, InstanceReference } from '../types';
+import { AnnotationModel, CogniteClient } from '@cognite/sdk';
+import { Image360AnnotationFilterDelegate, Image360AnnotationProvider, Image360AnnotationSpecifier, Image360FileDescriptor, InstanceReference } from '../types';
 import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
 import { AssetAnnotationImage360Info, AssetHybridAnnotationImage360Info, DefaultImage360Collection, Image360AnnotationAssetQueryResult } from '../../../360-images';
 export declare class Cdf360ImageAnnotationProvider implements Image360AnnotationProvider<ClassicDataSourceType> {
     private readonly _client;
     private readonly _collectionToInstanceReferenceToAnnotationMap;
+    private readonly _collectionAnnotationsCache;
+    private readonly _collectionFileIdMapCache;
     constructor(client: CogniteClient);
     findImageAnnotationsForInstance(asset: InstanceReference<DataSourceType>, collection: DefaultImage360Collection<ClassicDataSourceType>): Promise<Image360AnnotationAssetQueryResult<ClassicDataSourceType>[]>;
     private fetchImageAnnotationsForInstance;
+    /**
+     * Gets all annotations for a collection
+     */
+    private getAllAnnotationsForCollection;
+    /**
+     * Gets the fileId to entity/revision mapping
+     */
+    private getFileIdToEntityRevisionMap;
     private cacheResult;
     getRelevant360ImageAnnotations(annotationSpecifier: Image360AnnotationSpecifier<ClassicDataSourceType>): Promise<ClassicDataSourceType['image360AnnotationType'][]>;
+    /**
+     * Fetches file info for the given IDs and returns a map of fileId -> externalId.
+     */
+    private fetchFileIdToExternalIdMapping;
+    /**
+     * Resolves the mapping from internal file IDs to external IDs.
+     * This is needed to match annotations (which have annotatedResourceId) to descriptors (which may have externalId).
+     */
+    resolveFileIdToExternalIdMapping(annotations: AnnotationModel[], descriptors: Image360FileDescriptor[]): Promise<Map<number, string>>;
     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;
+    /**
+     * Builds a mapping from annotatedResourceId (internal file ID) to entity/revision.
+     * For legacy descriptors with fileId, uses the fileId directly.
+     * For new descriptors with externalId, resolves the mapping via one batched API call.
+     */
+    private buildFileIdToEntityRevisionMap;
     private fetchAllAnnotations;
     private listFileAnnotations;
 }

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

@@ -32,6 +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'][]>;
+    /**
+     * Resolves the mapping from internal file IDs (annotatedResourceId) to external IDs.
+     * This is needed to match annotations to face descriptors when descriptors use externalId.
+     * Optional - if not implemented, the caller should build mapping from descriptors only.
+     */
+    resolveFileIdToExternalIdMapping?(annotations: T['image360AnnotationType'][], descriptors: Image360FileDescriptor[]): Promise<Map<number, string>>;
     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[]>;

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

@@ -0,0 +1,9 @@
+/*!
+ * Copyright 2025 Cognite AS
+ */
+import { Image360FileDescriptor } from '../types';
+/**
+ * Gets the externalId from a file descriptor, if available.
+ * Works with both direct externalId and instanceId.externalId.
+ */
+export declare function getExternalIdFromDescriptor(desc: Image360FileDescriptor): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.29.3",
+  "version": "4.29.4",
   "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": {