CERC/hub
58
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
pilar 2020-12-14 19:12:56 -05:00
commit d4d336cf93
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
city_model_structure/attributes/surface.py
View File

@ -386,7 +386,10 @@ class Surface:
if self.type != 'Wall' or surface.type != 'Wall': if self.type != 'Wall' or surface.type != 'Wall':
return return
if self._geometry_helper.is_almost_same_surface(self, surface): if self._geometry_helper.is_almost_same_surface(self, surface):
try:
intersection_area = self.intersect(surface).area intersection_area = self.intersect(surface).area
except ValueError:
intersection_area = 0
self.add_shared(surface, intersection_area) self.add_shared(surface, intersection_area)
surface.add_shared(self, intersection_area) surface.add_shared(self, intersection_area)

8
factories/occupancy_feeders/helpers/occupancy_helper.py
View File

@ -6,7 +6,7 @@ Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc
class OccupancyHelper: class OccupancyHelper:
occupancy_function = { occupancy_pluto_function = {
'C1': 'C-12 Residential', 'C1': 'C-12 Residential',
'C5': 'C-12 Residential', 'C5': 'C-12 Residential',
'D3': 'C-12 Residential', 'D3': 'C-12 Residential',
@ -17,6 +17,9 @@ class OccupancyHelper:
'U0': 'C-10 Warehouse', 'U0': 'C-10 Warehouse',
'W4': 'C-9 School', 'W4': 'C-9 School',
} }
occupancy_function = {
'residential': 'C-12 Residential'
}
@staticmethod @staticmethod
def pluto_occupancy_function(building_pluto_function): def pluto_occupancy_function(building_pluto_function):
@ -25,4 +28,7 @@ class OccupancyHelper:
:param building_pluto_function: str :param building_pluto_function: str
:return: str :return: str
""" """
try:
return OccupancyHelper.occupancy_pluto_function[building_pluto_function]
except KeyError:
return OccupancyHelper.occupancy_function[building_pluto_function] return OccupancyHelper.occupancy_function[building_pluto_function]