From b18b1a795dbd5202fff43dfbce03924b2bb3299d Mon Sep 17 00:00:00 2001
From: toni <toni@localhost.localdomain>
Date: Fri, 10 Mar 2017 15:35:44 +0100
Subject: [PATCH] merged with master

---
 floorplan/v2/Floorplan.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/floorplan/v2/Floorplan.h b/floorplan/v2/Floorplan.h
index 8cc07ab..95359ba 100644
--- a/floorplan/v2/Floorplan.h
+++ b/floorplan/v2/Floorplan.h
@@ -184,7 +184,7 @@ namespace Floorplan {
 	struct POI;
 	struct Stair;
 	struct Elevator;
-    struct GroundTruthPoint;
+        struct GroundTruthPoint;
 
 	using FloorOutline = std::vector<FloorOutlinePolygon*>;
 	using FloorObstacles = std::vector<FloorObstacle*>;
@@ -195,7 +195,7 @@ namespace Floorplan {
 	using FloorPOIs = std::vector<POI*>;
 	using FloorStairs = std::vector<Stair*>;
 	using FloorElevators = std::vector<Elevator*>;
-    using FloorGroundTruthPoints = std::vector<GroundTruthPoint*>;
+        using FloorGroundTruthPoints = std::vector<GroundTruthPoint*>;
 
 	/** describes one floor within the map, starting at a given height */
 	struct Floor {
@@ -212,7 +212,7 @@ namespace Floorplan {
 		FloorPOIs pois;							// POIs within the floor
 		FloorStairs stairs;						// all stairs within one floor
 		FloorElevators elevators;				// all elevators within one floor
-        FloorGroundTruthPoints gtpoints;        // all ground truth points within one floor
+                FloorGroundTruthPoints gtpoints;        // all ground truth points within one floor
 		//FloorKeyValue other;					// other, free elements
 
 		Floor() {;}
@@ -237,14 +237,14 @@ namespace Floorplan {
 		bool operator == (const POI& o) const {return (o.type == type) && (o.name == name) && (o.pos == pos);}
 	};
 
-    /** a GroundTruthPoint located somewhere on a floor */
-    struct GroundTruthPoint {
-        int id; //TODO: this value can be changed and isn't set incremental within the indoormap
-        Point2 pos;
-        GroundTruthPoint() : id(), pos() {;}
-        GroundTruthPoint(const int& id, const Point2& pos) : id(id), pos(pos) {;}
-        bool operator == (const GroundTruthPoint& o) const {return (o.id == id) && (o.pos == pos);}
-    };
+        /** a GroundTruthPoint located somewhere on a floor */
+        struct GroundTruthPoint {
+            int id; //TODO: this value can be changed and isn't set incremental within the indoormap
+            Point2 pos;
+            GroundTruthPoint() : id(), pos() {;}
+            GroundTruthPoint(const int& id, const Point2& pos) : id(id), pos(pos) {;}
+            bool operator == (const GroundTruthPoint& o) const {return (o.id == id) && (o.pos == pos);}
+        };
 
 	/** an AccessPoint located somewhere on a floor */
 	struct AccessPoint : public HasMeta {
@@ -278,7 +278,7 @@ namespace Floorplan {
 		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);}
-        Point3 getPos(const Floor* f) const {return pos + Point3(0,0,f->atHeight);}	// relative to the floor's ground
+                Point3 getPos(const Floor* f) const {return pos + Point3(0,0,f->atHeight);}	// relative to the floor's ground
 	};