From 1680db56c7d1063528ef7a721e3c6f1518f2489f Mon Sep 17 00:00:00 2001
From: Hypnos <12692680+Hypnos3@users.noreply.github.com>
Date: Mon, 11 Apr 2022 23:30:31 +0200
Subject: [PATCH] smaller cleanup

---
 nodes/lib/timeControlHelper.js | 14 ++++++--------
 package.json                   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/nodes/lib/timeControlHelper.js b/nodes/lib/timeControlHelper.js
index e54e5e7..5411960 100644
--- a/nodes/lib/timeControlHelper.js
+++ b/nodes/lib/timeControlHelper.js
@@ -509,34 +509,32 @@ function getRuleTimeData(node, msg, rule, dNow) {
     if (rule.timeMin) {
         rule.timeMin.now = dNow;
         rule.timeDataMin = node.positionConfig.getTimeProp(node, msg, rule.timeMin);
-        const numMin = rule.timeDataMin.value.getTime();
         rule.timeDataMin.source = 'min';
         if (rule.timeDataMin.error) {
             hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeDataMin.error }), undefined, rule.timeDataMin.error);
         } else if (!rule.timeDataMin.value) {
             throw new Error('Error can not calc Alt time!');
         } else {
-            if (numMin > rule.timeData.ts) {
+            rule.timeDataMin.ts = rule.timeDataMin.value.getTime();
+            rule.timeDataMin.dayId = hlp.getDayId(rule.timeDataMin.value);
+            if (rule.timeDataMin.ts > rule.timeData.ts) {
                 [rule.timeData, rule.timeDataMin] = [rule.timeDataMin, rule.timeData];
-                rule.timeData.ts = numMin;
-                rule.timeData.dayId = hlp.getDayId(rule.timeDataMin.value);
             }
         }
     }
     if (rule.timeMax) {
         rule.timeMax.now = dNow;
         rule.timeDataMax = node.positionConfig.getTimeProp(node, msg, rule.timeMax);
-        const numMax = rule.timeDataMax.value.getTime();
         rule.timeDataMax.source = 'max';
         if (rule.timeDataMax.error) {
             hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeDataMax.error }), undefined, rule.timeDataMax.error);
         } else if (!rule.timeDataMax.value) {
             throw new Error('Error can not calc Alt time!');
         } else {
-            if (numMax < rule.timeData.ts) {
+            rule.timeDataMax.ts = rule.timeDataMax.value.getTime();
+            rule.timeDataMax.dayId = hlp.getDayId(rule.timeDataMax.value);
+            if (rule.timeDataMax.ts < rule.timeData.ts) {
                 [rule.timeData, rule.timeDataMax] = [rule.timeDataMax, rule.timeData];
-                rule.timeData.ts = numMax;
-                rule.timeData.dayId = hlp.getDayId(rule.timeDataMax.value);
             }
         }
     }
diff --git a/package.json b/package.json
index 1b01dd5..bb26a65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-sun-position",
-  "version": "2.2.0-beta3",
+  "version": "2.2.0-beta4",
   "description": "NodeRED nodes to get sun and moon position",
   "keywords": [
     "node-red",