Merge pull request #2020 from ThatOpen/Fix-Schema

Fix Schemas

Author: beachtom

src/cpp/web-ifc/parsing/IfcLoader.cpp

@@ -57,13 +57,15 @@ namespace webifc::parsing {
       auto line = GetHeaderLinesWithType(schema::FILE_SCHEMA)[0];
       MoveToHeaderLineArgument(line, 0);
       auto schemas = _schemaManager.GetAvailableSchemas();
+      auto schemaMaps = _schemaManager.GetAvailableSchemaMaps();
 
       while (!_tokenStream->IsAtEnd()) {
           IfcTokenType t = static_cast<IfcTokenType>(_tokenStream->Read<char>());
           if (t == IfcTokenType::LINE_END) break;
           if (t == IfcTokenType::LABEL) 
           {
             std::string_view schemaName = _tokenStream->ReadString();
+            if (schemaMaps.contains(schemaName)) schemaName = schemaMaps[schemaName];
             for (size_t i = 0; i < schemas.size();i++) 
             {
               if (_schemaManager.GetSchemaName(schemas[i]) == schemaName) return schemas[i];

src/cpp/web-ifc/schema/IfcSchemaManager.cpp

@@ -32,6 +32,11 @@ namespace webifc::schema {
         return _schemas;
     }
 
+    const std::map<std::string_view,std::string_view> &IfcSchemaManager::GetAvailableSchemaMaps() const
+    {
+        return _schemaMap;
+    }
+
     uint32_t IfcSchemaManager::IfcTypeToTypeCode(std::string_view name) const
     {
         return IfcTypeToTypeCode(name.data(),name.size());

src/cpp/web-ifc/schema/IfcSchemaManager.h

@@ -6,6 +6,7 @@
 
 #include "ifc-schema.h"
 #include <vector>
+#include <map>
 #include <string>
 #include <string_view>
 #include <unordered_set>
@@ -17,6 +18,7 @@ namespace webifc::schema {
         public:
             IfcSchemaManager();
             const std::vector<IFC_SCHEMA> GetAvailableSchemas() const;
+            const std::map<std::string_view,std::string_view> &GetAvailableSchemaMaps() const;
             std::string_view GetSchemaName(IFC_SCHEMA schema) const;
             uint32_t IfcTypeToTypeCode(const std::string_view name) const;
             std::string IfcTypeCodeToType(const uint32_t typeCode) const; 
@@ -27,6 +29,7 @@ namespace webifc::schema {
             std::unordered_set<uint32_t> _ifcElements;
             std::vector<IFC_SCHEMA> _schemas;
             std::vector<std::string_view> _schemaNames;
+            std::map<std::string_view,std::string_view> _schemaMap;
             void initSchemaData();
             uint32_t IfcTypeToTypeCode(const void * name, const size_t len) const;
     };

src/cpp/web-ifc/schema/schema-functions.cpp

@@ -4,6 +4,16 @@
 #include "IfcSchemaManager.h"
 namespace webifc::schema {
 void IfcSchemaManager::initSchemaData() {
+_schemaMap["IFC2X_FINAL"]="IFC2X3";
+_schemaMap["IFC4X1"]="IFC4X3";
+_schemaMap["IFC4X2"]="IFC4X3";
+_schemaMap["IFC4X3_RC3"]="IFC4X3";
+_schemaMap["IFC4X3_RC4"]="IFC4X3";
+_schemaMap["IFC4X3_RC1"]="IFC4X3";
+_schemaMap["IFC4X3_RC2"]="IFC4X3";
+_schemaMap["IFC4X3_ADD2"]="IFC4X3";
+_schemaMap["IFC4X3_ADD1"]="IFC4X3";
+_schemaMap["IFC4X2SCGL"]="IFC4X3";
 _ifcElements.insert(IFCPRODUCT);
 _ifcElements.insert(IFCPROXY);
 _ifcElements.insert(IFCSPATIALSTRUCTUREELEMENT);

src/schema-generator/gen_functional_types.ts

@@ -354,7 +354,9 @@ cppSchema.push("#include <string>");
 cppSchema.push("#include \"ifc-schema.h\"");
 cppSchema.push("#include \"IfcSchemaManager.h\"");
 cppSchema.push("namespace webifc::schema {")
+
 cppSchema.push("void IfcSchemaManager::initSchemaData() {");
+for (const schemaAlias of schemaAliases) cppSchema.push(`_schemaMap["${schemaAlias.schemaName}"]="${schemaAlias.alias}";`);
 completeifcElementList.forEach(element => {
     cppSchema.push(`_ifcElements.insert(${element.toUpperCase()});`);
 });