s_ranjbar/energy_system_modelling_workflow
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed importer and geometr factory issue

Browse Source
This commit is contained in:
home-imac 2022-11-18 15:36:03 -05:00
parent 5b99d3b190
commit c24ad62081
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imports/geometry/gpandas.py
View File

@ -58,10 +58,10 @@ class GPandas:
if self._city is None:
self._city = City(self._lower_corner, self._upper_corner, self._srs_name)
for scene_index, bldg in self._scene.iterrows():
geom = bldg.geom
polygon = ShapelyPoly(geom['coordinates'][0])
height = float(bldg['height_mean'])
building_mesh = trimesh.creation.extrude_polygon(polygon, height)
geometry = bldg.geometry
# polygon = ShapelyPoly(geometry['coordinates'][0])
height = float(bldg['height'])
building_mesh = trimesh.creation.extrude_polygon(geometry, height)
trimesh.repair.fill_holes(building_mesh)
trimesh.repair.fix_winding(building_mesh)
year_of_construction = int(bldg['year_built'])

3
imports/geometry_factory.py
View File

@ -17,7 +17,7 @@ class GeometryFactory:
"""
GeometryFactory class
"""
def __init__(self, file_type, path, data_frame=None):
def __init__(self, file_type, path=None, data_frame=None):
self._file_type = '_' + file_type.lower()
self._path = path
self._data_frame = data_frame
@ -46,6 +46,7 @@ class GeometryFactory:
"""
if self._data_frame is None:
self._data_frame = geopandas.read_file(self._path)
print( self._data_frame )
return GPandas(self._data_frame).city
@property