hoffmation-base 3.2.28 → 3.2.30

package/lib/devices/espresense/trilateration.d.ts

@@ -1,5 +1,4 @@
-import { RoomBase } from '../../services';
-import { iTrilaterationBasePoint, iTrilaterationPoint, iTrilaterationPointDistance } from '../../interfaces';
+import { iRoomBase, iTrilaterationBasePoint, iTrilaterationPoint, iTrilaterationPointDistance } from '../../interfaces';
 export declare class Trilateration {
     /**
      * A list of all reference points for trilateration (e.g. Rooms, {@link iBluetoothDetector}s)
@@ -10,7 +9,7 @@ export declare class Trilateration {
      * This list is filled mostly by {@link Trilateration.addRoom} thus resulting in the air outside the house not being included
      */
     static possiblePoints: iTrilaterationPoint[];
-    static addRoom(room: RoomBase, startPoint: iTrilaterationPoint, endPoint: iTrilaterationPoint): void;
+    static addRoom(room: iRoomBase, startPoint: iTrilaterationPoint, endPoint: iTrilaterationPoint): void;
     static initialize(): void;
     static getBestMatches(distances: iTrilaterationPointDistance[]): iTrilaterationPoint[];
     static checkRoom(distances: iTrilaterationPointDistance[]): string | undefined;

package/lib/devices/espresense/trilateration.js

@@ -8,6 +8,8 @@ class Trilateration {
     static addRoom(room, startPoint, endPoint) {
         const points = trilaterationPoint_1.TrilaterationPoint.getPointsInRange(startPoint, endPoint, room.roomName);
         logging_1.ServerLogService.writeLog(enums_1.LogLevel.Debug, `Adding ${points.length} trilateration points for room ${room.roomName} from ${startPoint.coordinateName} to ${endPoint.coordinateName}`);
+        // Remove all points from this room
+        this.possiblePoints = this.possiblePoints.filter((point) => point.roomName !== room.roomName);
         this.possiblePoints.push(...points);
     }
     static initialize() {

package/lib/devices/espresense/trilaterationPoint.d.ts

@@ -1,12 +1,14 @@
-import { iTrilaterationPoint } from '../../interfaces';
+import { iTrilaterationCoordinate, iTrilaterationPoint } from '../../interfaces';
 export declare class TrilaterationPoint implements iTrilaterationPoint {
     x: number;
     y: number;
     z: number;
     roomName: string;
+    static byCoordinate(coordinate: iTrilaterationCoordinate, roomName: string): TrilaterationPoint;
     static getPointsInRange(a: iTrilaterationPoint, b: iTrilaterationPoint, roomName?: string): TrilaterationPoint[];
     constructor(x: number, y: number, z: number, roomName: string);
     get coordinateName(): string;
     getDistance(other: iTrilaterationPoint): number;
     getDot5Distance(other: iTrilaterationPoint): number;
+    getCoordinate(): iTrilaterationCoordinate;
 }

package/lib/devices/espresense/trilaterationPoint.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrilaterationPoint = void 0;
 const utils_1 = require("../../utils");
 class TrilaterationPoint {
+    static byCoordinate(coordinate, roomName) {
+        return new TrilaterationPoint(coordinate.x, coordinate.y, coordinate.z, roomName);
+    }
     static getPointsInRange(a, b, roomName = '') {
         const points = [];
         if (a.x > b.x || a.y > b.y || a.z > b.z) {
@@ -32,5 +35,12 @@ class TrilaterationPoint {
     getDot5Distance(other) {
         return utils_1.Utils.roundDot5(this.getDistance(other));
     }
+    getCoordinate() {
+        return {
+            x: this.x,
+            y: this.y,
+            z: this.z,
+        };
+    }
 }
 exports.TrilaterationPoint = TrilaterationPoint;

package/lib/interfaces/iRoomBase.d.ts

@@ -5,6 +5,7 @@ import { iRoomSettingsController } from './iRoomSettingsController';
 import { iIdHolder } from './iIdHolder';
 import { iDeviceCluster } from './iDevicecluster';
 import { ITimeCallback } from './ITimeCallback';
+import { iTrilaterationPoint } from './iTrilaterationPoint';
 /**
  * This interface represents a room with it's base functionality.
  * Whilst accessing the custom rooms can be beneficial for direct device interaction, this provides interactions to e.g. device groups.
@@ -66,6 +67,14 @@ export interface iRoomBase extends iIdHolder {
      * The time-callback for controlling light at sunset
      */
     sonnenUntergangLichtCallback: ITimeCallback | undefined;
+    /**
+     * The bot-left corner of the room in 2D/3D Map
+     */
+    startPoint?: iTrilaterationPoint;
+    /**
+     * The top-right corner of the room in 2D/3D Map
+     */
+    endPoint?: iTrilaterationPoint;
     /**
      *
      */

package/lib/interfaces/iRoomSettings.d.ts

@@ -1,5 +1,6 @@
 import { iObjectSettings } from './settings';
 import { iTimePair } from './iTimePair';
+import { iTrilaterationCoordinate } from './iTrilaterationCoordinate';
 /**
  *
  */
@@ -76,6 +77,14 @@ export interface iRoomSettings extends iObjectSettings {
      *
      */
     includeLampsInNormalMovementLightning: boolean;
+    /**
+     * Die Startkoordinate des Raums
+     */
+    trilaterationStartPoint?: iTrilaterationCoordinate;
+    /**
+     * Die Endkoordinate des Raums
+     */
+    trilaterationEndPoint?: iTrilaterationCoordinate;
     /**
      *
      */

package/lib/interfaces/iTrilaterationPoint.d.ts

@@ -19,4 +19,8 @@ export interface iTrilaterationPoint extends iTrilaterationCoordinate {
      *
      */
     getDot5Distance(other: iTrilaterationPoint): number;
+    /**
+     *
+     */
+    getCoordinate(): iTrilaterationCoordinate;
 }

package/lib/models/rooms/RoomSettings/RoomSettingsController.d.ts

@@ -1,4 +1,4 @@
-import { iRoomBase, iRoomSettingsController, iTimePair } from '../../../interfaces';
+import { iRoomBase, iRoomSettingsController, iTimePair, iTrilaterationPoint } from '../../../interfaces';
 import { SunTimeOffsets } from '../../sun-time-offsets';
 import { RoomSettings } from './roomSettings';
 import { RoomBase } from '../../../services';
@@ -16,7 +16,7 @@ export declare class RoomSettingsController {
      */
     lampOffset: SunTimeOffsets;
     private _settingsContainer;
-    constructor(room: RoomBase);
+    constructor(room: RoomBase, startPoint?: iTrilaterationPoint, endPoint?: iTrilaterationPoint);
     get settingsContainer(): RoomSettings;
     get lichtSonnenAufgangAus(): boolean;
     get ambientLightAfterSunset(): boolean;

package/lib/models/rooms/RoomSettings/RoomSettingsController.js

@@ -7,20 +7,23 @@ exports.RoomSettingsController = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const sun_time_offsets_1 = require("../../sun-time-offsets");
 const roomSettings_1 = require("./roomSettings");
-const weather_1 = require("../../../services/weather");
+const services_1 = require("../../../services");
 const api_1 = require("../../../api");
 const utils_1 = require("../../../utils");
 const logging_1 = require("../../../logging");
 const enums_1 = require("../../../enums");
+const devices_1 = require("../../../devices");
 class RoomSettingsController {
-    constructor(room) {
+    constructor(room, startPoint, endPoint) {
         this._settingsContainer = new roomSettings_1.RoomSettings();
         this.roomName = room.roomName;
         this.rolloOffset = new sun_time_offsets_1.SunTimeOffsets(this.sonnenAufgangRolloDelay, this.sonnenUntergangRolloDelay, this.sonnenAufgangRolloMinTime.hours, this.sonnenAufgangRolloMinTime.minutes, this.sonnenUntergangRolloMaxTime.hours, this.sonnenUntergangRolloMaxTime.minutes);
+        this._settingsContainer.trilaterationStartPoint = startPoint === null || startPoint === void 0 ? void 0 : startPoint.getCoordinate();
+        this._settingsContainer.trilaterationEndPoint = endPoint === null || endPoint === void 0 ? void 0 : endPoint.getCoordinate();
         this.lampOffset = new sun_time_offsets_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
         this._settingsContainer.onChangeCb = this.onSettingChange.bind(this);
         this._settingsContainer.initializeFromDb(room);
-        weather_1.WeatherService.addWeatherUpdateCb(`ShutterWeatherUpdate${this.roomName}`, () => {
+        services_1.WeatherService.addWeatherUpdateCb(`ShutterWeatherUpdate${this.roomName}`, () => {
             var _a;
             if (this.sonnenUntergangRolloAdditionalOffsetPerCloudiness > 0) {
                 (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();
@@ -98,6 +101,13 @@ class RoomSettingsController {
         logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `${this.roomName} RoomSettingsController.onSettingChange`);
         this.recalcLampOffset();
         this.recalcRolloOffset();
+        if (this.room !== undefined &&
+            this._settingsContainer.trilaterationStartPoint !== undefined &&
+            this._settingsContainer.trilaterationEndPoint !== undefined) {
+            this.room.startPoint = devices_1.TrilaterationPoint.byCoordinate(this._settingsContainer.trilaterationStartPoint, this.roomName);
+            this.room.endPoint = devices_1.TrilaterationPoint.byCoordinate(this._settingsContainer.trilaterationEndPoint, this.roomName);
+            devices_1.Trilateration.addRoom(this.room, this.room.startPoint, this.room.endPoint);
+        }
     }
     recalcRolloOffset() {
         var _a;

package/lib/models/rooms/RoomSettings/roomSettings.d.ts

@@ -1,4 +1,4 @@
-import { iRoomSettings, iTimePair } from '../../../interfaces';
+import { iRoomSettings, iTimePair, iTrilaterationCoordinate } from '../../../interfaces';
 import { ObjectSettings } from '../../../settingsObjects';
 export declare class RoomSettings extends ObjectSettings implements iRoomSettings {
     /**
@@ -74,5 +74,9 @@ export declare class RoomSettings extends ObjectSettings implements iRoomSetting
      * Whether normal ceiling lights should also be turned on by movement, even if there are LEDs and outlets
      */
     includeLampsInNormalMovementLightning: boolean;
+    /** @inheritDoc */
+    trilaterationStartPoint?: iTrilaterationCoordinate;
+    /** @inheritDoc */
+    trilaterationEndPoint?: iTrilaterationCoordinate;
     fromPartialObject(_obj: Partial<RoomSettings>): void;
 }

package/lib/models/rooms/RoomSettings/roomSettings.js

@@ -82,7 +82,7 @@ class RoomSettings extends settingsObjects_1.ObjectSettings {
         this.includeLampsInNormalMovementLightning = settings_service_1.SettingsService.settings.roomDefault.includeLampsInNormalMovementLightning;
     }
     fromPartialObject(_obj) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         this.ambientLightAfterSunset = (_a = _obj.ambientLightAfterSunset) !== null && _a !== void 0 ? _a : this.ambientLightAfterSunset;
         this.lichtSonnenAufgangAus = (_b = _obj.lichtSonnenAufgangAus) !== null && _b !== void 0 ? _b : this.lichtSonnenAufgangAus;
         this.radioUrl = (_c = _obj.radioUrl) !== null && _c !== void 0 ? _c : this.radioUrl;
@@ -101,8 +101,10 @@ class RoomSettings extends settingsObjects_1.ObjectSettings {
         this.sonnenUntergangRolloDelay = (_q = _obj.sonnenUntergangRolloDelay) !== null && _q !== void 0 ? _q : this.sonnenUntergangRolloDelay;
         this.sonnenUntergangLampenDelay = (_r = _obj.sonnenUntergangLampenDelay) !== null && _r !== void 0 ? _r : this.sonnenUntergangLampenDelay;
         this.sonnenUntergangRollos = (_s = _obj.sonnenUntergangRollos) !== null && _s !== void 0 ? _s : this.sonnenUntergangRollos;
+        this.trilaterationEndPoint = (_t = _obj.trilaterationEndPoint) !== null && _t !== void 0 ? _t : this.trilaterationEndPoint;
+        this.trilaterationStartPoint = (_u = _obj.trilaterationStartPoint) !== null && _u !== void 0 ? _u : this.trilaterationStartPoint;
         this.includeLampsInNormalMovementLightning =
-            (_t = _obj.includeLampsInNormalMovementLightning) !== null && _t !== void 0 ? _t : this.includeLampsInNormalMovementLightning;
+            (_v = _obj.includeLampsInNormalMovementLightning) !== null && _v !== void 0 ? _v : this.includeLampsInNormalMovementLightning;
         super.fromPartialObject(_obj);
     }
 }

package/lib/services/RoomBase.js

@@ -23,11 +23,8 @@ class RoomBase {
         this.skipNextRolloUp = false;
         this._deviceCluster = new devices_1.DeviceCluster();
         this.info = new models_1.RoomInfo(roomName, etage);
-        this.settings = new models_1.RoomSettingsController(this);
+        this.settings = new models_1.RoomSettingsController(this, startPoint, endPoint);
         room_service_1.RoomService.addToRoomList(this);
-        if (startPoint !== undefined && endPoint !== undefined) {
-            devices_1.Trilateration.addRoom(this, startPoint, endPoint);
-        }
     }
     get sonnenUntergangLichtCallback() {
         var _a;

package/lib/settingsObjects/objectSettings.d.ts

@@ -4,6 +4,10 @@ export declare abstract class ObjectSettings implements iObjectSettings {
      * Callback to be fired when the settings change
      */
     onChangeCb?: () => void;
+    /**
+     * An optional JSON string containing custom settings, primary used for debug/prototyping.
+     */
+    customSettingsJson?: string;
     persist(holder: iIdHolder): void;
     /**
      * Loads the settings from the database

package/lib/settingsObjects/objectSettings.js

@@ -43,9 +43,11 @@ class ObjectSettings {
         });
     }
     fromPartialObject(_obj) {
+        var _a;
         if (this.onChangeCb) {
             this.onChangeCb();
         }
+        this.customSettingsJson = (_a = _obj.customSettingsJson) !== null && _a !== void 0 ? _a : this.customSettingsJson;
     }
     toJSON() {
         return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['onChangeCb']));