Commit Graph

1144 Commits

Author SHA1 Message Date
ae47bfd25e Partial correction for unit test after merge 2021-04-07 14:35:40 -04:00
82f029684e Partial correction for unit test after merge 2021-04-07 14:33:08 -04:00
Pilar
48ed0ace4b fixed bug when merging 2021-04-07 14:31:16 -04:00
Pilar
ff701e7f77 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	city_model_structure/building.py
#	imports/geometry_feeders/citygml.py
2021-04-07 14:23:41 -04:00
Pilar
e19a22920b created import obj and tested 2021-04-07 14:20:13 -04:00
1c444f3667 Correct energy ade export to work with new surfaces 2021-04-07 13:07:57 -04:00
86fe064a25 Partial correction for unit tests 2021-04-07 12:57:56 -04:00
c480a6c4cb Partial correction for unit tests 2021-04-07 12:06:21 -04:00
634bbc286f Change export method from property to function to improve the semantic 2021-04-07 11:52:39 -04:00
7a77c47d04 Merge remote-tracking branch 'origin/master' 2021-04-07 11:48:00 -04:00
5084a4457c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	tests/test_exports.py
2021-04-07 11:47:41 -04:00
Pilar
5290cb6ba9 adding import obj (not yet working). Also erased accent from Alvarez 2021-04-07 11:47:39 -04:00
09ee39c314 Review changes for CityGml import factory change to use the new format for surfaces based in polygons 2021-04-07 11:46:44 -04:00
Pilar
39c6a3afd2 fixing tests after changes in Surface and building 2021-04-07 10:33:05 -04:00
88e43a0770 CityGml import factory change to use the new format for surfaces based in polygons 2021-04-06 18:06:19 -04:00
Pilar
ba735fb53d changes for new definition of surfaces (by polygons) and buildings (by polyhedrons) 2021-04-06 13:48:18 -04:00
Pilar
bf0cda131e max_x, max_y, max_z (and min) changed to envelope_upper_corner (and lower) 2021-04-01 15:51:09 -04:00
Pilar
48dfbb8c1f Merge remote-tracking branch 'origin/master' 2021-04-01 10:36:14 -04:00
Pilar
fc588fab62 reorganized properties in city_object and building 2021-04-01 10:36:07 -04:00
cd607122d3 Partial implementation energy ADE, till thermal zones 2021-04-01 10:35:22 -04:00
7620f89629 Partial implementation energy ADE, till thermal zones 2021-04-01 09:25:39 -04:00
Pilar
1498731275 code for storeys division cleaned 2021-03-31 14:17:53 -04:00
Pilar
809dc1b3b6 storey division working, code needs to be cleaned 2021-03-30 17:57:38 -04:00
Pilar
e5e6b19ed9 storey division working, code needs to be cleaned 2021-03-30 17:57:28 -04:00
Pilar
2702c77a33 Merge remote-tracking branch 'origin/master' 2021-03-30 15:13:03 -04:00
Pilar
17ff59827e sent triangulate from polyhedron.py to polygon.py 2021-03-30 15:12:54 -04:00
8560c62be4 Partial implementation energy ADE, till thermal zones 2021-03-26 12:53:27 -04:00
Pilar
e353a7c800 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	city_model_structure/building.py
2021-03-25 09:15:05 -04:00
Pilar
9a40cfa54b testing building separation in storeys with the new configuration of geometry using polygons and polyhedrons (NOT working yet). 2021-03-25 09:11:42 -04:00
636047b99c Partial implementation energy ADE, till geometry export (LOD2) this commit is broken, due some missing attribute (max_(coord)) at surface class 2021-03-25 09:11:30 -04:00
Pilar
dbbe3d56fc before behnam changes in libs 2021-03-23 10:13:01 -04:00
413c302ed3 Export energy ade as a file 2021-03-17 09:23:48 -04:00
f0e7f55535 Export energy ade 2021-03-16 20:14:40 -04:00
Pilar
7f902553cf solved demand units 2021-03-16 19:40:41 -04:00
Pilar
b6c49b950d with year 2021-03-16 19:28:21 -04:00
Pilar
67fe44e303 added two files to tests_data 2021-03-16 18:25:29 -04:00
Pilar
659428c5a4 erased change obj Y to Z 2021-03-16 17:18:57 -04:00
Pilar
10478cb932 Merge remote-tracking branch 'origin/master' 2021-03-16 17:15:15 -04:00
Pilar
d5170014c0 obj Y to Z 2021-03-16 17:15:08 -04:00
Guillermo Gutierrez Morote
29b8c7aa41 Delete modules.xml 2021-03-16 17:04:34 -04:00
Guillermo Gutierrez Morote
ab8c8e4639 Delete profiles_settings.xml 2021-03-16 17:04:26 -04:00
Guillermo Gutierrez Morote
ed14191fe3 Delete Project_Default.xml 2021-03-16 17:04:19 -04:00
Guillermo Gutierrez Morote
1baaef5f64 Delete libs.iml 2021-03-16 17:04:00 -04:00
Pilar
8f36b88571 obj export to ground reference 2021-03-16 16:58:52 -04:00
Pilar
f98a341ea2 Merge remote-tracking branch 'origin/master' 2021-03-16 13:44:06 -04:00
Pilar
8ec399947c erased many classes created by Sanam but never used. Modified some classes to adapt to EnergyADE 2021-03-16 13:43:59 -04:00
490fcb9563 Implement exports factories clases and export stl and obj city version. 2021-03-16 12:33:22 -04:00
Pilar
4e4875392f modifications in classes for energyADE 2021-03-16 12:19:35 -04:00
Pilar
b8e5d74e39 reestablished name and country_code in city.py 2021-03-15 12:44:33 -04:00
Pilar
69d7f9d7af actualized requirements.txt 2021-03-15 11:47:30 -04:00