Skip to content

Commit

Permalink
Merge master into hflatval/show-only-cad-by-default
Browse files Browse the repository at this point in the history
  • Loading branch information
cognite-bulldozer[bot] authored Jul 26, 2024
2 parents 04266a3 + 43a84d2 commit d0a0bf1
Show file tree
Hide file tree
Showing 59 changed files with 1,181 additions and 886 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { Range3 } from '../utilities/geometry/Range3';
import { getBoundingBoxFromPlanes } from '../utilities/geometry/getBoundingBoxFromPlanes';
import { Changes } from '../domainObjectsHelpers/Changes';
import { type CogniteClient } from '@cognite/sdk/dist/src';
import { FdmSDK } from '../../../utilities/FdmSDK';
import { FdmSDK } from '../../../data-providers/FdmSDK';

const DIRECTIONAL_LIGHT_NAME = 'DirectionalLight';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Copyright 2024 Cognite AS
*/
import { type FdmSDK } from '../../../utilities/FdmSDK';
import { type FdmSDK } from '../../../data-providers/FdmSDK';
import { type ObservationFdmNode, type ObservationProperties } from './models';

import { type Observation } from './types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VisualDomainObject } from '../../base/domainObjects/VisualDomainObject'
import { type ThreeView } from '../../base/views/ThreeView';
import { ObservationsView } from './ObservationsView';
import { type TranslateKey } from '../../base/utilities/TranslateKey';
import { type FdmSDK } from '../../../utilities/FdmSDK';
import { type FdmSDK } from '../../../data-providers/FdmSDK';
import { Changes } from '../../base/domainObjectsHelpers/Changes';
import { ObservationsCache } from './ObservationsCache';
import { PanelInfo } from '../../base/domainObjectsHelpers/PanelInfo';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
/*!
* Copyright 2024 Cognite AS
*/
import { type DmsUniqueIdentifier, type FdmNode, type Source } from '../../../utilities/FdmSDK';
import {
type DmsUniqueIdentifier,
type FdmNode,
type Source
} from '../../../data-providers/FdmSDK';

export type ObservationProperties = {
// "ID as the node appears in the Source system"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
type DmsUniqueIdentifier,
type FdmSDK,
type InstanceFilter
} from '../../../utilities/FdmSDK';
} from '../../../data-providers/FdmSDK';
import { type ObservationFdmNode, OBSERVATION_SOURCE, type ObservationProperties } from './models';

import { v4 as uuid } from 'uuid';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@cognite/reveal';
import { type ObservationProperties } from './models';
import { type Vector3 } from 'three';
import { type FdmNode } from '../../../utilities/FdmSDK';
import { type FdmNode } from '../../../data-providers/FdmSDK';
import { type DomainObjectIntersection } from '../../base/domainObjectsHelpers/DomainObjectIntersection';
import { type ObservationsDomainObject } from './ObservationsDomainObject';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ export class AssetMappingAndNode3DCache {
if (ids.length === 0) {
return [];
}
const idChunks = chunk(ids, 100);
const idChunks = chunk(ids, 1000);
const initialIndex = 0;
const assetMappings = await this.fetchMappingsInQueue(
initialIndex,
Expand Down
Loading

0 comments on commit d0a0bf1

Please sign in to comment.