RnD/generalFunctions
3
0
Fork 2
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix number comparisons for position values

Browse Source
This commit is contained in:
p.vanderwilt
2025-10-03 15:55:20 +02:00
parent c70bed2b39
commit 5117df14db
2 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/measurements/MeasurementBuilder.js
View File

@@ -40,7 +40,7 @@ class MeasurementBuilder {
if (!this.variant) { if (!this.variant) {
throw new Error('Measurement variant is required'); throw new Error('Measurement variant is required');
} }
if (!this.position) { if (Number.isNaN(this.position)) {
throw new Error('Measurement position is required'); throw new Error('Measurement position is required');
} }

88
src/measurements/MeasurementContainer.js
View File

@@ -105,60 +105,60 @@ class MeasurementContainer {
// ENHANCED: Update your existing value method // ENHANCED: Update your existing value method
value(val, timestamp = Date.now(), sourceUnit = null) { value(val, timestamp = Date.now(), sourceUnit = null) {
if (!this._ensureChainIsValid()) return this; if (!this._ensureChainIsValid()) return this;
const measurement = this._getOrCreateMeasurement(); const measurement = this._getOrCreateMeasurement();
const targetUnit = this._getTargetUnit(this._currentType); const targetUnit = this._getTargetUnit(this._currentType);
let convertedValue = val; let convertedValue = val;
let finalUnit = sourceUnit || targetUnit; let finalUnit = sourceUnit || targetUnit;
// Auto-convert if enabled and units are specified // Auto-convert if enabled and units are specified
if (this.autoConvert && sourceUnit && targetUnit && sourceUnit !== targetUnit) { if (this.autoConvert && sourceUnit && targetUnit && sourceUnit !== targetUnit) {
try { try {
convertedValue = convertModule(val).from(sourceUnit).to(targetUnit); convertedValue = convertModule(val).from(sourceUnit).to(targetUnit);
finalUnit = targetUnit; finalUnit = targetUnit;
if (this.logger) { if (this.logger) {
this.logger.debug(`Auto-converted ${val} ${sourceUnit} to ${convertedValue} ${targetUnit}`); this.logger.debug(`Auto-converted ${val} ${sourceUnit} to ${convertedValue} ${targetUnit}`);
}
} catch (error) {
if (this.logger) {
this.logger.warn(`Auto-conversion failed from ${sourceUnit} to ${targetUnit}: ${error.message}`);
}
convertedValue = val;
finalUnit = sourceUnit;
} }
} catch (error) {
if (this.logger) {
this.logger.warn(`Auto-conversion failed from ${sourceUnit} to ${targetUnit}: ${error.message}`);
}
convertedValue = val;
finalUnit = sourceUnit;
} }
}
measurement.setValue(convertedValue, timestamp); measurement.setValue(convertedValue, timestamp);
if (finalUnit && !measurement.unit) { if (finalUnit && !measurement.unit) {
measurement.setUnit(finalUnit); measurement.setUnit(finalUnit);
} }
// ENHANCED: Emit event with rich context // ENHANCED: Emit event with rich context
const eventData = { const eventData = {
value: convertedValue, value: convertedValue,
originalValue: val, originalValue: val,
unit: finalUnit, unit: finalUnit,
sourceUnit: sourceUnit, sourceUnit: sourceUnit,
timestamp, timestamp,
position: this._currentPosition, position: this._currentPosition,
variant: this._currentVariant, variant: this._currentVariant,
type: this._currentType, type: this._currentType,
// NEW: Enhanced context // NEW: Enhanced context
childId: this.childId, childId: this.childId,
childName: this.childName, childName: this.childName,
parentRef: this.parentRef parentRef: this.parentRef
}; };
// Emit the exact event your parent expects // Emit the exact event your parent expects
this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._convertPositionNum2Str(this._currentPosition)}`, eventData); this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._convertPositionNum2Str(this._currentPosition)}`, eventData);
this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData); this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData);
//console.log(`Emitted event: ${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData); // console.log(`Emitted event: ${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData);
return this; return this;
} }
@@ -284,7 +284,7 @@ class MeasurementContainer {
// Helper methods // Helper methods
_ensureChainIsValid() { _ensureChainIsValid() {
if (!this._currentType || !this._currentVariant || !this._currentPosition) { if (!this._currentType || !this._currentVariant || Number.isNaN(this._currentPosition)) {
if (this.logger) { if (this.logger) {
this.logger.error('Incomplete measurement chain, required: type, variant, and position'); this.logger.error('Incomplete measurement chain, required: type, variant, and position');
} }