Correct paths and unittest errors caused by refactoring

factories/occupancy/occupancy_factory.py

@@ -12,7 +12,7 @@ class OccupancyFactory:
   """
   PhysicsFactor class
   """
-  def __init__(self, handler, city, base_path=Path(Path(__file__).parent.parent / 'data/occupancy')):
+  def __init__(self, handler, city, base_path=Path(Path(__file__).parent.parent.parent / 'data/occupancy')):
     self._handler = '_' + handler.lower().replace(' ', '_')
     self._city = city
     self._base_path = base_path

factories/usage/usage_feeders/us_base_usage_parameters.py

@@ -19,7 +19,7 @@ class UsBaseUsageParameters:
     self._city = city
     # todo: control not archetype found
     # ToDo: this is using the german library as a temporary approach, need to use/define a library for US
-    path = str(Path(__file__).parent.parent.parent / 'data/usage/de_library.xml')
+    path = str(Path(__file__).parent.parent.parent.parent / 'data/usage/de_library.xml')
     print('usage:', path)
     with open(path) as xml:
       self._library = xmltodict.parse(xml.read(), force_list='zoneUsageVariant')

helpers/configuration_helper.py

@@ -104,4 +104,4 @@ class ConfigurationHelper:
     attributes to consider that they may share walls in meters
     :return: float
     """
-    return self._config.getfloat('attributes', 'max_location_distance_for_shared_walls')
+    return self._config.getfloat('buildings', 'max_location_distance_for_shared_walls')

tests/test_geometry_factory.py

@@ -24,7 +24,7 @@ class TestGeometryFactory(TestCase):
 
   def _get_citygml(self):
     if self._city_gml is None:
-      file_path = (self._example_path / 'attributes.gml').resolve()
+      file_path = (self._example_path / 'buildings.gml').resolve()
       self._city_gml = GeometryFactory('citygml', file_path).city
       self.assertIsNotNone(self._city_gml, 'city is none')
     return self._city_gml

tests/test_occupancy_factory.py

@@ -33,7 +33,7 @@ class TestOccupancyFactory(TestCase):
 
   def _get_citygml_with_usage(self):
     if self._city_gml_with_usage is None:
-      file_path = (self._example_path / 'attributes.gml').resolve()
+      file_path = (self._example_path / 'buildings.gml').resolve()
       self._city_gml_with_usage = GeometryFactory('citygml', file_path).city
       self.assertIsNotNone(self._city_gml_with_usage, 'city is none')
       UsageFactory(self._handler, self._city_gml_with_usage)

tests/test_physics_factory.py

@@ -25,7 +25,7 @@ class TestPhysicsFactory(TestCase):
 
   def _get_citygml(self):
     if self._city_gml is None:
-      file_path = (self._example_path / 'attributes.gml').resolve()
+      file_path = (self._example_path / 'buildings.gml').resolve()
       self._city_gml = GeometryFactory('citygml', file_path).city
       self.assertIsNotNone(self._city_gml, 'city is none')
     return self._city_gml