Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-11 06:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure $ chars in TTL are only enclosed in <IRI> not shortened postfixes"

Browse Source
This commit is contained in:
Thomas Krijnen
2024-10-03 10:30:36 +02:00
parent 83c40c7fb4
commit 2c08cff67b
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/TtlWktSerializer.cpp
+20 -8
View File
@@ -237,20 +237,32 @@ void TtlWktSerializer::writeHeader()
void TtlWktSerializer::write(const IfcGeom::TriangulationElement* o) void TtlWktSerializer::write(const IfcGeom::TriangulationElement* o)
{ {
auto ttl_object_id = [&]() { auto ttl_object_id = [&](const char* const postfix = nullptr) {
return boost::replace_all_copy(object_id(o), "-", "_"); using namespace ifcopenshell::geometry::settings;
auto oid = boost::replace_all_copy(object_id(o), "-", "_");
if (oid.find('$') == std::string::npos) {
return "base:" + oid + (postfix ? postfix : (const char* const)"");
} else {
std::string base;
if (settings_.get<BaseUri>().has()) {
base = settings_.get<BaseUri>().get();
} else {
base = "http://example.org/";
}
return "<" + base + oid + (postfix ? postfix : (const char* const) "") + ">";
}
}; };
filename_.stream << "base:" << ttl_object_id() << " a geo:Feature ;\n"; filename_.stream << ttl_object_id() << " a geo:Feature ;\n";
filename_.stream << " dcterms:identifier " << escape_for_turtle( filename_.stream << " dcterms:identifier " << escape_for_turtle(
IfcUtil::convert_utf8_to_utf32(o->guid())) << " ;\n"; IfcUtil::convert_utf8_to_utf32(o->guid())) << " ;\n";
filename_.stream << " rdfs:label " << escape_for_turtle( filename_.stream << " rdfs:label " << escape_for_turtle(
IfcUtil::convert_utf8_to_utf32(o->name()) IfcUtil::convert_utf8_to_utf32(o->name())
) << " ;\n"; ) << " ;\n";
filename_.stream << " geo:hasGeometry base:" << ttl_object_id() << "_geometry .\n\n"; filename_.stream << " geo:hasGeometry " << ttl_object_id("_geometry") << " .\n\n";
if (!o->geometry().polyhedral_faces_with_holes().empty()) { if (!o->geometry().polyhedral_faces_with_holes().empty()) {
filename_.stream << "base:" << ttl_object_id() << "_geometry a geo:Geometry ;\n"; filename_.stream << ttl_object_id("_geometry") << " a geo:Geometry ;\n";
filename_.stream << " geo:asWKT " << escape_for_turtle( filename_.stream << " geo:asWKT " << escape_for_turtle(
IfcUtil::convert_utf8_to_utf32( IfcUtil::convert_utf8_to_utf32(
capture_output( capture_output(
@@ -291,8 +303,8 @@ void TtlWktSerializer::write(const IfcGeom::TriangulationElement* o)
} }
if (lowest_face) { if (lowest_face) {
filename_.stream << "base:" << ttl_object_id() << " geo:hasGeometry base:" << ttl_object_id() << "_footprint_geometry .\n\n"; filename_.stream << ttl_object_id() << " geo:hasGeometry " << ttl_object_id("_footprint_geometry") << " .\n\n";
filename_.stream << "base:" << ttl_object_id() << "_footprint_geometry a geo:Geometry ;\n"; filename_.stream << ttl_object_id("_footprint_geometry") << " a geo:Geometry ;\n";
filename_.stream << " geo:asWKT " << escape_for_turtle( filename_.stream << " geo:asWKT " << escape_for_turtle(
IfcUtil::convert_utf8_to_utf32( IfcUtil::convert_utf8_to_utf32(
capture_output( capture_output(
@@ -306,7 +318,7 @@ void TtlWktSerializer::write(const IfcGeom::TriangulationElement* o)
) << "^^geo:wktLiteral .\n\n"; ) << "^^geo:wktLiteral .\n\n";
} }
} else { } else {
filename_.stream << "base:" << ttl_object_id() << "_geometry a geo:Geometry ;\n"; filename_.stream << ttl_object_id("_geometry") << " a geo:Geometry ;\n";
bool force_2d = true; bool force_2d = true;
double z_value; double z_value;
for (size_t i = 2; i < o->geometry().verts().size(); i += 3) { for (size_t i = 2; i < o->geometry().verts().size(); i += 3) {