Merge branch 'release/0.0.4'

bimspot · Dec 9, 2019 · ed636ca · ed636ca
2 parents 4907c12 + 50a91da
commit ed636ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -2,12 +2,12 @@
 
 The `xeokit-metadata` is a multi-platform command line tool for extracting
 the structural hierarchy of the building elements within an `IFC` into the
-[metadata format of the `xeokit-sdk`][0]. Currently only IFC 2x3 is supported.
+[metadata format of the `xeokit-sdk`][0].
 
 ## Usage
 
 ```
-$ wget --quiet https://github.com/bimspot/xeokit-metadata/releases/download/0.0.3/xeokit-metadata-linux-x64.tar.gz
+$ wget --quiet https://github.com/bimspot/xeokit-metadata/releases/download/0.0.4/xeokit-metadata-linux-x64.tar.gz
 $ tar -zxvf xeokit-metadata-linux-x64.tar.gz
 $ chmod +x xeokit-metadata-linux-x64/xeokit-metadata
 $ ln -s /absolute/path/to/xeokit-metadata-linux-x64/xeokit-metadata /usr/local/bin/xeokit-metadata

diff --git a/xeokit/xeokit-metadata/MetaModel.cs b/xeokit/xeokit-metadata/MetaModel.cs
@@ -96,13 +96,14 @@ public static MetaModel fromIfc(string ifcPath) {
  /// IIfcObjectDefinition.
  /// </returns>
  private static List<MetaObject> extractHierarchy(IIfcObjectDefinition
- objectDefinition) {
+ objectDefinition, string parentId=null) {
  var metaObjects = new List<MetaObject>();
 
  var parentObject = new MetaObject {
  id = objectDefinition.GlobalId,
  name = objectDefinition.Name,
- type = objectDefinition.GetType().Name
+ type = objectDefinition.GetType().Name,
+ parent = parentId
  };
 
  metaObjects.Add(parentObject);
@@ -130,7 +131,7 @@ private static List<MetaObject> extractHierarchy(IIfcObjectDefinition
  .SelectMany(r => r.RelatedObjects);
 
  foreach (var item in relatedObjects) {
- var children = extractHierarchy(item);
+ var children = extractHierarchy(item, parentObject.id);
  metaObjects.AddRange(children);
  }