Merge commit '762770a' into HEAD

# Conflicts:
#	pumpingStation.html
#	src/nodeClass.js
#	src/specificClass.js

src/nodeClass.js

@@ -39,29 +39,16 @@ class nodeClass {
     const cfgMgr = new configManager();
     this.defaultConfig = cfgMgr.getConfig(this.name);
 
-    // Merge UI config over defaults
-    this.config = {
-      general: {
-        name: this.name,
-        id: node.id, // node.id is for the child registration process
-        unit: uiConfig.unit, // add converter options later to convert to default units (need like a model that defines this which units we are going to use and then conver to those standards)
-        logging: {
-          enabled: uiConfig.enableLog,
-          logLevel: uiConfig.logLevel
-        }
-      },
-      functionality: {
-        positionVsParent: uiConfig.positionVsParent,// Default to 'atEquipment' if not specified
-        distance: uiConfig.hasDistance ? uiConfig.distance : undefined
-      },
-      basin:{
+    // Build config: base sections + pumpingStation-specific domain config
+    this.config = cfgMgr.buildConfig(this.name, uiConfig, node.id, {
+      basin: {
         volume: uiConfig.basinVolume,
         height: uiConfig.basinHeight,
         heightInlet: uiConfig.heightInlet,
         heightOutlet: uiConfig.heightOutlet,
         heightOverflow: uiConfig.heightOverflow,
       },
-      hydraulics:{
+      hydraulics: {
         refHeight: uiConfig.refHeight,
         minHeightBasedOn: uiConfig.minHeightBasedOn,
         basinBottomRef: uiConfig.basinBottomRef,
@@ -82,9 +69,7 @@ class nodeClass {
         overfillThresholdPercent: uiConfig.overfillThresholdPercent,
         timeleftToFullOrEmptyThresholdSeconds: uiConfig.timeleftToFullOrEmptyThresholdSeconds
       }
-    };
-
-    console.log(`position vs child for ${this.name} is ${this.config.functionality.positionVsParent} the distance is ${this.config.functionality.distance}`);
+    });
 
     // Utility for formatting outputs
     this._output = new outputUtils();
@@ -211,20 +196,23 @@ class nodeClass {
         case 'changemode':
           this.source.changeMode(msg.payload);
           break;
-        case 'registerChild':
+        case 'registerChild': {
           // Register this node as a child of the parent node
           const childId = msg.payload;
-          const childObj = this.RED.nodes.getNode(childId); 
-          this.source.childRegistrationUtils.registerChild(childObj.source ,msg.positionVsParent);
+          const childObj = this.RED.nodes.getNode(childId);
+          this.source.childRegistrationUtils.registerChild(childObj.source, msg.positionVsParent);
           break;
-        case 'calibratePredictedVolume':
+        }
+        case 'calibratePredictedVolume': {
           const injectedVol = parseFloat(msg.payload);
           this.source.calibratePredictedVolume(injectedVol);
           break;
-        case 'calibratePredictedLevel':
+        }
+        case 'calibratePredictedLevel': {
           const injectedLevel = parseFloat(msg.payload);
           this.source.calibratePredictedLevel(injectedLevel);
           break;
+        }
         case 'q_in': {
           // payload can be number or { value, unit, timestamp }
           const val = Number(msg.payload);
@@ -233,8 +221,6 @@ class nodeClass {
           this.source.setManualInflow(val, ts, unit);
           break;
         }
-                  
-          
       }
       done();
     });

src/specificClass.js

@@ -6,7 +6,8 @@ const {
   childRegistrationUtils,
   MeasurementContainer,
   coolprop,
-  interpolation
+  interpolation,
+  POSITIONS
 } = require('generalFunctions');
 
 class PumpingStation {