diff --git a/lca_carbon_workflow.py b/lca_carbon_workflow.py index 2297ec0..ae0a82b 100644 --- a/lca_carbon_workflow.py +++ b/lca_carbon_workflow.py @@ -9,6 +9,8 @@ Mohammad Reza Seyedabadi mohammad.seyedabadi@mail.concordia.ca from pathlib import Path +from input_geojson_content import InputGeoJsonContent + from hub.imports.geometry_factory import GeometryFactory from hub.imports.construction_factory import ConstructionFactory from hub.helpers.dictionaries import Dictionaries @@ -31,8 +33,9 @@ class LCACarbonWorkflow: constructions_catalog_file, catalog='nrcan', building_parameters=('height', 'year_of_construction', 'function')): - self.file_path = (Path(__file__).parent / 'input_files' / city_path) - self.catalogs_path = (Path(__file__).parent / 'input_files') + self.file_path = Path(__file__).parent / 'input_files' / \ + InputGeoJsonContent(city_path).content + self.catalogs_path = Path(__file__).parent / 'input_files' self.archetypes_catalog_file_name = archetypes_catalog_file_name self.constructions_catalog_file = constructions_catalog_file self.nrcan_catalogs = AccessNrcanCatalog(