markus/lib-paveit-demo
1
0
Fork 0
Code Pull Requests Activity

add norm to bitumen parameter and limits

Browse Source
This commit is contained in:
Markus Clauß
2023-05-23 10:18:13 +02:00
parent 6aedb1d1fd
commit 9562ecabfa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/paveit/datamodels/enumeration.py
View File

@@ -46,5 +46,6 @@ class NormEnum(Enum):
DINEN12592 = "DIN EN 12592" DINEN12592 = "DIN EN 12592"
DINEN12593 = "DIN EN 12593" DINEN12593 = "DIN EN 12593"
DINISO2592 = "DIN EN ISO 2592" DINISO2592 = "DIN EN ISO 2592"
TLBitumen2019 = 'TL Bitumen-StB (08/2019) '
#Gestein #Gestein
TLGestein2018 = "'TL Gestein-StB 04 (2018)'" TLGestein2018 = "'TL Gestein-StB 04 (2018)'"

8
src/paveit/datamodels/norm_specification.py
View File

@@ -21,7 +21,9 @@ class DeliveryGrain(EnumerateBase):
norm = StringField(required=True, default='TL Gestein-StB 04 (2018)') norm = StringField(required=True, default='TL Gestein-StB 04 (2018)')
# Bitumen # Bitumen
class BitumenParameterTLBitumen2013Strassenbaubitumen(EnumerateBase): class BitumenParameterStrassenbaubitumen(EnumerateBase):
norm = EnumField(NormEnum, default=NormEnum.TLBitumen2019)
penetration = FloatField(min_value=0, max_value=1000) penetration = FloatField(min_value=0, max_value=1000)
softening_point = FloatField(min_value=0, max_value =500) softening_point = FloatField(min_value=0, max_value =500)
@@ -33,10 +35,12 @@ class BitumenParameterTLBitumen2013Strassenbaubitumen(EnumerateBase):
hardening_resistance_masschange = FloatField(min_value=0, max_value=100) hardening_resistance_masschange = FloatField(min_value=0, max_value=100)
class BitumenParameterLimitsTLBitumen2013Strassenbaubitumen(EnumerateBase): class BitumenParameterLimitsStrassenbaubitumen(EnumerateBase):
name = StringField() name = StringField()
category = EnumField(BitumenCategoryEnum, required=True) category = EnumField(BitumenCategoryEnum, required=True)
norm = EnumField(NormEnum, default=NormEnum.TLBitumen2019)
penetration_norm = EnumField(NormEnum, default=NormEnum.DINEN1426) penetration_norm = EnumField(NormEnum, default=NormEnum.DINEN1426)
penetration_unit = StringField('0.1 mm') penetration_unit = StringField('0.1 mm')