From 4f190401c36675b85498f5c2e53861fd040a112b Mon Sep 17 00:00:00 2001
From: Felipe Diniello <felipediniello@pm.me>
Date: Tue, 13 Jun 2023 21:39:17 +0200
Subject: [PATCH] known position

---
 kairo-common/src/influxdb_models/mod.rs                      | 4 ++--
 kairo-common/src/lib.rs                                      | 1 +
 .../src/{influxdb_models => models}/known_position.rs        | 5 ++++-
 kairo-common/src/models/mod.rs                               | 2 ++
 simulation-tools/src/nav_dev/error_report.rs                 | 2 +-
 simulation-tools/src/nav_dev/main.rs                         | 5 +----
 xyz-engine/src/position_solver.rs                            | 5 +----
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename kairo-common/src/{influxdb_models => models}/known_position.rs (94%)

diff --git a/kairo-common/src/influxdb_models/mod.rs b/kairo-common/src/influxdb_models/mod.rs
index a360f12..2ae90bf 100644
--- a/kairo-common/src/influxdb_models/mod.rs
+++ b/kairo-common/src/influxdb_models/mod.rs
@@ -1,10 +1,10 @@
 // pub mod multiple_measures;
 mod beacon_measure;
 mod device_status;
-mod known_position;
+// mod known_position;
 
 // Renaming types for ease of use outside the scope of this module
 pub const BEACONMEASURE_TIME_WINDOW: u64 = 4;
 pub type BeaconMeasure = beacon_measure::BeaconMeasure;
-pub type KnownPosition = known_position::KnownPosition;
+// pub type KnownPosition = known_position::KnownPosition;
 pub type DeviceStatus = device_status::DeviceStatus;
diff --git a/kairo-common/src/lib.rs b/kairo-common/src/lib.rs
index f5289d6..b664c4e 100644
--- a/kairo-common/src/lib.rs
+++ b/kairo-common/src/lib.rs
@@ -13,5 +13,6 @@ pub type MAC = types::mac::MAC;
 mod models;
 pub type Antenna = models::antenna::Antenna;
 pub type DeviceReport =  models::DeviceReport;
+pub type KnownPosition = models::known_position::KnownPosition;
 
 
diff --git a/kairo-common/src/influxdb_models/known_position.rs b/kairo-common/src/models/known_position.rs
similarity index 94%
rename from kairo-common/src/influxdb_models/known_position.rs
rename to kairo-common/src/models/known_position.rs
index df43554..d22deb6 100644
--- a/kairo-common/src/influxdb_models/known_position.rs
+++ b/kairo-common/src/models/known_position.rs
@@ -3,12 +3,14 @@ use influxdb::{InfluxDbWriteable, ReadQuery};
 use serde::{Deserialize, Serialize};
 
 use crate::helper::for_async::get_influx_cli;
-use crate::Point;
+use crate::{Point,MAC};
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, InfluxDbWriteable)]
 pub struct KnownPosition {
+    // pub id: MAC,
     pub x: f64,
     pub y: f64,
+    pub z: f64,
     pub time: DateTime<Utc>,
 }
 
@@ -17,6 +19,7 @@ impl KnownPosition {
         KnownPosition {
             x: pos.x,
             y: pos.y,
+            z: 0.0,
             time: chrono::Utc::now(),
         }
     }
diff --git a/kairo-common/src/models/mod.rs b/kairo-common/src/models/mod.rs
index 2e93798..eb76ba9 100644
--- a/kairo-common/src/models/mod.rs
+++ b/kairo-common/src/models/mod.rs
@@ -1,4 +1,6 @@
 pub mod antenna;
+pub mod known_position;
+
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct DeviceReport {
diff --git a/simulation-tools/src/nav_dev/error_report.rs b/simulation-tools/src/nav_dev/error_report.rs
index be90089..811f733 100644
--- a/simulation-tools/src/nav_dev/error_report.rs
+++ b/simulation-tools/src/nav_dev/error_report.rs
@@ -4,7 +4,7 @@ use kairo_common::helper::for_async::get_influx_cli;
 use serde::Serialize;
 use tokio::time;
 
-use kairo_common::{influxdb_models::KnownPosition, Point};
+use kairo_common::{KnownPosition, Point};
 
 use crate::Config;
 
diff --git a/simulation-tools/src/nav_dev/main.rs b/simulation-tools/src/nav_dev/main.rs
index 981ade5..df47a8c 100644
--- a/simulation-tools/src/nav_dev/main.rs
+++ b/simulation-tools/src/nav_dev/main.rs
@@ -4,10 +4,7 @@ use std::{thread, time};
 mod error_report;
 
 use kairo_common::helper::for_sync::{get_mqtt_cli, mqtt_pub};
-use kairo_common::{
-    influxdb_models::{BeaconMeasure, KnownPosition},
-    Antenna, DeviceReport, Point,
-};
+use kairo_common::{influxdb_models::BeaconMeasure, Antenna, DeviceReport, KnownPosition, Point};
 
 #[derive(Clone)]
 pub struct Config {
diff --git a/xyz-engine/src/position_solver.rs b/xyz-engine/src/position_solver.rs
index 11c2c12..a9787e4 100644
--- a/xyz-engine/src/position_solver.rs
+++ b/xyz-engine/src/position_solver.rs
@@ -1,10 +1,7 @@
 use itertools::Itertools;
 use std::collections::HashMap;
 
-use kairo_common::{
-    influxdb_models::{BeaconMeasure, KnownPosition},
-    Antenna, Point, MAC,
-};
+use kairo_common::{influxdb_models::BeaconMeasure, Antenna, KnownPosition, Point, MAC};
 struct KnownDistance {
     point: Point,
     dist: f64,