s_ranjbar/system_assignation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_in_nrcan_construction_importer' into 'master'

Browse Source 
Bug in nrcan construction importer

See merge request Guille/hub!59
This commit is contained in:
Guillermo Gutierrez Morote 2023-02-23 20:47:01 +00:00
commit ecb67eb4e4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hub/imports/construction/nrcan_physics_parameters.py
View File

@ -87,7 +87,7 @@ class NrcanPhysicsParameters:
for thermal_zone in thermal_zones: for thermal_zone in thermal_zones:
thermal_zone.additional_thermal_bridge_u_value = archetype.extra_loses_due_to_thermal_bridges thermal_zone.additional_thermal_bridge_u_value = archetype.extra_loses_due_to_thermal_bridges
thermal_zone.effective_thermal_capacity = archetype.thermal_capacity thermal_zone.effective_thermal_capacity = archetype.thermal_capacity
thermal_zone.indirectly_heated_area_ratio = archetype.indirect_heated_ratio thermal_zone.indirectly_heated_area_ratio = 0
thermal_zone.infiltration_rate_system_on = archetype.infiltration_rate_for_ventilation_system_on thermal_zone.infiltration_rate_system_on = archetype.infiltration_rate_for_ventilation_system_on
thermal_zone.infiltration_rate_system_off = archetype.infiltration_rate_for_ventilation_system_off thermal_zone.infiltration_rate_system_off = archetype.infiltration_rate_for_ventilation_system_off
for thermal_boundary in thermal_zone.thermal_boundaries: for thermal_boundary in thermal_zone.thermal_boundaries:

6
hub/imports/geometry/citygml.py
View File

@ -22,8 +22,8 @@ class CityGml:
def __init__(self, def __init__(self,
path, path,
extrusion_height_field=None, extrusion_height_field=None,
year_of_construction_field='yearOfConstruction', year_of_construction_field=None,
function_field='function', function_field=None,
function_to_hub=None): function_to_hub=None):
self._city = None self._city = None
self._lod = None self._lod = None
@ -31,6 +31,8 @@ class CityGml:
self._lod2_tags = ['lod2Solid', 'lod2MultiSurface', 'lod2MultiCurve'] self._lod2_tags = ['lod2Solid', 'lod2MultiSurface', 'lod2MultiCurve']
self._extrusion_height_field = extrusion_height_field self._extrusion_height_field = extrusion_height_field
self._function_to_hub = function_to_hub self._function_to_hub = function_to_hub
if year_of_construction_field is None:
year_of_construction_field = 'yearOfConstruction'
self._year_of_construction_field = year_of_construction_field self._year_of_construction_field = year_of_construction_field
if function_field is None: if function_field is None:
function_field = 'function' function_field = 'function'