Change some Enum names and capitalize a few extra

nens · Mar 12, 2024 · 8e63213 · 8e63213
1 parent cbfbe2f
commit 8e63213
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/threedi_schematisation_editor/enumerators.py b/threedi_schematisation_editor/enumerators.py
@@ -10,7 +10,7 @@ class GeometryType(Enum):
 
 
 class BoundaryType(Enum):
-    WATERLEVEL = 1
+    WATER_LEVEL = 1
     VELOCITY = 2
     DISCHARGE = 3
     SOMMERFELD = 5
@@ -160,19 +160,17 @@ class PipeCalculationType(Enum):
     EMBEDDED = 0
     ISOLATED = 1
     CONNECTED = 2
-    BROAD_CRESTED = 3
-    SHORT_CRESTED = 4
 
 
 class SewerageType(Enum):
-    MIXED = 0
-    RAIN_WATER = 1
-    DRY_WEATHER_FLOW = 2
+    COMBINED_SEWER = 0
+    STORM_DRAIN = 1
+    SANITARY_SEWER = 2
     TRANSPORT = 3
     SPILLWAY = 4
-    ZINKER = 5
+    SYPHON = 5
     STORAGE = 6
-    STORAGE_TANK = 7
+    STORAGE_AND_SETTLEMENT_TANK = 7
 
 
 class PumpType(Enum):
@@ -181,9 +179,9 @@ class PumpType(Enum):
 
 
 class InfiltrationSurfaceOption(Enum):
-    RAIN = 0
-    WHOLE_SURFACE = 1
-    WET_SURFACE = 2
+    WHOLE_SURFACE_WHEN_RAINING = 0
+    ALWAYS_WHOLE_SURFACE = 1
+    WET_SURFACE_ONLY = 2
 
 
 class ZoomCategories(Enum):

diff --git a/threedi_schematisation_editor/utils.py b/threedi_schematisation_editor/utils.py
@@ -280,7 +280,7 @@ def enum_name_format_fn(entry_name):
 
 
 def enum_entry_name_format(entry_name):
-    if entry_name != "YZ":
+    if entry_name not in ["YZ", "HPE", "HDPE", "PVC"]:
         formatted_entry_name = entry_name.capitalize().replace("_", " ")
     else:
         formatted_entry_name = entry_name