merged duplicated code regarding GPCPolygon

wifi/estimate/ray3/ModelFactory.h

@@ -3,7 +3,8 @@
 
 #include "../../../floorplan/v2/Floorplan.h"
 #include "../../../geo/Triangle3.h"
-#include "ModelFactoryHelper.h"
+#include "../../../geo/GPCPolygon2.h"
+
 #include "Obstacle3.h"
 #include "Cube.h"
 #include "Tube.h"
@@ -129,7 +130,7 @@ namespace Ray3D {
 
 			// process all "add" regions by type
 			// [this allows for overlaps of the same type]
-			std::unordered_map<std::string, Polygon> types;
+			std::unordered_map<std::string, GPCPolygon2> types;
 			for (Floorplan::FloorOutlinePolygon* fop : f->outline) {
 				if (fop->method == Floorplan::OutlineMethod::ADD) {
 					if (fop->outdoor) {