Commit Graph

228 Commits

Author SHA1 Message Date
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
dd7bd337dd Correct bug in Gml Lod 2022-11-25 15:32:31 -05:00
a0445200a5 assign lod at city level and correct unit tests 2022-11-25 15:25:59 -05:00
5b932a8ac6 Bug fix in geojson import 2022-11-25 14:39:35 -05:00
677b021e23 Partial corretion geojson importer 2022-11-25 12:40:13 -05:00
245c218e1f Merge remote-tracking branch 'origin/master' into geojson 2022-11-25 12:39:47 -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
Pilar
9e38be1b2f Merge branch 'master' into fixed_small_bug_in_thermal_zone
# Conflicts:
#	unittests/test_schedules_factory.py
2022-11-21 14:59:46 -05:00
b357e4d6c7 Merge remote-tracking branch 'origin/master' into geojson
# Conflicts:
#	unittests/test_geometry_factory.py
2022-11-21 14:12:18 -05:00
cfa4241213 rollback quick fix 2022-11-21 14:00:12 -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
Pilar
c1f2ff5c4b erased schedules factory as the schedules are now integrated in usage factory 2022-11-21 11:55:34 -05:00
Pilar
ac9b51b8b9 Temporary fixed in geopandas importer 2022-11-21 11:31:30 -05:00
991e3df240 partial geojson implementation 2022-11-18 16:05:43 -05:00
home-imac
c24ad62081 fixed importer and geometr factory issue 2022-11-18 15:36:03 -05:00
13fa69b438 partial geojson implementation 2022-11-17 15:56:49 -05:00
37187b7046 small style correction 2022-11-16 16:27:34 -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
fae577deaa quick fix for failed archetype search 2022-11-14 03:19:04 -05:00
home-imac
3568255c29 gpandas added in factory 2022-11-13 21:07:04 -05:00
home-imac
de449edc76 added geopandas import support 2022-11-13 20:10:42 -05:00
Guillermo Gutierrez Morote
15eea30d81 Merge branch 'updating_central_data_model' into 'master'
Updating central data model

See merge request Guille/hub!31
2022-11-10 19:20:27 +00:00
Pilar
e9559a8485 finished the reorganization between thermal boundaries and surfaces 2022-11-09 14:22:26 -05:00
6473ffd6dc Homogenize todos
IDF export now allows the user to select the target and adjacent buildings
 - Only target and adjacent buildings in the city are calculated.
 - All other buildings are considered shade objects.

The zones are properly labeled with the building name
The "Building" is labeled as a city
2022-11-09 11:42:06 -05:00
Pilar
f5fe1fd4d9 added associated_thermal_boundaries to Surface 2022-11-08 16:28:07 -05:00
Pilar
e3acabeb74 fixing bug in test_enrichment.py 2022-06-08 16:22:12 -04:00
920d95eef2 Citygml can now generate the envelop out of the buildings 2022-06-07 13:31:35 -04:00
Pilar
6c8b8ec35b Found a bug in comnet factory and modified type of data from temperature to any number 2022-06-06 13:37:48 -04:00
Pilar
a6e239bb45 Found a bug in comnet factory and modified type of data from temperature to any number 2022-06-01 23:17:04 -04:00
e43c366036 Correct small bug in material archetype assignation 2022-05-26 20:35:59 -04:00
dd3fc42d10 Merge remote-tracking branch 'origin/master' 2022-05-19 14:26:38 -04:00
15c1c1235f partial parser for data sources 2022-05-18 22:51:55 -04:00
Pilar
9350013af9 erased not_detailed_source_mean_annual_internal_gains parameter and changed by internal_gains. During the import, for those catalogs that don't provide that information, the internal_gains are calculated and saved depending on the information they provide. 2022-05-18 14:52:41 -04:00
Pilar
9013dda26b modified usage zone class to hide not_detailed_source_mean_annual_internal_gains 2022-05-16 10:19:03 -04:00
f53beb4a0a Correct rhino read 2022-05-04 05:09:43 -04:00
0ec80dacc0 Correct rhino read 2022-05-03 14:50:41 -04:00
9b5577c677 Small bug corrections + rename libs to hub 2022-05-02 17:39:37 -04:00
Pilar
d0fa0c1f8a windows included in idf export 2022-05-02 15:02:06 -04:00
Pilar
9c3ac59866 Merge branch 'master' into installation_in_macos 2022-04-28 14:44:42 -04:00
Pilar
06ecae7e88 looking for a bug 2022-04-28 14:41:09 -04:00
Pilar
0e7acd89d1 looking for a bug 2022-04-28 14:34:23 -04:00
Peter Yefi
d3a52c8bfc Fixed pandas append deprecation warning 2022-04-28 10:58:45 -04:00
d5565530c1 Merge initial version for Catalogs as factories data sources 2022-04-26 19:41:00 -04:00
Pilar
74dfa69aea modified year of construction in tests to be able to run ConstructionFactory with nrel 2022-04-26 19:14:12 -04:00
Pilar
88c0e9fa5f modifications in idf to import more complex schedules and schedules by file 2022-04-26 18:39:42 -04:00
Pilar
bff362ed05 check merge branches 2022-04-19 16:20:41 -04:00
Pilar
e2b882723b Modified construction factory to read from catalogs instead of file 2022-04-19 15:49:41 -04:00