CERC/hub
58
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

Upgraded geometry package. Fixed related issues

Browse Source
This commit is contained in:
Peter Yefi 2023-05-23 21:43:35 -04:00
parent 79e79f48c4
commit dfde4212a3
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hub/city_model_structure/city.py
View File

@ -26,7 +26,7 @@ from hub.city_model_structure.level_of_detail import LevelOfDetail
from hub.city_model_structure.machine import Machine from hub.city_model_structure.machine import Machine
from hub.city_model_structure.parts_consisting_building import PartsConsistingBuilding from hub.city_model_structure.parts_consisting_building import PartsConsistingBuilding
from geometry import Library as GeometryHelper from geometry import Library as GeometryHelper
from hub.helpers.location import Location from geometry import Location
from hub.city_model_structure.energy_system import EnergySystem from hub.city_model_structure.energy_system import EnergySystem
from hub.city_model_structure.lca_material import LcaMaterial from hub.city_model_structure.lca_material import LcaMaterial
import pandas as pd import pandas as pd

2
hub/city_model_structure/iot/sensor.py
View File

@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group
Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
""" """
from hub.helpers.location import Location from geometry import Location
from hub.city_model_structure.iot.sensor_measure import SensorMeasure from hub.city_model_structure.iot.sensor_measure import SensorMeasure
from hub.city_model_structure.iot.sensor_type import SensorType from hub.city_model_structure.iot.sensor_type import SensorType

4
hub/imports/geometry/citygml_classes/citygml_lod1.py
View File

@ -9,7 +9,9 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase
from hub.city_model_structure.building_demand.surface import Surface from hub.city_model_structure.building_demand.surface import Surface
from geometry import Polygon from geometry import Polygon
from geometry import Helper as GeometryHelper from geometry import Helper
GeometryHelper = Helper.instance()
class CityGmlLod1(CityGmlBase): class CityGmlLod1(CityGmlBase):

4
hub/imports/geometry/citygml_classes/citygml_lod2.py
View File

@ -8,7 +8,9 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase
from hub.city_model_structure.building_demand.surface import Surface from hub.city_model_structure.building_demand.surface import Surface
from geometry import Polygon from geometry import Polygon
from geometry import Helper as GeometryHelper from geometry import Helper
GeometryHelper = Helper.instance()
class CityGmlLod2(CityGmlBase): class CityGmlLod2(CityGmlBase):

4
hub/imports/geometry/rhino.py
View File

@ -13,10 +13,12 @@ from hub.city_model_structure.building import Building
from hub.city_model_structure.building_demand.surface import Surface as HubSurface from hub.city_model_structure.building_demand.surface import Surface as HubSurface
from hub.city_model_structure.city import City from hub.city_model_structure.city import City
from hub.helpers.configuration_helper import ConfigurationHelper from hub.helpers.configuration_helper import ConfigurationHelper
from geometry import Helper as GeometryHelper from geometry import Helper
from geometry import Polygon from geometry import Polygon
from geometry import Point from geometry import Point
GeometryHelper = Helper.instance()
class Rhino: class Rhino:
def __init__(self, path): def __init__(self, path):

3
requirements.txt
View File

@ -25,4 +25,5 @@ triangle
psycopg2-binary psycopg2-binary
Pillow Pillow
pathlib pathlib
pickle5 pickle5
cerc-geometry