m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity

Merge branch 'add/geopandas/importer' into 'master'

Browse Source 
fixed importer and geometr factory issue

See merge request Guille/hub!34
This commit is contained in:
Guillermo Gutierrez Morote 2022-11-18 22:08:18 +00:00
commit feb54b7e68
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: if self._city is None:
self._city = City(self._lower_corner, self._upper_corner, self._srs_name) self._city = City(self._lower_corner, self._upper_corner, self._srs_name)
for scene_index, bldg in self._scene.iterrows(): for scene_index, bldg in self._scene.iterrows():
geom = bldg.geom geometry = bldg.geometry
polygon = ShapelyPoly(geom['coordinates'][0]) # polygon = ShapelyPoly(geometry['coordinates'][0])
height = float(bldg['height_mean']) height = float(bldg['height'])
building_mesh = trimesh.creation.extrude_polygon(polygon, height) building_mesh = trimesh.creation.extrude_polygon(geometry, height)
trimesh.repair.fill_holes(building_mesh) trimesh.repair.fill_holes(building_mesh)
trimesh.repair.fix_winding(building_mesh) trimesh.repair.fix_winding(building_mesh)
year_of_construction = int(bldg['year_built']) year_of_construction = int(bldg['year_built'])

3
imports/geometry_factory.py
View File

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