Preparation for charts moved from here to laerm app

routes/api.js
   - removed unnecessary table entry

app.js
   - removed unnecessary calls

actions/ddata4maps.js
   - return options as object

sensorspecials/noise.js
   - removed all references to xxxxxData-Calls
   - removed checks for /chart/...

removed route/chartapi.js,  sensorspecials/noisCharts.js and utilites/tables.js

sensorspecials/noise.js

@@ -6,7 +6,6 @@ import { getActData, getAvgData, getLongAvg, fetchFromInflux, calcRange} from ".
 import checkParams from "../utilities/checkparams.js";
 import * as ERR from "../utilities/errortexts.js"
 import {DateTime} from 'luxon'
-import * as noiseChart from "./noiseChart.js";
 
 const setoptionfromtable = (opt,tabval) => {
     let ret = opt
@@ -23,7 +22,6 @@ export const getNoiseData = async (params, possibles, props) => {
     let {opts, err} = checkParams(params, {
         mandatory:[
             {name:'sensorid', type: 'int'},
-            {name:'chart', type: 'bool'},
         ],
         optional: possibles
     })
@@ -43,22 +41,21 @@ export const getNoiseData = async (params, possibles, props) => {
             opts.start = start
             opts.stop = stop
             let erg = await x.func(opts)                    // get the data
-            if (opts.chart) {
-                return erg
-            }
             ret = {
                 err: erg.err,
-                sid: opts.sensorid,
-                indoor: props.location[0].indoor,
-                span: opts.span,
-                start: opts.start.slice(7),
-                data: opts.data,
-                peak: opts.peak,
-                count: erg.values.length,
+                options: {
+                    sid: opts.sensorid,
+                    indoor: props.location[0].indoor,
+                    span: opts.span,
+                    start: opts.start.slice(7),
+                    data: opts.data,
+                    peak: opts.peak,
+                    count: erg.values.length,
+                },
                 values: erg.values,
             }
             if (!x.peak) {
-                delete ret.peak
+                delete ret.options.peak
             }
             if(ret.values.length === 0) {
                 ret.err = ERR.NODATA
@@ -96,10 +93,7 @@ export const getNoiseData = async (params, possibles, props) => {
 // *********************************************
 const getLiveData = async (opts) => {
     const erg = await getActData(opts)
-    if (!opts.chart || erg.err) {
-        return erg
-    }
-    return noiseChart.liveData(opts, erg.values)
+    return erg
 }
 
 
@@ -133,7 +127,7 @@ const gethavgData = async (opts, props) => {
     let erg = await getNoiseAVGData(opts)
     if (opts.csv) {
         let csvStr = "datetime,n_AVG,peakcount\n"
-        if(!erg.err) {
+        if (!erg.err) {
             for (let item of erg.values) {
                 if (item.n_AVG != -1) {
                     csvStr += item.datetime + ',' + item.n_AVG + ',' + item.peakcount + '\n'
@@ -141,11 +135,8 @@ const gethavgData = async (opts, props) => {
             }
         }
         return csvStr
-    } else if (!opts.chart || erg.err) {
-        return {err: erg.err, values: erg.values}
-    } else {
-        return noiseChart.havgData(opts, erg.values)
     }
+    return {err: erg.err, values: erg.values}
 }
 
 
@@ -175,10 +166,10 @@ const gethavgData = async (opts, props) => {
 // *********************************************
 async function getdavgData(opts) {
     opts.long = true;
-    let erg =  await getNoiseAVGData(opts);
+    let erg = await getNoiseAVGData(opts);
     let val = [];
     let csvStr = 'datetime,n_AVG,peakcount\n';
-    if(!erg.err) {
+    if (!erg.err) {
         for (let i = 0; i < erg.values.length; i += 24) {
             let sum = 0;
             let count = 0;
@@ -196,7 +187,7 @@ async function getdavgData(opts) {
                     }
                 }
             }
-            if (count === 0 ) {
+            if (count === 0) {
                 werte.n_AVG = -1
             } else {
                 werte.n_AVG = 10 * Math.log10(sum / count);
@@ -211,11 +202,8 @@ async function getdavgData(opts) {
     }
     if (opts.csv) {
         return csvStr;
-    } else if (!opts.chart || erg.err) {
-        return {err: erg.err, values: val}
-    } else {
-        return noiseChart.davgData(opts, val)
     }
+    return {err: erg.err, values: val}
 }
 
 
@@ -310,13 +298,11 @@ async function getdaynightData(opts) {
     }
     if (opts.csv) {
         return csvStr;
-    } else if (!opts.chart || erg.err) {
-        return {err: erg.err, values: val}
-    } else {
-        return noiseChart.dayNightData(opts, val)
     }
+    return {err: erg.err, values: val}
 }
 
+
 // *********************************************
 // getLdenData
 //
@@ -345,10 +331,10 @@ async function getdaynightData(opts) {
 // *********************************************
 async function getLdenData(opts) {
     opts.long = true;
-    let erg =  await getNoiseAVGData(opts);
+    let erg = await getNoiseAVGData(opts);
     let val = [];
     let csvStr = 'datetime,lden\n';
-    if(!erg.err) {
+    if (!erg.err) {
         let done = false;
         const calcAVG = (sum, cnt) => {
             if (cnt != 0) {
@@ -425,11 +411,8 @@ async function getLdenData(opts) {
     }
     if (opts.csv) {
         return csvStr;
-    } else if (!opts.chart || erg.err) {
-        return {err: erg.err, values: val}
-    } else {
-        return noiseChart.ldenData(opts, val)
     }
+    return {err: erg.err, values: val}
 }