From ae357ffd4b391cfd3a56ea1aba29d41720fa8552 Mon Sep 17 00:00:00 2001
From: FrankE <support@frank-ebner.de>
Date: Tue, 29 Nov 2016 21:29:10 +0100
Subject: [PATCH] added new parameters to Floorplan-APs and -Beacons

---
 floorplan/v2/Floorplan.h       | 13 +++++++++++++
 floorplan/v2/FloorplanReader.h |  9 +++++++++
 floorplan/v2/FloorplanWriter.h |  9 +++++++++
 3 files changed, 31 insertions(+)

diff --git a/floorplan/v2/Floorplan.h b/floorplan/v2/Floorplan.h
index 0668f03..64644c8 100644
--- a/floorplan/v2/Floorplan.h
+++ b/floorplan/v2/Floorplan.h
@@ -172,6 +172,11 @@ namespace Floorplan {
 		std::string name;
 		std::string mac;
 		Point3 pos;		// z is relative to the floor's height
+		struct Model {
+			float txp;
+			float exp;
+			float waf;
+		} model;
 		AccessPoint() : name(), mac(), pos() {;}
 		AccessPoint(const std::string& name, const std::string& mac, const Point3& pos) : name(name), mac(toUpperCase(mac)), pos(pos) {;}
 		bool operator == (const AccessPoint& o) const {return (o.name == name) && (o.mac == mac) && (o.pos == pos);}
@@ -182,7 +187,15 @@ namespace Floorplan {
 	struct Beacon {
 		std::string name;
 		std::string mac;
+		std::string major;
+		std::string minor;
+		std::string uuid;
 		Point3 pos;		// z is relative to the floor's height
+		struct Model {
+			float txp;
+			float exp;
+			float waf;
+		} model;
 		Beacon() : name(), mac(), pos() {;}
 		Beacon(const std::string& name, const std::string& mac, const Point3& pos) : name(name), mac(mac), pos(pos) {;}
 		bool operator == (const Beacon& o) const {return (o.name == name) && (o.mac == mac) && (o.pos == pos);}
diff --git a/floorplan/v2/FloorplanReader.h b/floorplan/v2/FloorplanReader.h
index 396f338..2af6df0 100644
--- a/floorplan/v2/FloorplanReader.h
+++ b/floorplan/v2/FloorplanReader.h
@@ -241,6 +241,9 @@ namespace Floorplan {
 			ap->mac = n->Attribute("mac");
 			ap->name = n->Attribute("name");
 			ap->pos = parsePoint3(n);
+			ap->model.txp = n->FloatAttribute("mdl_txp");
+			ap->model.exp = n->FloatAttribute("mdl_exp");
+			ap->model.waf = n->FloatAttribute("mdl_waf");
 			return ap;
 		}
 
@@ -259,6 +262,12 @@ namespace Floorplan {
 			Beacon* b = new Beacon();
 			b->mac = n->Attribute("mac");
 			b->name = n->Attribute("name");
+			b->major = n->Attribute("major");
+			b->minor = n->Attribute("minor");
+			b->uuid = n->Attribute("uuid");
+			b->model.txp = n->FloatAttribute("mdl_txp");
+			b->model.exp = n->FloatAttribute("mdl_exp");
+			b->model.waf = n->FloatAttribute("mdl_waf");
 			b->pos = parsePoint3(n);
 			return b;
 		}
diff --git a/floorplan/v2/FloorplanWriter.h b/floorplan/v2/FloorplanWriter.h
index bd0bc4e..3a927a0 100644
--- a/floorplan/v2/FloorplanWriter.h
+++ b/floorplan/v2/FloorplanWriter.h
@@ -153,6 +153,9 @@ namespace Floorplan {
 				accesspoint->SetAttribute("x", ap->pos.x);
 				accesspoint->SetAttribute("y", ap->pos.y);
 				accesspoint->SetAttribute("z", ap->pos.z);
+				accesspoint->SetAttribute("mdl_txp", ap->model.txp);
+				accesspoint->SetAttribute("mdl_exp", ap->model.exp);
+				accesspoint->SetAttribute("mdl_waf", ap->model.waf);
 				accesspoints->InsertEndChild(accesspoint);
 			}
 			floor->InsertEndChild(accesspoints);
@@ -162,9 +165,15 @@ namespace Floorplan {
 				XMLElem* beacon = doc.NewElement("beacon");
 				beacon->SetAttribute("name", b->name.c_str());
 				beacon->SetAttribute("mac", b->mac.c_str());
+				beacon->SetAttribute("major", b->major.c_str());
+				beacon->SetAttribute("minor", b->minor.c_str());
+				beacon->SetAttribute("uuid", b->uuid.c_str());
 				beacon->SetAttribute("x", b->pos.x);
 				beacon->SetAttribute("y", b->pos.y);
 				beacon->SetAttribute("z", b->pos.z);
+				beacon->SetAttribute("mdl_txp", b->model.txp);
+				beacon->SetAttribute("mdl_exp", b->model.exp);
+				beacon->SetAttribute("mdl_waf", b->model.waf);
 				beacons->InsertEndChild(beacon);
 			}
 			floor->InsertEndChild(beacons);