Merge branch 'gitflow'

tudelft3d · Aug 16, 2018 · a90bc0d · a90bc0d
2 parents 0c76ebf + 83bce52
commit a90bc0d
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 32 deletions.
diff --git a/src/Bridge.cpp b/src/Bridge.cpp
@@ -27,7 +27,6 @@
 */
 
 #include "Bridge.h"
-#include "io.h"
 
 float Bridge::_heightref;
 bool Bridge::_flatten;

diff --git a/src/Bridge.h b/src/Bridge.h
@@ -30,6 +30,7 @@
 #define Bridge_h
 
 #include "TopoFeature.h"
+#include "io.h"
 
 class Bridge: public Boundary3D {
 public:

diff --git a/src/Building.cpp b/src/Building.cpp
@@ -27,8 +27,6 @@
 */
 
 #include "Building.h"
-#include "io.h"
-#include <algorithm>
 
 //-- static variable
 float Building::_heightref_top;

diff --git a/src/Building.h b/src/Building.h
@@ -30,6 +30,8 @@
 #define Building_h
 
 #include "TopoFeature.h"
+#include "io.h"
+#include <algorithm>
 
 class Building: public Flat {
 public:

diff --git a/src/Forest.cpp b/src/Forest.cpp
@@ -27,7 +27,6 @@
 */
 
 #include "Forest.h"
-#include "io.h"
 
 Forest::Forest(char *wkt, std::string layername, AttributeMap attributes, std::string pid, int simplification, double simplification_tinsimp, float innerbuffer)
   : TIN(wkt, layername, attributes, pid, simplification, simplification_tinsimp, innerbuffer) {}

diff --git a/src/Forest.h b/src/Forest.h
@@ -30,6 +30,7 @@
 #define Forest_h
 
 #include "TopoFeature.h"
+#include "io.h"
 
 class Forest: public TIN {
 public:

diff --git a/src/Map3d.cpp b/src/Map3d.cpp
@@ -27,12 +27,6 @@
 */
 
 #include "Map3d.h"
-#include "io.h"
-#include "boost/locale.hpp"
-#include "boost/tokenizer.hpp"
-#include "boost/algorithm/string.hpp"
-#include "nlohmann-json/json.hpp"
-#include "codecvt"
 
 Map3d::Map3d() {
   OGRRegisterAll();

diff --git a/src/Map3d.h b/src/Map3d.h
@@ -31,6 +31,7 @@
 
 #include "definitions.h"
 #include "geomtools.h"
+#include "io.h"
 #include "TopoFeature.h"
 #include "Building.h"
 #include "Terrain.h"
@@ -39,9 +40,7 @@
 #include "Road.h"
 #include "Separation.h"
 #include "Bridge.h"
-
-#include <set>
-#include <array>
+#include "boost/locale.hpp"
 
 typedef std::pair<Box2, TopoFeature*> PairIndexed;
 

diff --git a/src/Road.cpp b/src/Road.cpp
@@ -27,7 +27,6 @@
 */
 
 #include "Road.h"
-#include "io.h"
 
 float Road::_heightref;
 bool  Road::_filter_outliers;

diff --git a/src/Road.h b/src/Road.h
@@ -30,6 +30,7 @@
 #define Road_h
 
 #include "TopoFeature.h"
+#include "io.h"
 
 class Road: public Boundary3D {
 public:

diff --git a/src/Separation.cpp b/src/Separation.cpp
@@ -27,7 +27,6 @@
 */
 
 #include "Separation.h"
-#include "io.h"
 
 float Separation::_heightref;
 

diff --git a/src/Separation.h b/src/Separation.h
@@ -30,6 +30,7 @@
 #define Separation_h
 
 #include "TopoFeature.h"
+#include "io.h"
 
 class Separation: public Boundary3D {
 public:

diff --git a/src/Terrain.cpp b/src/Terrain.cpp
@@ -27,8 +27,6 @@
 */
 
 #include "Terrain.h"
-#include "io.h"
-#include <algorithm>
 
 Terrain::Terrain(char *wkt, std::string layername, AttributeMap attributes, std::string pid, int simplification, double simplification_tinsimp, float innerbuffer)
   : TIN(wkt, layername, attributes, pid, simplification, simplification_tinsimp, innerbuffer) {}

diff --git a/src/Terrain.h b/src/Terrain.h
@@ -30,6 +30,7 @@
 #define Terrain_h
 
 #include "TopoFeature.h"
+#include "io.h"
 
 class Terrain: public TIN {
 public:

diff --git a/src/TopoFeature.cpp b/src/TopoFeature.cpp
@@ -27,8 +27,6 @@
 */
 
 #include "TopoFeature.h"
-#include "io.h"
-#include "polyfit.hpp"
 
 TopoFeature::TopoFeature(char *wkt, std::string layername, AttributeMap attributes, std::string pid) {
   _id = pid;

diff --git a/src/TopoFeature.h b/src/TopoFeature.h
@@ -31,8 +31,9 @@
 
 #include "definitions.h"
 #include "geomtools.h"
+#include "io.h"
+#include "polyfit.hpp"
 #include "nlohmann-json/json.hpp"
-#include <random>
 
 class TopoFeature {
 public:

diff --git a/src/Water.cpp b/src/Water.cpp
@@ -27,7 +27,6 @@
 */
 
 #include "Water.h"
-#include "io.h"
 
 float Water::_heightref;
 

diff --git a/src/Water.h b/src/Water.h
@@ -30,6 +30,7 @@
 #define Water_h
 
 #include "TopoFeature.h"
+#include "io.h"
 
 class Water: public Flat {
 public:

diff --git a/src/definitions.h b/src/definitions.h
@@ -2,11 +2,8 @@
 #define __3DFIER__Definitions__
 
 #include <iostream>
-#include <iomanip>
 #include <cmath>
 #include <vector>
-#include <set>
-#include <map>
 #include <unordered_map>
 
 #include <liblas/liblas.hpp>
@@ -15,17 +12,13 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/box.hpp>
-#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/index/rtree.hpp>
-#include "boost/filesystem.hpp"
-#include <boost/filesystem/operations.hpp>
 
 namespace bg = boost::geometry;
 namespace bgi = boost::geometry::index;
 typedef bg::model::d2::point_xy<double> Point2;
 typedef bg::model::segment<Point2> Segment2;
-typedef bg::model::linestring<Point2> Linestring2;
 typedef bg::model::polygon<Point2, true, false> Polygon2; //-- cw, first!=last
 typedef bg::model::ring<Point2, true, false> Ring2; //-- cw, first!=last
 typedef bg::model::box<Point2> Box2;

diff --git a/src/geomtools.cpp b/src/geomtools.cpp
@@ -26,8 +26,8 @@
   Julianalaan 134, Delft 2628BL, the Netherlands
 */
 
-#include "io.h"
 #include "geomtools.h"
+#include "io.h"
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Projection_traits_xy_3.h>
@@ -37,8 +37,6 @@
 
 #include <vector>
 #include <unordered_set>
-#include <iterator>
-#include <memory>
 #include <boost/heap/fibonacci_heap.hpp>
 
 // fibonacci heap for greedy insertion code

diff --git a/src/main.cpp b/src/main.cpp
@@ -35,7 +35,6 @@
 #include "boost/chrono.hpp"
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
-#include <map>
 
 std::string VERSION = "1.0";
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ @@
     */
     #include "Separation.h"
-    #include "io.h"
     float Separation::_heightref;
@@ Expand Down @@