diff --git a/config/configuration.ini b/config/configuration.ini index 54caaf41..840206f1 100644 --- a/config/configuration.ini +++ b/config/configuration.ini @@ -19,4 +19,4 @@ shortwave_reflectance = 0.8 min_air_change = 0.5 [buildings] -max_location_distance_for_shared_walls = 200.0 \ No newline at end of file +max_location_distance_for_shared_walls = 100.0 \ No newline at end of file diff --git a/geometry/geometry_feeders/city_gml.py b/geometry/geometry_feeders/city_gml.py index fe573989..7ab527cc 100644 --- a/geometry/geometry_feeders/city_gml.py +++ b/geometry/geometry_feeders/city_gml.py @@ -18,7 +18,6 @@ class CityGml: CityGml class """ def __init__(self, path): - start = datetime.utcnow() self._city = None with open(path) as gml: # Clean the namespaces is an important task to prevent wrong ns:field due poor citygml implementations @@ -54,7 +53,6 @@ class CityGml: self._upper_corner = np.fromstring(envelope['upperCorner'], dtype=float, sep=' ') self._srs_name = envelope['@srsName'] - print('city_gml constructor', datetime.utcnow() - start) @property def content(self): @@ -71,7 +69,6 @@ class CityGml: :return: City """ if self._city is None: - start = datetime.utcnow() self._city = City(self._lower_corner, self._upper_corner, self._srs_name) i = 0 for o in self._gml['CityModel']['cityObjectMember']: @@ -85,17 +82,13 @@ class CityGml: for bound in o['Building']['boundedBy']: surface_type = next(iter(bound)) if 'lod2MultiSurface' in bound[surface_type]: - start = datetime.utcnow() lod = 2 surfaces = CityGml._lod2(bound) - print('lod2 ', surface_type, datetime.utcnow() - start) if 'lod3Solid' in o['Building']: lod += 4 if 'lod4Solid' in o['Building']: lod += 8 - name = o['Building']['@id'] - lod_terrain_str = 'lod' + str(lod) + 'TerrainIntersection' terrains = [] if lod_terrain_str in o['Building']: @@ -161,5 +154,4 @@ class CityGml: surfaces = [Surface(s['Polygon']['exterior']['LinearRing']['posList'], surface_type=GeometryHelper.gml_surface_to_libs(surface_type)) for s in bound[surface_type]['lod2MultiSurface']['MultiSurface']['surfaceMember']] - print(len(surfaces), 'surfaces') return surfaces