Commit Graph

11 Commits

Author SHA1 Message Date
67227a0a79 merge changes with main 2022-11-28 13:44:02 -05:00
8c6e34cd22 Merge remote-tracking branch 'origin/master' into geojson
# Conflicts:
#	city_model_structure/building.py
#	city_model_structure/bus_system.py
#	city_model_structure/city_object.py
#	city_model_structure/city_objects_cluster.py
#	city_model_structure/energy_system.py
#	imports/energy_systems/air_source_hp_parameters.py
#	imports/energy_systems/water_to_water_hp_parameters.py
#	imports/geometry/citygml.py
#	imports/geometry/gpandas.py
#	imports/geometry/obj.py
#	imports/geometry/rhino.py
#	imports/geometry_factory.py
2022-11-28 13:13:55 -05:00
a0445200a5 assign lod at city level and correct unit tests 2022-11-25 15:25:59 -05:00
b5dd5bf7ed initial implementation of Geojson importer
Bug correction overall code quality improvement
2022-11-24 17:58:45 -05:00
1e24e43b64 Refactoring building creation and bringing code up to date 2022-11-23 10:20:33 -05:00
6be5325f75 Correct unit tests due latest changes in gpandas handler.
Partial rollback of some changes
2022-11-21 13:53:58 -05:00
home-imac
c24ad62081 fixed importer and geometr factory issue 2022-11-18 15:36:03 -05:00
a617f598ff Add unit tests and requirements for geopandas factory.
Geopandas factory now can receive a geojson file or a pandas data frame by using the optional variable data_frame in the constructor to be consistent with the rest of the factories

So from:
 ConstructionFactory('gpandas', dataframe)
to:
 ConstructionFactory('gpandas, '', dataframe)
2022-11-16 16:26:45 -05:00
d91da411fd variable name correction, it will overwrite index and most likely case bugs in case of more than one scene. 2022-11-15 11:28:23 -05:00
7e5ead2363 small style correction 2022-11-15 11:25:38 -05:00
home-imac
de449edc76 added geopandas import support 2022-11-13 20:10:42 -05:00