From 1f8bb79d4309d18d05f8a5e09af4f759dba73623 Mon Sep 17 00:00:00 2001 From: Philip Schell Date: Thu, 28 Mar 2019 15:18:33 +0100 Subject: [PATCH] ask server for panic data --- Lora-Map/resources/js/marker.js | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/Lora-Map/resources/js/marker.js b/Lora-Map/resources/js/marker.js index eb495e1..7dc7f44 100644 --- a/Lora-Map/resources/js/marker.js +++ b/Lora-Map/resources/js/marker.js @@ -1,16 +1,20 @@ -var markers = {}; -var serverLocation = {}; - -setInterval(datarunner, 1000); +setInterval(datarunner, 1000); function datarunner() { - var xhttp = new XMLHttpRequest(); - xhttp.onreadystatechange = parsedata; - xhttp.open("GET", "http://{%REQUEST_URL_HOST%}:8080/loc", true); - xhttp.send(); + var loc = new XMLHttpRequest(); + loc.onreadystatechange = parseAjaxLoc; + loc.open("GET", "http://{%REQUEST_URL_HOST%}:8080/loc", true); + loc.send(); + + var panic = new XMLHttpRequest(); + panic.onreadystatechange = parseAjaxPanic; + panic.open("GET", "http://{%REQUEST_URL_HOST%}:8080/panic", true); + panic.send(); } +var markers = {}; +var serverLocation = {}; //https://leafletjs.com/reference-1.4.0.html#marker -function parsedata() { +function parseAjaxLoc() { if (this.readyState === 4 && this.status === 200) { serverLocation = JSON.parse(this.responseText); for (var key in serverLocation) { @@ -40,4 +44,14 @@ function parsedata() { updateStatus(); updateDeviceStatus(); } +} + +function parseAjaxPanic() { + if (this.readyState === 4 && this.status === 200) { + var panics = JSON.parse(this.responseText); + for (var id in panics) { + if (panics.hasOwnProperty(id)) { + } + } + } } \ No newline at end of file