Update filtered data

Change-Id: I618df6e66fd428b1344b4f3faa31f3ab87bba137
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/include/Node.h b/include/Node.h
index ad3bf264137c8040c29763ce62abd8fe409c3878..8f835e487ac532ada54efe9b4e3f89aeafb9c04d 100755 (executable)
--- a/include/Node.h
+++ b/include/Node.h
@@ -80,9 +80,11 @@ public:
        int getZ(void) {return _z;};
        void setZ(int z) {_z = z;};
        int getRange(void) {return _range;};
+       void copyFilteredRange(const Node &node) { _filtered_range = node._filtered_range; }
        float getFilteredRange(void) { return _filtered_range.getState(); };
        void setRange(int range) {_range = range;};
        int getAoa(void) {return _aoa;};
+       void copyFilteredAoa(const Node &node) { _filtered_aoa = node._filtered_aoa; }
        float getFilteredAoa(void) { return _filtered_aoa.getState(); };
        void setAoa(int aoa) {_aoa = aoa;};
        int getPdoa(void) {return _pdoa;};

diff --git a/packaging/uwb-manager.spec b/packaging/uwb-manager.spec
index 2721e405bbdc0a4bec600849f5f416df68ffa635..85af337b68fd151ff99d689f4b173238baf44017 100755 (executable)
--- a/packaging/uwb-manager.spec
+++ b/packaging/uwb-manager.spec
@@ -1,6 +1,6 @@
 Name:       uwb-manager
 Summary:    This is the daemon managing UWB related functionalities
-Version:    0.0.6
+Version:    0.0.7
 Release:    1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/LocationManager.cpp b/src/LocationManager.cpp
index 3c1adb3a03ee495b304e475eafcee28d7b1a3b56..0fe3cc5259907bfe1d665833e6b883e1df42632f 100644 (file)
--- a/src/LocationManager.cpp
+++ b/src/LocationManager.cpp
@@ -361,6 +361,10 @@ void LocationManager::updateUwbNodes(void)
 
                auto itr = this->_node_map.find(p_node->getNodeId());
                bool added = itr == this->_node_map.end();
+               if (!added) {
+                       p_node->copyFilteredRange(*itr->second.get());
+                       p_node->copyFilteredAoa(*itr->second.get());
+               }
 
                p_node->setLastUpdate(std::chrono::steady_clock::now());
                p_node->updateFilters();

diff --git a/src/UwbDbusIfaceAdapter.cpp b/src/UwbDbusIfaceAdapter.cpp
index 8ac7cee17f9234ca10275f7fac150d7088f46fda..5d8586d772706c39a856997e9f105be2ad4fadfd 100644 (file)
--- a/src/UwbDbusIfaceAdapter.cpp
+++ b/src/UwbDbusIfaceAdapter.cpp
@@ -300,6 +300,10 @@ static void __build_network_variant(std::map<int, std::unique_ptr<Node>> &node_m
                                                g_variant_new_int32(node_ptr->getAoa()));
                g_variant_builder_add(builder, "{sv}", "Pdoa",
                                                g_variant_new_int32(node_ptr->getPdoa()));
+               g_variant_builder_add(builder, "{sv}", "FilteredRange",
+                                               g_variant_new_int32((int)node_ptr->getFilteredRange()));
+               g_variant_builder_add(builder, "{sv}", "FilteredAoa",
+                                               g_variant_new_int32((int)node_ptr->getFilteredAoa()));
                g_variant_builder_close(builder);
        }