Skip to content

Commit

Permalink
Update inputlocator.py
Browse files Browse the repository at this point in the history
  • Loading branch information
ShiZhongming committed Jan 15, 2024
1 parent fa8bbea commit ccbf66f
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions cea/inputlocator.py
Original file line number Diff line number Diff line change
Expand Up @@ -561,17 +561,17 @@ def get_site_polygon(self):
check_cpg(shapefile_path)
return shapefile_path

def get_zone_csv(self):
"""scenario/inputs/building-geometry/zone.csv"""
zone_csv_path = os.path.join(self.get_building_geometry_folder(), 'zone.csv')
check_cpg(zone_csv_path)
return zone_csv_path

def get_zone_xlsx(self):
"""scenario/inputs/building-geometry/zone.xlsx"""
zone_xlsx_path = os.path.join(self.get_building_geometry_folder(), 'zone.xlsx')
check_cpg(zone_xlsx_path)
return zone_xlsx_path
# def get_zone_csv(self):
# """scenario/inputs/building-geometry/zone.csv"""
# zone_csv_path = os.path.join(self.get_building_geometry_folder(), 'zone.csv')
# check_cpg(zone_csv_path)
# return zone_csv_path

# def get_zone_xlsx(self):
# """scenario/inputs/building-geometry/zone.xlsx"""
# zone_xlsx_path = os.path.join(self.get_building_geometry_folder(), 'zone.xlsx')
# check_cpg(zone_xlsx_path)
# return zone_xlsx_path

def get_surroundings_geometry(self):
"""scenario/inputs/building-geometry/surroundings.shp"""
Expand All @@ -592,13 +592,13 @@ def get_building_typology(self):
"""scenario/inputs/building-properties/typology.dbf"""
return os.path.join(self.get_building_properties_folder(), 'typology.dbf')

def get_building_typology_csv(self):
"""scenario/inputs/building-properties/typology.csv"""
return os.path.join(self.get_building_properties_folder(), 'typology.csv')
# def get_building_typology_csv(self):
# """scenario/inputs/building-properties/typology.csv"""
# return os.path.join(self.get_building_properties_folder(), 'typology.csv')

def get_building_typology_xlsx(self):
"""scenario/inputs/building-properties/typology.xlsx"""
return os.path.join(self.get_building_properties_folder(), 'typology.xlsx')
# def get_building_typology_xlsx(self):
# """scenario/inputs/building-properties/typology.xlsx"""
# return os.path.join(self.get_building_properties_folder(), 'typology.xlsx')

def get_building_supply(self):
"""scenario/inputs/building-properties/supply_systems.dbf"""
Expand Down Expand Up @@ -1001,17 +1001,17 @@ def get_street_network(self):
check_cpg(shapefile_path)
return shapefile_path

def get_streets_csv(self):
"""scenario/inputs/networks/streets.csv"""
streets_csv_path = os.path.join(self.get_building_geometry_folder(), 'streets.csv')
check_cpg(streets_csv_path)
return streets_csv_path

def get_streets_xlsx(self):
"""scenario/inputs/networks/streets.xlsx"""
streets_xlsx_path = os.path.join(self.get_building_geometry_folder(), 'streets.xlsx')
check_cpg(streets_xlsx_path)
return streets_xlsx_path
# def get_streets_csv(self):
# """scenario/inputs/networks/streets.csv"""
# streets_csv_path = os.path.join(self.get_building_geometry_folder(), 'streets.csv')
# check_cpg(streets_csv_path)
# return streets_csv_path
#
# def get_streets_xlsx(self):
# """scenario/inputs/networks/streets.xlsx"""
# streets_xlsx_path = os.path.join(self.get_building_geometry_folder(), 'streets.xlsx')
# check_cpg(streets_xlsx_path)
# return streets_xlsx_path

# OUTPUTS

Expand Down

0 comments on commit ccbf66f

Please sign in to comment.