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

Update to ifcopenshell 0.7.0 and cjio 0.8

Browse Source 
LoD is string in v1.1
This commit is contained in:
Balázs Dukai
2023-06-10 07:00:32 +02:00
parent 818f77da2b
commit a97cd7ad24
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifccityjson/README.md
+1 -1
View File
@@ -3,7 +3,7 @@ Converter for CityJSON files and IFC. Currently only supports one-way conversion
## Dependencies ## Dependencies
- [IfcOpenShell](https://github.com/IfcOpenShell/IfcOpenShell) (also IfcOpenShell api is needed) - [IfcOpenShell](https://github.com/IfcOpenShell/IfcOpenShell) (also IfcOpenShell api is needed)
- [CJIO](https://github.com/cityjson/cjio) - [CJIO](https://github.com/cityjson/cjio) (>=0.8, <1.0)
## Usage of IFCCityJSON ## Usage of IFCCityJSON
An extended ifccityjson tutorial can be found on [the OSARCH wiki](https://wiki.osarch.org/index.php?title=Ifccityjson) An extended ifccityjson tutorial can be found on [the OSARCH wiki](https://wiki.osarch.org/index.php?title=Ifccityjson)
src/ifccityjson/cityjson2ifc/cityjson2ifc.py
+10 -10
View File
@@ -45,7 +45,7 @@ JSON_TO_IFC = {
"SolitaryVegetationObject": ["IfcGeographicElement", {"PredefinedType": "USERDEFINED", "SolitaryVegetationObject": ["IfcGeographicElement", {"PredefinedType": "USERDEFINED",
"ObjectType": "SolitaryVegetationObject"}], "ObjectType": "SolitaryVegetationObject"}],
"CityFurniture": ["IfcFurnishingElement"], "CityFurniture": ["IfcFurnishingElement"],
"GenericCityObject": ["IfcCivilElement"], "OtherConstruction": ["IfcCivilElement"],
"Bridge": ["IfcCivilElement"], # Update for IFC4.3 "Bridge": ["IfcCivilElement"], # Update for IFC4.3
"BridgePart": ["IfcCivilElement"], # Update for IFC4.3 "BridgePart": ["IfcCivilElement"], # Update for IFC4.3
"BridgeInstallation": ["IfcCivilElement"], # Update for IFC4.3 "BridgeInstallation": ["IfcCivilElement"], # Update for IFC4.3
@@ -118,9 +118,9 @@ class Cityjson2ifc:
# Georeferencing # Georeferencing
self.properties["local_translation"] = None self.properties["local_translation"] = None
self.properties["local_scale"] = None self.properties["local_scale"] = None
if self.city_model.is_transform(): if not self.city_model.is_transformed:
self.properties["local_scale"] = self.city_model.j['transform']['scale'] self.properties["local_scale"] = self.city_model.transform['scale']
local_translation = self.city_model.j['transform']['translate'] local_translation = self.city_model.transform['translate']
self.properties["local_translation"] = { self.properties["local_translation"] = {
"Eastings": local_translation[0], "Eastings": local_translation[0],
"Northings": local_translation[1], "Northings": local_translation[1],
@@ -141,7 +141,7 @@ class Cityjson2ifc:
ifcopenshell.api.run("unit.assign_unit", self.IFC_model, length={"is_metric": True, "raw": "METERS"}) ifcopenshell.api.run("unit.assign_unit", self.IFC_model, length={"is_metric": True, "raw": "METERS"})
self.properties["owner_history"] = self.create_owner_history() self.properties["owner_history"] = self.create_owner_history()
self.IFC_representation_context = ifcopenshell.api.run("context.add_context", self.IFC_model, self.IFC_representation_context = ifcopenshell.api.run("context.add_context", self.IFC_model,
**{"context": "Model"}) **{"context_type": "Model"})
if not self.city_model.has_metadata() or "presentLoDs" not in self.city_model.j["metadata"]: if not self.city_model.has_metadata() or "presentLoDs" not in self.city_model.j["metadata"]:
self.city_model.update_metadata() self.city_model.update_metadata()
@@ -174,7 +174,7 @@ class Cityjson2ifc:
"ContextIdentifier": "Body", "ContextIdentifier": "Body",
"TargetView": "USERDEFINED", "TargetView": "USERDEFINED",
"ParentContext": self.IFC_representation_context, "ParentContext": self.IFC_representation_context,
"UserDefinedTargetView": "LOD" + str(lod)}) "UserDefinedTargetView": "LOD" + lod})
def create_owner_history(self): def create_owner_history(self):
actor = self.IFC_model.createIfcActorRole("ENGINEER", None, None) actor = self.IFC_model.createIfcActorRole("ENGINEER", None, None)
@@ -246,10 +246,10 @@ class Cityjson2ifc:
IFC_shape_representations = [] IFC_shape_representations = []
for geometry in obj.geometry: for geometry in obj.geometry:
lod = geometry.lod lod = geometry.lod
if self.properties["lod"] is not None and str(lod) != self.properties["lod"]: if self.properties["lod"] is not None and lod != self.properties["lod"]:
continue continue
if str(lod) not in self.IFC_representation_sub_contexts: if lod not in self.IFC_representation_sub_contexts:
self.IFC_representation_sub_contexts[str(lod)] = self.create_representation_sub_context(lod) self.IFC_representation_sub_contexts[lod] = self.create_representation_sub_context(lod)
IFC_geometry, shape_representation_type = None, None IFC_geometry, shape_representation_type = None, None
@@ -325,7 +325,7 @@ class Cityjson2ifc:
IFC_geometry = [IFC_geometry] IFC_geometry = [IFC_geometry]
shape_representation = self.IFC_model.create_entity("IfcShapeRepresentation", shape_representation = self.IFC_model.create_entity("IfcShapeRepresentation",
self.IFC_representation_sub_contexts[str(lod)], 'Body', self.IFC_representation_sub_contexts[lod], 'Body',
shape_representation_type, shape_representation_type,
IFC_geometry) IFC_geometry)
return shape_representation return shape_representation