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

Add roof area to the persistence

Browse Source
This commit is contained in:
Guille Gutierrez 2023-05-29 11:13:49 -04:00
parent 04bf3bbef3
commit 061952eb17
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hub/persistence/db_setup.py
View File

@ -6,7 +6,7 @@ Project Coder Peter Yefi peteryefi@gmail.com
""" """
import logging import logging
from hub.persistence import Repository from hub.persistence.repository import Repository
from hub.persistence.models import Application from hub.persistence.models import Application
from hub.persistence.models import City from hub.persistence.models import City
from hub.persistence.models import CityObject from hub.persistence.models import CityObject

2
hub/persistence/models/city_object.py
View File

@ -32,6 +32,7 @@ class CityObject(Models):
total_heating_area = Column(Float, nullable=False) total_heating_area = Column(Float, nullable=False)
wall_area = Column(Float, nullable=False) wall_area = Column(Float, nullable=False)
windows_area = Column(Float, nullable=False) windows_area = Column(Float, nullable=False)
roof_area = Column(Float, nullable=False)
system_name = Column(String, nullable=False) system_name = Column(String, nullable=False)
created = Column(DateTime, default=datetime.datetime.utcnow) created = Column(DateTime, default=datetime.datetime.utcnow)
updated = Column(DateTime, default=datetime.datetime.utcnow) updated = Column(DateTime, default=datetime.datetime.utcnow)
@ -46,6 +47,7 @@ class CityObject(Models):
self.usage = building.usages_percentage self.usage = building.usages_percentage
self.volume = building.volume self.volume = building.volume
self.area = building.floor_area self.area = building.floor_area
self.roof_area = sum(roof.solid_polygon.area for roof in building.roofs)
storeys = building.storeys_above_ground storeys = building.storeys_above_ground
if storeys is None: if storeys is None:
storeys = building.max_height / building.average_storey_height storeys = building.max_height / building.average_storey_height