guille 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
..
citygml_classes	Partial corretion geojson importer	2022-11-25 12:40:13 -05:00
helpers	initial implementation of Geojson importer	2022-11-24 17:58:45 -05:00
citygml.py	Merge remote-tracking branch 'origin/master' into geojson	2022-11-28 13:13:55 -05:00
geojson.py	Bug fix in geojson import	2022-11-25 14:39:35 -05:00
gpandas.py	Merge remote-tracking branch 'origin/master' into geojson	2022-11-28 13:13:55 -05:00
obj.py	Merge remote-tracking branch 'origin/master' into geojson	2022-11-28 13:13:55 -05:00
osm_subway.py	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
rhino.py	assign lod at city level and correct unit tests	2022-11-25 15:25:59 -05:00