Merge branch 'solid-nef-fix'

Author: hugoledoux

README.md

@@ -2,9 +2,10 @@
 
 Validation of 3D primitives according to the international standard ISO 19107.
 
-Its main aim is the 3D primitives of GML (`<gml:Solid>`, `<gml:CompositeSurface>`, or `<gml:MultiSurface>`), but it can be used to validate any 3D primitive. 
+The 3D primitives of GML (`<gml:Solid>`, `<gml:CompositeSurface>`, or `<gml:MultiSurface>`) are what it was built for, but it can be used to validate any 3D primitive, also in other formats. 
 It accepts as input any GML files (or one of the formats built upon it, such as CityGML), OBJ, OFF, and [POLY](http://wias-berlin.de/software/tetgen/1.5/doc/manual/manual006.html#ff_poly).
 It simply scans the file looking for the 3D primitives and validates these according to the rules in ISO19107 (all the rest is ignored). 
+In a OBJ/OFF/STL file, each primitive will be validated according to the ISO 19107 rules. 
 
 For `Solids`, the validation is performed hierarchically, ie first every polygon (embedded in 3D) is validated (by projecting it to a 2D plane and using [GEOS](http://trac.osgeo.org/geos/)), then every shell is validated (must be watertight, no self-intersections, orientation of the normals must be consistent and pointing outwards, etc), and finally the interactions between the shells are analysed. 
 This means that if a polygon of your solid is not valid, the validator will report that error but will *not* continue the validation (to avoid "cascading" errors). 
@@ -13,14 +14,15 @@ For `CompositeSurfaces`, the surface formed by the polygons must be a 2-manifold
 
 For `MultiSurfaces`, only the validation of the individual polygons is performed, ie are they valid according to the 2D rules, and are they planar?
 
-Most of the details are available in this scientific article:
+Most of the details are available in this scientific article, (if you use val3dity for scientific purposes please cite this article):
 
 > Ledoux, Hugo (2013). On the validation of solids represented with the
 international standards for geographic information. *Computer-Aided Civil and Infrastructure Engineering*, 28(9):693-706. [ [PDF] ](https://3d.bk.tudelft.nl/hledoux/pdfs/13_cacaie.pdf) [ [DOI] ](http://dx.doi.org/10.1111/mice.12043)
 
+
 ## Web application
 
-If you're running Windows and/or you don't want to go through the troubles of compiling, we suggest you use the [web application](http://geovalidation.bk.tudelft.nl/val3dity). 
+If you're you don't want to go through the troubles of compiling and/or installing val3dity, we suggest you use the [web application](http://geovalidation.bk.tudelft.nl/val3dity). 
 You upload your file to our server and get a validation report back.
 We delete the file as soon as it has been validated.
 However, a file is limited to 50MB.
@@ -30,7 +32,7 @@ However, a file is limited to 50MB.
 
 It is a command-line program, which we provide as source code, with CMake.
 It's trivial to compile under Mac and Linux.
-For Windows, we do not offer binaries at this moment, but compiling it is possible with the CMake.
+[For Windows, we do offer an executable](https://github.com/tudelft3d/val3dity/releases).
 
 To compile val3dity yourself, you first need to install the following free libraries:
 
@@ -87,60 +89,16 @@ See the [FAQ for the web application](http://geovalidation.bk.tudelft.nl/val3dit
 
 ## Options for validating
 
-It is possible to define 2 tolerances for the planarity of surfaces with the flags 
+It is possible to define 2 tolerances for the planarity of surfaces with the flags: 
 
   1. `--planarity_d2s` the distance between every point forming a surface and a plane is less than a given tolerance (eg 1cm, which is the default).
   1. `--planarity_n` the surface is triangulated and the normal of each triangle must not deviate more than than a certain usef-defined tolerance (eg 1 degree, which is the default).
 
-Similarly, the input points in a GML files are snapped together using a tolerance, which can be changed with `--snap_tolerance` (default is 1mm)
+Similarly, the input points in a GML files are snapped together using a tolerance, which can be changed with `--snap_tolerance` (default is 1mm).
 
 ## Error reported 
 
-(a description of each error is available [here](https://github.com/tudelft3d/val3dity/blob/master/errors_description/errors_description.md))
-
-### Ring level
-
-  * 101: TOO_FEW_POINTS
-  * 102: CONSECUTIVE_POINTS_SAME
-  * 103: NOT_CLOSED
-  * 104: SELF_INTERSECTION 
-  * 105: COLLAPSED_TO_LINE
-
-
-### POLYGON level
-
-  * 201: INTERSECTION_RINGS
-  * 202: DUPLICATED_RINGS
-  * 203: NON_PLANAR_POLYGON_DISTANCE_PLANE 
-  * 204: NON_PLANAR_POLYGON_NORMALS_DEVIATION 
-  * 205: INTERIOR_DISCONNECTED
-  * 206: HOLE_OUTSIDE
-  * 207: INNER_RINGS_NESTED
-  * 208: ORIENTATION_RINGS_SAME
+![](https://dl.dropboxusercontent.com/u/8129172/errorcodes.png)
 
+(a description of each error is available [here](https://github.com/tudelft3d/val3dity/blob/master/errors_description/errors_description.md))
 
-### SHELL level
-
-  * 301: TOO_FEW_POLYGONS
-  * 302: NOT_CLOSED
-  * 303: NON_MANIFOLD_VERTEX
-  * 304: NON_MANIFOLD_EDGE 
-  * 305: SEPARATE_PARTS
-  * 306: SELF_INTERSECTION
-  * 307: POLYGON_WRONG_ORIENTATION
-  * 308: ALL_POLYGONS_WRONG_ORIENTATION
-  * 309: VERTICES_NOT_USED 
-
-
-### SOLID level
-
-  * 401: SHELLS_FACE_ADJACENT
-  * 402: SHELL_INTERIOR_INTERSECT
-  * 403: INNER_SHELL_OUTSIDE_OUTER
-  * 404: INTERIOR_OF_SHELL_NOT_CONNECTED
-
-### OTHERS
-
-  * 901: INVALID_INPUT_FILE
-  * 902: EMPTY_PRIMITIVE
-  * 999: UNKNOWN_ERROR

Shell.cpp

@@ -373,7 +373,7 @@ bool Shell::construct_ct(const vector< vector<int> >& pgnids, const vector<Polyg
 }
 
 
-void Shell::translate_vertices()
+void Shell::get_min_bbox(double& x, double& y)
 {
   vector<Point3>::iterator it = _lsPts.begin();
   K::FT minx = 9e10;
@@ -385,6 +385,14 @@ void Shell::translate_vertices()
     if (it->y() < miny)
       miny = it->y();
   }
+  x = minx;
+  y = miny;
+}
+
+
+void Shell::translate_vertices(double minx, double miny)
+{
+  vector<Point3>::iterator it = _lsPts.begin();
   for (it = _lsPts.begin(); it != _lsPts.end(); it++)
   {
     Point3 tp(CGAL::to_double(it->x() - minx), CGAL::to_double(it->y() - miny), CGAL::to_double(it->z()));
@@ -645,12 +653,6 @@ bool Shell::validate_as_shell(double tol_planarity_d2p, double tol_planarity_nor
   std::clog << "--Geometrical consistency" << std::endl;
   if (is_polyhedron_geometrically_consistent(this) == false)
     return false;
-//-- 4. orientation of the normals is outwards or inwards
-  std::clog << "--Orientation of normals" << std::endl;
-  if (check_global_orientation_normals(_polyhedron, this->is_outer()) == false) {
-    this->add_error(308);
-    return false;
-  }
   return true;
 }
 

Shell.h

@@ -36,6 +36,7 @@ class Shell
 
   int    number_vertices();
   int    number_faces();
+  void   get_min_bbox(double& x, double& y);
   bool   is_outer();
   int    get_id();
   CgalPolyhedron* get_cgal_polyhedron();
@@ -51,7 +52,7 @@ class Shell
   void          add_error(int code, std::string faceid = "", std::string info = "");
   bool          has_errors();
   std::set<int> get_unique_error_codes();
-  void          translate_vertices();
+  void          translate_vertices(double minx, double miny);
   std::string   get_poly_representation();
 
 private: