FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

added earth-registration load/save

Browse Source
This commit is contained in:
FrankE
2017-03-21 21:11:58 +01:00
parent b8b35d2a50
commit b03804d378
4 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
floorplan/v2/Floorplan.h
View File

@@ -545,6 +545,9 @@ namespace Floorplan {
Point3 posOnMap_m; Point3 posOnMap_m;
/** empty ctor */
EarthPosMapPos() : posOnEarth(), posOnMap_m() {;}
/** ctor */ /** ctor */
EarthPosMapPos(const EarthPos posOnEarth, const Point3 posOnMap_m) : posOnEarth(posOnEarth), posOnMap_m(posOnMap_m) {;} EarthPosMapPos(const EarthPos posOnEarth, const Point3 posOnMap_m) : posOnEarth(posOnEarth), posOnMap_m(posOnMap_m) {;}
@@ -555,7 +558,7 @@ namespace Floorplan {
struct EarthRegistration { struct EarthRegistration {
/** all available correspondences: earth <-> map */ /** all available correspondences: earth <-> map */
std::vector<EarthPosMapPos> correspondences; std::vector<EarthPosMapPos*> correspondences;
}; };

26
floorplan/v2/FloorplanReader.h
View File

@@ -81,12 +81,36 @@ namespace Floorplan {
IndoorMap* map = new IndoorMap(); IndoorMap* map = new IndoorMap();
map->width = el->FloatAttribute("width"); map->width = el->FloatAttribute("width");
map->depth = el->FloatAttribute("depth"); map->depth = el->FloatAttribute("depth");
FOREACH_NODE(n, el) { FOREACH_NODE(n, el) {
if (std::string("floors") == n->Name()) {map->floors = parseFloors(n);} if (std::string("floors") == n->Name()) {map->floors = parseFloors(n);}
if (std::string("earthReg") == n->Name()) {map->earthReg = parseEarthReg(n);}
} }
return map; return map;
} }
/** parse the <earthReg> node */
static EarthRegistration parseEarthReg(const XMLElem* el) {
EarthRegistration reg;
FOREACH_NODE(n, el) {
if (std::string("correspondences") == n->Name()) {
FOREACH_NODE(n2, n) {
if (std::string("point") == n2->Name()) {
Floorplan::EarthPosMapPos* pos = new Floorplan::EarthPosMapPos();
pos->posOnMap_m.x = n2->FloatAttribute("mx");
pos->posOnMap_m.y = n2->FloatAttribute("my");
pos->posOnMap_m.z = n2->FloatAttribute("mz");
pos->posOnEarth.lat = n2->FloatAttribute("lat");
pos->posOnEarth.lon = n2->FloatAttribute("lon");
pos->posOnEarth.height = n2->FloatAttribute("alt");
reg.correspondences.push_back(pos);
}
}
}
}
return reg;
}
/** parse the <floors> node */ /** parse the <floors> node */
static std::vector<Floor*> parseFloors(const XMLElem* el) { static std::vector<Floor*> parseFloors(const XMLElem* el) {
std::vector<Floor*> floors; std::vector<Floor*> floors;

23
floorplan/v2/FloorplanWriter.h
View File

@@ -49,11 +49,34 @@ namespace Floorplan {
root->SetAttribute("width", map->width); root->SetAttribute("width", map->width);
root->SetAttribute("depth", map->depth); root->SetAttribute("depth", map->depth);
// add earth registration to the map
addEarthReg(doc, root, map);
// add all floors to the map // add all floors to the map
addFloors(doc, root, map); addFloors(doc, root, map);
} }
/** add earth registration to the map */
static void addEarthReg(XMLDoc& doc, XMLElem* root, const IndoorMap* map) {
XMLElem* earthReg = doc.NewElement("earthReg"); {
XMLElem* correspondences = doc.NewElement("correspondences");
for (const Floorplan::EarthPosMapPos* reg : map->earthReg.correspondences) {
XMLElem* point = doc.NewElement("point");
point->SetAttribute("lat", reg->posOnEarth.lat);
point->SetAttribute("lon", reg->posOnEarth.lon);
point->SetAttribute("alt", reg->posOnEarth.height);
point->SetAttribute("mx", reg->posOnMap_m.x);
point->SetAttribute("my", reg->posOnMap_m.y);
point->SetAttribute("mz", reg->posOnMap_m.z);
correspondences->InsertEndChild(point);
}
earthReg->InsertEndChild(correspondences);
} root->InsertEndChild(earthReg);
}
/** add all floors to the map */ /** add all floors to the map */
static void addFloors(XMLDoc& doc, XMLElem* root, const IndoorMap* map) { static void addFloors(XMLDoc& doc, XMLElem* root, const IndoorMap* map) {
XMLElem* floors = doc.NewElement("floors"); XMLElem* floors = doc.NewElement("floors");

5
geo/EarthPos.h
View File

@@ -11,6 +11,11 @@ struct EarthPos {
/** height above sea level */ /** height above sea level */
float height; float height;
/** empty ctor */
EarthPos() : lat(NAN), lon(NAN), height(NAN) {
;
}
/** ctor with values */ /** ctor with values */
EarthPos(const double lat, const double lon, const float height) : lat(lat), lon(lon), height(height) { EarthPos(const double lat, const double lon, const float height) : lat(lat), lon(lon), height(height) {
; ;