*** WIP WIP *** load all charts in advance

This commit is contained in:
rxf
2023-04-04 10:39:13 +02:00
parent 5082eb408f
commit 71a59fb9e8
6 changed files with 56 additions and 58 deletions
+16 -30
View File
@@ -3,19 +3,25 @@
import * as dt from './datetime.js'
import * as chart_live from "./chart_live.js"
import * as utils from "./chart_utilities.js"
import { showChart } from './showcharts.js'
import { showChart, loadAll } from './showcharts.js'
let map = null
let bounds
let popuptext = ''
let clickedSensor = 0
let clickedcoords = {}
const colorscale = ['#d53e4f', '#fc8d59', '#fee08b', '#e6f598', '#99d594', '#3288bd', '#808080'];
const dba = [100, 80, 60, 40, 20, 0, -999];
export async function showMap(params) {
if (map) return
map = L.map('map',{ scrollWheelZoom: false}).setView(params.center, parseInt(params.zoom))
export async function showMap(params, status) {
utils.removeTabs()
if(map && map.remove) {
map.off();
map.remove();
}
map = L.map('map', {scrollWheelZoom: false}).setView(params.center, parseInt(params.zoom))
L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
maxZoom: 19,
attribution: '&copy; <a href="http://www.js.openstreetmap.org/copyright">OpenStreetMap</a>'
@@ -54,6 +60,11 @@ export async function showMap(params) {
let triggerEl = document.querySelector('#livetab')
bootstrap.Tab.getInstance(triggerEl).show() // Select tab by name
await showChart(params, 'live', 'dlive')
loadAll(params)
status.loaded = true
map.setView([clickedcoords.lat, clickedcoords.lng]);
})
})
@@ -209,6 +220,7 @@ export async function buildMarkers() {
async function onMarkerClick(e, click) {
let item = e.target.options;
clickedSensor = item.name;
clickedcoords = e.latlng
let offlinetext = `
<tr><td colspan="2"><span style="color:red;">offline</span></td></tr>
@@ -255,32 +267,6 @@ async function setCenter(adr) {
// Show the last date below tha map grafics
async function showLastDate(ld) {
// const url = `http://localhost:3004/getproperties?type=noise&box=${bounds.toBBoxString()}`
//
// let ret = await fetch(url)
// .catch(e => {
// console.log(e)
// });
// let sensors = await ret.json()
//
// let url = '/api/getdata';
// let ld = moment(dt);
// let last = ld.subtract(1,'h')
// let erg;
// let allsens
// try {
// erg = await $.getJSON(url + `?data=props&last=1900-01-01`);
// allsens = erg.count
// erg = await $.getJSON(url + `?data=props&last=${last.format('YYYY-MM-DD HH:mm')}`);
// if ((erg != undefined) && (erg.values[0].error != undefined)) {
// showError(3,erg.values[0].error,aktsensorid);
// return;
// }
// }
// catch(e) {
// console.log(e)
// }
// fetch all sensors
const url = `/chart/getmapdata?type=noise`
let ret = await fetch(url)
.catch(e => {