Merge branch 'dev' into object_creation_fix

README.md

@@ -79,8 +79,8 @@ Or you can use the tab **files** to upload the file. (see image below)\
 -->
 
 ### **WORK IN PROGRESS**
-
 -   (Scounger) bug fix: objects only if necessary
+-   (Scrounger) Calculate distance between ioBroker and tracker
 
 ### 0.1.2 (2023-02-24)
 

io-package.json

@@ -1,7 +1,7 @@
 {
 	"common": {
 		"name": "tractive-gps",
-		"version": "0.1.2",
+		"version": "0.1.3",
 		"news": {
 			"0.1.2": {
 				"en": "Dependencies updated\nUI updated",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.tractive-gps",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "This adapter allows you to connect to the Tractive GPS service and retrieve the location of your pets.",
   "author": {
     "name": "xXBJXx",
@@ -31,7 +31,8 @@
     "cron": "^2.2.0",
     "dayjs": "^1.11.7",
     "react-leaflet": "3.2.5",
-    "source-map-support": "^0.5.21"
+    "source-map-support": "^0.5.21",
+    "geo-position.ts": "^1.4.1"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.5.9",

src/lib/object_definition.ts

@@ -101,6 +101,42 @@ export const stateAttrb: StateAttr = {
 		read: true,
 		write: false,
 	},
+	prioritized_zone_entered_at: {
+		name: 'Prioritized zone entered at',
+		desc: 'Prioritized zone entered at',
+		type: 'number',
+		role: 'value',
+		def: null,
+		read: true,
+		write: false,
+	},
+	prioritized_zone_last_seen_at: {
+		name: 'Prioritized zone last seen at',
+		desc: 'Prioritized zone last seen at',
+		type: 'number',
+		role: 'value',
+		def: null,
+		read: true,
+		write: false,
+	},
+	prioritized_zone_type: {
+		name: 'Prioritized zone type',
+		desc: 'Prioritized zone type',
+		type: 'string',
+		role: 'value',
+		def: null,
+		read: true,
+		write: false,
+	},
+	prioritized_zone_id: {
+		name: 'Prioritized zone id',
+		desc: 'Prioritized zone id',
+		type: 'string',
+		role: 'value',
+		def: null,
+		read: true,
+		write: false,
+	},
 	hw_status: {
 		name: 'Hardware Status',
 		desc: 'Hardware Status of the device',
@@ -335,6 +371,16 @@ export const stateAttrb: StateAttr = {
 		read: true,
 		write: false,
 	},
+	distance: {
+		name: 'Distance',
+		desc: 'Distance to ioBroker',
+		type: 'number',
+		role: 'value.gps.distance',
+		def: 0,
+		unit: 'm',
+		read: true,
+		write: false,
+	},
 	speed: {
 		name: 'Speed',
 		desc: 'Speed in meters per second',

src/main.ts

@@ -5,6 +5,7 @@ import * as utils from '@iobroker/adapter-core';
 // import 'source-map-support/register.js';
 import axios from 'axios';
 import { CronJob } from 'cron';
+import { GeoPosition } from 'geo-position.ts';
 import sourceMapSupport from 'source-map-support';
 import { decrypt, encrypt } from './lib/Helper';
 import { stateAttrb } from './lib/object_definition';
@@ -199,6 +200,21 @@ class TractiveGPS extends utils.Adapter {
 						val: value[1],
 						ack: true,
 					});
+
+					let sysConfig = await this.getForeignObjectAsync('system.config');
+
+					if (sysConfig && sysConfig.common && sysConfig.common.longitude && sysConfig.common.latitude) {
+						let sysPoint = new GeoPosition(sysConfig.common.latitude, sysConfig.common.longitude);
+						let petPoint = new GeoPosition(value[0], value[1]);
+
+						await this.setStateAsync(`${device._id}.device_pos_report.distance`, {
+							val: Number(sysPoint.Distance(petPoint).toFixed(0)),
+							ack: true,
+						});
+					} else {
+						this.writeLog('No gps coordinates of system found!', "warn");
+					}
+
 				} else {
 					if (typeof value === 'object' && value !== null) {
 						await this.setStateAsync(`${device._id}.device_pos_report.${key}`, {
@@ -416,6 +432,11 @@ class TractiveGPS extends utils.Adapter {
 							common: stateAttrb['longitude'],
 							native: {},
 						});
+						await this.extendObjectAsync(`${device._id}.device_pos_report.distance`, {
+							type: 'state',
+							common: stateAttrb['distance'],
+							native: {},
+						});
 					} else {
 						await this.setObjectNotExistsAsync(`${device._id}.device_pos_report.${key}`, {
 							type: 'state',

src/types/TractiveDevice.ts

@@ -41,6 +41,10 @@ export interface Tracker {
 	charging_state: string;
 	battery_state: string;
 	power_saving_zone_id: string | null;
+	prioritized_zone_entered_at: number | null;
+	prioritized_zone_last_seen_at: number | null;
+	prioritized_zone_type: string,
+	prioritized_zone_id: string
 }
 
 export interface DeviceHwReport {