Commit Graph

1779 Commits

Author SHA1 Message Date
6d987f43f7 Update hub/version.py 2023-10-24 02:04:05 -04:00
f62ab95cf0 Merge pull request 'geojson_exporter' (#50) from geojson_exporter into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/50
2023-10-24 02:03:06 -04:00
b711bceb7b Add geojson exporter 2023-10-24 08:01:57 +02:00
6ee1466b8e Add geojson exporter 2023-10-24 08:00:48 +02:00
a31281cae7 Code quality improvements and basic creation og geojson from gml 2023-10-20 14:19:46 +02:00
8d5010218b Update hub/version.py 2023-10-19 02:23:18 -04:00
a102a201e6 Merge pull request 'cesiumjs_tileset' (#49) from cesiumjs_tileset into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/49
2023-10-19 02:22:40 -04:00
2afce4acce Corrected obj and glb exporters, building now exposes lower and upper corner 2023-10-19 07:39:35 +02:00
9c1e05939a The city energy system importer for the north america is modified and tested. 2023-10-17 17:25:13 -04:00
978cc9d1ea added system schematics to the data folder and to the catalog importer 2023-10-16 17:48:42 -04:00
0240e89170 modified a small bug in north_america_energy_system_catalog.py 2023-10-16 17:24:39 -04:00
c6d4feec89 Modified the classes and the north amercia catalog importer based on the changes Pilar made in the data model structure 2023-10-16 16:44:53 -04:00
3f649fd020 finished central data model new structure for energy systems, importer and test 2023-10-13 13:31:46 -04:00
d94bce4174 half made changes in central data model for systems 2023-10-13 08:23:40 -04:00
f865490ff9 Corrected bug in distribution_systems_electrical_consumption, but need to be confirmed with pilar 2023-10-13 09:11:03 +02:00
31a4893ed8 Corrections in persistence, distribution_systems_electrical_consumption property seems to be bugged 2023-10-13 08:57:42 +02:00
1a7ad20135 new catalog model and factory finished and test passed 2023-10-12 11:59:52 -04:00
fe76d2fe3d Correct the positions for the boxes 2023-10-11 17:16:18 +02:00
57ee3e734b finished generic system and system parts 2023-10-11 09:14:38 -04:00
7cb4600c15 Correct the positions for the boxes 2023-10-11 14:32:31 +02:00
3578d2faae add temporary indentation to tilesets 2023-10-11 06:01:15 +02:00
d6bfe730eb add non-standard render position to tileset 2023-10-11 06:00:34 +02:00
84f5ebe4a0 checking a problem with lists assignation where a single value should be assigned 2023-10-10 16:22:45 -04:00
6b24a59178 Add exports for cesium tileset and glb format 2023-10-10 11:16:26 +02:00
11dc02d0e8 starting point, not working 2023-10-10 05:03:31 -04:00
d29161b05e rolled back and error introduced in a previous commit 2023-10-06 04:54:20 -04:00
a331dce966 fixed error in logic in _create_generic_systems 2023-10-06 04:14:52 -04:00
3f91da9f45 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model
# Conflicts:
#	hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
2023-10-06 04:13:32 -04:00
f13d7fd860 fixed error in logic in _associate_energy_systems 2023-10-06 04:11:56 -04:00
ef89da8552 created a loop for generation systems in _associate_energy_systems 2023-10-05 16:18:08 -04:00
9654bee978 modified the names and changed all singulars to plurals 2023-10-05 14:45:33 -04:00
dae117fb44 Merge remote-tracking branch 'origin/energy_plus_result_factory' into energy_plus_result_factory 2023-10-05 14:20:24 -04:00
91fa9d5ca1 modified the names and changed all singulars to plurals 2023-10-05 14:20:02 -04:00
8e145eefa1 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model 2023-10-05 13:22:42 -04:00
6f40a15609 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model 2023-10-05 13:22:32 -04:00
4a14deece1 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model 2023-10-05 13:22:19 -04:00
ca48d6448b changed all the singular names to plural and turned distribution and emission systems into lists 2023-10-05 13:18:57 -04:00
f2bfc297b3 Basic style correction and missing docstrings 2023-10-05 11:30:20 +02:00
d5c443a57b Merge remote-tracking branch 'origin/main' into energy_system_central_data_model 2023-10-05 11:02:13 +02:00
568317ebf1 Merge pull request 'fixing_working_hours_problem' (#47) from fixing_working_hours_problem into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/47
2023-10-05 04:40:58 -04:00
af32decf96 Merge pull request 'added_new_functions_to_dictionaries' (#48) from added_new_functions_to_dictionaries into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/48
2023-10-05 04:40:19 -04:00
bb05b01312 Merge pull request 'feature/load_compressed_city' (#46) from feature/load_compressed_city into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/46
2023-10-05 04:38:59 -04:00
cbda6ce13d Tried to modify the test_systems_factory.py but received an error saying GenerationSystem object is not iterable 2023-10-04 17:07:19 -04:00
2b696f9251 Merge branch 'main' into feature/load_compressed_city 2023-10-04 15:12:42 -04:00
a97c068513 Add removal of decompressed pickle file 2023-10-04 15:11:35 -04:00
f0ad1462d0 finished the first part of the test. 2023-10-03 17:50:17 -04:00
23a8fbe86d continued working on the importer 2023-10-03 13:07:20 -04:00
087384475f changing from generation system to generation systemS in system importer north america 2023-10-03 09:40:32 -04:00
fac6844da1 started working on the test 2023-10-02 13:19:58 -04:00
b914c9e7bf made final changes to north_america_custom_energy_system_parameters.py 2023-10-02 12:39:30 -04:00