diff --git a/urbanopt_des/urbanopt_analysis.py b/urbanopt_des/urbanopt_analysis.py index e56d7e5..108d16a 100644 --- a/urbanopt_des/urbanopt_analysis.py +++ b/urbanopt_des/urbanopt_analysis.py @@ -275,8 +275,6 @@ def resample_actual_data(self) -> None: for building_id in self.geojson.get_building_ids(): meters = self.geojson.get_meters_for_building(building_id) for meter in meters: - # print(f"Processing meter {meter} for building {building_id}") - meter_readings = self.geojson.get_meter_readings_for_building(building_id, meter) # add the meter_type to all the json objects [meter_reading.update({"meter_type": meter, "building_id": building_id}) for meter_reading in meter_readings] diff --git a/urbanopt_des/urbanopt_geojson.py b/urbanopt_des/urbanopt_geojson.py index 8a3243c..cf95f9f 100644 --- a/urbanopt_des/urbanopt_geojson.py +++ b/urbanopt_des/urbanopt_geojson.py @@ -8,8 +8,8 @@ class DESGeoJSON(UrbanOptGeoJson): - def __init__(self, filename: Path): - super().__init__(filename) + def __init__(self, filename: Path, building_ids=None, skip_validation=False): + super().__init__(filename, building_ids, skip_validation) def create_aggregated_representation(self, building_names: list[str]) -> None: """Go through the GeoJSON file and if it is of type Building, then aggregate the characteristics.