diff --git a/src/paveit/datamodels/enumeration.py b/src/paveit/datamodels/enumeration.py index c5d1c0b..9b3fbeb 100755 --- a/src/paveit/datamodels/enumeration.py +++ b/src/paveit/datamodels/enumeration.py @@ -46,5 +46,6 @@ class NormEnum(Enum): DINEN12592 = "DIN EN 12592" DINEN12593 = "DIN EN 12593" DINISO2592 = "DIN EN ISO 2592" + TLBitumen2019 = 'TL Bitumen-StB (08/2019) ' #Gestein TLGestein2018 = "'TL Gestein-StB 04 (2018)'" \ No newline at end of file diff --git a/src/paveit/datamodels/norm_specification.py b/src/paveit/datamodels/norm_specification.py index bf28d06..fa71de4 100644 --- a/src/paveit/datamodels/norm_specification.py +++ b/src/paveit/datamodels/norm_specification.py @@ -21,7 +21,9 @@ class DeliveryGrain(EnumerateBase): norm = StringField(required=True, default='TL Gestein-StB 04 (2018)') # Bitumen -class BitumenParameterTLBitumen2013Strassenbaubitumen(EnumerateBase): +class BitumenParameterStrassenbaubitumen(EnumerateBase): + + norm = EnumField(NormEnum, default=NormEnum.TLBitumen2019) penetration = FloatField(min_value=0, max_value=1000) 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) -class BitumenParameterLimitsTLBitumen2013Strassenbaubitumen(EnumerateBase): +class BitumenParameterLimitsStrassenbaubitumen(EnumerateBase): name = StringField() category = EnumField(BitumenCategoryEnum, required=True) + norm = EnumField(NormEnum, default=NormEnum.TLBitumen2019) + penetration_norm = EnumField(NormEnum, default=NormEnum.DINEN1426) penetration_unit = StringField('0.1 mm')