Skip to content

Commit f821eec

Browse files
author
xavfa
committed
Merge form ForDev in a hard way. From this commit, the ForDev branch becomes the main one !!!!
1 parent 632ab15 commit f821eec

33 files changed

+4195
-1892
lines changed

BuildObject/BuildingObject.py

+879
Large diffs are not rendered by default.

BuildObject/DB_Building.py

-890
This file was deleted.

BuildObject/DB_Data.py

-243
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
# @Author : Xavier Faure
22
3+
import CoreFiles.GeneralFunctions as GrlFct
34

4-
5-
def checkBldFilter(building):
5+
def checkBldFilter(building,LogFile = [],DebugMode = False):
66
CaseOk = len(building.BlocHeight) if building.Multipolygon else building.height
7+
msg =''
78
# if the building have bloc with no Height or if the hiegh is below 1m (shouldn't be as corrected in the Building class now)
89
if len(building.BlocHeight) > 0 and min(building.BlocHeight) < 1:
910
CaseOk = 0
11+
msg = '[Error] The building has a given height below 1m...\n'
12+
if DebugMode: GrlFct.Write2LogFile(msg, LogFile)
1013
# is heated area is below 50m2, we just drop the building
1114
if building.EPHeatedArea < 50:
1215
CaseOk = 0
16+
msg = '[Error] The building has a given heated area below 50m2...\n'
17+
if DebugMode: GrlFct.Write2LogFile(msg, LogFile)
1318
# is no floor is present...(shouldn't be as corrected in the Building class now)
1419
if 0 in building.BlocNbFloor:
1520
CaseOk = 0
16-
return CaseOk
21+
msg = '[Error] The building has a given number of floor equal to 0...\n'
22+
if DebugMode: GrlFct.Write2LogFile(msg, LogFile)
23+
return CaseOk,msg

0 commit comments

Comments
 (0)