Merge branch 'master' into performance_improvements

# Conflicts:
#	src/ifcexpressparser/implementation.py
#	src/ifcgeom/IfcGeomFunctions.cpp
#	src/ifcparse/Ifc4.cpp

src/ifcwrap/CMakeLists.txt

@@ -73,6 +73,8 @@ IF(PYTHONINTERP_FOUND)
             DESTINATION "${python_package_dir}/ifcopenshell")
         INSTALL(FILES
                 "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/geom/__init__.py"
+                "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/geom/app.py"
+                "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/geom/main.py"
                 "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/geom/occ_utils.py"
                 DESTINATION "${python_package_dir}/ifcopenshell/geom")
         INSTALL(TARGETS _ifcopenshell_wrapper DESTINATION "${python_package_dir}/ifcopenshell")

src/ifcwrap/IfcGeomWrapper.i

@@ -168,6 +168,7 @@ struct ShapeRTTI : public boost::static_visitor<PyObject*>
 			# Hide the getters with read-only property implementations
 			id = property(id)
 			brep_data = property(brep_data)
+			surface_styles = property(surface_styles)
 	%}
 };
 

src/ifcwrap/IfcParseWrapper.i

@@ -124,6 +124,18 @@ namespace IfcUtil {
 		unsigned i = IfcSchema::Type::GetAttributeIndex($self->type(), a);
 		return std::pair<IfcUtil::ArgumentType,Argument*>($self->getArgumentType(i), $self->getArgument(i));
 	}
+
+	bool __eq__(IfcParse::IfcLateBoundEntity* other) const {
+		if ($self == other) {
+			return true;
+		}
+		return $self->id() == other->id() && $self->entity->file == other->entity->file;
+	}
+
+	// Just something to have a somewhat sensible value to hash
+	size_t file_pointer() const {
+		return reinterpret_cast<size_t>($self->entity->file);
+	}
 }
 
 %extend IfcParse::IfcSpfHeader {
@@ -208,4 +220,14 @@ namespace IfcUtil {
 	const char* const version() {
 		return IFCOPENSHELL_VERSION;
 	}
+
+	std::string get_supertype(std::string n) {
+		boost::to_upper(n);
+		IfcSchema::Type::Enum t = IfcSchema::Type::FromString(n);
+		if (IfcSchema::Type::Parent(t)) {
+			return IfcSchema::Type::ToString(*IfcSchema::Type::Parent(t));
+		} else {
+			return "";
+		}
+	}
 %}