partial revert of 24acfea

src/ifcgeom/mapping/IfcPointByDistanceExpression.cpp

@@ -52,15 +52,6 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcPointByDistanceExpression* i
    if (inst->OffsetVertical().has_value()) {
        auto offset_vertical = inst->OffsetVertical().get() * length_unit_;
        o += offset_vertical * z;
-
-       auto tmp1 = (z * offset_vertical).eval();
-       auto tmp2 = (Eigen::Vector3d(0, 0, 1) * offset_vertical).eval();
-       auto tmp3 = (tmp1 - tmp2).eval();
-
-       std::ostringstream oss;
-       oss << "local z: " << z.x() << "," << z.y() << "," << z.z() << "; delta: " << tmp3.x() << "," << tmp3.y() << "," << tmp3.z();
-       auto osss = oss.str();
-       std::wcout << osss.c_str() << std::endl;
    }
 
    if (inst->OffsetLongitudinal().has_value()) {

src/ifcopenshell-python/ifcopenshell/draw.py

@@ -42,7 +42,6 @@ WHITE = numpy.array((1.0, 1.0, 1.0))
 
 DO_NOTHING = lambda *args: None
 
-ARRANGE_POLYGON_SETTINGS = W.arrange_polygon_settings() if hasattr(W, 'arrange_polygon_settings') else None
 
 @dataclass
 class draw_settings:
@@ -537,7 +536,7 @@ def main(
                     *(tup for i, tup in enumerate(zip(path_objects, section_polies, polies)) if has_relevant_zone(i))
                 )
 
-            arranged = W.arrange_polygons(*filter(None, (ARRANGE_POLYGON_SETTINGS,)), polies)
+            arranged = W.arrange_polygons(polies)
             svg_data_3 = W.polygons_to_svg(arranged, False)
             dom3 = parseString(svg_data_3)
             svg3 = dom3.childNodes[0]

src/ifcparse/IfcSchema.h

@@ -358,7 +358,6 @@ class IFC_PARSE_API entity : public declaration {
 
     const std::vector<const entity*>& subtypes() const { return subtypes_; }
     const std::vector<const attribute*>& attributes() const { return attributes_; }
-    const std::vector<const inverse_attribute*>& inverse_attributes() const { return inverse_attributes_; }
     const std::vector<bool>& derived() const { return derived_; }
 
     const std::vector<const attribute*> all_attributes() const {

src/ifcwrap/IfcGeomWrapper.i

@@ -1166,7 +1166,6 @@ ifcopenshell::geometry::taxonomy::item::ptr try_upcast(PyObject* obj0, swig_type
 %ignore svgfill::line_segments_to_polygons;
 %ignore svgfill::svg_to_polygons;
 %ignore svgfill::arrange_polygons;
-%ignore svgfill::abstract_arrangement;
 
 %template(svg_line_segments) std::vector<std::array<svgfill::point_2, 2>>;
 %template(svg_groups_of_line_segments) std::vector<std::vector<std::array<svgfill::point_2, 2>>>;
@@ -1288,9 +1287,9 @@ ifcopenshell::geometry::taxonomy::item::ptr try_upcast(PyObject* obj0, swig_type
 		}	
 	}
 
-	std::vector<svgfill::polygon_2> arrange_polygons(svgfill::arrange_polygon_settings settings, const std::vector<svgfill::polygon_2>& polygons) {
+	std::vector<svgfill::polygon_2> arrange_polygons(const std::vector<svgfill::polygon_2>& polygons) {
 		std::vector<svgfill::polygon_2> r;
-		if (svgfill::arrange_polygons(settings, polygons, r)) {
+		if (svgfill::arrange_polygons(polygons, r)) {
 			return r;
 		} else {
 			throw std::runtime_error("Failed to arrange polygons");

src/svgfill/src/svgfill.cpp

@@ -483,18 +483,6 @@ public:
 		return ps;
 	}
 
-	size_t delete_same_facet_edge_pairs() {
-        size_t n_deleted = 0;
-        for (auto it = arr.edges_begin(); it != arr.edges_end();) {
-            decltype(it) current = it++;
-            if (current->face() == current->twin()->face()) {
-                arr.remove_edge(current);
-                n_deleted++;
-			}
-        }
-        return n_deleted;
-	}
-
 	void merge(const std::vector<int>& edge_indices) {
 		if (edge_indices.empty()) {
 			return;

src/svgfill/src/svgfill.h

@@ -67,7 +67,6 @@ namespace svgfill {
 		virtual std::vector<int> get_face_pairs() = 0;
 		virtual size_t num_edges() = 0;
 		virtual size_t num_faces() = 0;
-        virtual size_t delete_same_facet_edge_pairs() = 0;
 	};
 
 	class SVGFILL_API context {
@@ -102,7 +101,6 @@ namespace svgfill {
 		void write(std::vector<std::vector<polygon_2>>&);
 		size_t num_edges() { return arr_->num_edges(); }
 		size_t num_faces() { return arr_->num_faces(); }
-        size_t delete_same_facet_edge_pairs() { return arr_->delete_same_facet_edge_pairs(); }
 
 		~context() {
 			delete arr_;
@@ -115,22 +113,7 @@ namespace svgfill {
 	SVGFILL_API std::string polygons_to_svg(const std::vector<std::vector<polygon_2>>& polygons, bool random_color=false);
 	SVGFILL_API std::string polygons_to_svg(const std::vector<polygon_2>& polygons, bool random_color = false);
 	SVGFILL_API bool svg_to_polygons(const std::string& data, const boost::optional<std::string>& class_name, std::vector<polygon_2>& polygons);
-
+	SVGFILL_API bool arrange_polygons(const std::vector<polygon_2>& polygons, std::vector<polygon_2>& arranged);
-	struct SVGFILL_API arrange_polygon_settings {
+}
-        bool debug_output = false;
-		// -1: compute from average edge length
-        double polygon_offset_distance = -1.;
-        // 0: use offset - union - negative offset to find the outer perimeter
-        // 1: radial walk along vertices; exact, but can only reuse vertices, not create new positions by means of intersections
-        int outer_perimiter_algo = 0;
-        // 0: outer perimiter and corridor center lines
-        // 1: input polygons, corridor center lines and segments connecting corridor center lines to input polygons
-        int topology_reconstruction_algo = 0;
-        bool perform_cleanup = true;
-        double subdivision_factor = 16.;
-    };
-
-	SVGFILL_API bool arrange_polygons(arrange_polygon_settings settings, const std::vector<polygon_2>& polygons, std::vector<polygon_2>& arranged);
-    }
 
 #endif