@vived/app 4.24.0 → 4.26.0

package/lib/Components/ChannelModel/PMs/index.d.ts

@@ -2,4 +2,5 @@ export * from "./ActiveModelObjectListPM";
 export * from "./ActiveModelPM";
 export * from "./ChannelModelObjectPM";
 export * from "./ChannelModelPM";
+export * from "./ModelHasLandmarksPM";
 export * from "./ModelObjectsAreHiddenPM";

package/lib/Components/ChannelModel/PMs/index.js

@@ -14,4 +14,5 @@ __exportStar(require("./ActiveModelObjectListPM"), exports);
 __exportStar(require("./ActiveModelPM"), exports);
 __exportStar(require("./ChannelModelObjectPM"), exports);
 __exportStar(require("./ChannelModelPM"), exports);
+__exportStar(require("./ModelHasLandmarksPM"), exports);
 __exportStar(require("./ModelObjectsAreHiddenPM"), exports);

package/lib/Components/FramedScreen/Adapters/framedContainerAdapter.d.ts

@@ -0,0 +1,3 @@
+import { PmAdapter } from "../../../Types";
+import { FramedContainerVM } from "../PM/FramedContainerPM";
+export declare const framedContainerAdapter: PmAdapter<FramedContainerVM>;

package/lib/Components/FramedScreen/Adapters/framedContainerAdapter.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.framedContainerAdapter = void 0;
+const FramedContainerPM_1 = require("../PM/FramedContainerPM");
+exports.framedContainerAdapter = {
+    defaultVM: FramedContainerPM_1.defaultFramedContainerVM,
+    subscribe: (id, appObjects, setVM) => {
+        const pm = FramedContainerPM_1.FramedContainerPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("framedContainerAdapter", "Unable to find FramedContainerPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (id, appObjects, setVM) => {
+        const pm = FramedContainerPM_1.FramedContainerPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("framedContainerAdapter", "Unable to find FramedContainerPM");
+            return;
+        }
+        pm.removeView(setVM);
+    },
+};

package/lib/Components/FramedScreen/Adapters/framedScreenSizeAdapter.d.ts

@@ -0,0 +1,3 @@
+import { SingletonPmAdapter } from "../../../Types";
+import { FramedScreenSizeVM } from "../PM/FramedScreenSizePM";
+export declare const framedScreenSizeAdapter: SingletonPmAdapter<FramedScreenSizeVM>;

package/lib/Components/FramedScreen/Adapters/framedScreenSizeAdapter.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.framedScreenSizeAdapter = void 0;
+const FramedScreenSizePM_1 = require("../PM/FramedScreenSizePM");
+exports.framedScreenSizeAdapter = {
+    defaultVM: FramedScreenSizePM_1.defaultFramedScreenVM,
+    subscribe: (appObjects, setVM) => {
+        const pm = FramedScreenSizePM_1.FramedScreenSizePM.get(appObjects);
+        if (!pm) {
+            appObjects.submitError("framedScreenSizeAdapter", "Unable to find FramedScreenSizePM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (appObjects, setVM) => {
+        const pm = FramedScreenSizePM_1.FramedScreenSizePM.get(appObjects);
+        if (!pm) {
+            appObjects.submitError("framedScreenSizeAdapter", "Unable to find FramedScreenSizePM");
+            return;
+        }
+        pm.removeView(setVM);
+    },
+};

package/lib/Components/FramedScreen/Adapters/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./framedContainerAdapter";
+export * from "./framedScreenSizeAdapter";

package/lib/Components/FramedScreen/Adapters/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./framedContainerAdapter"), exports);
+__exportStar(require("./framedScreenSizeAdapter"), exports);

package/lib/Components/FramedScreen/Mocks/FramedContainerPmMock.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="jest" />
+import { AppObject } from "../../../AppObject";
+import { FramedContainerPM } from "../PM/FramedContainerPM";
+export declare class FramedContainerPmMock extends FramedContainerPM {
+    vmsAreEqual: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}

package/lib/Components/FramedScreen/Mocks/FramedContainerPmMock.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FramedContainerPmMock = void 0;
+const FramedContainerPM_1 = require("../PM/FramedContainerPM");
+class FramedContainerPmMock extends FramedContainerPM_1.FramedContainerPM {
+    constructor(appObject) {
+        super(appObject, FramedContainerPM_1.FramedContainerPM.type);
+        this.vmsAreEqual = jest.fn();
+    }
+}
+exports.FramedContainerPmMock = FramedContainerPmMock;

package/lib/Components/FramedScreen/Mocks/FramedScreenSizePmMock.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="jest" />
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { FramedScreenSizePM } from "../PM/FramedScreenSizePM";
+export declare class FramedScreenSizePmMock extends FramedScreenSizePM {
+    vmsAreEqual: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}
+export declare function makeFramedScreenSizePmMock(appObjects: AppObjectRepo): FramedScreenSizePmMock;

package/lib/Components/FramedScreen/Mocks/FramedScreenSizePmMock.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeFramedScreenSizePmMock = exports.FramedScreenSizePmMock = void 0;
+const FramedScreenSizePM_1 = require("../PM/FramedScreenSizePM");
+class FramedScreenSizePmMock extends FramedScreenSizePM_1.FramedScreenSizePM {
+    constructor(appObject) {
+        super(appObject, FramedScreenSizePM_1.FramedScreenSizePM.type);
+        this.vmsAreEqual = jest.fn();
+    }
+}
+exports.FramedScreenSizePmMock = FramedScreenSizePmMock;
+function makeFramedScreenSizePmMock(appObjects) {
+    return new FramedScreenSizePmMock(appObjects.getOrCreate("FramedScreenSizePmMock"));
+}
+exports.makeFramedScreenSizePmMock = makeFramedScreenSizePmMock;

package/lib/Components/FramedScreen/Mocks/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./FramedContainerPmMock";
+export * from "./FramedScreenSizePmMock";

package/lib/Components/FramedScreen/Mocks/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./FramedContainerPmMock"), exports);
+__exportStar(require("./FramedScreenSizePmMock"), exports);

package/lib/Components/FramedScreen/PM/FramedContainerPM.d.ts

@@ -0,0 +1,16 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { AppObject } from "../../../AppObject/AppObject";
+import { AppObjectPM } from "../../../AppObject/AppObjectPM";
+export interface FramedContainerVM {
+    top: number;
+    left: number;
+    width: number;
+    height: number;
+    show: boolean;
+}
+export declare abstract class FramedContainerPM extends AppObjectPM<FramedContainerVM> {
+    static readonly type = "FramedContainerPM";
+    static get(id: string, appObjects: AppObjectRepo): FramedContainerPM | undefined;
+}
+export declare function makeFramedContainerPM(appObject: AppObject): FramedContainerPM;
+export declare const defaultFramedContainerVM: FramedContainerVM;

package/lib/Components/FramedScreen/PM/FramedContainerPM.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultFramedContainerVM = exports.makeFramedContainerPM = exports.FramedContainerPM = void 0;
+const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
+const Entities_1 = require("../Entities");
+class FramedContainerPM extends AppObjectPM_1.AppObjectPM {
+    static get(id, appObjects) {
+        var _a;
+        return (_a = appObjects
+            .get(id)) === null || _a === void 0 ? void 0 : _a.getComponent(FramedContainerPM.type);
+    }
+}
+exports.FramedContainerPM = FramedContainerPM;
+FramedContainerPM.type = "FramedContainerPM";
+function makeFramedContainerPM(appObject) {
+    return new FramedContainerPMImp(appObject);
+}
+exports.makeFramedContainerPM = makeFramedContainerPM;
+class FramedContainerPMImp extends FramedContainerPM {
+    constructor(appObject) {
+        super(appObject, FramedContainerPM.type);
+        this.onContainerChange = () => {
+            if (!this.container)
+                return;
+            const vm = {
+                height: this.container.size.y,
+                width: this.container.size.x,
+                top: this.container.position.y,
+                left: this.container.position.x,
+                show: this.container.show,
+            };
+            this.doUpdateView(vm);
+        };
+        this.dispose = () => {
+            var _a;
+            (_a = this.container) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onContainerChange);
+        };
+        this.container = appObject.getComponent(Entities_1.FramedScreenContainer.type);
+        if (!this.container) {
+            this.warn("FramedContainerPM has been added to an App Object that does not have a FramedScreenContainer");
+            return;
+        }
+        this.container.addChangeObserver(this.onContainerChange);
+        this.onContainerChange();
+    }
+    vmsAreEqual(a, b) {
+        if (a.height !== b.height)
+            return false;
+        if (a.width !== b.width)
+            return false;
+        if (a.top !== b.top)
+            return false;
+        if (a.left !== b.left)
+            return false;
+        if (a.show !== b.show)
+            return false;
+        return true;
+    }
+}
+exports.defaultFramedContainerVM = {
+    height: 0,
+    left: 0,
+    top: 0,
+    width: 0,
+    show: false,
+};

package/lib/Components/FramedScreen/PM/FramedScreenSizePM.d.ts

@@ -5,13 +5,9 @@ export interface FramedScreenSizeVM {
     width: number;
     height: number;
 }
-export declare class FramedScreenSizePM extends AppObjectPM<FramedScreenSizeVM> {
+export declare abstract class FramedScreenSizePM extends AppObjectPM<FramedScreenSizeVM> {
     static readonly type = "FramedScreenSizePM";
     static get: (appObjects: AppObjectRepo) => FramedScreenSizePM | undefined;
-    private screen?;
-    onContainerChange: () => void;
-    vmsAreEqual(a: FramedScreenSizeVM, b: FramedScreenSizeVM): boolean;
-    dispose: () => void;
-    constructor(appObject: AppObject);
 }
+export declare function makeFramedScreenSizePM(appObject: AppObject): FramedScreenSizePM;
 export declare const defaultFramedScreenVM: FramedScreenSizeVM;

package/lib/Components/FramedScreen/PM/FramedScreenSizePM.js

@@ -1,11 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultFramedScreenVM = exports.FramedScreenSizePM = void 0;
+exports.defaultFramedScreenVM = exports.makeFramedScreenSizePM = exports.FramedScreenSizePM = void 0;
 const AppObject_1 = require("../../../AppObject");
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
 const Entities_1 = require("../Entities");
 class FramedScreenSizePM extends AppObjectPM_1.AppObjectPM {
+}
+exports.FramedScreenSizePM = FramedScreenSizePM;
+FramedScreenSizePM.type = "FramedScreenSizePM";
+FramedScreenSizePM.get = (appObjects) => AppObject_1.getSingletonComponent(FramedScreenSizePM.type, appObjects);
+function makeFramedScreenSizePM(appObject) {
+    return new FramedScreenSizePMImp(appObject);
+}
+exports.makeFramedScreenSizePM = makeFramedScreenSizePM;
+class FramedScreenSizePMImp extends FramedScreenSizePM {
     constructor(appObject) {
+        var _a;
         super(appObject, FramedScreenSizePM.type);
         this.onContainerChange = () => {
             if (!this.screen)
@@ -16,17 +26,12 @@ class FramedScreenSizePM extends AppObjectPM_1.AppObjectPM {
             };
             this.doUpdateView(vm);
         };
-        this.dispose = () => {
-            var _a;
-            (_a = this.screen) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onContainerChange);
-        };
-        this.screen = appObject.getComponent(Entities_1.FramedScreenEntity.type);
-        if (!this.screen) {
-            this.warn("FramedScreenSizePM has been added to an App Object that does not have a FramedScreenEntity");
-            return;
-        }
-        this.screen.addChangeObserver(this.onContainerChange);
+        (_a = this.screen) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onContainerChange);
         this.onContainerChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get screen() {
+        return this.getCachedSingleton(Entities_1.FramedScreenEntity.type);
     }
     vmsAreEqual(a, b) {
         if (a.height !== b.height)
@@ -36,9 +41,6 @@ class FramedScreenSizePM extends AppObjectPM_1.AppObjectPM {
         return true;
     }
 }
-exports.FramedScreenSizePM = FramedScreenSizePM;
-FramedScreenSizePM.type = "FramedScreenSizePM";
-FramedScreenSizePM.get = (appObjects) => AppObject_1.getSingletonComponent(FramedScreenSizePM.type, appObjects);
 exports.defaultFramedScreenVM = {
     height: 0,
     width: 0,

package/lib/Components/FramedScreen/PM/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./FramedScreenContainerPM";
+export * from "./FramedContainerPM";
 export * from "./FramedScreenSizePM";

package/lib/Components/FramedScreen/PM/index.js

@@ -10,5 +10,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./FramedScreenContainerPM"), exports);
+__exportStar(require("./FramedContainerPM"), exports);
 __exportStar(require("./FramedScreenSizePM"), exports);

package/lib/Components/FramedScreen/index.d.ts

@@ -1,2 +1,4 @@
+export * from "./Adapters";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./PM";

package/lib/Components/FramedScreen/index.js

@@ -10,5 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Adapters"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);

package/lib/Components/Landmarks/Adapters/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./landmarkListAdapter";
+export * from "./landmarkSizeAdapter";

package/lib/Components/Landmarks/Adapters/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./landmarkListAdapter"), exports);
+__exportStar(require("./landmarkSizeAdapter"), exports);

package/lib/Components/Landmarks/Adapters/landmarkListAdapter.d.ts

@@ -0,0 +1,2 @@
+import { PmAdapter } from "../../../Types";
+export declare const landmarkListAdapter: PmAdapter<string[]>;

package/lib/Components/Landmarks/Adapters/landmarkListAdapter.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.landmarkListAdapter = void 0;
+const LandmarkListPM_1 = require("../PM/LandmarkListPM");
+exports.landmarkListAdapter = {
+    defaultVM: [],
+    subscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
+        const pm = LandmarkListPM_1.LandmarkListPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("landmarkListAdapter", "Unable to find LandmarkListPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (id, appObjects, setVM) => {
+        const pm = LandmarkListPM_1.LandmarkListPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("landmarkListAdapter", "Unable to find LandmarkListPM");
+            return;
+        }
+        pm.removeView(setVM);
+    },
+};

package/lib/Components/Landmarks/Adapters/landmarkSizeAdapter.d.ts

@@ -0,0 +1,2 @@
+import { PmAdapter } from "../../../Types";
+export declare const landmarkSizeAdapter: PmAdapter<number>;

package/lib/Components/Landmarks/Adapters/landmarkSizeAdapter.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.landmarkSizeAdapter = void 0;
+const LandmarkSizePM_1 = require("../PM/LandmarkSizePM");
+exports.landmarkSizeAdapter = {
+    defaultVM: 1,
+    subscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
+        const pm = LandmarkSizePM_1.LandmarkSizePM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("landmarkSizeAdapter", "Unable to find LandmarkSizePM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (id, appObjects, setVM) => {
+        const pm = LandmarkSizePM_1.LandmarkSizePM.get(id, appObjects);
+        if (pm) {
+            pm.removeView(setVM);
+        }
+    },
+};

package/lib/Components/Landmarks/Controller/MouseLandmark.d.ts

@@ -6,17 +6,7 @@ export declare abstract class MouseLandmark extends AppObjectController implemen
     pressed: boolean;
     abstract onMove: (e: MouseInputEvent) => void;
     abstract onDown: (e: MouseInputEvent) => void;
+    abstract onUp: (e: MouseInputEvent) => void;
+    abstract allow: (e: MouseInputEvent) => boolean;
 }
-export declare function makeMouseLandmark(appObject: AppObject): MouseLandmarkImp;
-declare class MouseLandmarkImp extends MouseLandmark {
-    addingLandmark: boolean;
-    pressed: boolean;
-    private tryPreviewLandmarkUc?;
-    private tryAddLandmarkUc?;
-    allow: (e: MouseInputEvent) => boolean;
-    onMove: (e: MouseInputEvent) => void;
-    onDown: (e: MouseInputEvent) => void;
-    onUp: (e: MouseInputEvent) => void;
-    constructor(appObject: AppObject);
-}
-export {};
+export declare function makeMouseLandmark(appObject: AppObject): MouseLandmark;

package/lib/Components/Landmarks/Controller/MouseLandmark.js

@@ -4,7 +4,6 @@ exports.makeMouseLandmark = exports.MouseLandmark = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Babylon_1 = require("../../Babylon");
 const MouseInput_1 = require("../../MouseInput");
-const LandmarkGlobals_1 = require("../Entities/LandmarkGlobals");
 const TryAddNewLandmarkUC_1 = require("../UseCases/TryAddNewLandmarkUC");
 const TryPreviewLandmarkUC_1 = require("../UseCases/TryPreviewLandmarkUC");
 class MouseLandmark extends AppObject_1.AppObjectController {
@@ -53,33 +52,20 @@ class MouseLandmarkImp extends MouseLandmark {
             this.pressed = true;
         };
         this.onUp = (e) => {
-            var _a;
             if (!this.allow(e))
                 return;
             if (!this.addingLandmark)
                 return;
             if (!this.tryAddLandmarkUc)
                 return;
-            const landmarkPreview = (_a = this.appObject.getComponent(LandmarkGlobals_1.LandmarkGlobals.type)) === null || _a === void 0 ? void 0 : _a.previewLandmark;
-            if (!landmarkPreview) {
+            if (!this.tryPreviewLandmarkUc)
                 return;
-            }
             const ray = Babylon_1.pixelToSceneRay(e.position, this.appObjects);
             this.tryAddLandmarkUc.addFromRay(ray);
-            landmarkPreview.hideable.isHidden = true;
+            this.tryPreviewLandmarkUc.hidePreview();
             this.addingLandmark = false;
             this.pressed = false;
         };
-        this.tryPreviewLandmarkUc = TryPreviewLandmarkUC_1.TryPreviewLandmarkUC.get(appObject);
-        if (!this.tryPreviewLandmarkUc) {
-            this.warn("Unable to find TryPreviewLandmarkUC");
-            return;
-        }
-        this.tryAddLandmarkUc = TryAddNewLandmarkUC_1.TryAddNewLandmarkUC.get(appObject);
-        if (!this.tryAddLandmarkUc) {
-            this.warn("Unable to find TryAddNewLandmarkUC");
-            return;
-        }
         const mouseInput = MouseInput_1.MouseInputEntity.get(this.appObjects);
         if (mouseInput) {
             mouseInput.registerController(this);
@@ -88,4 +74,10 @@ class MouseLandmarkImp extends MouseLandmark {
             this.warn("Unable to find MouseInputEntity");
         }
     }
+    get tryPreviewLandmarkUc() {
+        return this.getCachedSingleton(TryPreviewLandmarkUC_1.TryPreviewLandmarkUC.type);
+    }
+    get tryAddLandmarkUc() {
+        return this.getCachedSingleton(TryAddNewLandmarkUC_1.TryAddNewLandmarkUC.type);
+    }
 }

package/lib/Components/Landmarks/Controller/SubmitLandmarkSize.d.ts

@@ -1,2 +1,2 @@
 import { AppObjectRepo } from "../../../AppObject";
-export declare function submitLandmarkSize(size: number, appObjectId: string, appObjects: AppObjectRepo): void;
+export declare function submitLandmarkSize(size: number, id: string, appObjects: AppObjectRepo): void;

package/lib/Components/Landmarks/Controller/SubmitLandmarkSize.js

@@ -1,15 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.submitLandmarkSize = void 0;
-const LandmarkEntity_1 = require("../Entities/LandmarkEntity");
 const SetLandmarkSizeUC_1 = require("../UseCases/SetLandmarkSizeUC");
-function submitLandmarkSize(size, appObjectId, appObjects) {
-    const landmarkEntity = appObjects.getAppObjectComponent(appObjectId, LandmarkEntity_1.LandmarkEntity.type);
-    if (!landmarkEntity) {
-        appObjects.submitWarning("SubmitLandmarkSizeController", "LandmarkEntity App Object was not added.");
-        return;
-    }
-    const setLandmarkSizeUC = appObjects.getAppObjectComponent(appObjectId, SetLandmarkSizeUC_1.SetLandmarkSizeUC.type);
+function submitLandmarkSize(size, id, appObjects) {
+    const setLandmarkSizeUC = SetLandmarkSizeUC_1.SetLandmarkSizeUC.getById(id, appObjects);
     if (!setLandmarkSizeUC) {
         appObjects.submitWarning("SubmitLandmarkSizeController", "SetLandmarkSizeUC App Object was not added.");
         return;

package/lib/Components/Landmarks/Controller/TouchLandmark.d.ts

@@ -5,16 +5,6 @@ export declare abstract class TouchLandmark extends AppObjectController implemen
     abstract onTouchStart(e: TouchInputEvent): void;
     abstract onTouchMove(e: TouchInputEvent): void;
     abstract onTouchEnd(e: TouchInputEvent): void;
+    abstract allow: (e: TouchInputEvent) => boolean;
 }
-export declare function makeTouchLandmark(appObject: AppObject): TouchLandmarkImp;
-declare class TouchLandmarkImp extends TouchLandmark {
-    private lastTouch;
-    private tryPreviewLandmarkUc?;
-    private tryAddLandmarkUc?;
-    allow: (e: TouchInputEvent) => boolean;
-    onTouchStart: (e: TouchInputEvent) => void;
-    onTouchMove: (e: TouchInputEvent) => void;
-    onTouchEnd: (e: TouchInputEvent) => void;
-    constructor(appObject: AppObject);
-}
-export {};
+export declare function makeTouchLandmark(appObject: AppObject): TouchLandmark;

package/lib/Components/Landmarks/Controller/TouchLandmark.js

@@ -5,7 +5,6 @@ const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
 const Babylon_1 = require("../../Babylon");
 const TouchController_1 = require("../../TouchController");
-const LandmarkGlobals_1 = require("../Entities/LandmarkGlobals");
 const TryAddNewLandmarkUC_1 = require("../UseCases/TryAddNewLandmarkUC");
 const TryPreviewLandmarkUC_1 = require("../UseCases/TryPreviewLandmarkUC");
 class TouchLandmark extends AppObject_1.AppObjectController {
@@ -21,13 +20,14 @@ class TouchLandmarkImp extends TouchLandmark {
         super(appObject, TouchLandmark.type);
         this.lastTouch = ValueObjects_1.Vector2.Zero();
         this.allow = (e) => {
-            return true;
+            if (e.touches.length === 1) {
+                return true;
+            }
+            return false;
         };
         this.onTouchStart = (e) => {
             if (!this.allow(e))
                 return;
-            if (e.touchCount > 1)
-                return;
             if (!this.tryPreviewLandmarkUc)
                 return;
             const position = e.touches[0].position;
@@ -48,31 +48,18 @@ class TouchLandmarkImp extends TouchLandmark {
             this.tryPreviewLandmarkUc.tryPreviewLandmark(ray, true);
         };
         this.onTouchEnd = (e) => {
-            var _a;
             if (!this.allow(e))
                 return;
             if (e.touchCount > 1)
                 return;
             if (!this.tryAddLandmarkUc)
                 return;
-            const landmarkPreview = (_a = this.appObject.getComponent(LandmarkGlobals_1.LandmarkGlobals.type)) === null || _a === void 0 ? void 0 : _a.previewLandmark;
-            if (!landmarkPreview) {
+            if (!this.tryPreviewLandmarkUc)
                 return;
-            }
             const ray = Babylon_1.pixelToSceneRay(this.lastTouch, this.appObjects);
             this.tryAddLandmarkUc.addFromRay(ray);
-            landmarkPreview.hideable.isHidden = true;
+            this.tryPreviewLandmarkUc.hidePreview();
         };
-        this.tryPreviewLandmarkUc = TryPreviewLandmarkUC_1.TryPreviewLandmarkUC.get(appObject);
-        if (!this.tryPreviewLandmarkUc) {
-            this.warn("Unable to find TryPreviewLandmarkUC");
-            return;
-        }
-        this.tryAddLandmarkUc = TryAddNewLandmarkUC_1.TryAddNewLandmarkUC.get(appObject);
-        if (!this.tryAddLandmarkUc) {
-            this.warn("Unable to find TryAddNewLandmarkUC");
-            return;
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(this.appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -81,4 +68,10 @@ class TouchLandmarkImp extends TouchLandmark {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get tryPreviewLandmarkUc() {
+        return this.getCachedSingleton(TryPreviewLandmarkUC_1.TryPreviewLandmarkUC.type);
+    }
+    get tryAddLandmarkUc() {
+        return this.getCachedSingleton(TryAddNewLandmarkUC_1.TryAddNewLandmarkUC.type);
+    }
 }

package/lib/Components/Landmarks/Controller/UpdateLandmarkSize.d.ts

@@ -1,2 +1,2 @@
 import { AppObjectRepo } from "../../../AppObject";
-export declare function updateLandmarkSize(size: number, appObjectId: string, appObjects: AppObjectRepo): void;
+export declare function updateLandmarkSize(size: number, id: string, appObjects: AppObjectRepo): void;

package/lib/Components/Landmarks/Controller/UpdateLandmarkSize.js

@@ -1,17 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateLandmarkSize = void 0;
-const LandmarkEntity_1 = require("../Entities/LandmarkEntity");
 const SetLandmarkSizeUC_1 = require("../UseCases/SetLandmarkSizeUC");
-function updateLandmarkSize(size, appObjectId, appObjects) {
-    const landmarkEntity = appObjects.getAppObjectComponent(appObjectId, LandmarkEntity_1.LandmarkEntity.type);
-    if (!landmarkEntity) {
-        appObjects.submitWarning("UpdateLandmarkSizeController", "LandmarkEntity App Object was not added.");
-        return;
-    }
-    const setLandmarkSizeUC = appObjects.getAppObjectComponent(appObjectId, SetLandmarkSizeUC_1.SetLandmarkSizeUC.type);
+function updateLandmarkSize(size, id, appObjects) {
+    const setLandmarkSizeUC = SetLandmarkSizeUC_1.SetLandmarkSizeUC.getById(id, appObjects);
     if (!setLandmarkSizeUC) {
-        appObjects.submitWarning("UpdateLandmarkSizeController", "SetLandmarkSizeUC App Object was not added.");
+        appObjects.submitWarning("SubmitLandmarkSizeController", "SetLandmarkSizeUC App Object was not added.");
         return;
     }
     setLandmarkSizeUC.updateSize(size);