Many changes to have Noise Live Chart

sensorspecials/noise.js

@@ -2,11 +2,12 @@
 // rxf 2023-03-05
 
 import {returnOnError} from "../utilities/reporterror.js";
-import { getActData, getAvgData, getLongAvg, fetchFromInflux, calcRange } from "../actions/getsensorData.js"
+import { getActData, getAvgData, getLongAvg, fetchFromInflux, calcRange} from "../actions/getsensorData.js"
 import checkParams from "../utilities/checkparams.js";
 import {getOneProperty} from "../actions/getproperties.js";
 import * as ERR from "../utilities/errortexts.js"
 import {DateTime} from 'luxon'
+import {getData4map} from "../actions/data4map.js";
 
 const setoptionfromtable = (opt,tabval) => {
     let ret = opt
@@ -41,7 +42,7 @@ export const getNoiseData = async (params, possibles, props) => {
             let {start, stop} = calcRange(opts)             // calc time range
             opts.start = start
             opts.stop = stop
-            let erg = await x.func(opts)                    // get the data
+            let erg = await x.func(opts, props)                    // get the data
             ret.sid = opts.sensorid
             ret.start = opts.start.slice(7)
             ret.span = opts.span
@@ -49,8 +50,10 @@ export const getNoiseData = async (params, possibles, props) => {
                 ret.average = x.avg
                 ret.peak = opts.peak
             }
-            ret.count = erg.length
-            ret.values = erg
+            ret.count = erg.values.length
+            ret.values = erg.values
+            ret.err = erg.err
+            ret.props =  erg.props
             return ret
         }
     }
@@ -82,9 +85,9 @@ export const getNoiseData = async (params, possibles, props) => {
 //          ....
 //
 // *********************************************
-const getLiveData = async (opt) => {
+const getLiveData = async (opt, props) => {
     let retur = {sid: opt.sensorid, span: opt.span, start: opt.datetime, count: 0, values: [], err: null};
-    return await getActData(opt)
+    return await getActData(opt, props)
 }
 
 
@@ -421,10 +424,6 @@ const getAPIprops = (opt) => {
 
 }
 
-const getMAPaktData = (opt) => {
-
-}
-
 const whatTable = [
     {'what':'live', 'span': 1, 'daystart': false, avg: null, 'func': getLiveData},
     {'what':'havg', 'span': 30, 'daystart': true, avg: 'hour', 'func': gethavgData},
@@ -432,7 +431,6 @@ const whatTable = [
     {'what':'daynight', 'span': 30, 'daystart': true, avg: null, 'func': getdaynightData},
     {'what':'lden', 'span': 30, 'daystart': true, avg: null, 'func': getLdenData},
     {'what':'props', 'span': 0, 'daystart': true, avg: null, 'func': getAPIprops},
-    {'what':'mapdata', 'span': 0, 'daystart': false, avg: null, 'func': getMAPaktData},
 ];