From 123411eca625742fdb4acc8e62896b1f636e5806 Mon Sep 17 00:00:00 2001
From: Philip Schell <philip.schell@fit.fraunhofer.de>
Date: Thu, 25 Jul 2019 11:14:04 +0200
Subject: [PATCH] Refactoring Js finished Make only one request per second
 instead of four per AJAX

---
 CHANGELOG                          |  1 +
 Lora-Map/Server.cs                 | 10 +---------
 Lora-Map/resources/js/functions.js | 22 ++--------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f853833..6910f1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 ### Bugfixes
 ### Changes
 * Refactoring of all JS
+* Make only one request per second instead of four per AJAX
 
 ## 1.2.8
 ### New Features
diff --git a/Lora-Map/Server.cs b/Lora-Map/Server.cs
index 056c126..2247c7a 100644
--- a/Lora-Map/Server.cs
+++ b/Lora-Map/Server.cs
@@ -135,17 +135,9 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
           return true;
         } else if (cont.Request.Url.PathAndQuery.StartsWith("/admin")) {
           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/")) {
           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) {
         Helper.WriteError("SendWebserverResponse(): 500 - " + e.Message + "\n\n" + e.StackTrace);
         cont.Response.StatusCode = 500;
diff --git a/Lora-Map/resources/js/functions.js b/Lora-Map/resources/js/functions.js
index 42d6d9c..33efadc 100644
--- a/Lora-Map/resources/js/functions.js
+++ b/Lora-Map/resources/js/functions.js
@@ -34,7 +34,7 @@
     get1000.send();
   },
   _RunnerOnce: function () {
-    /*var getonce = new XMLHttpRequest();
+    var getonce = new XMLHttpRequest();
     getonce.onreadystatechange = function () {
       if (getonce.readyState === 4 && getonce.status === 200) {
         var json = JSON.parse(getonce.responseText);
@@ -43,25 +43,7 @@
       }
     };
     getonce.open("GET", "/getonce", true);
-    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();
+    getonce.send();
   },
   _ParseAJAX: function (utcobject) {
     if (utcobject.hasOwnProperty("utc")) {