Senor-Label richtiger Umbruch

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-log
+log
+.env

charts/preparecharts.js

@@ -128,7 +128,7 @@ export const liveData = (params, values, req) => {
         },
         max: utils.noise_ymax,
 //        min: utils.noise_ymin,
-        min: 20,
+        min: 10,
 //            opposite: true,
         tickAmount: 11,
         useHTML: true,

charts/utilities.js

@@ -5,7 +5,7 @@ import { translate as trans } from '../routes/index.js'
 let language = 'en'
 
 export const colors = {'eq': '#0000FF', 'max': '#FF0000', 'min': '#008000', 'peaks': '#DAA520'};
-export const noise_ymin = 30;
+export const noise_ymin = 20;
 export const noise_ymax = 120;
 
 export function createGlobObtions() {

deploy.sh

@@ -28,7 +28,7 @@ shift $((OPTIND-1))
 
 
 ./build_and_copy.sh localhost
-# docker tag $name docker.citysensor.de/$name
+docker tag $name docker.citysensor.de/$name:latest
 dat=`date +%Y%m%d%H%M`
 docker tag $name docker.citysensor.de/$name:V_$dat
 docker push docker.citysensor.de/$name

package.json

@@ -1,7 +1,7 @@
 {
   "name": "laerm-web-sensorapi",
-  "version": "3.2.2",
+  "version": "3.2.3",
-  "date": "2024-09-01 13:15 UTC",
+  "date": "2024-12-18 16:00 UTC",
   "private": true,
   "scripts": {
     "start": "node bin/www.js >>/var/log/noise.log 2>&1"

public/javascripts/chart_utilities.js

@@ -163,16 +163,19 @@ export function calcDays(data, isyear) {
 export async function addSensorID2chart(chart, sensor, width) {
     let indoor = sensor.indoor || false
     let addr =  await addAddress(sensor.sid)
+    chart.renderer.rect((width/2)-200,65,400,150,0)
+    .attr({
+        zIndex: 3
+    }).add()
     let sens = chart.renderer.label(
-        `Sensor: <span class="bigger">${sensor.sid}</span> ${indoor ? ' (indoor)' : ''}&nbsp;&nbsp;&nbsp;&nbsp;${addr.street}, ${addr.plz}  ${addr.city}`,
+        `Sensor: &nbsp;<span class="bigger">${sensor.sid}</span> ${indoor ? ' (indoor)' : ''}<br /><br />${addr.street}<br />${addr.plz}  ${addr.city}`,
-        width / 2 - 100, 65,
+        width / 2 - 150, 70)
-        'text', 0, 0, true)
         .css({
-            fontSize: '12pt',
+            fontSize: '14pt',
             'font-weight': 'bold',
         })
         .attr({
-            zIndex: 2,
+            zIndex: 3,
         }).add();
 }
 

routes/index.js

@@ -1,5 +1,5 @@
 import express from 'express'
-import pkg from '../package.json' assert { type: "json" }
+import pkg from '../package.json' with { type: "json" }
 import { setLanguage } from '../charts/utilities.js'
 
 const router = express.Router()