diff --git a/jest.config.js b/jest.config.js index 44d30e73..c5f6d1f5 100644 --- a/jest.config.js +++ b/jest.config.js @@ -4,8 +4,10 @@ export default { "/src/**/*", ], coveragePathIgnorePatterns: [ - "/src/Mapillary.js", + "/src/api/ents/", "/src/export/", + "/src/component/shaders/", + "/src/Mapillary.js", "interfaces" ], coverageProvider: "v8", diff --git a/spec/Bootstrap.ts b/spec/Bootstrap.ts index c87ebe30..b4dc7cc8 100644 --- a/spec/Bootstrap.ts +++ b/spec/Bootstrap.ts @@ -2,7 +2,7 @@ import { ComponentService } from "../src/component/ComponentService"; import { MarkerSet } from "../src/component/marker/MarkerSet"; import { Graph } from "../src/graph/Graph"; import { TraversingState } from "../src/state/states/TraversingState"; -import { IInterpolator } from "../src/utils/interfaces/IInterpolator"; +import { Interpolator } from "../src/state/interfaces/IInterpolator"; type Item = { lat: number; @@ -39,7 +39,7 @@ class SpatialIndexMock { class CoverMock { public activate(): void { /* noop */ } } -class InterpolatorMock implements IInterpolator { +class InterpolatorMock implements Interpolator { public solve(x: number): number { return x; } } diff --git a/spec/api/APIWrapper.spec.ts b/spec/api/APIWrapper.spec.ts index faebacf0..7a3bb577 100644 --- a/spec/api/APIWrapper.spec.ts +++ b/spec/api/APIWrapper.spec.ts @@ -2,9 +2,9 @@ import { empty as observableEmpty, Observable } from "rxjs"; import { catchError } from "rxjs/operators"; import { APIWrapper } from "../../src/api/APIWrapper"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; -import { ISequence } from "../../src/api/interfaces/ISequence"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; +import { SequenceEnt } from "../../src/api/ents/SequenceEnt"; import { DataProvider } from "../helper/ProviderHelper"; describe("APIWrapperctor", () => { @@ -32,7 +32,7 @@ describe("APIWrapperimageByKeyFill$", () => { api.imageByKeyFill$([key]) .subscribe( - (result: { [key: string]: IFillNode }): void => { + (result: { [key: string]: SpatialImageEnt }): void => { expect(result).toBeDefined(); expect(providerSpy.calls.count()).toBe(1); @@ -91,7 +91,7 @@ describe("APIWrapperimageByKeyFull$", () => { api.imageByKeyFull$([key]) .subscribe( - (result: { [key: string]: IFillNode }): void => { + (result: { [key: string]: SpatialImageEnt }): void => { expect(result).toBeDefined(); expect(providerSpy.calls.count()).toBe(1); @@ -150,7 +150,7 @@ describe("APIWrapperimagesByH$", () => { api.imagesByH$(h) .subscribe( - (result: { [key: string]: { [index: string]: ICoreNode } }): void => { + (result: { [key: string]: { [index: string]: CoreImageEnt } }): void => { expect(result).toBeDefined(); expect(providerSpy.calls.count()).toBe(1); @@ -209,7 +209,7 @@ describe("APIWrappersequenceByKey$", () => { api.sequenceByKey$([skey]) .subscribe( - (result: { [key: string]: ISequence }): void => { + (result: { [key: string]: SequenceEnt }): void => { expect(result).toBeDefined(); expect(providerSpy.calls.count()).toBe(1); diff --git a/spec/api/FalcorDataProvider.spec.ts b/spec/api/FalcorDataProvider.spec.ts index ff818fe0..16cc2f0b 100644 --- a/spec/api/FalcorDataProvider.spec.ts +++ b/spec/api/FalcorDataProvider.spec.ts @@ -1,12 +1,12 @@ import * as pako from "pako"; import * as falcor from "falcor"; import { FalcorDataProvider } from "../../src/api/FalcorDataProvider"; -import { IClusterReconstruction } from "../../src/api/interfaces/IClusterReconstruction"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; -import { ISequence } from "../../src/api/interfaces/ISequence"; +import { ReconstructionEnt } from "../../src/api/ents/ReconstructionEnt"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; import { ModelCreator } from "../../src/api/ModelCreator"; import { MapillaryError } from "../../src/error/MapillaryError"; +import { SequenceEnt } from "../../src/api/ents/SequenceEnt"; describe("FalcorDataProvider.ctor", () => { it("should create a data provider", () => { @@ -41,7 +41,7 @@ describe("FalcorDataProvider.getFillImages", () => { provider.getFillImages([key]) .then( - (result: { [key: string]: IFillNode }): void => { + (result: { [key: string]: SpatialImageEnt }): void => { expect(result).toBeDefined(); expect(modelSpy.calls.count()).toBe(1); @@ -196,7 +196,7 @@ describe("FalcorDataProvider.getFullImages", () => { provider.getFullImages([key]) .then( - (result: { [key: string]: IFillNode }): void => { + (result: { [key: string]: SpatialImageEnt }): void => { expect(result).toBeDefined(); expect(spy.calls.count()).toBe(1); @@ -268,7 +268,7 @@ describe("FalcorDataProvider.getFullImages", () => { provider.getFullImages([key]) .then( - (result: { [key: string]: IFillNode }): void => { return; }, + (result: { [key: string]: SpatialImageEnt }): void => { return; }, (error: Error): void => { expect(invalidateSpy.calls.count()).toBe(1); expect(invalidateSpy.calls.first().args.length).toBe(1); @@ -308,7 +308,7 @@ describe("FalcorDataProvider.getCoreImages", () => { provider.getCoreImages(h) .then( - (result: { [key: string]: { [index: string]: ICoreNode } }): void => { + (result: { [key: string]: { [index: string]: CoreImageEnt } }): void => { expect(result).toBeDefined(); expect(spy.calls.count()).toBe(1); @@ -348,7 +348,7 @@ describe("FalcorDataProvider.getCoreImages", () => { provider.getCoreImages(h) .then( - (result: { [key: string]: { [index: string]: ICoreNode } }): void => { return; }, + (result: { [key: string]: { [index: string]: CoreImageEnt } }): void => { return; }, (error: Error): void => { expect(invalidateSpy.calls.count()).toBe(1); expect(invalidateSpy.calls.first().args.length).toBe(1); @@ -386,7 +386,7 @@ describe("FalcorDataProvider.getCoreImages", () => { provider.getCoreImages(h) .then( - (result: { [key: string]: { [index: string]: ICoreNode } }): void => { + (result: { [key: string]: { [index: string]: CoreImageEnt } }): void => { expect(result).toBeDefined(); expect(result[h]).toBeDefined(); @@ -423,7 +423,7 @@ describe("FalcorDataProvider.getSequences", () => { provider.getSequences([skey]) .then( - (result: { [key: string]: ISequence }): void => { + (result: { [key: string]: SequenceEnt }): void => { expect(result).toBeDefined(); expect(spy.calls.count()).toBe(1); @@ -463,7 +463,7 @@ describe("FalcorDataProvider.getSequences", () => { provider.getSequences([skey]) .then( - (result: { [key: string]: ISequence }): void => { return; }, + (result: { [key: string]: SequenceEnt }): void => { return; }, (error: Error): void => { expect(invalidateSpy.calls.count()).toBe(1); expect(invalidateSpy.calls.first().args.length).toBe(1); @@ -504,7 +504,7 @@ describe("FalcorDataProvider.getSequences", () => { provider.getSequences([skey]) .then( - (result: { [key: string]: ISequence }): void => { + (result: { [key: string]: SequenceEnt }): void => { expect(result).toBeDefined(); expect(result[skey]).toBeDefined(); expect(result[skey].key).toBe(skey); @@ -542,7 +542,7 @@ describe("FalcorDataProvider.getSequences", () => { provider.getSequences([skey]) .then( - (result: { [key: string]: ISequence }): void => { + (result: { [key: string]: SequenceEnt }): void => { expect(result).toBeDefined(); expect(result[skey]).toBeDefined(); expect(result[skey].key).toBe(skey); @@ -579,7 +579,7 @@ describe("FalcorDataProvider.getSequences", () => { provider.getSequences([skey]) .then( - (result: { [key: string]: ISequence }): void => { + (result: { [key: string]: SequenceEnt }): void => { expect(result).toBeDefined(); expect(result[skey]).toBeDefined(); expect(result[skey].key).toBe(skey); @@ -763,11 +763,11 @@ describe("FalcorDataProvider.getClusterReconstruction", () => { provider.getClusterReconstruction("url") .then( - (r: IClusterReconstruction): void => { + (r: ReconstructionEnt): void => { expect(r.points).toEqual({}); - expect(r.reference_lla.altitude).toBe(1); - expect(r.reference_lla.latitude).toBe(2); - expect(r.reference_lla.longitude).toBe(3); + expect(r.reference.alt).toBe(1); + expect(r.reference.lat).toBe(2); + expect(r.reference.lon).toBe(3); done(); }); diff --git a/spec/api/FalcorDataProviderUrls.spec.ts b/spec/api/FalcorDataProviderUrls.spec.ts index ab1e2207..84eada0b 100644 --- a/spec/api/FalcorDataProviderUrls.spec.ts +++ b/spec/api/FalcorDataProviderUrls.spec.ts @@ -1,12 +1,12 @@ import { FalcorDataProviderUrls } from "../../src/api/FalcorDataProvider"; -import { IFalcorDataProviderOptions } from "../../src/api/interfaces/IFalcorDataProviderOptions"; +import { FalcorDataProviderOptions } from "../../src/api/interfaces/FalcorDataProviderOptions"; describe("DataProviderUrls.ctor", () => { it("should set all option properties", () => { - const options: IFalcorDataProviderOptions = { + const options: FalcorDataProviderOptions = { apiHost: "test-api", clientToken: "ct", - clusterReconstructionHost: "test-cluster", + reconstructionHost: "test-cluster", imageHost: "test-image", imageTileHost: "test-image-tile", meshHost: "test-mesh", diff --git a/spec/api/S2GeometryProvider.spec.ts b/spec/api/S2GeometryProvider.spec.ts index 634973b0..2fdb73bb 100644 --- a/spec/api/S2GeometryProvider.spec.ts +++ b/spec/api/S2GeometryProvider.spec.ts @@ -1,6 +1,6 @@ import { S2 } from "s2-geometry"; -import { ICellCorners } from "../../src/api/interfaces/ICellCorners"; -import { ILatLon } from "../../src/api/interfaces/ILatLon"; +import { CellCorners } from "../../src/api/interfaces/CellCorners"; +import { LatLonEnt } from "../../src/api/ents/LatLonEnt"; import { S2GeometryProvider } from "../../src/api/S2GeometryProvider"; import { MapillaryError } from "../../src/error/MapillaryError"; import { GeoCoords } from "../../src/geo/GeoCoords"; @@ -217,7 +217,7 @@ describe("S2GeometryProvider.getCorners", () => { it("should be correctly placed relative to each other", () => { const geometry: S2GeometryProvider = new S2GeometryProvider(); - const latLons: ILatLon[] = [ + const latLons: LatLonEnt[] = [ { lat: 0, lon: 0 }, { lat: 45, lon: 0 }, { lat: 0, lon: 45 }, @@ -232,7 +232,7 @@ describe("S2GeometryProvider.getCorners", () => { for (let latLon of latLons) { const cellId: string = geometry.latLonToCellId(latLon); - const corners: ICellCorners = geometry.getCorners(cellId); + const corners: CellCorners = geometry.getCorners(cellId); expect(corners.se.lat).toBeLessThan(corners.ne.lat); expect(corners.se.lat).toBeLessThan(corners.nw.lat); diff --git a/spec/component/Component.spec.ts b/spec/component/Component.spec.ts index 35fee158..a127d51e 100644 --- a/spec/component/Component.spec.ts +++ b/spec/component/Component.spec.ts @@ -1,16 +1,16 @@ import { skip } from "rxjs/operators"; import { Component } from "../../src/component/Component"; -import { IComponentConfiguration } from "../../src/component/interfaces/IComponentConfiguration"; +import { ComponentConfiguration } from "../../src/component/interfaces/ComponentConfiguration"; -interface ITestConfiguration extends IComponentConfiguration { +interface TestConfiguration extends ComponentConfiguration { test?: string; } -class TestComponent extends Component { +class TestComponent extends Component { protected _activate(): void { /*noop*/ } protected _deactivate(): void { /*noop*/ } - protected _getDefaultConfiguration(): ITestConfiguration { + protected _getDefaultConfiguration(): TestConfiguration { return {}; } } @@ -29,7 +29,7 @@ describe("Component.configuration$", () => { component.configuration$ .subscribe( - (configuration: IComponentConfiguration): void => { + (configuration: ComponentConfiguration): void => { expect(Object.keys(configuration).length).toBe(0); }); }); @@ -40,7 +40,7 @@ describe("Component.configuration$", () => { component.configuration$.pipe( skip(1)) .subscribe( - (configuration: ITestConfiguration): void => { + (configuration: TestConfiguration): void => { expect(Object.keys(configuration).length).toBe(1); expect(configuration.test).toBe("test"); done(); @@ -55,7 +55,7 @@ describe("Component.configuration$", () => { component.configuration$.pipe( skip(2)) .subscribe( - (configuration: ITestConfiguration): void => { + (configuration: TestConfiguration): void => { expect(Object.keys(configuration).length).toBe(1); expect(configuration.test).toBe("testchanged"); done(); diff --git a/spec/component/direction/DirectionDOMRenderer.spec.ts b/spec/component/direction/DirectionDOMRenderer.spec.ts index 403f310a..05de5088 100644 --- a/spec/component/direction/DirectionDOMRenderer.spec.ts +++ b/spec/component/direction/DirectionDOMRenderer.spec.ts @@ -6,15 +6,15 @@ import { NodeHelper } from "../../helper/NodeHelper"; import { Navigator } from "../../../src/viewer/Navigator"; import { Node } from "../../../src/graph/Node"; import { DirectionDOMRenderer } from "../../../src/component/direction/DirectionDOMRenderer"; -import { IDirectionConfiguration } from "../../../src/component/interfaces/IDirectionConfiguration"; +import { DirectionConfiguration } from "../../../src/component/interfaces/DirectionConfiguration"; import { RenderCamera } from "../../../src/render/RenderCamera"; -import { IFrame } from "../../../src/state/interfaces/IFrame"; +import { AnimationFrame } from "../../../src/state/interfaces/AnimationFrame"; import { FrameHelper } from "../../helper/FrameHelper"; import { RenderMode } from "../../../src/render/RenderMode"; describe("DirectionDOMRenderer.ctor", () => { it("should be defined", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -34,7 +34,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should not need render when constructed", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -46,7 +46,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should need render when node is set", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -63,7 +63,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should not need render after rendering", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -88,7 +88,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should not need render when setting render camera without node set", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -105,7 +105,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should not need render when setting configuration without node set", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -120,7 +120,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should not need render when resizing without node set", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -134,7 +134,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should need render when setting changed render camera if node is set", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -158,7 +158,7 @@ describe("DirectionDOMRenderer.needsRender", () => { expect(renderer.needsRender).toBe(false); let renderCamera: RenderCamera = new RenderCamera(1, 1, RenderMode.Fill); - const frame: IFrame = new FrameHelper().createFrame(); + const frame: AnimationFrame = new FrameHelper().createFrame(); frame.state.camera.up.fromArray([0, 0, 1]); frame.state.camera.lookat.fromArray([1, 1, 0]); renderCamera.setFrame(frame); @@ -168,7 +168,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should need render when setting changed configuration if node is set", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, @@ -198,7 +198,7 @@ describe("DirectionDOMRenderer.needsRender", () => { }); it("should need render when resizing if node is set", () => { - let configuration: IDirectionConfiguration = { + let configuration: DirectionConfiguration = { distinguishSequence: false, maxWidth: 200, minWidth: 100, diff --git a/spec/component/keyboard/KeyPlayHandler.spec.ts b/spec/component/keyboard/KeyPlayHandler.spec.ts index 4472a286..c56b74be 100644 --- a/spec/component/keyboard/KeyPlayHandler.spec.ts +++ b/spec/component/keyboard/KeyPlayHandler.spec.ts @@ -9,24 +9,24 @@ import { NodeHelper } from "../../helper/NodeHelper"; import { Navigator } from "../../../src/viewer/Navigator"; import { Node } from "../../../src/graph/Node"; import { Component } from "../../../src/component/Component"; -import { IComponentConfiguration } from "../../../src/component/interfaces/IComponentConfiguration"; +import { ComponentConfiguration } from "../../../src/component/interfaces/ComponentConfiguration"; import { KeyPlayHandler } from "../../../src/component/keyboard/KeyPlayHandler"; -import { IEdgeStatus } from "../../../src/graph/interfaces/IEdgeStatus"; +import { NavigationEdgeStatus } from "../../../src/graph/interfaces/NavigationEdgeStatus"; import { State } from "../../../src/state/State"; import { Container } from "../../../src/viewer/Container"; -import { EdgeDirection } from "../../../src/graph/edge/EdgeDirection"; +import { NavigationDirection } from "../../../src/graph/edge/NavigationDirection"; -interface ITestConfiguration extends IComponentConfiguration { +interface TestConfiguration extends ComponentConfiguration { test: boolean; } -class TestComponent extends Component { +class TestComponent extends Component { constructor(name: string, container: Container, navigator: Navigator) { super(name, container, navigator); } protected _activate(): void { /* noop */ } protected _deactivate(): void { /* noop */ } - protected _getDefaultConfiguration(): ITestConfiguration { return { test: false }; } + protected _getDefaultConfiguration(): TestConfiguration { return { test: false }; } } describe("KeyPlayHandler.ctor", () => { @@ -92,12 +92,12 @@ describe("KeyPlayHandler.enable", () => { it("should not prevent default if modifier key is pressed", () => { (>navigatorMock.playService.playing$).next(true); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); (>navigatorMock.playService.speed$).next(0.5); (>navigatorMock.stateService.state$).next(State.Traversing); const node: Node = nodeHelper.createNode(); - const sequenceEdgesSubject: Subject = new Subject(); + const sequenceEdgesSubject: Subject = new Subject(); new MockCreator().mockProperty(node, "sequenceEdges$", sequenceEdgesSubject); (>navigatorMock.stateService.currentNode$).next(node); sequenceEdgesSubject.next({ cached: false, edges: [] }); @@ -130,12 +130,12 @@ describe("KeyPlayHandler.enable", () => { it("should change speed if `>` or `<` is pressed", () => { (>navigatorMock.playService.playing$).next(true); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); (>navigatorMock.playService.speed$).next(0.5); (>navigatorMock.stateService.state$).next(State.Traversing); const node: Node = nodeHelper.createNode(); - const sequenceEdgesSubject: Subject = new Subject(); + const sequenceEdgesSubject: Subject = new Subject(); new MockCreator().mockProperty(node, "sequenceEdges$", sequenceEdgesSubject); (>navigatorMock.stateService.currentNode$).next(node); sequenceEdgesSubject.next({ cached: false, edges: [] }); @@ -162,12 +162,12 @@ describe("KeyPlayHandler.enable", () => { it("should change direction when not playing", () => { (>navigatorMock.playService.playing$).next(true); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); (>navigatorMock.playService.speed$).next(0.5); (>navigatorMock.stateService.state$).next(State.Traversing); const node: Node = nodeHelper.createNode(); - const sequenceEdgesSubject: Subject = new Subject(); + const sequenceEdgesSubject: Subject = new Subject(); new MockCreator().mockProperty(node, "sequenceEdges$", sequenceEdgesSubject); (>navigatorMock.stateService.currentNode$).next(node); sequenceEdgesSubject.next({ cached: false, edges: [] }); @@ -181,18 +181,18 @@ describe("KeyPlayHandler.enable", () => { expect(setDirectionSpy.calls.count()).toBe(0); (>navigatorMock.playService.playing$).next(false); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); (>containerMock.keyboardService.keyDown$).next(shiftKeyboardEvent); expect(shiftPreventDefaultSpy.calls.count()).toBe(2); expect(setDirectionSpy.calls.count()).toBe(1); - expect(setDirectionSpy.calls.argsFor(0)[0]).toBe(EdgeDirection.Prev); + expect(setDirectionSpy.calls.argsFor(0)[0]).toBe(NavigationDirection.Prev); (>navigatorMock.playService.playing$).next(false); - (>navigatorMock.playService.direction$).next(EdgeDirection.Prev); + (>navigatorMock.playService.direction$).next(NavigationDirection.Prev); (>containerMock.keyboardService.keyDown$).next(shiftKeyboardEvent); expect(shiftPreventDefaultSpy.calls.count()).toBe(3); expect(setDirectionSpy.calls.count()).toBe(2); - expect(setDirectionSpy.calls.argsFor(1)[0]).toBe(EdgeDirection.Next); + expect(setDirectionSpy.calls.argsFor(1)[0]).toBe(NavigationDirection.Next); }); it("should play when stopped edge direction exist and stop when playing", () => { @@ -201,13 +201,13 @@ describe("KeyPlayHandler.enable", () => { (>navigatorMock.stateService.state$).next(State.Traversing); const node: Node = nodeHelper.createNode(); - const sequenceEdgesSubject: Subject = new Subject(); + const sequenceEdgesSubject: Subject = new Subject(); new MockCreator().mockProperty(node, "sequenceEdges$", sequenceEdgesSubject); (>navigatorMock.stateService.currentNode$).next(node); sequenceEdgesSubject.next({ cached: false, edges: [] }); (>navigatorMock.playService.playing$).next(false); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); (>navigatorMock.playService.speed$).next(0.5); const spacebarKeyboardEvent: KeyboardEvent = EventHelper.createKeyboardEvent("keyDown", { key: " " }); @@ -217,13 +217,13 @@ describe("KeyPlayHandler.enable", () => { expect(playSpy.calls.count()).toBe(0); expect(stopSpy.calls.count()).toBe(0); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); sequenceEdgesSubject.next({ cached: true, edges: [{ - data: { direction: EdgeDirection.Next, worldMotionAzimuth: 0 }, - from: node.key, - to: "toKey", + data: { direction: NavigationDirection.Next, worldMotionAzimuth: 0 }, + source: node.key, + target: "toKey", }], }); (>containerMock.keyboardService.keyDown$).next(spacebarKeyboardEvent); @@ -245,13 +245,13 @@ describe("KeyPlayHandler.enable", () => { (>navigatorMock.stateService.state$).next(State.Earth); const node: Node = nodeHelper.createNode(); - const sequenceEdgesSubject: Subject = new Subject(); + const sequenceEdgesSubject: Subject = new Subject(); new MockCreator().mockProperty(node, "sequenceEdges$", sequenceEdgesSubject); (>navigatorMock.stateService.currentNode$).next(node); sequenceEdgesSubject.next({ cached: false, edges: [] }); (>navigatorMock.playService.playing$).next(false); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); (>navigatorMock.playService.speed$).next(0.5); const spacebarKeyboardEvent: KeyboardEvent = EventHelper.createKeyboardEvent("keyDown", { key: " " }); @@ -261,13 +261,13 @@ describe("KeyPlayHandler.enable", () => { expect(playSpy.calls.count()).toBe(0); expect(stopSpy.calls.count()).toBe(0); - (>navigatorMock.playService.direction$).next(EdgeDirection.Next); + (>navigatorMock.playService.direction$).next(NavigationDirection.Next); sequenceEdgesSubject.next({ cached: true, edges: [{ - data: { direction: EdgeDirection.Next, worldMotionAzimuth: 0 }, - from: node.key, - to: "toKey", + data: { direction: NavigationDirection.Next, worldMotionAzimuth: 0 }, + source: node.key, + target: "toKey", }], }); (>containerMock.keyboardService.keyDown$).next(spacebarKeyboardEvent); diff --git a/spec/component/keyboard/KeyZoomHandler.spec.ts b/spec/component/keyboard/KeyZoomHandler.spec.ts index d2568f4c..b67991ce 100644 --- a/spec/component/keyboard/KeyZoomHandler.spec.ts +++ b/spec/component/keyboard/KeyZoomHandler.spec.ts @@ -11,24 +11,24 @@ import { TransformHelper } from "../../helper/TransformHelper"; import { Navigator } from "../../../src/viewer/Navigator"; import { Transform } from "../../../src/geo/Transform"; import { Component } from "../../../src/component/Component"; -import { IComponentConfiguration } from "../../../src/component/interfaces/IComponentConfiguration"; +import { ComponentConfiguration } from "../../../src/component/interfaces/ComponentConfiguration"; import { KeyZoomHandler } from "../../../src/component/keyboard/KeyZoomHandler"; import { ViewportCoords } from "../../../src/geo/ViewportCoords"; import { RenderCamera } from "../../../src/render/RenderCamera"; import { Container } from "../../../src/viewer/Container"; import { RenderMode } from "../../../src/render/RenderMode"; -interface ITestConfiguration extends IComponentConfiguration { +interface TestConfiguration extends ComponentConfiguration { test: boolean; } -class TestComponent extends Component { +class TestComponent extends Component { constructor(name: string, container: Container, navigator: Navigator) { super(name, container, navigator); } protected _activate(): void { /* noop */ } protected _deactivate(): void { /* noop */ } - protected _getDefaultConfiguration(): ITestConfiguration { return { test: false }; } + protected _getDefaultConfiguration(): TestConfiguration { return { test: false }; } } describe("KeyZoomHandler.ctor", () => { diff --git a/spec/component/marker/Marker.spec.ts b/spec/component/marker/Marker.spec.ts index 15b4de94..79772fae 100644 --- a/spec/component/marker/Marker.spec.ts +++ b/spec/component/marker/Marker.spec.ts @@ -1,9 +1,9 @@ import * as THREE from "three"; -import { ILatLon } from "../../../src/api/interfaces/ILatLon"; +import { LatLonEnt } from "../../../src/api/ents/LatLonEnt"; import { Marker } from "../../../src/component/marker/marker/Marker"; class TestMarker extends Marker { - constructor(id: string, latLon: ILatLon) { super(id, latLon); } + constructor(id: string, latLon: LatLonEnt) { super(id, latLon); } protected _createGeometry(position: number[]): void { this._geometry = new THREE.Object3D(); this._geometry.position.fromArray(position); diff --git a/spec/component/marker/MarkerScene.spec.ts b/spec/component/marker/MarkerScene.spec.ts index 4f8c0811..9b2a6a7f 100644 --- a/spec/component/marker/MarkerScene.spec.ts +++ b/spec/component/marker/MarkerScene.spec.ts @@ -1,10 +1,10 @@ import * as THREE from "three"; -import { ILatLon } from "../../../src/api/interfaces/ILatLon"; +import { LatLonEnt } from "../../../src/api/ents/LatLonEnt"; import { Marker } from "../../../src/component/marker/marker/Marker"; import { MarkerScene } from "../../../src/component/marker/MarkerScene"; class TestMarker extends Marker { - constructor(id: string, latLon: ILatLon) { super(id, latLon); } + constructor(id: string, latLon: LatLonEnt) { super(id, latLon); } protected _createGeometry(position: number[]): void { /* noop */ } protected _disposeGeometry(): void { /* noop */ } protected _getInteractiveObjects(): THREE.Object3D[] { return []; } diff --git a/spec/component/marker/MarkerSet.spec.ts b/spec/component/marker/MarkerSet.spec.ts index 21d0f005..9a74a7d2 100644 --- a/spec/component/marker/MarkerSet.spec.ts +++ b/spec/component/marker/MarkerSet.spec.ts @@ -3,12 +3,12 @@ bootstrap(); import { first } from "rxjs/operators"; import { Subscription } from "rxjs"; -import { ILatLon } from "../../../src/api/interfaces/ILatLon"; +import { LatLonEnt } from "../../../src/api/ents/LatLonEnt"; import { Marker } from "../../../src/component/marker/marker/Marker"; import { MarkerSet } from "../../../src/component/marker/MarkerSet"; class TestMarker extends Marker { - constructor(id: string, latLon: ILatLon) { super(id, latLon); } + constructor(id: string, latLon: LatLonEnt) { super(id, latLon); } protected _createGeometry(position: number[]): void { /* noop */ } protected _disposeGeometry(): void { /* noop */ } protected _getInteractiveObjects(): THREE.Object3D[] { return []; } diff --git a/spec/component/mouse/DragPanHandler.spec.ts b/spec/component/mouse/DragPanHandler.spec.ts index 8052d118..94381d5d 100644 --- a/spec/component/mouse/DragPanHandler.spec.ts +++ b/spec/component/mouse/DragPanHandler.spec.ts @@ -17,7 +17,7 @@ import { DragPanHandler } from "../../../src/component/mouse/DragPanHandler"; import { Spatial } from "../../../src/geo/Spatial"; import { ViewportCoords } from "../../../src/geo/ViewportCoords"; import { RenderCamera } from "../../../src/render/RenderCamera"; -import { IFrame } from "../../../src/state/interfaces/IFrame"; +import { AnimationFrame } from "../../../src/state/interfaces/AnimationFrame"; import { Container } from "../../../src/viewer/Container"; import { RenderMode } from "../../../src/render/RenderMode"; @@ -219,8 +219,8 @@ describe("DragPanHandler.enable", () => { testComponent.activate(); handler.enable(); - const frame: IFrame = new FrameHelper().createFrame(); - (>navigatorMock.stateService.currentState$).next(frame); + const frame: AnimationFrame = new FrameHelper().createFrame(); + (>navigatorMock.stateService.currentState$).next(frame); (>navigatorMock.panService.panNodes$).next([]); @@ -257,8 +257,8 @@ describe("DragPanHandler.enable", () => { testComponent.activate(); handler.enable(); - const frame: IFrame = new FrameHelper().createFrame(); - (>navigatorMock.stateService.currentState$).next(frame); + const frame: AnimationFrame = new FrameHelper().createFrame(); + (>navigatorMock.stateService.currentState$).next(frame); (>navigatorMock.panService.panNodes$).next([]); @@ -296,8 +296,8 @@ describe("DragPanHandler.enable", () => { testComponent.activate(); handler.enable(); - const frame: IFrame = new FrameHelper().createFrame(); - (>navigatorMock.stateService.currentState$).next(frame); + const frame: AnimationFrame = new FrameHelper().createFrame(); + (>navigatorMock.stateService.currentState$).next(frame); (>navigatorMock.panService.panNodes$).next([]); @@ -336,8 +336,8 @@ describe("DragPanHandler.enable", () => { testComponent.activate(); handler.enable(); - const frame: IFrame = new FrameHelper().createFrame(); - (>navigatorMock.stateService.currentState$).next(frame); + const frame: AnimationFrame = new FrameHelper().createFrame(); + (>navigatorMock.stateService.currentState$).next(frame); (>navigatorMock.panService.panNodes$).next([]); diff --git a/spec/component/popup/Popup.spec.ts b/spec/component/popup/Popup.spec.ts index da81b33c..217c8c22 100644 --- a/spec/component/popup/Popup.spec.ts +++ b/spec/component/popup/Popup.spec.ts @@ -1,5 +1,5 @@ import { take } from "rxjs/operators"; -import { IPopupOffset } from "../../../src/component/popup/interfaces/IPopupOffset"; +import { PopupOffset } from "../../../src/component/popup/interfaces/PopupOffset"; import { Popup } from "../../../src/component/popup/popup/Popup"; import { ViewportCoords } from "../../../src/geo/ViewportCoords"; import { RenderCamera } from "../../../src/render/RenderCamera"; @@ -519,7 +519,7 @@ describe("Popup.offset", () => { const viewportCoords: ViewportCoords = new ViewportCoords(); spyOn(viewportCoords, "basicToCanvasSafe").and.returnValue([40, 60]); - const offset: IPopupOffset = { + const offset: PopupOffset = { bottom: [0, 1], bottomLeft: [2, 3], bottomRight: [4, 5], @@ -548,7 +548,7 @@ describe("Popup.offset", () => { const viewportCoords: ViewportCoords = new ViewportCoords(); spyOn(viewportCoords, "basicToCanvasSafe").and.returnValue([40, 60]); - const offset: IPopupOffset = { + const offset: PopupOffset = { bottom: [-0, -1], bottomLeft: [-2, -3], bottomRight: [-4, -5], diff --git a/spec/component/popup/PopupComponent.spec.ts b/spec/component/popup/PopupComponent.spec.ts index 4092328c..620a9e4c 100644 --- a/spec/component/popup/PopupComponent.spec.ts +++ b/spec/component/popup/PopupComponent.spec.ts @@ -7,7 +7,7 @@ import { ContainerMockCreator } from "../../helper/ContainerMockCreator"; import { NavigatorMockCreator } from "../../helper/NavigatorMockCreator"; import { Popup } from "../../../src/component/popup/popup/Popup"; import { PopupComponent } from "../../../src/component/popup/PopupComponent"; -import { ISize } from "../../../src/render/interfaces/ISize"; +import { ViewportSize } from "../../../src/render/interfaces/ViewportSize"; import { RenderCamera } from "../../../src/render/RenderCamera"; import { Container } from "../../../src/viewer/Container"; @@ -287,7 +287,7 @@ describe("PopupComponent.updateAdded", () => { popupComponent.activate(); (>containerMock.renderService.renderCamera$).next(null); - (>containerMock.renderService.size$).next(null); + (>containerMock.renderService.size$).next(null); (>navigatorMock.stateService.currentTransform$).next(null); popupComponent.add([popup]); @@ -313,7 +313,7 @@ describe("PopupComponent.updateAdded", () => { popupComponent.activate(); (>containerMock.renderService.renderCamera$).next(null); - (>containerMock.renderService.size$).next(null); + (>containerMock.renderService.size$).next(null); (>navigatorMock.stateService.currentTransform$).next(null); popupComponent.add([popup]); @@ -345,7 +345,7 @@ describe("PopupComponent.updateAll", () => { popupComponent.activate(); (>containerMock.renderService.renderCamera$).next(null); - (>containerMock.renderService.size$).next(null); + (>containerMock.renderService.size$).next(null); (>navigatorMock.stateService.currentTransform$).next(null); expect(updateSpy.calls.count()).toBe(1); @@ -373,7 +373,7 @@ describe("PopupComponent.updateAll", () => { popupComponent.deactivate(); (>containerMock.renderService.renderCamera$).next(null); - (>containerMock.renderService.size$).next(null); + (>containerMock.renderService.size$).next(null); (>navigatorMock.stateService.currentTransform$).next(null); expect(updateSpy.calls.count()).toBe(0); diff --git a/spec/component/sequence/SequenceComponent.spec.ts b/spec/component/sequence/SequenceComponent.spec.ts index 3073c13e..62bd0d96 100644 --- a/spec/component/sequence/SequenceComponent.spec.ts +++ b/spec/component/sequence/SequenceComponent.spec.ts @@ -11,9 +11,9 @@ import { Node } from "../../../src/graph/Node"; import { SequenceComponent } from "../../../src/component/sequence/SequenceComponent"; import { SequenceDOMRenderer } from "../../../src/component/sequence/SequenceDOMRenderer"; import { GraphMode } from "../../../src/graph/GraphMode"; -import { IEdgeStatus } from "../../../src/graph/interfaces/IEdgeStatus"; +import { NavigationEdgeStatus } from "../../../src/graph/interfaces/NavigationEdgeStatus"; import { Sequence } from "../../../src/graph/Sequence"; -import { ISize } from "../../../src/render/interfaces/ISize"; +import { ViewportSize } from "../../../src/render/interfaces/ViewportSize"; import { State } from "../../../src/state/State"; import { Container } from "../../../src/viewer/Container"; @@ -132,7 +132,7 @@ describe("SequenceComponent.activate", () => { const node1: Node = nodeHelper.createNode(); mockCreator.mockProperty(node1, "spatialEdges", { cached: false, edges: [] }); - mockCreator.mockProperty(node1, "sequenceEdges$", new Subject()); + mockCreator.mockProperty(node1, "sequenceEdges$", new Subject()); mockCreator.mockProperty(node1, "key", "nodeKey1"); (>navigatorMock.stateService.currentNode$).next(node1); @@ -141,7 +141,7 @@ describe("SequenceComponent.activate", () => { const node2: Node = nodeHelper.createNode(); mockCreator.mockProperty(node2, "spatialEdges", { cached: false, edges: [] }); - mockCreator.mockProperty(node2, "sequenceEdges$", new Subject()); + mockCreator.mockProperty(node2, "sequenceEdges$", new Subject()); mockCreator.mockProperty(node2, "key", "nodeKey2"); (>navigatorMock.stateService.currentNode$).next(node2); @@ -150,7 +150,7 @@ describe("SequenceComponent.activate", () => { const node3: Node = nodeHelper.createNode(); mockCreator.mockProperty(node3, "spatialEdges", { cached: false, edges: [] }); - mockCreator.mockProperty(node3, "sequenceEdges$", new Subject()); + mockCreator.mockProperty(node3, "sequenceEdges$", new Subject()); mockCreator.mockProperty(node3, "key", "nodeKey2"); (>navigatorMock.stateService.currentNode$).next(node3); @@ -171,7 +171,7 @@ describe("SequenceComponent.activate", () => { const node1: Node = nodeHelper.createNode(); mockCreator.mockProperty(node1, "spatialEdges", { cached: false, edges: [] }); - mockCreator.mockProperty(node1, "sequenceEdges$", new Subject()); + mockCreator.mockProperty(node1, "sequenceEdges$", new Subject()); mockCreator.mockProperty(node1, "key", "nodeKey1"); mockCreator.mockProperty(node1, "sequenceKey", "sequenceKey1"); (>navigatorMock.stateService.currentNode$).next(node1); @@ -181,7 +181,7 @@ describe("SequenceComponent.activate", () => { const node2: Node = nodeHelper.createNode(); mockCreator.mockProperty(node2, "spatialEdges", { cached: false, edges: [] }); - mockCreator.mockProperty(node2, "sequenceEdges$", new Subject()); + mockCreator.mockProperty(node2, "sequenceEdges$", new Subject()); mockCreator.mockProperty(node2, "key", "nodeKey2"); mockCreator.mockProperty(node2, "sequenceKey", "sequenceKey1"); (>navigatorMock.stateService.currentNode$).next(node2); @@ -190,7 +190,7 @@ describe("SequenceComponent.activate", () => { const node3: Node = nodeHelper.createNode(); mockCreator.mockProperty(node3, "spatialEdges", { cached: false, edges: [] }); - mockCreator.mockProperty(node3, "sequenceEdges$", new Subject()); + mockCreator.mockProperty(node3, "sequenceEdges$", new Subject()); mockCreator.mockProperty(node3, "key", "nodeKey3"); mockCreator.mockProperty(node3, "sequenceKey", "sequenceKey2"); (>navigatorMock.stateService.currentNode$).next(node3); @@ -215,7 +215,7 @@ describe("SequenceComponent.activate", () => { const node1: Node = nodeHelper.createNode(); mockCreator.mockProperty(node1, "spatialEdges", { cached: false, edges: [] }); - mockCreator.mockProperty(node1, "sequenceEdges$", new Subject()); + mockCreator.mockProperty(node1, "sequenceEdges$", new Subject()); mockCreator.mockProperty(node1, "key", "nodeKey1"); mockCreator.mockProperty(node1, "sequenceKey", "sequenceKey1"); (>navigatorMock.stateService.currentNode$).next(node1); @@ -270,7 +270,7 @@ describe("SequenceComponent.activate", () => { (>navigatorMock.stateService.state$).next(State.Traversing); (>navigatorMock.playService.speed$).next(1); - (>containerMock.renderService.size$).next({ height: 1, width: 1 }); + (>containerMock.renderService.size$).next({ height: 1, width: 1 }); const node1: Node = nodeHelper.createNode(); mockCreator.mockProperty(node1, "spatialEdges", { cached: false, edges: [] }); @@ -303,7 +303,7 @@ describe("SequenceComponent.activate", () => { (>navigatorMock.stateService.state$).next(State.Traversing); (>navigatorMock.playService.speed$).next(1); - (>containerMock.renderService.size$).next({ height: 1, width: 1 }); + (>containerMock.renderService.size$).next({ height: 1, width: 1 }); const sequenceKey1: string = "sequenceKey1"; const nodeKey1: string = "nodeKey1"; @@ -343,7 +343,7 @@ describe("SequenceComponent.activate", () => { (>navigatorMock.stateService.state$).next(State.Traversing); (>navigatorMock.playService.speed$).next(1); - (>containerMock.renderService.size$).next({ height: 1, width: 1 }); + (>containerMock.renderService.size$).next({ height: 1, width: 1 }); const sequenceKey1: string = "sequenceKey1"; const nodeKey1: string = "nodeKey1"; @@ -397,7 +397,7 @@ describe("SequenceComponent.activate", () => { (>navigatorMock.stateService.state$).next(State.Traversing); (>navigatorMock.playService.speed$).next(1); - (>containerMock.renderService.size$).next({ height: 1, width: 1 }); + (>containerMock.renderService.size$).next({ height: 1, width: 1 }); const sequenceKey1: string = "sequenceKey1"; const sequenceKey2: string = "sequenceKey2"; @@ -463,7 +463,7 @@ describe("SequenceComponent.activate", () => { (>navigatorMock.stateService.state$).next(State.Traversing); (>navigatorMock.playService.speed$).next(1); - (>containerMock.renderService.size$).next({ height: 1, width: 1 }); + (>containerMock.renderService.size$).next({ height: 1, width: 1 }); const sequenceKey1: string = "sequenceKey1"; const nodeKey1: string = "nodeKey1"; @@ -513,7 +513,7 @@ describe("SequenceComponent.activate", () => { (>navigatorMock.stateService.state$).next(State.Traversing); (>navigatorMock.playService.speed$).next(1); - (>containerMock.renderService.size$).next({ height: 1, width: 1 }); + (>containerMock.renderService.size$).next({ height: 1, width: 1 }); const sequenceKey1: string = "sequenceKey1"; const nodeKey1: string = "nodeKey1"; diff --git a/spec/component/spatialData/SpatialDataCache.spec.ts b/spec/component/spatialData/SpatialDataCache.spec.ts index 2c7bc837..cd6ae296 100644 --- a/spec/component/spatialData/SpatialDataCache.spec.ts +++ b/spec/component/spatialData/SpatialDataCache.spec.ts @@ -3,7 +3,7 @@ import { Subject } from "rxjs"; import { Node } from "../../../src/graph/Node"; import { FalcorDataProvider } from "../../../src/api/FalcorDataProvider"; import { GeohashGeometryProvider } from "../../../src/api/GeohashGeometryProvider"; -import { IClusterReconstruction } from "../../../src/api/interfaces/IClusterReconstruction"; +import { ReconstructionEnt } from "../../../src/api/ents/ReconstructionEnt"; import { SpatialDataCache } from "../../../src/component/spatialdata/SpatialDataCache"; import { GraphService } from "../../../src/graph/GraphService"; import { GraphServiceMockCreator } from "../../helper/GraphServiceMockCreator"; @@ -172,7 +172,7 @@ describe("SpatialDataCache.cacheReconstructions$", () => { let emitCount: number = 0; cache.cacheClusterReconstructions$(hash) .subscribe( - (r: IClusterReconstruction): void => { + (r: ReconstructionEnt): void => { expect(r.key).toBe(node.clusterKey); emitCount++; }, @@ -263,7 +263,7 @@ describe("SpatialDataCache.cacheReconstructions$", () => { let resolver: Function; const promise: any = { - then: (resolve: (value: IClusterReconstruction) => void): void => { + then: (resolve: (value: ReconstructionEnt) => void): void => { resolver = resolve; }, }; @@ -402,12 +402,12 @@ describe("SpatialDataCache.updateCell$", () => { }); describe("SpatialDataCache.updateReconstructions$", () => { - const createCluster = (key: string): IClusterReconstruction => { + const createCluster = (key: string): ReconstructionEnt => { return { cameras: {}, key, points: {}, - reference_lla: { latitude: 0, longitude: 0, altitude: 0 }, + reference: { lat: 0, lon: 0, alt: 0 }, shots: {}, } } @@ -418,7 +418,7 @@ describe("SpatialDataCache.updateReconstructions$", () => { { clientToken: "cid" }, geometryProvider); spyOn(dataProvider, "getClusterReconstruction").and .returnValue( - new Promise(() => { /* noop */ })); + new Promise(() => { /* noop */ })); const graphService = new GraphServiceMockCreator().create(); const cache = new SpatialDataCache(graphService, dataProvider); @@ -432,7 +432,7 @@ describe("SpatialDataCache.updateReconstructions$", () => { let resolver: Function; const promise: any = { - then: (resolve: (value: IClusterReconstruction) => void): void => { + then: (resolve: (value: ReconstructionEnt) => void): void => { resolver = resolve; }, }; @@ -472,7 +472,7 @@ describe("SpatialDataCache.updateReconstructions$", () => { let resolver: Function; const promise: any = { - then: (resolve: (value: IClusterReconstruction) => void): void => { + then: (resolve: (value: ReconstructionEnt) => void): void => { resolver = resolve; }, }; diff --git a/spec/component/tag/CreateHandlerBase.spec.ts b/spec/component/tag/CreateHandlerBase.spec.ts index db2f9799..3cb321e2 100644 --- a/spec/component/tag/CreateHandlerBase.spec.ts +++ b/spec/component/tag/CreateHandlerBase.spec.ts @@ -3,7 +3,7 @@ import { Navigator } from "../../../src/viewer/Navigator"; import { ContainerMockCreator } from "../../helper/ContainerMockCreator"; import { NavigatorMockCreator } from "../../helper/NavigatorMockCreator"; import { Component } from "../../../src/component/Component"; -import { ITagConfiguration } from "../../../src/component/interfaces/ITagConfiguration"; +import { TagConfiguration } from "../../../src/component/interfaces/TagConfiguration"; import { CreateHandlerBase } from "../../../src/component/tag/handlers/CreateHandlerBase"; import { TagCreator } from "../../../src/component/tag/TagCreator"; import { ViewportCoords } from "../../../src/geo/ViewportCoords"; @@ -19,10 +19,10 @@ class CreateTestHandler extends CreateHandlerBase { protected _getNameExtension(): string { return "create-test"; } } -class TestComponent extends Component { +class TestComponent extends Component { protected _activate(): void { /*noop*/ } protected _deactivate(): void { /*noop*/ } - protected _getDefaultConfiguration(): ITagConfiguration { return {}; } + protected _getDefaultConfiguration(): TagConfiguration { return {}; } } describe("CreateHandlerBase.ctor", () => { diff --git a/spec/component/tag/CreatePointHandler.spec.ts b/spec/component/tag/CreatePointHandler.spec.ts index 23307892..46c014b5 100644 --- a/spec/component/tag/CreatePointHandler.spec.ts +++ b/spec/component/tag/CreatePointHandler.spec.ts @@ -5,7 +5,7 @@ import { NavigatorMockCreator } from "../../helper/NavigatorMockCreator"; import { Navigator } from "../../../src/viewer/Navigator"; import { Component } from "../../../src/component/Component"; -import { ITagConfiguration } from "../../../src/component/interfaces/ITagConfiguration"; +import { TagConfiguration } from "../../../src/component/interfaces/TagConfiguration"; import { PointGeometry } from "../../../src/component/tag/geometry/PointGeometry"; import { CreatePointHandler } from "../../../src/component/tag/handlers/CreatePointHandler"; import { TagCreator } from "../../../src/component/tag/TagCreator"; @@ -13,10 +13,10 @@ import { ViewportCoords } from "../../../src/geo/ViewportCoords"; import { Container } from "../../../src/viewer/Container"; import { Geometry } from "../../../src/component/tag/geometry/Geometry"; -class TestComponent extends Component { +class TestComponent extends Component { protected _activate(): void { /*noop*/ } protected _deactivate(): void { /*noop*/ } - protected _getDefaultConfiguration(): ITagConfiguration { return {}; } + protected _getDefaultConfiguration(): TagConfiguration { return {}; } } describe("CreatePointHandler.ctor", () => { diff --git a/spec/component/tag/TagScene.spec.ts b/spec/component/tag/TagScene.spec.ts index 132a50b8..32f956eb 100644 --- a/spec/component/tag/TagScene.spec.ts +++ b/spec/component/tag/TagScene.spec.ts @@ -4,7 +4,7 @@ import { RectGeometry } from "../../../src/component/tag/geometry/RectGeometry"; import { RenderTag } from "../../../src/component/tag/tag/RenderTag"; import { Tag } from "../../../src/component/tag/tag/Tag"; import { TagScene } from "../../../src/component/tag/TagScene"; -import { ISize } from "../../../src/render/interfaces/ISize"; +import { ViewportSize } from "../../../src/render/interfaces/ViewportSize"; import { ISpriteAtlas } from "../../../src/viewer/interfaces/ISpriteAtlas"; describe("TagScene.ctor", () => { @@ -36,7 +36,7 @@ class TestTag extends Tag { class TestRenderTag extends RenderTag { public dispose(): void { /*noop*/ } - public getDOMObjects(atlas: ISpriteAtlas, camera: THREE.Camera, size: ISize): vd.VNode[] { return []; } + public getDOMObjects(atlas: ISpriteAtlas, camera: THREE.Camera, size: ViewportSize): vd.VNode[] { return []; } public getGLObjects(): THREE.Object3D[] { return []; } public getRetrievableObjects(): THREE.Object3D[] { return []; } } diff --git a/spec/component/utils/HandlerBase.spec.ts b/spec/component/utils/HandlerBase.spec.ts index e75af299..1a5ffda7 100644 --- a/spec/component/utils/HandlerBase.spec.ts +++ b/spec/component/utils/HandlerBase.spec.ts @@ -4,27 +4,27 @@ import { NavigatorMockCreator } from "../../helper/NavigatorMockCreator"; import { Navigator } from "../../../src/viewer/Navigator"; import { Component } from "../../../src/component/Component"; -import { IComponentConfiguration } from "../../../src/component/interfaces/IComponentConfiguration"; +import { ComponentConfiguration } from "../../../src/component/interfaces/ComponentConfiguration"; import { HandlerBase } from "../../../src/component/utils/HandlerBase"; import { Container } from "../../../src/viewer/Container"; -interface ITestConfiguration extends IComponentConfiguration { +interface TestConfiguration extends ComponentConfiguration { test: boolean; } -class TestComponent extends Component { +class TestComponent extends Component { constructor(name: string, container: Container, navigator: Navigator) { super(name, container, navigator); } protected _activate(): void { /* noop */ } protected _deactivate(): void { /* noop */ } - protected _getDefaultConfiguration(): ITestConfiguration { return { test: false }; } + protected _getDefaultConfiguration(): TestConfiguration { return { test: false }; } } -class TestHandler extends HandlerBase { +class TestHandler extends HandlerBase { protected _disable(): void { /* noop */ } protected _enable(): void { /* noop */ } - protected _getConfiguration(enable: boolean): ITestConfiguration { return { test: enable }; } + protected _getConfiguration(enable: boolean): TestConfiguration { return { test: enable }; } } describe("HandlerBase.ctor", () => { diff --git a/spec/geo/GeoCoords.spec.ts b/spec/geo/GeoCoords.spec.ts index 6dda3590..c4a59d9c 100644 --- a/spec/geo/GeoCoords.spec.ts +++ b/spec/geo/GeoCoords.spec.ts @@ -1,5 +1,5 @@ import { GeoCoords } from "../../src/geo/GeoCoords"; -import { ILatLonAlt } from "../../src/geo/interfaces/ILatLonAlt"; +import { LatLonAltEnt } from "../../src/api/ents/LatLonAltEnt"; let precision: number = 8; @@ -14,7 +14,7 @@ describe("GeoCoords.geodeticToEcef", () => { }); it("should convert Equator - Greenwich to X axis value", () => { - let position: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let position: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let ecef: number[] = geoCoords.geodeticToEcef(position.lat, position.lon, position.alt); @@ -24,7 +24,7 @@ describe("GeoCoords.geodeticToEcef", () => { }); it("should convert positions on Equator to WGS84 a distance", () => { - let position1: ILatLonAlt = { alt: 0, lat: 0, lon: 90 }; + let position1: LatLonAltEnt = { alt: 0, lat: 0, lon: 90 }; let ecef1: number[] = geoCoords.geodeticToEcef(position1.lat, position1.lon, position1.alt); @@ -32,7 +32,7 @@ describe("GeoCoords.geodeticToEcef", () => { expect(ecef1[1]).toBeCloseTo(wgs84a, precision); expect(ecef1[2]).toBeCloseTo(0, precision); - let position2: ILatLonAlt = { alt: 0, lat: 0, lon: 180 }; + let position2: LatLonAltEnt = { alt: 0, lat: 0, lon: 180 }; let ecef2: number[] = geoCoords.geodeticToEcef(position2.lat, position2.lon, position2.alt); @@ -40,7 +40,7 @@ describe("GeoCoords.geodeticToEcef", () => { expect(ecef2[1]).toBeCloseTo(0, precision); expect(ecef2[2]).toBeCloseTo(0, precision); - let position3: ILatLonAlt = { alt: 0, lat: 0, lon: -90 }; + let position3: LatLonAltEnt = { alt: 0, lat: 0, lon: -90 }; let ecef3: number[] = geoCoords.geodeticToEcef(position3.lat, position3.lon, position3.alt); @@ -50,7 +50,7 @@ describe("GeoCoords.geodeticToEcef", () => { }); it("should convert random Equator postion correctly", () => { - let position: ILatLonAlt = { alt: 0, lat: 0, lon: 35.6589 }; + let position: LatLonAltEnt = { alt: 0, lat: 0, lon: 35.6589 }; let ecef: number[] = geoCoords.geodeticToEcef(position.lat, position.lon, position.alt); @@ -60,7 +60,7 @@ describe("GeoCoords.geodeticToEcef", () => { }); it("should convert value with altitude correctly", () => { - let position: ILatLonAlt = { alt: 452.43537987, lat: 0, lon: 0 }; + let position: LatLonAltEnt = { alt: 452.43537987, lat: 0, lon: 0 }; let ecef: number[] = geoCoords.geodeticToEcef(position.lat, position.lon, position.alt); @@ -70,7 +70,7 @@ describe("GeoCoords.geodeticToEcef", () => { }); it("should convert North Pole value correctly", () => { - let position: ILatLonAlt = { alt: 0, lat: 90, lon: 0 }; + let position: LatLonAltEnt = { alt: 0, lat: 90, lon: 0 }; let ecef: number[] = geoCoords.geodeticToEcef(position.lat, position.lon, position.alt); @@ -80,7 +80,7 @@ describe("GeoCoords.geodeticToEcef", () => { }); it("should convert back and forth between WGS84 and ECEF and correspond", () => { - let position: ILatLonAlt = { alt: 25.34543543, lat: 12.469889789, lon: -33.34589734 }; + let position: LatLonAltEnt = { alt: 25.34543543, lat: 12.469889789, lon: -33.34589734 }; let ecef: number[] = geoCoords.geodeticToEcef(position.lat, position.lon, position.alt); let rePosition: number[] = geoCoords.ecefToGeodetic(ecef[0], ecef[1], ecef[2]); @@ -166,7 +166,7 @@ describe("GeoCoords.ecefToEnu", () => { }); it("should convert to ECEF position corresponding to geodetic to ENU at origin", () => { - let ref: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let ref: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let ecef: number[] = [wgs84a, 0, 0]; let enu: number[] = geoCoords.ecefToEnu(ecef[0], ecef[1], ecef[2], ref.lat, ref.lon, ref.alt); @@ -177,7 +177,7 @@ describe("GeoCoords.ecefToEnu", () => { }); it("should convert positions on Equator to ENU positions at origin", () => { - let ref1: ILatLonAlt = { alt: 0, lat: 0, lon: 90 }; + let ref1: LatLonAltEnt = { alt: 0, lat: 0, lon: 90 }; let ecef1: number[] = [0, wgs84a, 0]; let enu1: number[] = geoCoords.ecefToEnu(ecef1[0], ecef1[1], ecef1[2], ref1.lat, ref1.lon, ref1.alt); @@ -186,7 +186,7 @@ describe("GeoCoords.ecefToEnu", () => { expect(enu1[1]).toBeCloseTo(0, precision); expect(enu1[2]).toBeCloseTo(0, precision); - let ref2: ILatLonAlt = { alt: 0, lat: 0, lon: 180 }; + let ref2: LatLonAltEnt = { alt: 0, lat: 0, lon: 180 }; let ecef2: number[] = [-wgs84a, 0, 0]; let enu2: number[] = geoCoords.ecefToEnu(ecef2[0], ecef2[1], ecef2[2], ref2.lat, ref2.lon, ref2.alt); @@ -195,7 +195,7 @@ describe("GeoCoords.ecefToEnu", () => { expect(enu2[1]).toBeCloseTo(0, precision); expect(enu2[2]).toBeCloseTo(0, precision); - let ref3: ILatLonAlt = { alt: 0, lat: 0, lon: -90 }; + let ref3: LatLonAltEnt = { alt: 0, lat: 0, lon: -90 }; let ecef3: number[] = [0, -wgs84a, 0]; let enu3: number[] = geoCoords.ecefToEnu(ecef3[0], ecef3[1], ecef3[2], ref3.lat, ref3.lon, ref3.alt); @@ -206,7 +206,7 @@ describe("GeoCoords.ecefToEnu", () => { }); it("should convert ECEF position with altitude to ENU with correct z-value", () => { - let ref: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let ref: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let altitude: number = 5.38973284; let ecef: number[] = [wgs84a + altitude, 0, 0]; @@ -219,7 +219,7 @@ describe("GeoCoords.ecefToEnu", () => { }); it("should convert ECEF position with translation to correct ENU position", () => { - let ref: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let ref: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let translation: number = 1.38973284; let ecef: number[] = [wgs84a, translation, translation]; @@ -240,7 +240,7 @@ describe("GeoCoords.enuToEcef", () => { }); it("should convert to ENU position at origin to ECEF X-value", () => { - let ref: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let ref: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let enu: number[] = [0, 0, 0]; let ecef: number[] = geoCoords.enuToEcef(enu[0], enu[1], enu[2], ref.lat, ref.lon, ref.alt); @@ -251,7 +251,7 @@ describe("GeoCoords.enuToEcef", () => { }); it("should convert to ENU position with up value to ECEF X-value", () => { - let ref: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let ref: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let enu: number[] = [0, 0, 7.3823847239847]; let ecef: number[] = geoCoords.enuToEcef(enu[0], enu[1], enu[2], ref.lat, ref.lon, ref.alt); @@ -262,7 +262,7 @@ describe("GeoCoords.enuToEcef", () => { }); it("should convert ECEF position with translation to correct ENU position", () => { - let ref: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let ref: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let translation: number = -2.34875843758493; let enu: number[] = [translation, translation, 0]; @@ -283,8 +283,8 @@ describe("GeoCoords.geodeticToEnu", () => { }); it("should convert to ENU position at origin when lla is at reference", () => { - let ref: ILatLonAlt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; - let lla: ILatLonAlt = { alt: ref.alt, lat: ref.lat, lon: ref.lon }; + let ref: LatLonAltEnt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; + let lla: LatLonAltEnt = { alt: ref.alt, lat: ref.lat, lon: ref.lon }; let enu: number[] = geoCoords.geodeticToEnu(lla.lat, lla.lon, lla.alt, ref.lat, ref.lon, ref.alt); @@ -294,10 +294,10 @@ describe("GeoCoords.geodeticToEnu", () => { }); it("should convert to ENU z value corresponding to diff with reference lla", () => { - let ref: ILatLonAlt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; + let ref: LatLonAltEnt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; let altTranslation: number = 4.4556433242; - let lla: ILatLonAlt = { alt: ref.alt + altTranslation, lat: ref.lat, lon: ref.lon }; + let lla: LatLonAltEnt = { alt: ref.alt + altTranslation, lat: ref.lat, lon: ref.lon }; let enu: number[] = geoCoords.geodeticToEnu(lla.lat, lla.lon, lla.alt, ref.lat, ref.lon, ref.alt); @@ -307,8 +307,8 @@ describe("GeoCoords.geodeticToEnu", () => { }); it("should convert back and forth between WGS84 and ENU and correspond", () => { - let ref: ILatLonAlt = { alt: -3.645563324, lat: 13.469889789, lon: 92.376689734 }; - let lla: ILatLonAlt = { alt: ref.alt + 20, lat: ref.lat - 0.01, lon: ref.lon + 0.01 }; + let ref: LatLonAltEnt = { alt: -3.645563324, lat: 13.469889789, lon: 92.376689734 }; + let lla: LatLonAltEnt = { alt: ref.alt + 20, lat: ref.lat - 0.01, lon: ref.lon + 0.01 }; let enu: number[] = geoCoords.geodeticToEnu(lla.lat, lla.lon, lla.alt, ref.lat, ref.lon, ref.alt); let reLla: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], ref.lat, ref.lon, ref.alt); @@ -327,7 +327,7 @@ describe("GeoCoords.enuToGeodetic", () => { }); it("should convert to reference WGS84 when ENU position is origin", () => { - let ref: ILatLonAlt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; + let ref: LatLonAltEnt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; let enu: number[] = [0, 0, 0]; let lla: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], ref.lat, ref.lon, ref.alt); @@ -338,7 +338,7 @@ describe("GeoCoords.enuToGeodetic", () => { }); it("should convert to reference WGS84 at correct altitude when ENU position has non zero z value", () => { - let ref: ILatLonAlt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; + let ref: LatLonAltEnt = { alt: 12.523892390, lat: 12.9450823, lon: 133.34589734 }; let enu: number[] = [0, 0, 5.234872384927]; let lla: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], ref.lat, ref.lon, ref.alt); @@ -349,7 +349,7 @@ describe("GeoCoords.enuToGeodetic", () => { }); it("should convert back and forth between ENU and WGS84 and correspond", () => { - let ref: ILatLonAlt = { alt: 7.34543543, lat: -52.469889789, lon: -113.34589734 }; + let ref: LatLonAltEnt = { alt: 7.34543543, lat: -52.469889789, lon: -113.34589734 }; let enu: number[] = [12.435534543, -55.34242121, 5.98023489]; let lla: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], ref.lat, ref.lon, ref.alt); diff --git a/spec/geo/Transform.spec.ts b/spec/geo/Transform.spec.ts index 3b7ef25b..8a0e4d45 100644 --- a/spec/geo/Transform.spec.ts +++ b/spec/geo/Transform.spec.ts @@ -5,7 +5,7 @@ import { GeoHelper } from "../helper/GeoHelper"; import { Node } from "../../src/graph/Node"; import { Transform } from "../../src/geo/Transform"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; describe("Transform.rt", () => { @@ -22,7 +22,7 @@ describe("Transform.rt", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = r; node.makeFull(fillNode); @@ -64,7 +64,7 @@ describe("Transform.rt", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = r; node.makeFull(fillNode); @@ -106,7 +106,7 @@ describe("Transform.rt", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = r; node.makeFull(fillNode); @@ -148,7 +148,7 @@ describe("Transform.rt", () => { let t: number[] = [10, 20, 30]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = r; node.makeFull(fillNode); @@ -200,7 +200,7 @@ describe("Transform.srt", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.atomic_scale = 1; fillNode.c_rotation = r; node.makeFull(fillNode); @@ -243,7 +243,7 @@ describe("Transform.srt", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.atomic_scale = 3; fillNode.c_rotation = r; node.makeFull(fillNode); @@ -286,7 +286,7 @@ describe("Transform.srt", () => { let t: number[] = [-10, 20, -30]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.atomic_scale = 0.5; fillNode.c_rotation = r; node.makeFull(fillNode); @@ -338,7 +338,7 @@ describe("Transform.basicWidth", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.width = width; fillNode.orientation = 1; node.makeFull(fillNode); @@ -362,7 +362,7 @@ describe("Transform.basicWidth", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.height = height; fillNode.orientation = 5; node.makeFull(fillNode); @@ -394,7 +394,7 @@ describe("Transform.basicHeight", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.height = height; fillNode.orientation = 1; node.makeFull(fillNode); @@ -418,7 +418,7 @@ describe("Transform.basicHeight", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.width = width; fillNode.orientation = 5; node.makeFull(fillNode); @@ -449,7 +449,7 @@ describe("Transform.width", () => { let node: Node = new Node(helper.createCoreNode()); - const fillNode: IFillNode = helper.createFillNode(); + const fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.width = 0; node.makeFull(fillNode); @@ -472,7 +472,7 @@ describe("Transform.width", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.width = width; node.makeFull(fillNode); @@ -501,7 +501,7 @@ describe("Transform.height", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.height = -1; fillNode.orientation = 1; node.makeFull(fillNode); @@ -525,7 +525,7 @@ describe("Transform.height", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.height = height; fillNode.orientation = 1; node.makeFull(fillNode); @@ -555,7 +555,7 @@ describe("Transform.focal", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); node.makeFull(fillNode); let transform: Transform = new Transform( @@ -577,7 +577,7 @@ describe("Transform.focal", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.cfocal = focal; node.makeFull(fillNode); @@ -606,7 +606,7 @@ describe("Transform.orientation", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); node.makeFull(fillNode); let transform: Transform = new Transform( @@ -628,7 +628,7 @@ describe("Transform.orientation", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.orientation = 3; node.makeFull(fillNode); @@ -678,7 +678,7 @@ describe("Transform.scale", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.atomic_scale = 0.4; node.makeFull(fillNode); @@ -759,7 +759,7 @@ describe("Transform.unprojectSfM", () => { let t: number[] = geoHelper.getTranslation(r, C); let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = r; node.makeFull(fillNode); @@ -809,7 +809,7 @@ describe("Transform.unprojectSfM", () => { let t: number[] = [0, 0, 0]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = r; node.makeFull(fillNode); @@ -899,7 +899,7 @@ describe("Transform.unprojectBasic", () => { let t: number[] = [10, 20, 30]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = [0.1, 0.2, 0.3]; fillNode.orientation = 1; node.makeFull(fillNode); @@ -928,7 +928,7 @@ describe("Transform.unprojectBasic", () => { let t: number[] = [10, 20, 30]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = [0.1, 0.2, 0.3]; fillNode.orientation = 3; node.makeFull(fillNode); @@ -957,7 +957,7 @@ describe("Transform.unprojectBasic", () => { let t: number[] = [10, 20, 30]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = [0.1, 0.2, 0.3]; fillNode.orientation = 6; node.makeFull(fillNode); @@ -986,7 +986,7 @@ describe("Transform.unprojectBasic", () => { let t: number[] = [10, 20, 30]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = [0.1, 0.2, 0.3]; fillNode.orientation = 8; node.makeFull(fillNode); @@ -1015,7 +1015,7 @@ describe("Transform.unprojectBasic", () => { let t: number[] = [5, 15, 2]; let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.c_rotation = [0.5, -0.2, 0.3]; fillNode.camera_projection_type = "equirectangular"; diff --git a/spec/graph/FilterCreator.spec.ts b/spec/graph/FilterCreator.spec.ts index d9d796da..5b756468 100644 --- a/spec/graph/FilterCreator.spec.ts +++ b/spec/graph/FilterCreator.spec.ts @@ -1,7 +1,7 @@ import { NodeHelper } from "../helper/NodeHelper"; import { Node } from "../../src/graph/Node"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; import { FilterCreator, FilterFunction } from "../../src/graph/FilterCreator"; /** @@ -28,10 +28,10 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "skey"; let filter: FilterFunction = creator.createFilter(["==", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = sequenceKey; coreNode2.sequence_key = sequenceKey + "w"; @@ -60,10 +60,10 @@ describe("FilterCreator.createFilter", () => { let node3: Node = new Node(helper.createCoreNode()); let node4: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt; fillNode2.captured_at = capturedAt + 1; @@ -91,10 +91,10 @@ describe("FilterCreator.createFilter", () => { let node3: Node = new Node(helper.createCoreNode()); let node4: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); fillNode1.user.key = null; fillNode2.user.key = "ukey"; @@ -126,10 +126,10 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "skey"; let filter: FilterFunction = creator.createFilter(["!=", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = sequenceKey; coreNode2.sequence_key = sequenceKey + "w"; @@ -158,10 +158,10 @@ describe("FilterCreator.createFilter", () => { let node3: Node = new Node(helper.createCoreNode()); let node4: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt; fillNode2.captured_at = capturedAt + 1; @@ -189,10 +189,10 @@ describe("FilterCreator.createFilter", () => { let node3: Node = new Node(helper.createCoreNode()); let node4: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); fillNode1.user.key = null; fillNode2.user.key = "ukey"; @@ -230,11 +230,11 @@ describe("FilterCreator.createFilter", () => { let node4: Node = new Node(helper.createCoreNode()); let node5: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); - let fillNode5: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); + let fillNode5: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt - 1; fillNode2.captured_at = capturedAt; @@ -261,11 +261,11 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "0"; let filter: FilterFunction = creator.createFilter([">", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); - let coreNode5: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); + let coreNode5: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "-1"; coreNode2.sequence_key = sequenceKey; @@ -306,11 +306,11 @@ describe("FilterCreator.createFilter", () => { let node4: Node = new Node(helper.createCoreNode()); let node5: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); - let fillNode5: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); + let fillNode5: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt - 1; fillNode2.captured_at = capturedAt; @@ -337,11 +337,11 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "0"; let filter: FilterFunction = creator.createFilter([">=", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); - let coreNode5: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); + let coreNode5: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "-1"; coreNode2.sequence_key = sequenceKey; @@ -382,11 +382,11 @@ describe("FilterCreator.createFilter", () => { let node4: Node = new Node(helper.createCoreNode()); let node5: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); - let fillNode5: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); + let fillNode5: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt - 1; fillNode2.captured_at = capturedAt; @@ -413,11 +413,11 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "0"; let filter: FilterFunction = creator.createFilter(["<", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); - let coreNode5: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); + let coreNode5: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "-1"; coreNode2.sequence_key = sequenceKey; @@ -458,11 +458,11 @@ describe("FilterCreator.createFilter", () => { let node4: Node = new Node(helper.createCoreNode()); let node5: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); - let fillNode5: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); + let fillNode5: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt - 1; fillNode2.captured_at = capturedAt; @@ -489,11 +489,11 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "0"; let filter: FilterFunction = creator.createFilter(["<=", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); - let coreNode5: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); + let coreNode5: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "-1"; coreNode2.sequence_key = sequenceKey; @@ -534,11 +534,11 @@ describe("FilterCreator.createFilter", () => { let node4: Node = new Node(helper.createCoreNode()); let node5: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); - let fillNode5: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); + let fillNode5: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt - 1; fillNode2.captured_at = capturedAt; @@ -565,11 +565,11 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "0"; let filter: FilterFunction = creator.createFilter(["in", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); - let coreNode5: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); + let coreNode5: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "-1"; coreNode2.sequence_key = sequenceKey; @@ -595,9 +595,9 @@ describe("FilterCreator.createFilter", () => { let filter: FilterFunction = creator.createFilter(["in", "sequenceKey", null]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "1"; coreNode2.sequence_key = null; @@ -621,9 +621,9 @@ describe("FilterCreator.createFilter", () => { let node2: Node = new Node(helper.createCoreNode()); let node3: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = 0; fillNode2.captured_at = 1; @@ -651,10 +651,10 @@ describe("FilterCreator.createFilter", () => { let node3: Node = new Node(helper.createCoreNode()); let node4: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = 0; fillNode2.captured_at = 1; @@ -692,11 +692,11 @@ describe("FilterCreator.createFilter", () => { let node4: Node = new Node(helper.createCoreNode()); let node5: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); - let fillNode5: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); + let fillNode5: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = capturedAt - 1; fillNode2.captured_at = capturedAt; @@ -723,11 +723,11 @@ describe("FilterCreator.createFilter", () => { let sequenceKey: string = "0"; let filter: FilterFunction = creator.createFilter(["!in", "sequenceKey", sequenceKey]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); - let coreNode4: ICoreNode = helper.createCoreNode(); - let coreNode5: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); + let coreNode4: CoreImageEnt = helper.createCoreNode(); + let coreNode5: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "-1"; coreNode2.sequence_key = sequenceKey; @@ -753,9 +753,9 @@ describe("FilterCreator.createFilter", () => { let filter: FilterFunction = creator.createFilter(["!in", "sequenceKey", null]); - let coreNode1: ICoreNode = helper.createCoreNode(); - let coreNode2: ICoreNode = helper.createCoreNode(); - let coreNode3: ICoreNode = helper.createCoreNode(); + let coreNode1: CoreImageEnt = helper.createCoreNode(); + let coreNode2: CoreImageEnt = helper.createCoreNode(); + let coreNode3: CoreImageEnt = helper.createCoreNode(); coreNode1.sequence_key = "1"; coreNode2.sequence_key = null; @@ -779,9 +779,9 @@ describe("FilterCreator.createFilter", () => { let node2: Node = new Node(helper.createCoreNode()); let node3: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = 0; fillNode2.captured_at = 1; @@ -809,10 +809,10 @@ describe("FilterCreator.createFilter", () => { let node3: Node = new Node(helper.createCoreNode()); let node4: Node = new Node(helper.createCoreNode()); - let fillNode1: IFillNode = helper.createFillNode(); - let fillNode2: IFillNode = helper.createFillNode(); - let fillNode3: IFillNode = helper.createFillNode(); - let fillNode4: IFillNode = helper.createFillNode(); + let fillNode1: SpatialImageEnt = helper.createFillNode(); + let fillNode2: SpatialImageEnt = helper.createFillNode(); + let fillNode3: SpatialImageEnt = helper.createFillNode(); + let fillNode4: SpatialImageEnt = helper.createFillNode(); fillNode1.captured_at = 0; fillNode2.captured_at = 1; @@ -842,7 +842,7 @@ describe("FilterCreator.createFilter", () => { let creator: FilterCreator = new FilterCreator(); let node: Node = new Node(helper.createCoreNode()); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.captured_at = 1; node.makeFull(fillNode); diff --git a/spec/graph/Graph.spec.ts b/spec/graph/Graph.spec.ts index c9a0f089..dbae9dfa 100644 --- a/spec/graph/Graph.spec.ts +++ b/spec/graph/Graph.spec.ts @@ -17,10 +17,9 @@ import { Node } from "../../src/graph/Node"; import { APIWrapper } from "../../src/api/APIWrapper"; import { FalcorDataProvider } from "../../src/api/FalcorDataProvider"; import { GeohashGeometryProvider } from "../../src/api/GeohashGeometryProvider"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; -import { IFullNode } from "../../src/api/interfaces/IFullNode"; -import { ISequence } from "../../src/api/interfaces/ISequence"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; +import { ImageEnt } from "../../src/api/ents/ImageEnt"; import { GraphMapillaryError } from "../../src/error/GraphMapillaryError"; import { EdgeCalculator } from "../../src/graph/edge/EdgeCalculator"; import { @@ -28,9 +27,10 @@ import { NodeIndexItem, } from "../../src/graph/Graph"; import { GraphCalculator } from "../../src/graph/GraphCalculator"; -import { IGraphConfiguration } from "../../src/graph/interfaces/IGraphConfiguration"; +import { GraphConfiguration } from "../../src/graph/interfaces/GraphConfiguration"; import { Sequence } from "../../src/graph/Sequence"; import { DataProvider, GeometryProvider } from "../helper/ProviderHelper"; +import { SequenceEnt } from "../../src/api/ents/SequenceEnt"; describe("Graph.ctor", () => { it("should create a graph", () => { @@ -69,15 +69,15 @@ describe("Graph.cacheBoundingBox$", () => { const h: string = "h"; spyOn(geometryProvider, "bboxToCellIds").and.returnValue([h]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const key: string = "key"; - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = key; fullNode.cl.lat = 0.5; fullNode.cl.lon = 0.5; @@ -96,13 +96,13 @@ describe("Graph.cacheBoundingBox$", () => { done(); }); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[h] = {}; tileResult[h]["0"] = fullNode; imagesByH.next(tileResult); imagesByH.complete(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[key] = fullNode; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -121,21 +121,21 @@ describe("Graph.cacheBoundingBox$", () => { spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy: jasmine.Spy = spyOn(api, "imagesByH$"); imagesByHSpy.and.returnValue(imagesByH); const key: string = "key"; - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); const imageByKeyFillSpy: jasmine.Spy = spyOn(api, "imageByKeyFill$"); imageByKeyFillSpy.and.returnValue(imageByKeyFill); - const imageByKeyFull: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFull: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); const imageByKeyFullSpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeyFullSpy.and.returnValue(imageByKeyFull); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = key; fullNode.cl.lat = 0.5; fullNode.cl.lon = 0.5; @@ -144,7 +144,7 @@ describe("Graph.cacheBoundingBox$", () => { graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fullResult: { [key: string]: IFullNode } = {}; + const fullResult: { [key: string]: ImageEnt } = {}; fullResult[fullNode.key] = fullNode; imageByKeyFull.next(fullResult); imageByKeyFull.complete(); @@ -154,7 +154,7 @@ describe("Graph.cacheBoundingBox$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[h] = {}; tileResult[h]["0"] = fullNode; imagesByH.next(tileResult); @@ -194,16 +194,16 @@ describe("Graph.cacheBoundingBox$", () => { spyOn(dataProvider.geometry, "latLonToCellIds").and.returnValue([h]); spyOn(dataProvider.geometry, "latLonToCellId").and.returnValue(h); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy: jasmine.Spy = spyOn(api, "imagesByH$"); imagesByHSpy.and.returnValue(imagesByH); const key: string = "key"; - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = key; fullNode.cl.lat = 0.5; fullNode.cl.lon = 0.5; @@ -232,13 +232,13 @@ describe("Graph.cacheBoundingBox$", () => { done(); }); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[h] = {}; tileResult[h]["0"] = fullNode; imagesByH.next(tileResult); imagesByH.complete(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[key] = fullNode; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -256,8 +256,8 @@ describe("Graph.cacheFull$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const fullNode: IFullNode = helper.createFullNode(); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const fullNode: ImageEnt = helper.createFullNode(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); @@ -273,13 +273,13 @@ describe("Graph.cacheFull$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key) .subscribe( @@ -305,8 +305,8 @@ describe("Graph.cacheFull$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const fullNode: IFullNode = helper.createFullNode(); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const fullNode: ImageEnt = helper.createFullNode(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeyFullSpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeyFullSpy.and.returnValue(imageByKeyFull); @@ -323,16 +323,16 @@ describe("Graph.cacheFull$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const result: { [key: string]: IFullNode } = {}; + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; imageByKeyFull.next(result); imageByKeyFull.complete(); @@ -345,12 +345,12 @@ describe("Graph.cacheFull$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = undefined; graph.cacheFull$(fullNode.key) @@ -360,7 +360,7 @@ describe("Graph.cacheFull$", () => { done(); }); - const result: { [key: string]: IFullNode } = {}; + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; imageByKeyFull.next(result); imageByKeyFull.complete(); @@ -376,10 +376,10 @@ describe("Graph.cacheFull$", () => { const key: string = "key"; const otherKey: string = "otherKey"; - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); - const imageByKeyFullOther: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); + const imageByKeyFullOther: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.callFake( - (keys: string[]): Observable<{ [key: string]: IFullNode }> => { + (keys: string[]): Observable<{ [key: string]: ImageEnt }> => { if (keys[0] === key) { return imageByKeyFull; } else if (keys[0] === otherKey) { @@ -393,17 +393,17 @@ describe("Graph.cacheFull$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const graph: Graph = new Graph(api, undefined, calculator); - const otherNode: IFullNode = helper.createFullNode(); + const otherNode: ImageEnt = helper.createFullNode(); otherNode.key = otherKey; graph.cacheFull$(otherNode.key).subscribe(() => { /*noop*/ }); - const otherFullResult: { [key: string]: IFullNode } = {}; + const otherFullResult: { [key: string]: ImageEnt } = {}; otherFullResult[otherNode.key] = otherNode; imageByKeyFullOther.next(otherFullResult); imageByKeyFullOther.complete(); @@ -413,14 +413,14 @@ describe("Graph.cacheFull$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = key; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); expect(graph.hasNode(fullNode.key)).toBe(false); expect(graph.isCachingFull(fullNode.key)).toBe(true); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[h] = {}; tileResult[h]["0"] = otherNode; tileResult[h]["1"] = fullNode; @@ -430,7 +430,7 @@ describe("Graph.cacheFull$", () => { expect(graph.hasNode(fullNode.key)).toBe(true); expect(graph.getNode(fullNode.key).full).toBe(false); - const fullResult: { [key: string]: IFullNode } = {}; + const fullResult: { [key: string]: ImageEnt } = {}; fullResult[fullNode.key] = fullNode; imageByKeyFull.next(fullResult); imageByKeyFull.complete(); @@ -454,26 +454,26 @@ describe("Graph.cacheFill$", () => { const api: APIWrapper = new APIWrapper(dataProvider); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -482,9 +482,9 @@ describe("Graph.cacheFill$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const tileNode: ICoreNode = helper.createCoreNode(); + const tileNode: CoreImageEnt = helper.createCoreNode(); tileNode.key = "tileNodeKey"; - const result: { [key: string]: { [index: string]: ICoreNode } } = {}; + const result: { [key: string]: { [index: string]: CoreImageEnt } } = {}; result[h] = {}; result[h]["0"] = tileNode; imagesByH.next(result); @@ -506,26 +506,26 @@ describe("Graph.cacheFill$", () => { const api: APIWrapper = new APIWrapper(dataProvider); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -534,9 +534,9 @@ describe("Graph.cacheFill$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const tileNode: ICoreNode = helper.createCoreNode(); + const tileNode: CoreImageEnt = helper.createCoreNode(); tileNode.key = "tileNodeKey"; - const result: { [key: string]: { [index: string]: ICoreNode } } = {}; + const result: { [key: string]: { [index: string]: CoreImageEnt } } = {}; result[h] = {}; result[h]["0"] = tileNode; imagesByH.next(result); @@ -546,8 +546,8 @@ describe("Graph.cacheFill$", () => { graph.cacheFill$(tileNode.key).subscribe(() => { /*noop*/ }); - const fillTileNode: IFillNode = helper.createFullNode(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillTileNode: SpatialImageEnt = helper.createFullNode(); + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[tileNode.key] = fillTileNode; imageByKeyFill.next(fillResult); @@ -563,27 +563,27 @@ describe("Graph.cacheFill$", () => { const api: APIWrapper = new APIWrapper(dataProvider); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); const imageByKeyFillSpy: jasmine.Spy = spyOn(api, "imageByKeyFill$"); imageByKeyFillSpy.and.returnValue(imageByKeyFill); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -592,9 +592,9 @@ describe("Graph.cacheFill$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const tileNode: ICoreNode = helper.createCoreNode(); + const tileNode: CoreImageEnt = helper.createCoreNode(); tileNode.key = "tileNodeKey"; - const result: { [key: string]: { [index: string]: ICoreNode } } = {}; + const result: { [key: string]: { [index: string]: CoreImageEnt } } = {}; result[h] = {}; result[h]["0"] = tileNode; imagesByH.next(result); @@ -616,20 +616,20 @@ describe("Graph.cacheFill$", () => { const api: APIWrapper = new APIWrapper(dataProvider); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key); expect(graph.isCachingFull(fullNode.key)).toBe(true); @@ -641,7 +641,7 @@ describe("Graph.cacheFill$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); const graph: Graph = new Graph(api, undefined, calculator); @@ -653,18 +653,18 @@ describe("Graph.cacheFill$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const imageByKeyFill: Subject<{ [key: string]: IFillNode }> = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill: Subject<{ [key: string]: SpatialImageEnt }> = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -691,8 +691,8 @@ describe("Graph.cacheTiles$", () => { spyOn(geometryProvider, "latLonToCellIds").and.returnValue(["h"]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const graph: Graph = new Graph(api, undefined, calculator); @@ -717,19 +717,19 @@ describe("Graph.cacheTiles$", () => { const api: APIWrapper = new APIWrapper(dataProvider); const calculator: GraphCalculator = new GraphCalculator(null); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyResult: { [key: string]: IFullNode } = {}; + const imageByKeyResult: { [key: string]: ImageEnt } = {}; imageByKeyResult[fullNode.key] = fullNode; - const imageByKeyFull: Observable<{ [key: string]: IFullNode }> = observableOf<{ [key: string]: IFullNode }>(imageByKeyResult); + const imageByKeyFull: Observable<{ [key: string]: ImageEnt }> = observableOf<{ [key: string]: ImageEnt }>(imageByKeyResult); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const graph: Graph = new Graph(api, undefined, calculator); @@ -742,7 +742,7 @@ describe("Graph.cacheTiles$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const result: { [key: string]: { [index: string]: ICoreNode } } = {}; + const result: { [key: string]: { [index: string]: CoreImageEnt } } = {}; result[h] = {}; result[h]["0"] = fullNode; imagesByH.next(result); @@ -765,8 +765,8 @@ describe("Graph.cacheTiles$", () => { const encodeHsSpy: jasmine.Spy = spyOn(geometryProvider, "latLonToCellIds"); encodeHsSpy.and.returnValue([h]); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const graph: Graph = new Graph(api, undefined, calculator); @@ -788,20 +788,20 @@ describe("Graph.cacheTiles$", () => { const api: APIWrapper = new APIWrapper(dataProvider); const calculator: GraphCalculator = new GraphCalculator(null); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); const encodeHsSpy: jasmine.Spy = spyOn(geometryProvider, "latLonToCellIds"); encodeHsSpy.and.returnValue([h]); - const imageByKeyResult: { [key: string]: IFullNode } = {}; + const imageByKeyResult: { [key: string]: ImageEnt } = {}; imageByKeyResult[fullNode.key] = fullNode; - const imageByKeyFull: Observable<{ [key: string]: IFullNode }> = observableOf<{ [key: string]: IFullNode }>(imageByKeyResult); + const imageByKeyFull: Observable<{ [key: string]: ImageEnt }> = observableOf<{ [key: string]: ImageEnt }>(imageByKeyResult); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const graph: Graph = new Graph(api, undefined, calculator); @@ -813,7 +813,7 @@ describe("Graph.cacheTiles$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const result: { [key: string]: { [index: string]: ICoreNode } } = {}; + const result: { [key: string]: { [index: string]: CoreImageEnt } } = {}; result[h] = {}; result[h]["0"] = fullNode; imagesByH.next(result); @@ -846,10 +846,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); @@ -859,7 +859,7 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [key] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -872,10 +872,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); @@ -885,7 +885,7 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [key] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -900,10 +900,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); @@ -913,14 +913,14 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; + const imageResult: { [key: string]: ImageEnt } = {}; imageResult[nodeKey] = helper.createFullNode(); imageResult[nodeKey].key = nodeKey; imageByKey.next(imageResult); @@ -942,17 +942,17 @@ describe("Graph.cacheSequenceNodes$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue("h"); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 1, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, maxUnusedTiles: 0, }; - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator, undefined, configuration); @@ -962,15 +962,15 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; - const fullNode: IFullNode = helper.createFullNode(); + const imageResult: { [key: string]: ImageEnt } = {}; + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = nodeKey; fullNode.sequence_key = sequenceKey; imageResult[fullNode.key] = fullNode; @@ -994,17 +994,17 @@ describe("Graph.cacheSequenceNodes$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue("h"); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, maxUnusedTiles: 1, }; - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator, undefined, configuration); @@ -1014,15 +1014,15 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; - const fullNode: IFullNode = helper.createFullNode(); + const imageResult: { [key: string]: ImageEnt } = {}; + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = nodeKey; fullNode.sequence_key = sequenceKey; imageResult[fullNode.key] = fullNode; @@ -1048,17 +1048,17 @@ describe("Graph.cacheSequenceNodes$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue("h"); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 1, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, maxUnusedTiles: 0, }; - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator, undefined, configuration); @@ -1068,15 +1068,15 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; - const fullNode: IFullNode = helper.createFullNode(); + const imageResult: { [key: string]: ImageEnt } = {}; + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = nodeKey; fullNode.sequence_key = sequenceKey; imageResult[fullNode.key] = fullNode; @@ -1100,17 +1100,17 @@ describe("Graph.cacheSequenceNodes$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue("h"); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 1, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, maxUnusedTiles: 0, }; - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator, undefined, configuration); @@ -1120,15 +1120,15 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; - const fullNode: IFullNode = helper.createFullNode(); + const imageResult: { [key: string]: ImageEnt } = {}; + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = nodeKey; fullNode.sequence_key = sequenceKey; imageResult[fullNode.key] = fullNode; @@ -1154,17 +1154,17 @@ describe("Graph.cacheSequenceNodes$", () => { spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 1, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, maxUnusedTiles: 0, }; - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator, undefined, configuration); @@ -1174,15 +1174,15 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; - const fullNode: IFullNode = helper.createFullNode(); + const imageResult: { [key: string]: ImageEnt } = {}; + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = nodeKey; fullNode.sequence_key = sequenceKey; imageResult[fullNode.key] = fullNode; @@ -1191,8 +1191,8 @@ describe("Graph.cacheSequenceNodes$", () => { graph.initializeCache(fullNode.key); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -1200,7 +1200,7 @@ describe("Graph.cacheSequenceNodes$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -1233,17 +1233,17 @@ describe("Graph.cacheSequenceNodes$", () => { spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 1, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, maxUnusedTiles: 0, }; - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator, undefined, configuration); @@ -1253,15 +1253,15 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; - const fullNode: IFullNode = helper.createFullNode(); + const imageResult: { [key: string]: ImageEnt } = {}; + const fullNode: ImageEnt = helper.createFullNode(); fullNode.key = nodeKey; fullNode.sequence_key = sequenceKey; imageResult[fullNode.key] = fullNode; @@ -1270,8 +1270,8 @@ describe("Graph.cacheSequenceNodes$", () => { graph.initializeCache(fullNode.key); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -1279,7 +1279,7 @@ describe("Graph.cacheSequenceNodes$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -1305,10 +1305,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); @@ -1318,14 +1318,14 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; + const imageResult: { [key: string]: ImageEnt } = {}; imageResult[nodeKey] = helper.createFullNode(); imageResult[nodeKey].key = nodeKey; imageByKey.next(imageResult); @@ -1339,10 +1339,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1353,7 +1353,7 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -1361,7 +1361,7 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequenceNodes$(sequenceKey).subscribe(); graph.cacheSequenceNodes$(sequenceKey).subscribe(); - const imageResult: { [key: string]: IFullNode } = {}; + const imageResult: { [key: string]: ImageEnt } = {}; imageResult[nodeKey] = helper.createFullNode(); imageResult[nodeKey].key = nodeKey; imageByKey.next(imageResult); @@ -1375,10 +1375,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); @@ -1388,7 +1388,7 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [nodeKey] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -1410,10 +1410,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1423,7 +1423,7 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: Array(200).fill(undefined).map((value, i) => { return i.toString(); }) }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -1446,10 +1446,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1459,7 +1459,7 @@ describe("Graph.cacheSequenceNodes$", () => { graph.cacheSequence$(sequenceKey).subscribe(); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: Array(201).fill(undefined).map((value, i) => { return i.toString(); }) }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -1483,10 +1483,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1498,7 +1498,7 @@ describe("Graph.cacheSequenceNodes$", () => { const referenceNodeKey: string = "referenceNodeKey"; - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: Array.from(new Array(400), (x, i): string => i.toString()) }; result[sequenceKey].keys.splice(0, 1, referenceNodeKey); sequenceByKey.next(result); @@ -1525,10 +1525,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1540,7 +1540,7 @@ describe("Graph.cacheSequenceNodes$", () => { const referenceNodeKey: string = "referenceNodeKey"; - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: Array.from(new Array(400), (x, i): string => i.toString()) }; result[sequenceKey].keys.splice(399, 1, referenceNodeKey); sequenceByKey.next(result); @@ -1568,10 +1568,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1583,7 +1583,7 @@ describe("Graph.cacheSequenceNodes$", () => { const referenceNodeKey: string = "referenceNodeKey"; - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: Array.from(new Array(400), (x, i): string => i.toString()) }; result[sequenceKey].keys.splice(200, 1, referenceNodeKey); sequenceByKey.next(result); @@ -1612,10 +1612,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1627,7 +1627,7 @@ describe("Graph.cacheSequenceNodes$", () => { const referenceNodeKey: string = "referenceNodeKey"; - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: Array.from(new Array(400), (x, i): string => i.toString()) }; result[sequenceKey].keys.splice(200, 1, referenceNodeKey); sequenceByKey.next(result); @@ -1645,10 +1645,10 @@ describe("Graph.cacheSequenceNodes$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const imageByKey: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKey: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeySpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); imageByKeySpy.and.returnValue(imageByKey); @@ -1660,7 +1660,7 @@ describe("Graph.cacheSequenceNodes$", () => { const referenceNodeKey: string = "referenceNodeKey"; - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: Array.from(new Array(50), (x, i): string => i.toString()) }; result[sequenceKey].keys.splice(20, 1, referenceNodeKey); sequenceByKey.next(result); @@ -1700,15 +1700,15 @@ describe("Graph.cacheSpatialArea$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -1725,23 +1725,23 @@ describe("Graph.cacheSpatialArea$", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); const h: string = "h"; spyOn(dataProvider.geometry, "latLonToCellId").and.returnValue(h); spyOn(dataProvider.geometry, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -1751,7 +1751,7 @@ describe("Graph.cacheSpatialArea$", () => { spyOn(graphCalculator, "boundingBoxCorners") .and.returnValue([{ lat: -0.5, lon: -0.5 }, { lat: 0.5, lon: 0.5 }]); - const coreNode: ICoreNode = helper.createCoreNode(); + const coreNode: CoreImageEnt = helper.createCoreNode(); coreNode.key = "otherKey"; graph.hasTiles(fullNode.key); @@ -1759,7 +1759,7 @@ describe("Graph.cacheSpatialArea$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const result: { [key: string]: { [index: string]: ICoreNode } } = {}; + const result: { [key: string]: { [index: string]: CoreImageEnt } } = {}; result[h] = {}; result[h]["0"] = fullNode; result[h]["1"] = coreNode; @@ -1784,25 +1784,25 @@ describe("Graph.cacheSpatialEdges", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); imageByKeyFull.complete(); graph.cacheNodeSequence$(fullNode.key).subscribe(() => { /*noop*/ }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: ["prev", fullNode.key, "next"] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -1843,35 +1843,35 @@ describe("Graph.cacheSpatialEdges", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const fullNode: IFullNode = helper.createFullNode(); - const otherFullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); + const otherFullNode: ImageEnt = helper.createFullNode(); otherFullNode.key = "other-key"; otherFullNode.sequence_key = "otherSequenceKey"; - const imageByKeyFill = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFill = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); imageByKeyFull.complete(); graph.cacheNodeSequence$(fullNode.key).subscribe(() => { /*noop*/ }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: ["prev", fullNode.key, "next"] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -1887,7 +1887,7 @@ describe("Graph.cacheSpatialEdges", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const coreResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const coreResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; coreResult[cellId] = {}; coreResult[cellId]["0"] = fullNode; coreResult[cellId]["1"] = otherFullNode; @@ -1899,7 +1899,7 @@ describe("Graph.cacheSpatialEdges", () => { graph.cacheFill$(otherFullNode.key).subscribe(() => { /*noop*/ }); - const otherFetchResult: { [key: string]: IFullNode } = {}; + const otherFetchResult: { [key: string]: ImageEnt } = {}; otherFetchResult[otherFullNode.key] = otherFullNode; imageByKeyFill.next(otherFetchResult); imageByKeyFill.complete(); @@ -1930,25 +1930,25 @@ describe("Graph.cacheSpatialEdges", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); imageByKeyFull.complete(); graph.cacheNodeSequence$(fullNode.key).subscribe(() => { /*noop*/ }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: ["prev", fullNode.key, "next"] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -1957,7 +1957,7 @@ describe("Graph.cacheSpatialEdges", () => { spyOn(graphCalculator, "boundingBoxCorners").and.returnValue([{ lat: 0, lon: 0 }, { lat: 0, lon: 0 }]); - const otherFullNode: IFullNode = helper.createFullNode(); + const otherFullNode: ImageEnt = helper.createFullNode(); otherFullNode.sequence_key = "otherSequenceKey"; const otherNode: Node = new Node(otherFullNode); otherNode.makeFull(otherFullNode); @@ -1994,16 +1994,16 @@ describe("Graph.cacheNodeSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -2014,19 +2014,19 @@ describe("Graph.cacheNodeSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); imageByKeyFull.complete(); @@ -2041,20 +2041,20 @@ describe("Graph.cacheNodeSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = "sequenceKey"; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -2065,7 +2065,7 @@ describe("Graph.cacheNodeSequence$", () => { expect(g.isCachingNodeSequence(fullNode.key)).toBe(false); }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: [fullNode.key] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -2078,15 +2078,15 @@ describe("Graph.cacheNodeSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = "sequenceKey"; expect(() => { graph.cacheNodeSequence$(fullNode.key); }).toThrowError(Error); @@ -2096,26 +2096,26 @@ describe("Graph.cacheNodeSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = "sequenceKey"; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); graph.cacheNodeSequence$(fullNode.key).subscribe(() => { /*noop*/ }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: [fullNode.key] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -2129,21 +2129,21 @@ describe("Graph.cacheNodeSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); const sequenceByKeySpy: jasmine.Spy = spyOn(api, "sequenceByKey$"); sequenceByKeySpy.and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = "sequenceKey"; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -2157,20 +2157,20 @@ describe("Graph.cacheNodeSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = "sequenceKey"; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); @@ -2186,7 +2186,7 @@ describe("Graph.cacheNodeSequence$", () => { done(); }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: [fullNode.key] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -2220,7 +2220,7 @@ describe("Graph.cacheSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); @@ -2237,7 +2237,7 @@ describe("Graph.cacheSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, calculator); @@ -2258,7 +2258,7 @@ describe("Graph.cacheSequence$", () => { done(); }); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [key] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -2268,7 +2268,7 @@ describe("Graph.cacheSequence$", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); const sequenceByKeySpy: jasmine.Spy = spyOn(api, "sequenceByKey$"); sequenceByKeySpy.and.returnValue(sequenceByKey); @@ -2295,25 +2295,25 @@ describe("Graph.resetSpatialEdges", () => { const graphCalculator: GraphCalculator = new GraphCalculator(null); const edgeCalculator: EdgeCalculator = new EdgeCalculator(); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); imageByKeyFull.complete(); graph.cacheNodeSequence$(fullNode.key).subscribe(() => { /*noop*/ }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: ["prev", fullNode.key, "next"] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -2361,25 +2361,25 @@ describe("Graph.resetSpatialEdges", () => { const encodeHsSpy: jasmine.Spy = spyOn(geometryProvider, "latLonToCellIds"); encodeHsSpy.and.returnValue([h]); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); const graph: Graph = new Graph(api, undefined, graphCalculator, edgeCalculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fetchResult: { [key: string]: IFullNode } = {}; + const fetchResult: { [key: string]: ImageEnt } = {}; fetchResult[fullNode.key] = fullNode; imageByKeyFull.next(fetchResult); imageByKeyFull.complete(); graph.cacheNodeSequence$(fullNode.key).subscribe(() => { /*noop*/ }); - const result: { [key: string]: ISequence } = {}; + const result: { [key: string]: SequenceEnt } = {}; result[fullNode.sequence_key] = { key: fullNode.sequence_key, keys: ["prev", fullNode.key, "next"] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -2387,15 +2387,15 @@ describe("Graph.resetSpatialEdges", () => { expect(graph.hasTiles(fullNode.key)).toBe(false); expect(graph.isCachingTiles(fullNode.key)).toBe(false); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); observableFrom(graph.cacheTiles$(fullNode.key)).pipe( mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHresult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHresult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHresult[h] = {}; imagesByHresult[h]["0"] = fullNode; imagesByH.next(imagesByHresult); @@ -2456,13 +2456,13 @@ describe("Graph.reset", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2493,13 +2493,13 @@ describe("Graph.reset", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2531,13 +2531,13 @@ describe("Graph.reset", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); const graph: Graph = new Graph(api, undefined, calculator); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2583,10 +2583,10 @@ describe("Graph.uncache", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -2595,8 +2595,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2628,10 +2628,10 @@ describe("Graph.uncache", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -2640,9 +2640,9 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = "sequencKey"; - const result: { [key: string]: IFullNode } = {}; + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2674,10 +2674,10 @@ describe("Graph.uncache", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -2686,8 +2686,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2719,10 +2719,10 @@ describe("Graph.uncache", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -2731,8 +2731,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2766,10 +2766,10 @@ describe("Graph.uncache", () => { const h: string = "h"; spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 1, @@ -2778,8 +2778,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2815,7 +2815,7 @@ describe("Graph.uncache", () => { const imageByKeyFullSpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 1, @@ -2824,12 +2824,12 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode1: IFullNode = helper.createFullNode(); + const fullNode1: ImageEnt = helper.createFullNode(); fullNode1.key = "key1"; - const result1: { [key: string]: IFullNode } = {}; + const result1: { [key: string]: ImageEnt } = {}; result1[fullNode1.key] = fullNode1; - const imageByKeyFull1: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull1: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); imageByKeyFullSpy.and.returnValue(imageByKeyFull1); graph.cacheFull$(fullNode1.key).subscribe(() => { /*noop*/ }); @@ -2839,12 +2839,12 @@ describe("Graph.uncache", () => { expect(graph.hasNode(fullNode1.key)).toBe(true); - const fullNode2: IFullNode = helper.createFullNode(); + const fullNode2: ImageEnt = helper.createFullNode(); fullNode2.key = "key2"; - const result2: { [key: string]: IFullNode } = {}; + const result2: { [key: string]: ImageEnt } = {}; result2[fullNode2.key] = fullNode2; - const imageByKeyFull2: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull2: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); imageByKeyFullSpy.and.returnValue(imageByKeyFull2); graph.cacheFull$(fullNode2.key).subscribe(() => { /*noop*/ }); @@ -2894,10 +2894,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -2906,8 +2906,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2920,8 +2920,8 @@ describe("Graph.uncache", () => { expect(graph.hasInitializedCache(fullNode.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -2929,7 +2929,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -2957,10 +2957,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, @@ -2969,8 +2969,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -2983,8 +2983,8 @@ describe("Graph.uncache", () => { expect(graph.hasInitializedCache(fullNode.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -2992,7 +2992,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -3022,10 +3022,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -3034,8 +3034,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -3049,8 +3049,8 @@ describe("Graph.uncache", () => { expect(graph.hasInitializedCache(node.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -3058,7 +3058,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -3086,10 +3086,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -3098,8 +3098,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -3113,8 +3113,8 @@ describe("Graph.uncache", () => { expect(graph.hasInitializedCache(node.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(node.key); @@ -3148,7 +3148,7 @@ describe("Graph.uncache", () => { const imageByKeyFullSpy: jasmine.Spy = spyOn(api, "imageByKeyFull$"); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, @@ -3157,12 +3157,12 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode1: IFullNode = helper.createFullNode(); + const fullNode1: ImageEnt = helper.createFullNode(); fullNode1.key = "key1"; - const result1: { [key: string]: IFullNode } = {}; + const result1: { [key: string]: ImageEnt } = {}; result1[fullNode1.key] = fullNode1; - const imageByKeyFull1: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull1: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); imageByKeyFullSpy.and.returnValue(imageByKeyFull1); graph.cacheFull$(fullNode1.key).subscribe(() => { /*noop*/ }); @@ -3172,12 +3172,12 @@ describe("Graph.uncache", () => { expect(graph.hasNode(fullNode1.key)).toBe(true); - const fullNode2: IFullNode = helper.createFullNode(); + const fullNode2: ImageEnt = helper.createFullNode(); fullNode2.key = "key2"; - const result2: { [key: string]: IFullNode } = {}; + const result2: { [key: string]: ImageEnt } = {}; result2[fullNode2.key] = fullNode2; - const imageByKeyFull2: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull2: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); imageByKeyFullSpy.and.returnValue(imageByKeyFull2); graph.cacheFull$(fullNode2.key).subscribe(() => { /*noop*/ }); @@ -3197,8 +3197,8 @@ describe("Graph.uncache", () => { expect(graph.hasInitializedCache(node2.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode1.key); @@ -3206,7 +3206,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode1; imagesByHResult[h]["1"] = fullNode2; @@ -3237,10 +3237,10 @@ describe("Graph.uncache", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -3253,7 +3253,7 @@ describe("Graph.uncache", () => { graph.cacheSequence$(sequenceKey).subscribe(() => { /*noop*/ }); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -3276,10 +3276,10 @@ describe("Graph.uncache", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -3292,7 +3292,7 @@ describe("Graph.uncache", () => { graph.cacheSequence$(sequenceKey).subscribe(() => { /*noop*/ }); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -3315,10 +3315,10 @@ describe("Graph.uncache", () => { const api: APIWrapper = new APIWrapper(new FalcorDataProvider({ clientToken: "cid" })); const calculator: GraphCalculator = new GraphCalculator(null); - const sequenceByKey: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); spyOn(api, "sequenceByKey$").and.returnValue(sequenceByKey); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 1, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -3331,7 +3331,7 @@ describe("Graph.uncache", () => { graph.cacheSequence$(sequenceKey).subscribe(() => { /*noop*/ }); - const result: { [sequenceKey: string]: ISequence } = {}; + const result: { [sequenceKey: string]: SequenceEnt } = {}; result[sequenceKey] = { key: sequenceKey, keys: [] }; sequenceByKey.next(result); sequenceByKey.complete(); @@ -3356,7 +3356,7 @@ describe("Graph.uncache", () => { const sequenceByKeySpy: jasmine.Spy = spyOn(api, "sequenceByKey$"); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 1, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -3367,12 +3367,12 @@ describe("Graph.uncache", () => { const sequenceKey1: string = "sequenceKey1"; - const sequenceByKey1: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey1: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); sequenceByKeySpy.and.returnValue(sequenceByKey1); graph.cacheSequence$(sequenceKey1).subscribe(() => { /*noop*/ }); - const result1: { [sequenceKey: string]: ISequence } = {}; + const result1: { [sequenceKey: string]: SequenceEnt } = {}; result1[sequenceKey1] = { key: sequenceKey1, keys: [] }; sequenceByKey1.next(result1); sequenceByKey1.complete(); @@ -3385,12 +3385,12 @@ describe("Graph.uncache", () => { const sequenceKey2: string = "sequenceKey2"; - const sequenceByKey2: Subject<{ [key: string]: ISequence }> = new Subject<{ [key: string]: ISequence }>(); + const sequenceByKey2: Subject<{ [key: string]: SequenceEnt }> = new Subject<{ [key: string]: SequenceEnt }>(); sequenceByKeySpy.and.returnValue(sequenceByKey2); graph.cacheSequence$(sequenceKey2).subscribe(() => { /*noop*/ }); - const result2: { [sequenceKey: string]: ISequence } = {}; + const result2: { [sequenceKey: string]: SequenceEnt } = {}; result2[sequenceKey2] = { key: sequenceKey2, keys: [] }; sequenceByKey2.next(result2); sequenceByKey2.complete(); @@ -3429,10 +3429,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, @@ -3441,8 +3441,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -3451,8 +3451,8 @@ describe("Graph.uncache", () => { expect(graph.hasNode(fullNode.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -3460,7 +3460,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -3491,10 +3491,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, @@ -3503,9 +3503,9 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); + const fullNode: ImageEnt = helper.createFullNode(); fullNode.sequence_key = "sequenceKey"; - const result: { [key: string]: IFullNode } = {}; + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -3514,8 +3514,8 @@ describe("Graph.uncache", () => { expect(graph.hasNode(fullNode.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -3523,7 +3523,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -3555,10 +3555,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 1, maxUnusedPreStoredNodes: 0, @@ -3567,8 +3567,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -3577,8 +3577,8 @@ describe("Graph.uncache", () => { expect(graph.hasNode(fullNode.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -3586,7 +3586,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -3618,10 +3618,10 @@ describe("Graph.uncache", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(h); spyOn(geometryProvider, "latLonToCellIds").and.returnValue([h]); - const imageByKeyFull: Subject<{ [key: string]: IFullNode }> = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull: Subject<{ [key: string]: ImageEnt }> = new Subject<{ [key: string]: ImageEnt }>(); spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const configuration: IGraphConfiguration = { + const configuration: GraphConfiguration = { maxSequences: 0, maxUnusedNodes: 0, maxUnusedPreStoredNodes: 0, @@ -3630,8 +3630,8 @@ describe("Graph.uncache", () => { const graph: Graph = new Graph(api, undefined, calculator, undefined, undefined, configuration); - const fullNode: IFullNode = helper.createFullNode(); - const result: { [key: string]: IFullNode } = {}; + const fullNode: ImageEnt = helper.createFullNode(); + const result: { [key: string]: ImageEnt } = {}; result[fullNode.key] = fullNode; graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); @@ -3640,8 +3640,8 @@ describe("Graph.uncache", () => { expect(graph.hasNode(fullNode.key)).toBe(true); - const imagesByH: Subject<{ [key: string]: { [index: string]: ICoreNode } }> = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + const imagesByH: Subject<{ [key: string]: { [index: string]: CoreImageEnt } }> = + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); spyOn(api, "imagesByH$").and.returnValue(imagesByH); graph.hasTiles(fullNode.key); @@ -3649,7 +3649,7 @@ describe("Graph.uncache", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const imagesByHResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const imagesByHResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; imagesByHResult[h] = {}; imagesByHResult[h]["0"] = fullNode; imagesByH.next(imagesByHResult); @@ -3681,11 +3681,11 @@ describe("Graph.cacheCell$", () => { const cellId = "cellId"; const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy = spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill = new Subject<{ [key: string]: SpatialImageEnt }>(); const imageByKeyFillSpy = spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); @@ -3710,14 +3710,14 @@ describe("Graph.cacheCell$", () => { done(); }); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[cellId] = {}; tileResult[cellId]["0"] = fullNode; imagesByH.next(tileResult); imagesByH.complete(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[key] = fullNode; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -3736,11 +3736,11 @@ describe("Graph.cacheCell$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(cellId); const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy = spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFull = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeyFullSpy = spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); @@ -3748,14 +3748,14 @@ describe("Graph.cacheCell$", () => { spyOn(api, "imageByKeyFill$").and.stub(); const key = "full-key"; - const fullNode: IFullNode = new NodeHelper().createFullNode(); + const fullNode: ImageEnt = new NodeHelper().createFullNode(); fullNode.key = key; const graph: Graph = new Graph(api, undefined, calculator); graph.cacheFull$(fullNode.key).subscribe(() => { /*noop*/ }); - const fullResult: { [key: string]: IFullNode } = {}; + const fullResult: { [key: string]: ImageEnt } = {}; fullResult[fullNode.key] = fullNode; imageByKeyFull.next(fullResult); imageByKeyFull.complete(); @@ -3765,7 +3765,7 @@ describe("Graph.cacheCell$", () => { mergeAll()) .subscribe(() => { /*noop*/ }); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[cellId] = {}; tileResult[cellId]["0"] = fullNode; imagesByH.next(tileResult); @@ -3806,15 +3806,15 @@ describe("Graph.cacheCell$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(cellId); const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy = spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFull = new Subject<{ [key: string]: IFullNode }>(); + const imageByKeyFull = new Subject<{ [key: string]: ImageEnt }>(); const imageByKeyFullSpy = spyOn(api, "imageByKeyFull$").and.returnValue(imageByKeyFull); - const imageByKeyFill = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill = new Subject<{ [key: string]: SpatialImageEnt }>(); const imageByKeyFillSpy = spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); @@ -3827,7 +3827,7 @@ describe("Graph.cacheCell$", () => { graph.cacheFull$(fullNode1.key).subscribe(() => { /*noop*/ }); - const fullResult: { [key: string]: IFullNode } = {}; + const fullResult: { [key: string]: ImageEnt } = {}; fullResult[fullNode1.key] = fullNode1; imageByKeyFull.next(fullResult); imageByKeyFull.complete(); @@ -3839,7 +3839,7 @@ describe("Graph.cacheCell$", () => { const fullNode2 = new NodeHelper().createFullNode(); fullNode2.key = key2; - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[cellId] = {}; tileResult[cellId]["0"] = fullNode1; tileResult[cellId]["1"] = fullNode2; @@ -3876,7 +3876,7 @@ describe("Graph.cacheCell$", () => { done(); }); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[fullNode2.key] = fullNode2; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -3895,11 +3895,11 @@ describe("Graph.cacheCell$", () => { spyOn(geometryProvider, "latLonToCellId").and.returnValue(cellId); const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy = spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill = new Subject<{ [key: string]: SpatialImageEnt }>(); const imageByKeyFillSpy = spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); @@ -3934,13 +3934,13 @@ describe("Graph.cacheCell$", () => { done(); }); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = {}; + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[cellId] = {}; tileResult[cellId]["0"] = fullNode; imagesByH.next(tileResult); imagesByH.complete(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[fullNode.key] = fullNode; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -3982,11 +3982,11 @@ describe("Graph.updateCells$", () => { const calculator = new GraphCalculator(null); const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy = spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); const key = "full-key"; @@ -3998,14 +3998,14 @@ describe("Graph.updateCells$", () => { const cellId = "cellId"; graph.cacheCell$(cellId).subscribe(); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[cellId] = {}; tileResult[cellId]["0"] = fullNode; imagesByH.next(tileResult); imagesByH.complete(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[key] = fullNode; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -4013,7 +4013,7 @@ describe("Graph.updateCells$", () => { expect(graph.hasNode(key)).toBe(true); const imagesByHUpdate = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); imagesByHSpy.calls.reset(); imagesByHSpy.and.returnValue(imagesByHUpdate); @@ -4038,11 +4038,11 @@ describe("Graph.updateCells$", () => { const calculator = new GraphCalculator(null); const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy = spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); const key = "full-key"; @@ -4057,7 +4057,7 @@ describe("Graph.updateCells$", () => { expect(graph.hasNode(key)).toBe(false); const imagesByHUpdate = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); imagesByHSpy.calls.reset(); imagesByHSpy.and.returnValue(imagesByHUpdate); @@ -4069,14 +4069,14 @@ describe("Graph.updateCells$", () => { done(); }); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[cellId] = {}; tileResult[cellId]["0"] = fullNode; imagesByH.next(tileResult); imagesByH.complete(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[key] = fullNode; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -4096,11 +4096,11 @@ describe("Graph.updateCells$", () => { const calculator = new GraphCalculator(null); const imagesByH = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); const imagesByHSpy = spyOn(api, "imagesByH$").and.returnValue(imagesByH); - const imageByKeyFill = new Subject<{ [key: string]: IFillNode }>(); + const imageByKeyFill = new Subject<{ [key: string]: SpatialImageEnt }>(); spyOn(api, "imageByKeyFill$").and.returnValue(imageByKeyFill); const key1 = "full-key-1"; @@ -4112,14 +4112,14 @@ describe("Graph.updateCells$", () => { const cellId = "cellId"; graph.cacheCell$(cellId).subscribe(); - const tileResult: { [key: string]: { [index: string]: ICoreNode } } = + const tileResult: { [key: string]: { [index: string]: CoreImageEnt } } = {}; tileResult[cellId] = {}; tileResult[cellId]["0"] = fullNode1; imagesByH.next(tileResult); imagesByH.complete(); - const fillResult: { [key: string]: IFillNode } = {}; + const fillResult: { [key: string]: SpatialImageEnt } = {}; fillResult[key1] = fullNode1; imageByKeyFill.next(fillResult); imageByKeyFill.complete(); @@ -4127,7 +4127,7 @@ describe("Graph.updateCells$", () => { expect(graph.hasNode(key1)).toBe(true); const imagesByHUpdate = - new Subject<{ [key: string]: { [index: string]: ICoreNode } }>(); + new Subject<{ [key: string]: { [index: string]: CoreImageEnt } }>(); imagesByHSpy.calls.reset(); imagesByHSpy.and.returnValue(imagesByHUpdate); diff --git a/spec/graph/GraphCalculator.spec.ts b/spec/graph/GraphCalculator.spec.ts index 25b035f5..aee768a3 100644 --- a/spec/graph/GraphCalculator.spec.ts +++ b/spec/graph/GraphCalculator.spec.ts @@ -1,4 +1,4 @@ -import { ILatLon } from "../../src/api/interfaces/ILatLon"; +import { LatLonEnt } from "../../src/api/ents/LatLonEnt"; import { GeoCoords } from "../../src/geo/GeoCoords"; import { GraphCalculator } from "../../src/graph/GraphCalculator"; @@ -22,7 +22,7 @@ describe("GraphCalculator.boundingBoxCorners", () => { let calculator: GraphCalculator = new GraphCalculator(geoCoords); let threshold: number = 1; - let bbox: [ILatLon, ILatLon] = calculator.boundingBoxCorners({ lat: 0, lon: 0 }, threshold); + let bbox: [LatLonEnt, LatLonEnt] = calculator.boundingBoxCorners({ lat: 0, lon: 0 }, threshold); expect(bbox.length).toBe(2); expect(bbox[0].lat).toBe(-1); diff --git a/spec/graph/GraphService.spec.ts b/spec/graph/GraphService.spec.ts index e62cbc5d..0f571383 100644 --- a/spec/graph/GraphService.spec.ts +++ b/spec/graph/GraphService.spec.ts @@ -17,11 +17,11 @@ import { NodeHelper } from "../helper/NodeHelper"; import { Node } from "../../src/graph/Node"; import { APIWrapper } from "../../src/api/APIWrapper"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; import { Graph } from "../../src/graph/Graph"; import { GraphMode } from "../../src/graph/GraphMode"; import { GraphService } from "../../src/graph/GraphService"; -import { IEdgeStatus } from "../../src/graph/interfaces/IEdgeStatus"; +import { NavigationEdgeStatus } from "../../src/graph/interfaces/NavigationEdgeStatus"; import { Sequence } from "../../src/graph/Sequence"; import { DataProvider } from "../helper/ProviderHelper"; @@ -455,10 +455,10 @@ describe("GraphService.graphMode$", () => { class TestNode extends Node { private _assetsCached: boolean; - private _sequenceEdges: IEdgeStatus; - private _spatialEdges: IEdgeStatus; + private _sequenceEdges: NavigationEdgeStatus; + private _spatialEdges: NavigationEdgeStatus; - constructor(core: ICoreNode) { + constructor(core: CoreImageEnt) { super(core); this._assetsCached = false; @@ -474,11 +474,11 @@ class TestNode extends Node { this._assetsCached = value; } - public get sequenceEdges(): IEdgeStatus { + public get sequenceEdges(): NavigationEdgeStatus { return this._sequenceEdges; } - public get spatialEdges(): IEdgeStatus { + public get spatialEdges(): NavigationEdgeStatus { return this._spatialEdges; } } diff --git a/spec/graph/Node.spec.ts b/spec/graph/Node.spec.ts index f2531ddb..41c01bee 100644 --- a/spec/graph/Node.spec.ts +++ b/spec/graph/Node.spec.ts @@ -1,8 +1,8 @@ import { NodeHelper } from "../helper/NodeHelper"; import { Node } from "../../src/graph/Node"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; -import { IMesh } from "../../src/api/interfaces/IMesh"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; +import { MeshEnt } from "../../src/api/ents/MeshEnt"; import { NodeCache } from "../../src/graph/NodeCache"; describe("Node", () => { @@ -13,7 +13,7 @@ describe("Node", () => { }); it("should create a node", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); expect(node).toBeDefined(); @@ -28,12 +28,12 @@ describe("Node.full", () => { }); it("should make node full", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); expect(node.full).toBe(false); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); node.makeFull(fillNode); @@ -41,7 +41,7 @@ describe("Node.full", () => { }); it("should throw when fill is null", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); expect(() => { node.makeFull(null); }).toThrowError(Error); @@ -56,9 +56,9 @@ describe("Node.dispose", () => { }); it("should clear core and fill properties", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); node.makeFull(fillNode); node.dispose(); @@ -69,7 +69,7 @@ describe("Node.dispose", () => { }); it("should dipose cache", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); let nodeCache: NodeCache = new NodeCache(undefined); @@ -92,14 +92,14 @@ describe("Node.uncache", () => { }); it("should handle when cache is not initilized", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); node.uncache(); }); it("should dispose node cache", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); let nodeCache: NodeCache = new NodeCache(undefined); @@ -114,7 +114,7 @@ describe("Node.uncache", () => { }); it("should be able to initialize cache again after uncache", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); let nodeCache: NodeCache = new NodeCache(undefined); @@ -137,16 +137,16 @@ describe("Node.merged", () => { }); it("should not be merged when not full", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); expect(node.merged).toBe(false); }); it("should not be merged because merge version is zero", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.merge_version = 0; @@ -156,9 +156,9 @@ describe("Node.merged", () => { }); it("should be merged because merge version present and larger than zero", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); fillNode.merge_version = 7; @@ -176,7 +176,7 @@ describe("Node.assetsCached", () => { }); it("should not be cached when core", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); expect(node.assetsCached).toBe(false); @@ -184,7 +184,7 @@ describe("Node.assetsCached", () => { class NodeCacheMock extends NodeCache { protected _overridingImage: HTMLImageElement; - protected _overridingMesh: IMesh; + protected _overridingMesh: MeshEnt; constructor() { super(undefined); } @@ -196,19 +196,19 @@ describe("Node.assetsCached", () => { this._overridingImage = value; } - public get mesh(): IMesh { + public get mesh(): MeshEnt { return this._overridingMesh; } - public set mesh(value: IMesh) { + public set mesh(value: MeshEnt) { this._overridingMesh = value; } } it("should be cached when assets set", () => { - let coreNode: ICoreNode = helper.createCoreNode(); + let coreNode: CoreImageEnt = helper.createCoreNode(); let node: Node = new Node(coreNode); - let fillNode: IFillNode = helper.createFillNode(); + let fillNode: SpatialImageEnt = helper.createFillNode(); node.makeFull(fillNode); let nodeCache: NodeCacheMock = new NodeCacheMock(); diff --git a/spec/graph/NodeCache.spec.ts b/spec/graph/NodeCache.spec.ts index 311a7d6e..33cca71c 100644 --- a/spec/graph/NodeCache.spec.ts +++ b/spec/graph/NodeCache.spec.ts @@ -1,8 +1,8 @@ import { first, skip } from "rxjs/operators"; import { FalcorDataProvider } from "../../src/api/FalcorDataProvider"; -import { EdgeDirection } from "../../src/graph/edge/EdgeDirection"; -import { IEdge } from "../../src/graph/edge/interfaces/IEdge"; -import { IEdgeStatus } from "../../src/graph/interfaces/IEdgeStatus"; +import { NavigationDirection } from "../../src/graph/edge/NavigationDirection"; +import { NavigationEdge } from "../../src/graph/edge/interfaces/NavigationEdge"; +import { NavigationEdgeStatus } from "../../src/graph/interfaces/NavigationEdgeStatus"; import { NodeCache } from "../../src/graph/NodeCache"; import { ImageSize } from "../../src/viewer/ImageSize"; import { MockCreator } from "../helper/MockCreator"; @@ -37,7 +37,7 @@ describe("NodeCache.sequenceEdges$", () => { nodeCache.sequenceEdges$.pipe( first()) .subscribe( - (edgeStatus: IEdgeStatus): void => { + (edgeStatus: NavigationEdgeStatus): void => { expect(edgeStatus.cached).toBe(false); expect(edgeStatus.edges.length).toBe(0); @@ -48,24 +48,24 @@ describe("NodeCache.sequenceEdges$", () => { it("should emit cached non empty edge status when sequence edges cached", (done: Function) => { let nodeCache: NodeCache = new NodeCache(undefined); - let sequenceEdge: IEdge = { + let sequenceEdge: NavigationEdge = { data: { - direction: EdgeDirection.Next, + direction: NavigationDirection.Next, worldMotionAzimuth: 0, }, - from: "key1", - to: "key2", + source: "key1", + target: "key2", }; nodeCache.sequenceEdges$.pipe( skip(1), first()) .subscribe( - (edgeStatus: IEdgeStatus): void => { + (edgeStatus: NavigationEdgeStatus): void => { expect(edgeStatus.cached).toBe(true); expect(edgeStatus.edges.length).toBe(1); - expect(edgeStatus.edges[0].from).toBe(sequenceEdge.from); - expect(edgeStatus.edges[0].to).toBe(sequenceEdge.to); + expect(edgeStatus.edges[0].source).toBe(sequenceEdge.source); + expect(edgeStatus.edges[0].target).toBe(sequenceEdge.target); expect(edgeStatus.edges[0].data.direction).toBe(sequenceEdge.data.direction); expect(edgeStatus.edges[0].data.worldMotionAzimuth).toBe(sequenceEdge.data.worldMotionAzimuth); @@ -80,20 +80,20 @@ describe("NodeCache.resetSequenceEdges", () => { it("should reset the sequence edges", () => { let nodeCache: NodeCache = new NodeCache(undefined); - let sequenceEdge: IEdge = { + let sequenceEdge: NavigationEdge = { data: { - direction: EdgeDirection.Next, + direction: NavigationDirection.Next, worldMotionAzimuth: null, }, - from: "key1", - to: "key2", + source: "key1", + target: "key2", }; nodeCache.cacheSequenceEdges([sequenceEdge]); expect(nodeCache.sequenceEdges.cached).toBe(true); expect(nodeCache.sequenceEdges.edges.length).toBe(1); - expect(nodeCache.sequenceEdges.edges[0].from).toBe(sequenceEdge.from); + expect(nodeCache.sequenceEdges.edges[0].source).toBe(sequenceEdge.source); nodeCache.resetSequenceEdges(); @@ -109,7 +109,7 @@ describe("NodeCache.spatialEdges$", () => { nodeCache.spatialEdges$.pipe( first()) .subscribe( - (edgeStatus: IEdgeStatus): void => { + (edgeStatus: NavigationEdgeStatus): void => { expect(edgeStatus.cached).toBe(false); expect(edgeStatus.edges.length).toBe(0); @@ -120,24 +120,24 @@ describe("NodeCache.spatialEdges$", () => { it("should emit cached non empty edge status when spatial edges cached", (done: Function) => { let nodeCache: NodeCache = new NodeCache(undefined); - let spatialEdge: IEdge = { + let spatialEdge: NavigationEdge = { data: { - direction: EdgeDirection.StepForward, + direction: NavigationDirection.StepForward, worldMotionAzimuth: 0, }, - from: "key1", - to: "key2", + source: "key1", + target: "key2", }; nodeCache.spatialEdges$.pipe( skip(1), first()) .subscribe( - (edgeStatus: IEdgeStatus): void => { + (edgeStatus: NavigationEdgeStatus): void => { expect(edgeStatus.cached).toBe(true); expect(edgeStatus.edges.length).toBe(1); - expect(edgeStatus.edges[0].from).toBe(spatialEdge.from); - expect(edgeStatus.edges[0].to).toBe(spatialEdge.to); + expect(edgeStatus.edges[0].source).toBe(spatialEdge.source); + expect(edgeStatus.edges[0].target).toBe(spatialEdge.target); expect(edgeStatus.edges[0].data.direction).toBe(spatialEdge.data.direction); expect(edgeStatus.edges[0].data.worldMotionAzimuth).toBe(spatialEdge.data.worldMotionAzimuth); @@ -152,20 +152,20 @@ describe("NodeCache.resetSpatialEdges", () => { it("should reset the spatial edges", () => { let nodeCache: NodeCache = new NodeCache(undefined); - let spatialEdge: IEdge = { + let spatialEdge: NavigationEdge = { data: { - direction: EdgeDirection.StepForward, + direction: NavigationDirection.StepForward, worldMotionAzimuth: 0, }, - from: "key1", - to: "key2", + source: "key1", + target: "key2", }; nodeCache.cacheSpatialEdges([spatialEdge]); expect(nodeCache.spatialEdges.cached).toBe(true); expect(nodeCache.spatialEdges.edges.length).toBe(1); - expect(nodeCache.spatialEdges.edges[0].from).toBe(spatialEdge.from); + expect(nodeCache.spatialEdges.edges[0].source).toBe(spatialEdge.source); nodeCache.resetSpatialEdges(); @@ -178,22 +178,22 @@ describe("NodeCache.dispose", () => { it("should clear all properties", () => { let nodeCache: NodeCache = new NodeCache(undefined); - let sequencEdge: IEdge = { + let sequencEdge: NavigationEdge = { data: { - direction: EdgeDirection.StepForward, + direction: NavigationDirection.StepForward, worldMotionAzimuth: 0, }, - from: "key1", - to: "key2", + source: "key1", + target: "key2", }; - let spatialEdge: IEdge = { + let spatialEdge: NavigationEdge = { data: { - direction: EdgeDirection.StepForward, + direction: NavigationDirection.StepForward, worldMotionAzimuth: 0, }, - from: "key1", - to: "key2", + source: "key1", + target: "key2", }; nodeCache.cacheSequenceEdges([sequencEdge]); diff --git a/spec/graph/Sequence.spec.ts b/spec/graph/Sequence.spec.ts index cd165267..4595af24 100644 --- a/spec/graph/Sequence.spec.ts +++ b/spec/graph/Sequence.spec.ts @@ -1,11 +1,11 @@ -import { ISequence } from "../../src/api/interfaces/ISequence"; +import { SequenceEnt } from "../../src/api/ents/SequenceEnt"; import { Sequence } from "../../src/graph/Sequence"; describe("Sequence", () => { let sequence: Sequence; beforeEach(() => { - let response: ISequence = { + let response: SequenceEnt = { key: "A", keys: ["B", "C", "D", "E"], }; diff --git a/spec/graph/edge/EdgeCalculator.Pano.spec.ts b/spec/graph/edge/EdgeCalculator.Pano.spec.ts index 0b3f7379..6fb16ce1 100644 --- a/spec/graph/edge/EdgeCalculator.Pano.spec.ts +++ b/spec/graph/edge/EdgeCalculator.Pano.spec.ts @@ -2,9 +2,9 @@ import { Node } from "../../../src/graph/Node"; import { EdgeCalculator } from "../../../src/graph/edge/EdgeCalculator"; import { EdgeCalculatorDirections } from "../../../src/graph/edge/EdgeCalculatorDirections"; import { EdgeCalculatorSettings } from "../../../src/graph/edge/EdgeCalculatorSettings"; -import { IPotentialEdge } from "../../../src/graph/edge/interfaces/IPotentialEdge"; +import { PotentialEdge } from "../../../src/graph/edge/interfaces/PotentialEdge"; import { EdgeCalculatorHelper } from "../../helper/EdgeCalculatorHelper"; -import { EdgeDirection } from "../../../src/graph/edge/EdgeDirection"; +import { NavigationDirection } from "../../../src/graph/edge/NavigationDirection"; describe("EdgeCalculator.computeSphericalEdges", () => { let edgeCalculator: EdgeCalculator; @@ -14,7 +14,7 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge1: IPotentialEdge; + let potentialEdge1: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -52,8 +52,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should have a spherical edge irrespective of rotation", () => { @@ -65,8 +65,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should not have a spherical edge with to long distance", () => { @@ -91,7 +91,7 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdges = edgeCalculator.computeSphericalEdges(node, [potentialEdge1]); for (let sphericalEdge of sphericalEdges) { - expect(sphericalEdge.data.direction === EdgeDirection.Spherical).toBe(false); + expect(sphericalEdge.data.direction === NavigationDirection.Spherical).toBe(false); } }); @@ -112,8 +112,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge1: IPotentialEdge; - let potentialEdge2: IPotentialEdge; + let potentialEdge1: PotentialEdge; + let potentialEdge2: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -152,8 +152,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should have a spherical edge closest to preferred distance", () => { @@ -166,8 +166,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should have a spherical edge with same sequence", () => { @@ -180,8 +180,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should have a spherical edge with same sequence", () => { @@ -194,8 +194,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should have a spherical edge with smallest motion change", () => { @@ -208,8 +208,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); }); @@ -222,10 +222,10 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let node: Node; - let potentialEdge1: IPotentialEdge; - let potentialEdge2: IPotentialEdge; - let potentialEdge3: IPotentialEdge; - let potentialEdge4: IPotentialEdge; + let potentialEdge1: PotentialEdge; + let potentialEdge2: PotentialEdge; + let potentialEdge3: PotentialEdge; + let potentialEdge4: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -276,8 +276,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge4.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge4.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should have a spherical edge in four directions", () => { @@ -302,12 +302,12 @@ describe("EdgeCalculator.computeSphericalEdges", () => { for (let key of keys) { let edge = null; for (let sphericalEdge of sphericalEdges) { - if (sphericalEdge.to === key) { + if (sphericalEdge.target === key) { edge = sphericalEdge; } } - expect(edge.data.direction).toBe(EdgeDirection.Spherical); + expect(edge.data.direction).toBe(NavigationDirection.Spherical); } }); @@ -331,12 +331,12 @@ describe("EdgeCalculator.computeSphericalEdges", () => { for (let key of keys) { let edge = null; for (let sphericalEdge of sphericalEdges) { - if (sphericalEdge.to === key) { + if (sphericalEdge.target === key) { edge = sphericalEdge; } } - expect(edge.data.direction).toBe(EdgeDirection.Spherical); + expect(edge.data.direction).toBe(NavigationDirection.Spherical); } }); @@ -352,8 +352,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); }); @@ -365,7 +365,7 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge1: IPotentialEdge; + let potentialEdge1: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -402,8 +402,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step left edge", () => { @@ -416,8 +416,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepLeft); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepLeft); }); it("should have a step left edge for direction change", () => { @@ -430,8 +430,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepLeft); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepLeft); }); it("should have a step right edge", () => { @@ -444,8 +444,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepRight); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepRight); }); it("should have a step right edge for direction change", () => { @@ -458,8 +458,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepRight); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepRight); }); it("should have a step backward edge", () => { @@ -472,8 +472,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepBackward); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepBackward); }); it("should have a step backward edge for direction change", () => { @@ -486,8 +486,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepBackward); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepBackward); }); it("should have a step forward edge in opposite motion direction", () => { @@ -500,8 +500,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge in perpendicular motion direction", () => { @@ -514,8 +514,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge in perpendicular motion direction", () => { @@ -528,8 +528,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should not have a step forward edge when turn is to large", () => { @@ -577,8 +577,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge1: IPotentialEdge; - let potentialEdge2: IPotentialEdge; + let potentialEdge1: PotentialEdge; + let potentialEdge2: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -619,8 +619,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should prefer a step forward edge with preferred distance", () => { @@ -633,8 +633,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should prefer a step forward edge with smaller motion change", () => { @@ -647,8 +647,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should prefer a step forward edge with smaller motion change", () => { @@ -661,8 +661,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should prefer a step forward edge with same merge connected component", () => { @@ -675,8 +675,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); }); @@ -689,10 +689,10 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let node: Node; - let potentialEdge1: IPotentialEdge; - let potentialEdge2: IPotentialEdge; - let potentialEdge3: IPotentialEdge; - let potentialEdge4: IPotentialEdge; + let potentialEdge1: PotentialEdge; + let potentialEdge2: PotentialEdge; + let potentialEdge3: PotentialEdge; + let potentialEdge4: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -742,14 +742,14 @@ describe("EdgeCalculator.computeSphericalEdges", () => { expect(sphericalEdges.length).toBe(4); for (let sphericalEdge of sphericalEdges) { - if (sphericalEdge.to === potentialEdge1.key) { - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); - } else if (sphericalEdge.to === potentialEdge2.key) { - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepLeft); - } else if (sphericalEdge.to === potentialEdge3.key) { - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepBackward); - } else if (sphericalEdge.to === potentialEdge4.key) { - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepRight); + if (sphericalEdge.target === potentialEdge1.key) { + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); + } else if (sphericalEdge.target === potentialEdge2.key) { + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepLeft); + } else if (sphericalEdge.target === potentialEdge3.key) { + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepBackward); + } else if (sphericalEdge.target === potentialEdge4.key) { + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepRight); } } }); @@ -769,8 +769,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should not have a step left or right edge based on step forward edges", () => { @@ -791,8 +791,8 @@ describe("EdgeCalculator.computeSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.StepForward); }); }); @@ -804,8 +804,8 @@ describe("EdgeCalculator.computePerspectiveToSphericalEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge1: IPotentialEdge; - let potentialEdge2: IPotentialEdge; + let potentialEdge1: PotentialEdge; + let potentialEdge2: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -841,8 +841,8 @@ describe("EdgeCalculator.computePerspectiveToSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge1.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge1.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should not return a spherical edge when node is spherical", () => { @@ -869,8 +869,8 @@ describe("EdgeCalculator.computePerspectiveToSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should return the spherical edge preferring forward motion", () => { @@ -883,8 +883,8 @@ describe("EdgeCalculator.computePerspectiveToSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); it("should return the spherical edge preferring same connected component", () => { @@ -897,7 +897,7 @@ describe("EdgeCalculator.computePerspectiveToSphericalEdges", () => { let sphericalEdge = sphericalEdges[0]; - expect(sphericalEdge.to).toBe(potentialEdge2.key); - expect(sphericalEdge.data.direction).toBe(EdgeDirection.Spherical); + expect(sphericalEdge.target).toBe(potentialEdge2.key); + expect(sphericalEdge.data.direction).toBe(NavigationDirection.Spherical); }); }); diff --git a/spec/graph/edge/EdgeCalculator.Sequence.spec.ts b/spec/graph/edge/EdgeCalculator.Sequence.spec.ts index f38443af..fdfc1861 100644 --- a/spec/graph/edge/EdgeCalculator.Sequence.spec.ts +++ b/spec/graph/edge/EdgeCalculator.Sequence.spec.ts @@ -1,8 +1,8 @@ import { EdgeCalculator } from "../../../src/graph/edge/EdgeCalculator"; import { EdgeCalculatorDirections } from "../../../src/graph/edge/EdgeCalculatorDirections"; import { EdgeCalculatorSettings } from "../../../src/graph/edge/EdgeCalculatorSettings"; -import { EdgeDirection } from "../../../src/graph/edge/EdgeDirection"; -import { IEdge } from "../../../src/graph/edge/interfaces/IEdge"; +import { NavigationDirection } from "../../../src/graph/edge/NavigationDirection"; +import { NavigationEdge } from "../../../src/graph/edge/interfaces/NavigationEdge"; import { Node } from "../../../src/graph/Node"; import { Sequence } from "../../../src/graph/Sequence"; import { EdgeCalculatorHelper } from "../../helper/EdgeCalculatorHelper"; @@ -52,14 +52,14 @@ describe("EdgeCalculator.computeSequenceEdges", () => { let node: Node = helper.createFullNode(key, { alt: 0, lat: 0, lon: 0 }, sequenceKey, [0, 0, 0]); let sequence: Sequence = new Sequence({ key: sequenceKey, keys: [key, nextKey] }); - let sequenceEdges: IEdge[] = edgeCalculator.computeSequenceEdges(node, sequence); + let sequenceEdges: NavigationEdge[] = edgeCalculator.computeSequenceEdges(node, sequence); expect(sequenceEdges.length).toBe(1); - let sequenceEdge: IEdge = sequenceEdges[0]; + let sequenceEdge: NavigationEdge = sequenceEdges[0]; - expect(sequenceEdge.to).toBe(nextKey); - expect(sequenceEdge.data.direction).toBe(EdgeDirection.Next); + expect(sequenceEdge.target).toBe(nextKey); + expect(sequenceEdge.data.direction).toBe(NavigationDirection.Next); }); it("should return a prev edge", () => { @@ -70,14 +70,14 @@ describe("EdgeCalculator.computeSequenceEdges", () => { let node: Node = helper.createFullNode(key, { alt: 0, lat: 0, lon: 0 }, sequenceKey, [0, 0, 0]); let sequence: Sequence = new Sequence({ key: sequenceKey, keys: [prevKey, key] }); - let sequenceEdges: IEdge[] = edgeCalculator.computeSequenceEdges(node, sequence); + let sequenceEdges: NavigationEdge[] = edgeCalculator.computeSequenceEdges(node, sequence); expect(sequenceEdges.length).toBe(1); - let sequenceEdge: IEdge = sequenceEdges[0]; + let sequenceEdge: NavigationEdge = sequenceEdges[0]; - expect(sequenceEdge.to).toBe(prevKey); - expect(sequenceEdge.data.direction).toBe(EdgeDirection.Prev); + expect(sequenceEdge.target).toBe(prevKey); + expect(sequenceEdge.data.direction).toBe(NavigationDirection.Prev); }); it("should return a prev and a next edge", () => { @@ -90,15 +90,15 @@ describe("EdgeCalculator.computeSequenceEdges", () => { let node: Node = helper.createFullNode(key, { alt: 0, lat: 0, lon: 0 }, sequenceKey, [0, 0, 0]); let sequence: Sequence = new Sequence({ key: sequenceKey, keys: [prevKey, key, nextKey] }); - let sequenceEdges: IEdge[] = edgeCalculator.computeSequenceEdges(node, sequence); + let sequenceEdges: NavigationEdge[] = edgeCalculator.computeSequenceEdges(node, sequence); expect(sequenceEdges.length).toBe(2); for (let sequenceEdge of sequenceEdges) { - if (sequenceEdge.to === prevKey) { - expect(sequenceEdge.data.direction).toBe(EdgeDirection.Prev); - } else if (sequenceEdge.to === nextKey) { - expect(sequenceEdge.data.direction).toBe(EdgeDirection.Next); + if (sequenceEdge.target === prevKey) { + expect(sequenceEdge.data.direction).toBe(NavigationDirection.Prev); + } else if (sequenceEdge.target === nextKey) { + expect(sequenceEdge.data.direction).toBe(NavigationDirection.Next); } } }); diff --git a/spec/graph/edge/EdgeCalculator.Similar.spec.ts b/spec/graph/edge/EdgeCalculator.Similar.spec.ts index 8c1838a6..ec139379 100644 --- a/spec/graph/edge/EdgeCalculator.Similar.spec.ts +++ b/spec/graph/edge/EdgeCalculator.Similar.spec.ts @@ -1,9 +1,9 @@ import { EdgeCalculator } from "../../../src/graph/edge/EdgeCalculator"; import { EdgeCalculatorDirections } from "../../../src/graph/edge/EdgeCalculatorDirections"; import { EdgeCalculatorSettings } from "../../../src/graph/edge/EdgeCalculatorSettings"; -import { EdgeDirection } from "../../../src/graph/edge/EdgeDirection"; -import { IEdge } from "../../../src/graph/edge/interfaces/IEdge"; -import { IPotentialEdge } from "../../../src/graph/edge/interfaces/IPotentialEdge"; +import { NavigationDirection } from "../../../src/graph/edge/NavigationDirection"; +import { NavigationEdge } from "../../../src/graph/edge/interfaces/NavigationEdge"; +import { PotentialEdge } from "../../../src/graph/edge/interfaces/PotentialEdge"; import { Node } from "../../../src/graph/Node"; import { EdgeCalculatorHelper } from "../../helper/EdgeCalculatorHelper"; @@ -16,7 +16,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge: IPotentialEdge; + let potentialEdge: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -51,14 +51,14 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameMergeCC = true; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(1); - let similarEdge: IEdge = similarEdges[0]; + let similarEdge: NavigationEdge = similarEdges[0]; - expect(similarEdge.to).toBe(potentialEdge.key); - expect(similarEdge.data.direction).toBe(EdgeDirection.Similar); + expect(similarEdge.target).toBe(potentialEdge.key); + expect(similarEdge.data.direction).toBe(NavigationDirection.Similar); }); it("should not have a similar edge if sequence is missing on potential edge", () => { @@ -66,7 +66,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameMergeCC = true; potentialEdge.sequenceKey = null; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(0); }); @@ -76,7 +76,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameSequence = true; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(0); }); @@ -86,7 +86,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameSequence = true; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(0); }); @@ -95,7 +95,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameMergeCC = false; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(1); }); @@ -104,7 +104,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameMergeCC = true; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(1); }); @@ -116,7 +116,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameMergeCC = true; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(0); }); @@ -128,7 +128,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameMergeCC = true; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(0); }); @@ -141,14 +141,14 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameMergeCC = true; potentialEdge.sequenceKey = "other"; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(1); - let similarEdge: IEdge = similarEdges[0]; + let similarEdge: NavigationEdge = similarEdges[0]; - expect(similarEdge.to).toBe(potentialEdge.key); - expect(similarEdge.data.direction).toBe(EdgeDirection.Similar); + expect(similarEdge.target).toBe(potentialEdge.key); + expect(similarEdge.data.direction).toBe(NavigationDirection.Similar); }); it("should not have a similar edge for the same user within min time diff", () => { @@ -161,7 +161,7 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameUser = true; potentialEdge.capturedAt = 1050; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(0); }); @@ -176,19 +176,19 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge.sameUser = true; potentialEdge.capturedAt = 1200; - let similarEdges: IEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge]); expect(similarEdges.length).toBe(1); - let similarEdge: IEdge = similarEdges[0]; + let similarEdge: NavigationEdge = similarEdges[0]; - expect(similarEdge.to).toBe(potentialEdge.key); - expect(similarEdge.data.direction).toBe(EdgeDirection.Similar); + expect(similarEdge.target).toBe(potentialEdge.key); + expect(similarEdge.data.direction).toBe(NavigationDirection.Similar); }); it("should have a multiple similar edges from different sequences", () => { - let potentialEdge1: IPotentialEdge = helper.createPotentialEdge(); - let potentialEdge2: IPotentialEdge = helper.createPotentialEdge(); + let potentialEdge1: PotentialEdge = helper.createPotentialEdge(); + let potentialEdge2: PotentialEdge = helper.createPotentialEdge(); potentialEdge1.key = "k1"; potentialEdge1.sameMergeCC = true; @@ -198,20 +198,20 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge2.sameMergeCC = true; potentialEdge2.sequenceKey = "s2"; - let similarEdges: IEdge[] = + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge1, potentialEdge2]); expect(similarEdges.length).toBe(2); for (let similarEdge of similarEdges) { - expect(similarEdge.data.direction).toBe(EdgeDirection.Similar); + expect(similarEdge.data.direction).toBe(NavigationDirection.Similar); } for (let key of [potentialEdge1.key, potentialEdge2.key]) { let count: number = 0; for (let similarEdge of similarEdges) { - if (similarEdge.to === key) { + if (similarEdge.target === key) { count++; } } @@ -221,8 +221,8 @@ describe("EdgeCalculator.computeSimilarEdges", () => { }); it("should have only one similar edge for a sequence based on distance", () => { - let potentialEdge1: IPotentialEdge = helper.createPotentialEdge(); - let potentialEdge2: IPotentialEdge = helper.createPotentialEdge(); + let potentialEdge1: PotentialEdge = helper.createPotentialEdge(); + let potentialEdge2: PotentialEdge = helper.createPotentialEdge(); potentialEdge1.key = "k1"; potentialEdge1.distance = 2; @@ -234,20 +234,20 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge2.sameMergeCC = true; potentialEdge2.sequenceKey = "s1"; - let similarEdges: IEdge[] = + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge1, potentialEdge2]); expect(similarEdges.length).toBe(1); - let similarEdge: IEdge = similarEdges[0]; + let similarEdge: NavigationEdge = similarEdges[0]; - expect(similarEdge.to).toBe(potentialEdge2.key); - expect(similarEdge.data.direction).toBe(EdgeDirection.Similar); + expect(similarEdge.target).toBe(potentialEdge2.key); + expect(similarEdge.data.direction).toBe(NavigationDirection.Similar); }); it("should have only one similar edge for a sequence based on rotation", () => { - let potentialEdge1: IPotentialEdge = helper.createPotentialEdge(); - let potentialEdge2: IPotentialEdge = helper.createPotentialEdge(); + let potentialEdge1: PotentialEdge = helper.createPotentialEdge(); + let potentialEdge2: PotentialEdge = helper.createPotentialEdge(); potentialEdge1.key = "k1"; potentialEdge1.rotation = 2; @@ -259,14 +259,14 @@ describe("EdgeCalculator.computeSimilarEdges", () => { potentialEdge2.sameMergeCC = true; potentialEdge2.sequenceKey = "s1"; - let similarEdges: IEdge[] = + let similarEdges: NavigationEdge[] = edgeCalculator.computeSimilarEdges(node, [potentialEdge1, potentialEdge2]); expect(similarEdges.length).toBe(1); - let similarEdge: IEdge = similarEdges[0]; + let similarEdge: NavigationEdge = similarEdges[0]; - expect(similarEdge.to).toBe(potentialEdge2.key); - expect(similarEdge.data.direction).toBe(EdgeDirection.Similar); + expect(similarEdge.target).toBe(potentialEdge2.key); + expect(similarEdge.data.direction).toBe(NavigationDirection.Similar); }); }); diff --git a/spec/graph/edge/EdgeCalculator.Step.spec.ts b/spec/graph/edge/EdgeCalculator.Step.spec.ts index dc0b576e..e1ea5a1a 100644 --- a/spec/graph/edge/EdgeCalculator.Step.spec.ts +++ b/spec/graph/edge/EdgeCalculator.Step.spec.ts @@ -1,9 +1,9 @@ import { EdgeCalculator } from "../../../src/graph/edge/EdgeCalculator"; import { EdgeCalculatorDirections } from "../../../src/graph/edge/EdgeCalculatorDirections"; import { EdgeCalculatorSettings } from "../../../src/graph/edge/EdgeCalculatorSettings"; -import { EdgeDirection } from "../../../src/graph/edge/EdgeDirection"; -import { IEdge } from "../../../src/graph/edge/interfaces/IEdge"; -import { IPotentialEdge } from "../../../src/graph/edge/interfaces/IPotentialEdge"; +import { NavigationDirection } from "../../../src/graph/edge/NavigationDirection"; +import { NavigationEdge } from "../../../src/graph/edge/interfaces/NavigationEdge"; +import { PotentialEdge } from "../../../src/graph/edge/interfaces/PotentialEdge"; import { Node } from "../../../src/graph/Node"; import { EdgeCalculatorHelper } from "../../helper/EdgeCalculatorHelper"; @@ -15,14 +15,14 @@ describe("EdgeCalculator.computeStepEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge: IPotentialEdge; + let potentialEdge: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); directions = new EdgeCalculatorDirections(); - directions.steps[EdgeDirection.StepForward].useFallback = true; - directions.steps[EdgeDirection.StepBackward].useFallback = false; + directions.steps[NavigationDirection.StepForward].useFallback = true; + directions.steps[NavigationDirection.StepBackward].useFallback = false; edgeCalculator = new EdgeCalculator(settings, directions); @@ -45,59 +45,59 @@ describe("EdgeCalculator.computeStepEdges", () => { it("should have a step forward edge", () => { potentialEdge.motionChange = 0; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step left edge", () => { potentialEdge.motionChange = Math.PI / 2; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepLeft); + expect(stepEdge.target).toBe(potentialEdge.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepLeft); }); it("should have a step right edge", () => { potentialEdge.motionChange = -Math.PI / 2; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepRight); + expect(stepEdge.target).toBe(potentialEdge.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepRight); }); it("should have a step back edge", () => { potentialEdge.motionChange = Math.PI; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepBackward); + expect(stepEdge.target).toBe(potentialEdge.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepBackward); }); it("should not have any edges because potential is spherical", () => { potentialEdge.spherical = true; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(0); }); @@ -105,7 +105,7 @@ describe("EdgeCalculator.computeStepEdges", () => { it("should not have any edges because of max distance", () => { potentialEdge.distance = settings.stepMaxDistance + 1; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(0); }); @@ -113,7 +113,7 @@ describe("EdgeCalculator.computeStepEdges", () => { it("should not have any edges because of direction change", () => { potentialEdge.directionChange = settings.stepMaxDirectionChange + Math.PI / 18; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(0); }); @@ -121,7 +121,7 @@ describe("EdgeCalculator.computeStepEdges", () => { it("should not have any edges because of negative direction change", () => { potentialEdge.directionChange = -settings.stepMaxDirectionChange - Math.PI / 18; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(0); }); @@ -129,7 +129,7 @@ describe("EdgeCalculator.computeStepEdges", () => { it("should not have any edges because of drift", () => { potentialEdge.motionChange = settings.stepMaxDrift + Math.PI / 18; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(0); }); @@ -137,7 +137,7 @@ describe("EdgeCalculator.computeStepEdges", () => { it("should not have any edges because of negative drift", () => { potentialEdge.motionChange = -settings.stepMaxDrift - Math.PI / 18; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(0); }); @@ -146,7 +146,7 @@ describe("EdgeCalculator.computeStepEdges", () => { potentialEdge.distance = settings.stepMaxDistance + 1; potentialEdge.motionChange = 0; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges( + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges( node, [potentialEdge], potentialEdge.key, @@ -154,17 +154,17 @@ describe("EdgeCalculator.computeStepEdges", () => { expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should not fallback to previous node with disabled fallback setting", () => { potentialEdge.distance = settings.stepMaxDistance + 1; potentialEdge.motionChange = Math.PI; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges( + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges( node, [potentialEdge], null, @@ -176,7 +176,7 @@ describe("EdgeCalculator.computeStepEdges", () => { it("should not have any edges if node is spherical", () => { node = helper.createDefaultNode(true); - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge], null, null); expect(stepEdges.length).toBe(0); }); @@ -190,8 +190,8 @@ describe("EdgeCalculator.computeStepEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge1: IPotentialEdge; - let potentialEdge2: IPotentialEdge; + let potentialEdge1: PotentialEdge; + let potentialEdge2: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -212,84 +212,84 @@ describe("EdgeCalculator.computeStepEdges", () => { potentialEdge1.distance = settings.stepPreferredDistance + 1; potentialEdge2.distance = settings.stepPreferredDistance; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge based on preferred distance", () => { potentialEdge1.distance = settings.stepPreferredDistance - 1; potentialEdge2.distance = settings.stepPreferredDistance; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge for smallest motion change", () => { potentialEdge1.motionChange = settings.stepMaxDrift / 2; potentialEdge2.motionChange = settings.stepMaxDrift / 4; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge for smallest motion change", () => { potentialEdge1.motionChange = -settings.stepMaxDrift / 2; potentialEdge2.motionChange = -settings.stepMaxDrift / 4; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge for smallest vertical motion change", () => { potentialEdge1.verticalMotion = settings.stepMaxDrift / 2; potentialEdge2.verticalMotion = settings.stepMaxDrift / 4; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge for smallest vertical motion change", () => { potentialEdge1.verticalMotion = -settings.stepMaxDrift / 2; potentialEdge2.verticalMotion = -settings.stepMaxDrift / 4; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge for smallest combined motion change", () => { @@ -299,55 +299,55 @@ describe("EdgeCalculator.computeStepEdges", () => { potentialEdge2.motionChange = -settings.stepMaxDrift / 3; potentialEdge2.verticalMotion = -settings.stepMaxDrift / 3; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge with the same sequence", () => { potentialEdge1.sameSequence = false; potentialEdge2.sameSequence = true; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge with the same merge cc", () => { potentialEdge1.sameMergeCC = false; potentialEdge2.sameMergeCC = true; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); it("should have a step forward edge with smallest rotation", () => { potentialEdge1.rotation = 0.2; potentialEdge2.rotation = 0.1; - let stepEdges: IEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); + let stepEdges: NavigationEdge[] = edgeCalculator.computeStepEdges(node, [potentialEdge1, potentialEdge2], null, null); expect(stepEdges.length).toBe(1); - let stepEdge: IEdge = stepEdges[0]; + let stepEdge: NavigationEdge = stepEdges[0]; - expect(stepEdge.to).toBe(potentialEdge2.key); - expect(stepEdge.data.direction).toBe(EdgeDirection.StepForward); + expect(stepEdge.target).toBe(potentialEdge2.key); + expect(stepEdge.data.direction).toBe(NavigationDirection.StepForward); }); }); diff --git a/spec/graph/edge/EdgeCalculator.Turn.spec.ts b/spec/graph/edge/EdgeCalculator.Turn.spec.ts index db1581f7..bc8a1752 100644 --- a/spec/graph/edge/EdgeCalculator.Turn.spec.ts +++ b/spec/graph/edge/EdgeCalculator.Turn.spec.ts @@ -1,9 +1,9 @@ import { EdgeCalculator } from "../../../src/graph/edge/EdgeCalculator"; import { EdgeCalculatorDirections } from "../../../src/graph/edge/EdgeCalculatorDirections"; import { EdgeCalculatorSettings } from "../../../src/graph/edge/EdgeCalculatorSettings"; -import { EdgeDirection } from "../../../src/graph/edge/EdgeDirection"; -import { IEdge } from "../../../src/graph/edge/interfaces/IEdge"; -import { IPotentialEdge } from "../../../src/graph/edge/interfaces/IPotentialEdge"; +import { NavigationDirection } from "../../../src/graph/edge/NavigationDirection"; +import { NavigationEdge } from "../../../src/graph/edge/interfaces/NavigationEdge"; +import { PotentialEdge } from "../../../src/graph/edge/interfaces/PotentialEdge"; import { Node } from "../../../src/graph/Node"; import { EdgeCalculatorHelper } from "../../helper/EdgeCalculatorHelper"; @@ -15,7 +15,7 @@ describe("EdgeCalculator.computeTurnEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge: IPotentialEdge; + let potentialEdge: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -42,7 +42,7 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge.directionChange = Math.PI / 2; potentialEdge.spherical = true; - let stepEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); + let stepEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); expect(stepEdges.length).toBe(0); }); @@ -50,40 +50,40 @@ describe("EdgeCalculator.computeTurnEdges", () => { it("should have a turn left edge", () => { potentialEdge.directionChange = Math.PI / 2; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnLeft); + expect(turnEdge.target).toBe(potentialEdge.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnLeft); }); it("should have a turn right edge", () => { potentialEdge.directionChange = -Math.PI / 2; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnRight); + expect(turnEdge.target).toBe(potentialEdge.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnRight); }); it("should have a u-turn edge", () => { potentialEdge.directionChange = Math.PI; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnU); + expect(turnEdge.target).toBe(potentialEdge.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnU); }); it("should not have a u-turn edge when node is spherical", () => { @@ -91,7 +91,7 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge.directionChange = Math.PI; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge]); expect(turnEdges.length).toBe(0); }); @@ -105,8 +105,8 @@ describe("EdgeCalculator.computeTurnEdges", () => { let helper: EdgeCalculatorHelper; let node: Node; - let potentialEdge1: IPotentialEdge; - let potentialEdge2: IPotentialEdge; + let potentialEdge1: PotentialEdge; + let potentialEdge2: PotentialEdge; beforeEach(() => { settings = new EdgeCalculatorSettings(); @@ -133,14 +133,14 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge2.directionChange = Math.PI / 2; potentialEdge2.sameSequence = true; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge2.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnLeft); + expect(turnEdge.target).toBe(potentialEdge2.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnLeft); }); it("should have a turn left with the same merge cc", () => { @@ -150,14 +150,14 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge2.directionChange = Math.PI / 2; potentialEdge2.sameMergeCC = true; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge2.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnLeft); + expect(turnEdge.target).toBe(potentialEdge2.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnLeft); }); it("should have a turn left edge with the smallest distance", () => { @@ -167,19 +167,19 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge2.directionChange = Math.PI / 2; potentialEdge2.distance = 3; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge2.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnLeft); + expect(turnEdge.target).toBe(potentialEdge2.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnLeft); }); it("should have a turn left edge with the smallest motion difference", () => { let motionChange: number = - directions.turns[EdgeDirection.TurnLeft].motionChange; + directions.turns[NavigationDirection.TurnLeft].motionChange; potentialEdge1.directionChange = Math.PI / 2; potentialEdge1.motionChange = 0.9 * motionChange; @@ -187,14 +187,14 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge2.directionChange = Math.PI / 2; potentialEdge2.motionChange = motionChange; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge2.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnLeft); + expect(turnEdge.target).toBe(potentialEdge2.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnLeft); }); it("should have a turn left edge for rig setup with smallest direction change", () => { @@ -204,14 +204,14 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge2.distance = 0.5 * settings.turnMaxRigDistance; potentialEdge2.directionChange = 1.1 * settings.turnMinRigDirectionChange; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge2.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnLeft); + expect(turnEdge.target).toBe(potentialEdge2.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnLeft); }); it("should have a turn right edge for rig setup with smallest direction change", () => { @@ -221,14 +221,14 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge2.distance = 0.5 * settings.turnMaxRigDistance; potentialEdge2.directionChange = -1.1 * settings.turnMinRigDirectionChange; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); expect(turnEdges.length).toBe(1); - let turnEdge: IEdge = turnEdges[0]; + let turnEdge: NavigationEdge = turnEdges[0]; - expect(turnEdge.to).toBe(potentialEdge2.key); - expect(turnEdge.data.direction).toBe(EdgeDirection.TurnRight); + expect(turnEdge.target).toBe(potentialEdge2.key); + expect(turnEdge.data.direction).toBe(NavigationDirection.TurnRight); }); it("should not have a turn left edge for rig with too small angle", () => { @@ -238,7 +238,7 @@ describe("EdgeCalculator.computeTurnEdges", () => { potentialEdge1.distance = 0.5 * settings.turnMaxRigDistance; potentialEdge1.directionChange = -0.9 * settings.turnMinRigDirectionChange; - let turnEdges: IEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); + let turnEdges: NavigationEdge[] = edgeCalculator.computeTurnEdges(node, [potentialEdge1, potentialEdge2]); expect(turnEdges.length).toBe(0); }); diff --git a/spec/graph/edge/EdgeCalculator.spec.ts b/spec/graph/edge/EdgeCalculator.spec.ts index d3316853..a77eb2ad 100644 --- a/spec/graph/edge/EdgeCalculator.spec.ts +++ b/spec/graph/edge/EdgeCalculator.spec.ts @@ -1,8 +1,8 @@ import { GeoCoords } from "../../../src/geo/GeoCoords"; -import { ILatLonAlt } from "../../../src/geo/interfaces/ILatLonAlt"; +import { LatLonAltEnt } from "../../../src/api/ents/LatLonAltEnt"; import { Spatial } from "../../../src/geo/Spatial"; import { EdgeCalculator } from "../../../src/graph/edge/EdgeCalculator"; -import { IPotentialEdge } from "../../../src/graph/edge/interfaces/IPotentialEdge"; +import { PotentialEdge } from "../../../src/graph/edge/interfaces/PotentialEdge"; import { Node } from "../../../src/graph/Node"; import { EdgeCalculatorHelper } from "../../helper/EdgeCalculatorHelper"; @@ -44,15 +44,15 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [0, -Math.PI / 2, 0], 2, "perspective", 0, 0); let enu: number[] = [10, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [0, -Math.PI / 2, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(0); @@ -63,20 +63,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [0, -Math.PI / 2, 0]); let enu: number[] = [10, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [0, -Math.PI / 2, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.distance).toBeCloseTo(10, precision); @@ -95,15 +95,15 @@ describe("EdgeCalculator.getPotentialEdges", () => { let sequenceKey: string = "skey"; let edgeKey: string = "edgeKey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [0, -Math.PI / 2, 0]); let enu: number[] = [10, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, null, [0, -Math.PI / 2, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); @@ -114,20 +114,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [0, -Math.PI / 2, 0]); let enu: number[] = [3, -4, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [0, -Math.PI / 2, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.distance).toBeCloseTo(5, precision); @@ -138,20 +138,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [0, -Math.PI / 2, 0]); let enu: number[] = [5, 5, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [0, -Math.PI / 2, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.motionChange).toBeCloseTo(Math.PI / 4, precision); @@ -162,20 +162,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [Math.PI / 2, 0, 0]); let enu: number[] = [5, 5, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [Math.PI / 2, 0, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.motionChange).toBeCloseTo(-Math.PI / 4, precision); @@ -186,20 +186,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [Math.PI / 2, 0, 0]); let enu: number[] = [0, -10, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [Math.PI / 2, 0, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(Math.abs(potentialEdge.motionChange)).toBeCloseTo(Math.PI, precision); @@ -210,20 +210,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [Math.PI / 2, 0, 0]); let enu: number[] = [3, 4, 5]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [Math.PI / 2, 0, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.verticalMotion).toBeCloseTo(Math.PI / 4, precision); @@ -234,20 +234,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, [Math.PI / 2, 0, 0]); let enu: number[] = [-3, 4, -5]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, [Math.PI / 2, 0, 0]); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.verticalMotion).toBeCloseTo(-Math.PI / 4, precision); @@ -258,20 +258,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(Math.PI / 2)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.directionChange).toBeCloseTo(Math.PI / 2, precision); @@ -282,20 +282,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(-Math.PI / 2)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.directionChange).toBeCloseTo(-Math.PI / 2, precision); @@ -306,20 +306,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(Math.PI / 4)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(-3 * Math.PI / 4)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(Math.abs(potentialEdge.directionChange)).toBeCloseTo(Math.PI, precision); @@ -330,20 +330,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(Math.PI / 4)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(Math.PI / 4, Math.PI / 4)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.verticalDirectionChange).toBeCloseTo(Math.PI / 4, precision); @@ -354,20 +354,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(Math.PI / 4, 5 * Math.PI / 12)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(Math.PI / 4, 7 * Math.PI / 12)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.verticalDirectionChange).toBeCloseTo(-Math.PI / 6, precision); @@ -378,20 +378,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(Math.PI / 2, Math.PI / 6)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(Math.PI / 2, 2 * Math.PI / 3)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.rotation).toBeCloseTo(Math.PI / 2, precision); @@ -407,20 +407,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let theta: number = spatial.relativeRotationAngle(r1, r2); - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, r1); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, r2); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.rotation).toBeCloseTo(theta, precision); @@ -434,20 +434,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let r1: number[] = [0, 0, 0]; let r2: number[] = [0, 0, 0]; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, r1); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, r2); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.worldMotionAzimuth).toBeCloseTo(0, precision); @@ -461,20 +461,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let r1: number[] = [0, 0, 0]; let r2: number[] = [0, 0, 0]; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, r1); let enu: number[] = [0, 1, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, r2); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.worldMotionAzimuth).toBeCloseTo(Math.PI / 2, precision); @@ -488,20 +488,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let r1: number[] = [0, 0, 0]; let r2: number[] = [0, 0, 0]; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, r1); let enu: number[] = [-1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, r2); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(Math.abs(potentialEdge.worldMotionAzimuth)).toBeCloseTo(Math.PI, precision); @@ -515,20 +515,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let r1: number[] = [0, 0, 0]; let r2: number[] = [0, 0, 0]; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, r1); let enu: number[] = [0, -1, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, r2); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.worldMotionAzimuth).toBeCloseTo(-Math.PI / 2, precision); @@ -542,20 +542,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let r1: number[] = [0, 0, 0]; let r2: number[] = [0, 0, 0]; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, r1); let enu: number[] = [1, 1, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, r2); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.worldMotionAzimuth).toBeCloseTo(Math.PI / 4, precision); @@ -566,20 +566,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(0)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.sameSequence).toBe(true); @@ -591,20 +591,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let sequenceKey: string = "skey"; let edgeSequenceKey: string = "edgeSkey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0)); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, edgeSequenceKey, createRotationVector(0)); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.sameSequence).toBe(false); @@ -617,20 +617,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let mergeCC: number = 45; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0), mergeCC); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(0), mergeCC); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.sameMergeCC).toBe(true); @@ -644,20 +644,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let mergeCC1: number = 45; let mergeCC2: number = 22; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0), mergeCC1); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(0), mergeCC2); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.sameMergeCC).toBe(false); @@ -668,20 +668,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0), null); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(0), null); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.sameMergeCC).toBe(true); @@ -692,20 +692,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0), 467); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(0), null); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.sameMergeCC).toBe(false); @@ -716,20 +716,20 @@ describe("EdgeCalculator.getPotentialEdges", () => { let edgeKey: string = "edgeKey"; let sequenceKey: string = "skey"; - let lla: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let lla: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; let node: Node = helper.createFullNode(key, lla, sequenceKey, createRotationVector(0), 467); let enu: number[] = [1, 0, 0]; let geodetic: number[] = geoCoords.enuToGeodetic(enu[0], enu[1], enu[2], lla.lat, lla.lon, lla.alt); - let edgeLla: ILatLonAlt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; + let edgeLla: LatLonAltEnt = { alt: geodetic[2], lat: geodetic[0], lon: geodetic[1] }; let edgeNode: Node = helper.createFullNode(edgeKey, edgeLla, sequenceKey, createRotationVector(0), 435, "equirectangular"); - let potentialEdges: IPotentialEdge[] = + let potentialEdges: PotentialEdge[] = edgeCalculator.getPotentialEdges(node, [edgeNode], []); expect(potentialEdges.length).toBe(1); - let potentialEdge: IPotentialEdge = potentialEdges[0]; + let potentialEdge: PotentialEdge = potentialEdges[0]; expect(potentialEdge.key).toBe(edgeKey); expect(potentialEdge.spherical).toBe(true); diff --git a/spec/helper/DOMRendererMockCreator.ts b/spec/helper/DOMRendererMockCreator.ts index d25a9ac5..3ad0fd69 100644 --- a/spec/helper/DOMRendererMockCreator.ts +++ b/spec/helper/DOMRendererMockCreator.ts @@ -1,6 +1,6 @@ import { Subject } from "rxjs"; import { DOMRenderer } from "../../src/render/DOMRenderer"; -import { IVNodeHash } from "../../src/render/interfaces/IVNodeHash"; +import { VirtualNodeHash } from "../../src/render/interfaces/VirtualNodeHash"; import { MockCreator } from "./MockCreator"; import { MockCreatorBase } from "./MockCreatorBase"; @@ -9,8 +9,8 @@ export class DOMRendererMockCreator extends MockCreatorBase { public create(): DOMRenderer { const mock: DOMRenderer = new MockCreator().create(DOMRenderer, "DOMRenderer"); - this._mockProperty(mock, "element$", new Subject()); - this._mockProperty(mock, "render$", new Subject()); + this._mockProperty(mock, "element$", new Subject()); + this._mockProperty(mock, "render$", new Subject()); return mock; } diff --git a/spec/helper/EdgeCalculatorHelper.ts b/spec/helper/EdgeCalculatorHelper.ts index 30bef35f..bb0a9fbf 100644 --- a/spec/helper/EdgeCalculatorHelper.ts +++ b/spec/helper/EdgeCalculatorHelper.ts @@ -1,12 +1,12 @@ import { Node } from "../../src/graph/Node"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; -import { ILatLonAlt } from "../../src/geo/interfaces/ILatLonAlt"; -import { IPotentialEdge } from "../../src/graph/edge/interfaces/IPotentialEdge"; -import { CameraProjectionType } from "../../src/api/interfaces/CameraProjectionType"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; +import { LatLonAltEnt } from "../../src/api/ents/LatLonAltEnt"; +import { PotentialEdge } from "../../src/graph/edge/interfaces/PotentialEdge"; +import { CameraType } from "../../src/geo/interfaces/CameraType"; export class EdgeCalculatorHelper { - public createPotentialEdge(key: string = "pkey"): IPotentialEdge { + public createPotentialEdge(key: string = "pkey"): PotentialEdge { return { capturedAt: 0, directionChange: 0, @@ -27,10 +27,10 @@ export class EdgeCalculatorHelper { public createCoreNode( key: string, - latLonAlt: ILatLonAlt, + latLonAlt: LatLonAltEnt, sequenceKey: string): Node { - let coreNode: ICoreNode = { + let coreNode: CoreImageEnt = { cl: { lat: latLonAlt.lat, lon: latLonAlt.lon }, key: key, l: { lat: latLonAlt.lat, lon: latLonAlt.lon }, @@ -42,17 +42,17 @@ export class EdgeCalculatorHelper { public createFullNode( key: string = "key", - latLonAlt: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }, + latLonAlt: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }, sequenceKey: string = "skey", r: number[] = [0, 0, 0], mergeCC: number = 2, - cameraType: CameraProjectionType = "perspective", + cameraType: CameraType = "perspective", capturedAt: number = 0, mergeVersion: number = 1): Node { let node: Node = this.createCoreNode(key, latLonAlt, sequenceKey); - let fillNode: IFillNode = { + let fillNode: SpatialImageEnt = { atomic_scale: 0, c_rotation: r, ca: 0, @@ -79,9 +79,9 @@ export class EdgeCalculatorHelper { public createDefaultNode(spherical: boolean = false): Node { let key: string = "key"; let sequenceKey: string = "skey"; - let latLonAlt: ILatLonAlt = { alt: 0, lat: 0, lon: 0 }; + let latLonAlt: LatLonAltEnt = { alt: 0, lat: 0, lon: 0 }; - let cameraType: CameraProjectionType = spherical ? + let cameraType: CameraType = spherical ? "equirectangular" : null; diff --git a/spec/helper/FrameHelper.ts b/spec/helper/FrameHelper.ts index f5d295d3..f69f1292 100644 --- a/spec/helper/FrameHelper.ts +++ b/spec/helper/FrameHelper.ts @@ -1,17 +1,17 @@ import { NodeHelper } from "./NodeHelper"; import { TransformHelper } from "./TransformHelper"; -import { IFrame } from "../../src/state/interfaces/IFrame"; +import { AnimationFrame } from "../../src/state/interfaces/AnimationFrame"; import { State } from "../../src/state/State"; import { Camera } from "../../src/geo/Camera"; -import { CameraProjectionType } from "../../src/api/interfaces/CameraProjectionType"; +import { CameraType } from "../../src/geo/interfaces/CameraType"; export class FrameHelper { private _nodeHelper: NodeHelper = new NodeHelper(); private _transformHelper: TransformHelper = new TransformHelper(); public createFrame( - cameraType: CameraProjectionType = "perspective"): IFrame { + cameraType: CameraType = "perspective"): AnimationFrame { const currentNode = this._nodeHelper.createNode(cameraType); diff --git a/spec/helper/GLRendererMockCreator.ts b/spec/helper/GLRendererMockCreator.ts index c316fc0f..61cb6d25 100644 --- a/spec/helper/GLRendererMockCreator.ts +++ b/spec/helper/GLRendererMockCreator.ts @@ -1,6 +1,6 @@ import { Subject } from "rxjs"; import { GLRenderer } from "../../src/render/GLRenderer"; -import { IGLRenderHash } from "../../src/render/interfaces/IGLRenderHash"; +import { GLRenderHash } from "../../src/render/interfaces/IGLRenderHash"; import { MockCreator } from "./MockCreator"; import { MockCreatorBase } from "./MockCreatorBase"; @@ -10,7 +10,7 @@ export class GLRendererMockCreator extends MockCreatorBase { const mock: GLRenderer = new MockCreator().create(GLRenderer, "GLRenderer"); this._mockProperty(mock, "webGLRenderer$", new Subject()); - this._mockProperty(mock, "render$", new Subject()); + this._mockProperty(mock, "render$", new Subject()); this._mockProperty(mock, "postrender$", new Subject()); return mock; diff --git a/spec/helper/NodeHelper.ts b/spec/helper/NodeHelper.ts index 1aeb0b28..b5f8fed0 100644 --- a/spec/helper/NodeHelper.ts +++ b/spec/helper/NodeHelper.ts @@ -1,7 +1,7 @@ -import { CameraProjectionType } from "../../src/api/interfaces/CameraProjectionType"; -import { ICoreNode } from "../../src/api/interfaces/ICoreNode"; -import { IFillNode } from "../../src/api/interfaces/IFillNode"; -import { IFullNode } from "../../src/api/interfaces/IFullNode"; +import { CameraType } from "../../src/geo/interfaces/CameraType"; +import { CoreImageEnt } from "../../src/api/ents/CoreImageEnt"; +import { SpatialImageEnt } from "../../src/api/ents/SpatialImageEnt"; +import { ImageEnt } from "../../src/api/ents/ImageEnt"; import { Node } from "../../src/graph/Node"; export class NodeHelper { @@ -11,7 +11,7 @@ export class NodeHelper { private _userKey: string = "ukey"; private _username: string = "uname"; - public createCoreNode(): ICoreNode { + public createCoreNode(): CoreImageEnt { return { cl: { lat: 0, lon: 0 }, key: this._nodeKey, @@ -20,7 +20,7 @@ export class NodeHelper { }; } - public createFillNode(): IFillNode { + public createFillNode(): SpatialImageEnt { return { atomic_scale: 0, c_rotation: [0, 0, 0], @@ -42,7 +42,7 @@ export class NodeHelper { }; } - public createFullNode(): IFullNode { + public createFullNode(): ImageEnt { return { atomic_scale: 0, c_rotation: [0, 0, 0], @@ -68,7 +68,7 @@ export class NodeHelper { }; } - public createNode(cameraType: CameraProjectionType = "perspective"): Node { + public createNode(cameraType: CameraType = "perspective"): Node { let fullNode = this.createFullNode(); fullNode.camera_projection_type = cameraType; let node = new Node(fullNode); @@ -77,7 +77,7 @@ export class NodeHelper { } public createUnmergedNode(): Node { - let fullNode: IFullNode = this.createFullNode(); + let fullNode: ImageEnt = this.createFullNode(); fullNode.atomic_scale = undefined; fullNode.ca = undefined; diff --git a/spec/helper/PlayServiceMockCreator.ts b/spec/helper/PlayServiceMockCreator.ts index 535d54f2..40f9f64a 100644 --- a/spec/helper/PlayServiceMockCreator.ts +++ b/spec/helper/PlayServiceMockCreator.ts @@ -1,5 +1,5 @@ import { Subject } from "rxjs"; -import { EdgeDirection } from "../../src/graph/edge/EdgeDirection"; +import { NavigationDirection } from "../../src/graph/edge/NavigationDirection"; import { PlayService } from "../../src/viewer/PlayService"; import { MockCreator } from "./MockCreator"; @@ -9,7 +9,7 @@ export class PlayServiceMockCreator extends MockCreatorBase { public create(): PlayService { const mock: PlayService = new MockCreator().create(PlayService, "PlayService"); - this._mockProperty(mock, "direction$", new Subject()); + this._mockProperty(mock, "direction$", new Subject()); this._mockProperty(mock, "playing$", new Subject()); this._mockProperty(mock, "speed$", new Subject()); diff --git a/spec/helper/StateServiceMockCreator.ts b/spec/helper/StateServiceMockCreator.ts index e0707591..d020b93b 100644 --- a/spec/helper/StateServiceMockCreator.ts +++ b/spec/helper/StateServiceMockCreator.ts @@ -5,8 +5,8 @@ import { MockCreatorBase } from "./MockCreatorBase"; import { Node } from "../../src/graph/Node"; import { Transform } from "stream"; -import { ILatLonAlt } from "../../src/geo/interfaces/ILatLonAlt"; -import { IFrame } from "../../src/state/interfaces/IFrame"; +import { LatLonAltEnt } from "../../src/api/ents/LatLonAltEnt"; +import { AnimationFrame } from "../../src/state/interfaces/AnimationFrame"; import { State } from "../../src/state/State"; import { StateService } from "../../src/state/StateService"; @@ -18,11 +18,11 @@ export class StateServiceMockCreator extends MockCreatorBase { this._mockProperty(mock, "currentKey$", new Subject()); this._mockProperty(mock, "currentNode$", new Subject()); this._mockProperty(mock, "currentNodeExternal$", new Subject()); - this._mockProperty(mock, "currentState$", new Subject