Merge branch 'hotfix/error104'

Author: hugoledoux

data/test_metadata.yml

@@ -88,4 +88,6 @@ test_valid:
   "composite_solid": Two unit cubes in a CompositeSolid as CityJSON and CityGML
   "multi_solid": Two unit cubes in a MultiSolid as CityJSON
   "composite_solid_1": "Two unit cubes in a CompositeSolid CityGML, with <CityModel>, <cityObjectMember> part of the 'core' namespace"
+  "v104_1": the bug raised by the Marcin in Poland about wrong error 104, caused by CGAL and Eigen (Plane_3.to_2d())
+  "v104_2": like 104_1 but with very large z coords
 

data/test_valid/v104_1.off

@@ -0,0 +1,8 @@
+OFF
+5 1 0
+758731.86 379196.97 205.54
+758736.08 379207.34 205.54
+758743.72 379204.23 205.54
+758739.37 379193.92 205.54
+758732.25 379196.81 205.54
+5 0 1 2 3 4

data/test_valid/v104_2.off

@@ -0,0 +1,8 @@
+OFF
+5 1 0
+758731.86 379196.97 999205.54
+758736.08 379207.34 999205.54
+758743.72 379204.23 999205.54
+758739.37 379193.92 999205.54
+758732.25 379196.81 999205.54
+5 0 1 2 3 4

src/Surface.cpp

@@ -298,8 +298,7 @@ bool Surface::triangulate_shell()
       for ( ; itp2 != ids2.end(); itp2++)
         allpts.push_back(_lsPts[*itp2]);
     }
-    CgalPolyhedron::Plane_3 bestfitplane;
-    get_best_fitted_plane(allpts, bestfitplane);
+    CgalPolyhedron::Plane_3 bestfitplane = get_best_fitted_plane(allpts);
 
     // int proj = projection_plane(_lsPts, idsob);
     // Vector v0 = bestfitplane.orthogonal_vector();
@@ -504,8 +503,7 @@ bool Surface::validate_2d_primitives(double tol_planarity_d2p, double tol_planar
       }
     }
     double value;
-    CgalPolyhedron::Plane_3 bestfitplane;
-    get_best_fitted_plane(allpts, bestfitplane);
+    CgalPolyhedron::Plane_3 bestfitplane = get_best_fitted_plane(allpts);
     if (false == is_face_planar_distance2plane(allpts, bestfitplane, value, tol_planarity_d2p))
     {
       std::stringstream msg;

src/geomtools.cpp

@@ -262,9 +262,32 @@ Nef_polyhedron* get_aabb(Nef_polyhedron* mynef)
 }
 
 
-void get_best_fitted_plane(const std::vector< Point3 > &lsPts, CgalPolyhedron::Plane_3 &plane)
+CgalPolyhedron::Plane_3  get_best_fitted_plane(const std::vector< Point3 > &lsPts)
 {
-  linear_least_squares_fitting_3(lsPts.begin(), lsPts.end(), plane, CGAL::Dimension_tag<0>());  
+  CgalPolyhedron::Plane_3 p;
+  linear_least_squares_fitting_3(lsPts.begin(), lsPts.end(), p, CGAL::Dimension_tag<0>());  
+  K::FT tol = 1e-12;
+  K::FT a = p.a();
+  K::FT b = p.b();
+  K::FT c = p.c();
+  bool updated = false;
+  if (CGAL::abs(p.a()) < tol) {
+    a = 0;
+    updated = true;  
+  }
+  if (CGAL::abs(p.b()) < tol) {
+    b = 0;
+    updated = true;  
+  }
+  if (CGAL::abs(p.c()) < tol) {
+    c = 0;
+    updated = true;  
+  }
+  if (updated == false)
+    return p;
+  else {
+    return CgalPolyhedron::Plane_3(a, b, c, p.d());
+  }
 }
 
 

src/geomtools.h

@@ -37,8 +37,9 @@ namespace val3dity
 //-- misc
 #define PI 3.14159265
 
+CgalPolyhedron::Plane_3  get_best_fitted_plane(const std::vector< Point3 > &lsPts);
+
 bool    cmpPoint3(Point3 &p1, Point3 &p2, double tol);
-void    get_best_fitted_plane(const std::vector< Point3 > &lsPts, CgalPolyhedron::Plane_3 &plane);
 void    create_cgal_polygon(const std::vector<Point3>& lsPts, const std::vector<int>& ids, const CgalPolyhedron::Plane_3 &plane, Polygon &outpgn);
 bool    is_face_planar_distance2plane(const std::vector<Point3> &pts, const CgalPolyhedron::Plane_3 &plane, double& value, float tolerance);
 bool    is_face_planar_normals(const std::vector<int*> &trs, const std::vector<Point3>& lsPts, double& value, float angleTolerance);

src/main.cpp

@@ -42,7 +42,7 @@ using namespace std;
 using namespace val3dity;
 using json = nlohmann::json;
 
-std::string VAL3DITY_VERSION = "2.0.1";
+std::string VAL3DITY_VERSION = "2.0.2";
 
 
 std::string print_summary_validation(std::map<std::string, std::vector<Primitive*>>& dPrimitives, std::map<std::string, COError>& dCOerrors, IOErrors& ioerrs);

tests/test_valid.py

@@ -50,6 +50,16 @@ def data_v_405(request, dir_valid):
     return(file_path)
 
 
+@pytest.fixture(scope="module",
+                params=["v104_1.off",
+                        "v104_2.off"])
+def data_v_104(request, dir_valid):
+    file_path = os.path.abspath(
+        os.path.join(
+            dir_valid,
+            request.param))
+    return(file_path)
+
 
 @pytest.fixture(scope="module",
                 params=["basecube_large_coords.poly"])
@@ -107,6 +117,10 @@ def test_v_405(validate, data_v_405):
     error = validate(data_v_405)
     assert(error == [])
 
+def test_v_104(validate, data_planar):
+    error = validate(data_planar)
+    assert(error == [301])
+
 def test_planar(validate, data_planar):
     error = validate(data_planar)
     assert(error == [301])