Merge branch 'master' into bug_in_nrcan_construction_importer

This commit is contained in:
Pilar 2023-02-23 15:46:02 -05:00
commit 49d178faa3

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'