WIP WIP

app.js

@@ -13,6 +13,7 @@ const __dirname = path.dirname(__filename);
 
 import indexRouter from './routes/index.js'
 import apiRouter from './routes/api.js'
+import chartRouter from './routes/api.js'
 
 // import getdataRouter from './routes/getdata.js'
 // import putdataRouter from './routes/putdata.js'
@@ -29,7 +30,7 @@ app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/api', apiRouter)
 app.use('/', indexRouter);
-// app.use('/users', usersRouter);
+app.use('/chart', chartRouter);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {

public/javascripts/chart_live.js

@@ -22,7 +22,7 @@ const PlotDayLive_Noise = async (sid) => {
     let aktVal = {}
 
     // read the data from the server
-    const url = `/api/getsensordata?&sensorid=${sid}`
+    const url = `/chart/getsensordata?&sensorid=${sid}`
     let ret = await fetch(url)
         .catch(e => {
             logerror(e)
@@ -62,10 +62,10 @@ const PlotDayLive_Noise = async (sid) => {
                 '</tr></table>' +
                 '</div>'
         }
-        let txtMeldung = false
     } else {
         utils.showError(data.err)
     }
+    let txtMeldung = false
 
 
     // Plot-Options

public/javascripts/map.js

@@ -2,6 +2,7 @@
 
 import * as dt from './datetime.js'
 import * as chart_live from "./chart_live.js";
+import * as utils from "./chart_utilities.js";
 
 let map = null
 let bounds
@@ -154,13 +155,14 @@ export async function buildMarkers() {
         west: bounds.getWest(), south: bounds.getSouth(),
         east: bounds.getEast(), north: bounds.getNorth()
     }
-    const url = `/api/getmapdata?type=noise&box=${bounds.toBBoxString()}`
+    const url = `/chart/getmapdata?type=noise&box=${bounds.toBBoxString()}`
 
     let ret = await fetch(url)
         .catch(e => {
             console.log(e)
         });
     let sensors = await ret.json()
+    if (!sensors.err) {
         let markers = L.markerClusterGroup({
             spiderfyOnMaxZoom: true,
             showCoverageOnHover: false,
@@ -197,7 +199,11 @@ export async function buildMarkers() {
         }
         map.addLayer(markers);
         return sensors.lastdate
+    } else {
+        utils.showError(sensors.err)
     }
+}
+
 
     async function onMarkerClick(e, click) {
     let item = e.target.options;
@@ -274,7 +280,7 @@ async function showLastDate(ld) {
     //     console.log(e)
     // }
     // fetch all sensors
-    const url = `/api/getmapdata?type=noise`
+    const url = `/chart/getmapdata?type=noise`
     let ret = await fetch(url)
         .catch(e => {
             console.log(e)

views/index.pug

@@ -27,7 +27,7 @@ block content
 
     .tab-content#thetabs
       .tab-pane.fade.show.active#t_map(role="tabpanel" aria-labelledby="map-tab")
-        #map  MapTAB
+        #map
         #mapdateactsens
           #actsensors
           #mapdate
@@ -41,7 +41,7 @@ block content
       .tab-pane.fade#t_daynight(role="tabpanel" aria-labelledby="map-tab")
         #ddaynight  DayNightTAB
       .tab-pane.fade#t_lden(role="tabpanel" aria-labelledby="map-tab")
-        #dlden  LdenTAB
+        #dlden
 
 
   // Error-Dialog