Lora/Lora-Map
1
0
Fork 0
Code Issues 8 Pull Requests Releases 23 Wiki Activity

Refactoring Js finished

Browse Source 
Make only one request per second instead of four per AJAX
This commit is contained in:
Philip Schell 2019-07-25 11:14:04 +02:00
parent 22c37456e9
commit 123411eca6
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -5,6 +5,7 @@
### Bugfixes ### Bugfixes
### Changes ### Changes
* Refactoring of all JS * Refactoring of all JS
* Make only one request per second instead of four per AJAX
## 1.2.8 ## 1.2.8
### New Features ### New Features

8
Lora-Map/Server.cs
View File

@ -135,16 +135,8 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
return true; return true;
} else if (cont.Request.Url.PathAndQuery.StartsWith("/admin")) { } else if (cont.Request.Url.PathAndQuery.StartsWith("/admin")) {
return this.admin.ParseReuqest(cont); return this.admin.ParseReuqest(cont);
} else if (cont.Request.Url.PathAndQuery.StartsWith("/getlayer")) {
return SendJsonResponse(this.FindMapLayer(cont.Request), cont);
} else if (cont.Request.Url.PathAndQuery.StartsWith("/maps/")) { } else if (cont.Request.Url.PathAndQuery.StartsWith("/maps/")) {
return SendFileResponse(cont, "resources", false); return SendFileResponse(cont, "resources", false);
} else if (cont.Request.Url.PathAndQuery.StartsWith("/getgeo")) {
Byte[] buf = Encoding.UTF8.GetBytes(File.ReadAllText("json/geo.json"));
cont.Response.ContentLength64 = buf.Length;
cont.Response.OutputStream.Write(buf, 0, buf.Length);
Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
return true;
} }
} catch(Exception e) { } catch(Exception e) {
Helper.WriteError("SendWebserverResponse(): 500 - " + e.Message + "\n\n" + e.StackTrace); Helper.WriteError("SendWebserverResponse(): 500 - " + e.Message + "\n\n" + e.StackTrace);

22
Lora-Map/resources/js/functions.js
View File

@ -34,7 +34,7 @@
get1000.send(); get1000.send();
}, },
_RunnerOnce: function () { _RunnerOnce: function () {
/*var getonce = new XMLHttpRequest(); var getonce = new XMLHttpRequest();
getonce.onreadystatechange = function () { getonce.onreadystatechange = function () {
if (getonce.readyState === 4 && getonce.status === 200) { if (getonce.readyState === 4 && getonce.status === 200) {
var json = JSON.parse(getonce.responseText); var json = JSON.parse(getonce.responseText);
@ -43,25 +43,7 @@
} }
}; };
getonce.open("GET", "/getonce", true); getonce.open("GET", "/getonce", true);
getonce.send();*/ getonce.send();
var layergetter = new XMLHttpRequest();
layergetter.onreadystatechange = function () {
if (layergetter.readyState === 4 && layergetter.status === 200) {
MapObject._ParseAJAXLayers(JSON.parse(layergetter.responseText));
}
};
layergetter.open("GET", "/getlayer", true);
layergetter.send();
var geogetter = new XMLHttpRequest();
geogetter.onreadystatechange = function () {
if (geogetter.readyState === 4 && geogetter.status === 200) {
MapObject._ParseAJAXGeo(JSON.parse(geogetter.responseText));
}
};
geogetter.open("GET", "/getgeo", true);
geogetter.send();
}, },
_ParseAJAX: function (utcobject) { _ParseAJAX: function (utcobject) {
if (utcobject.hasOwnProperty("utc")) { if (utcobject.hasOwnProperty("utc")) {