Viele Updates, Version angepasst

public/javascripts/chart_utilities.js

@@ -17,7 +17,7 @@ export const noise_ymin = 30;                    // lowest value on y-axis for n
 export const noise_ymax = 120;                   // highest value on y-axis for noise
 export let peaklim = 70;                       // threshold for peak count
 
-export const url = '/api'
+export const url = '/srv'
 
 export function createGlobObtions() {
     // Options, die für alle Plots identisch sind
@@ -217,7 +217,7 @@ export const fetchfromserver = async (url) => {
 }
 
 export const addAddress = async (sid) => {
-    let url = `/api/getaddress?sensorid=${sid}`
+    let url = `/srv/getaddress?sensorid=${sid}`
     let erg = await fetchfromserver(url)
     if (!erg.err) {
         return erg.address

public/javascripts/global.js

@@ -116,7 +116,7 @@ import {setCurrentTab, getCurrentTab, showError, fetchfromserver} from "./chart_
     })
 
     const getSensorType = async (sid) => {
-        let url = `/api/getoneproperty?sensorid=${sid}`
+        let url = `/srv/getoneproperty?sensorid=${sid}`
         const data = await fetchfromserver(url)
         return data.props.type
     }

public/javascripts/map.js

@@ -12,12 +12,12 @@ const mapparams = {
     bounds: null,
     popuptext: '',
     clickedSensor: 0,    
-    APIURL: '/api/getmapdata?',
+    APIURL: '/srv/getmapdata?',
     MAXZOOM: 19    
 }
 
 export async function showMap(params) {
-    if(sysparams.category === 'laerm') {    
+    if(sysparams.category === 'noise') {    
         utils.removeTabs()
         if(mapparams.map && mapparams.map.remove) {
             mapparams.map.off();
@@ -36,7 +36,7 @@ export async function showMap(params) {
         await buildMarkers(params, mapparams)
     });
 
-    if(sysparams.category === 'laerm') {    
+    if(sysparams.category === 'noise'){    
         mapn.buildLegend(mapparams) 
     }
 
@@ -45,7 +45,7 @@ export async function showMap(params) {
 }
 
 const buildMarkers = async (params, mapparams) => {    
-    if(sysparams.category === 'laerm') {
+    if(sysparams.category === 'noise') {
         return mapn.buildMarkers(params, mapparams)
     } else if(sysparams.category === 'multigeiger') {
         return mapg.buildMarkers(params, mapparams)

public/javascripts/map_noise.js

@@ -57,9 +57,9 @@ export async function buildMarkers(params, mpp) {
             if ((params.weeks > 0) && (x.weeks > params.weeks)) {
                 continue
             }
-            // if (x.value <= -4) {
-            //     continue
-            // }
+             if (x.value <= -5) {
+                 continue
+             }
             let marker = L.marker([x.location[1], x.location[0]], {
                 icon: new L.Icon({
                     iconUrl: buildIcon(getColor(parseInt(x.value)), 0, x.indoor),

public/javascripts/map_utilities.js

@@ -4,7 +4,7 @@ import * as utils from "./chart_utilities.js"
 import * as dt from './datetime.js'
 
 function getColor(d, mapparams) {
-    if(sysparams.category === 'laerm') {
+    if(sysparams.category === 'noise') {
         return mapn.getColor(d, mapparams)
     } else if(sysparams.category === 'multigeiger') {   
         return mapg.getColor(d, mapparams)

public/javascripts/showcharts.js

@@ -55,7 +55,7 @@ export async function showChart(params, typ, container) {
             return this.axis.defaultLabelFormatter.call(this);
         }
     }
-    let url = `/api/getsensordata?sensorid=${params.sid}&data=${typ}&datetime=${params.datetime}`
+    let url = `/srv/getsensordata?sensorid=${params.sid}&data=${typ}&datetime=${params.datetime}`
     if (typ === 'live') {
         url += `&span=${params.span}`
     } else if ((typ === 'havg') || (typ === 'davg')) {
@@ -63,7 +63,7 @@ export async function showChart(params, typ, container) {
     }
     let erg = await fetchfromserver(url)
     if (!erg.err) {
-        if(sysparams.category === 'laerm') {
+        if(sysparams.category === 'noise') {
             utils.showTabs()
         }
         document.querySelector('#odth').style.display = 'none'