From 31b933ed986d15931e762fb320859dd6e850e508 Mon Sep 17 00:00:00 2001
From: Simon Bach <simon.bach@swisstopo.ch>
Date: Fri, 5 Jul 2024 09:45:36 +0200
Subject: [PATCH 1/3] fixed the file to use relativ pathes / variables instead
 of hard coded pathes

---
 static/index.html | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/static/index.html b/static/index.html
index cadaa7c..3f62e15 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="de">
 <!-- https://leafletjs.com/examples/quick-start/ -->
+<!-- 05.07.2024 bao -->
 <head>
         <style>
 
@@ -55,8 +56,8 @@
 
         </style>
 
-        <title>KARP GUI</title>
-        <h1>KARP - KADAS Routing Packager</h1>
+        <title id="titleid"></title>
+        <h1 id="h1id"></h1>
 
         <link rel="shortcut icon" type="image/x-icon" href="docs/images/favicon.ico" />
 
@@ -79,7 +80,7 @@ <h1>KARP - KADAS Routing Packager</h1>
                 <div id="leftpane" style="width: 49%; float:left;">
                         <div id="map" style="height: 470px; border: 1px solid #ccc "></div>
                         <br>
-                        <form method="POST" id="submitForm" action="https://l0t2511a.lt.admin.ch/api/v1/jobs/">
+                        <form method="POST" id="submitForm" action="javascript:postjobsurl;">
 
                                 <label for="name" width="300" >Export name:</label>
                                 <input type="text" id="name" name="name"  placeholder="Enter export name" required><br>
@@ -87,7 +88,7 @@ <h1>KARP - KADAS Routing Packager</h1>
                                 <label for="provider">Provider:</label>
                                 <input type="text" id="provider" name="provider" value="osm" style="background-color:Gainsboro" readonly><br>
 
-                                <label for="bbox">Boundingbox:</label>
+                                <label for="bbox">Boundingbox:<span id="env2"></span></label>
                                 <input type="text" id="bbox" name="bbox" placeholder="Use the map to draw the boundingbox or enter comma separated list w,s,e,n" required><br>
 
                                 <label for="desc">Description:</label>
@@ -100,6 +101,26 @@ <h1>KARP - KADAS Routing Packager</h1>
                         </form>
 
                         <script>
+                        // Variables for environment infos (PROD INT)
+                        var hostlocation = window.location.origin;
+                        var hostname = window.location.hostname;
+                        var hostenvironment = "";
+						var postjobsurl = "";
+
+                        if (hostname.includes("l0t2511a")) {
+                          hostenvironment  = "PROD";
+                        } else if (hostname.includes("l8t2511a")){
+                          hostenvironment = "INT";
+                        } else {
+                          hostenvironment = "UNKNOWN";
+                        };											
+                        
+                        document.getElementById("titleid").innerHTML = "KARP GUI ".concat(hostenvironment);
+                        document.getElementById("h1id").innerHTML = "KARP - KADAS Routing Packager ".concat(hostenvironment);
+                         
+                        postjobsurl = hostlocation.concat("/api/v1/jobs/");
+                        //document.getElementById("jobposturl").innerHTML = postjobsurl;
+                        
                         // Variables for extent
                         var sw = 0.0;
                         var ne = 0.0;
@@ -181,7 +202,7 @@ <h1>KARP - KADAS Routing Packager</h1>
 
                                         // prepare POST Call for ajax
                                         $.ajax({
-                                                url: "https://l0t2511a.lt.admin.ch/api/v1/jobs/",
+                                                url: postjobsurl,
                                                 type: "POST",
                                                 headers: {
                                                         "Authorization": "Basic YWRtaW5AZXhhbXBsZS5vcmc6YWRtaW4=",
@@ -245,7 +266,7 @@ <h1>KARP - KADAS Routing Packager</h1>
                         <script>
 
                         function jobresult() {
-                                $.getJSON("https://l0t2511a.lt.admin.ch/api/v1/jobs/", function (gr) {
+                                $.getJSON(postjobsurl, function (gr) {
                                         if (gr) {
                                                 //console.log(gr)
                                                 var jsonData = gr
@@ -381,7 +402,7 @@ <h1>KARP - KADAS Routing Packager</h1>
                         function delJob(jid) {
                                 //console.log("del Job: "+jid);
                                 $.ajax({
-                                        url: "https://l0t2511a.lt.admin.ch/api/v1/jobs/" + jid,
+                                        url: postjobsurl + jid,
                                         type: 'DELETE',
                                         headers: {
                                                 "Authorization": "Basic YWRtaW5AZXhhbXBsZS5vcmc6YWRtaW4=",

From df505bcd6243a5817026bf9302024111a4ceb19c Mon Sep 17 00:00:00 2001
From: Simon Bach <simon.bach@swisstopo.ch>
Date: Fri, 5 Jul 2024 10:45:57 +0200
Subject: [PATCH 2/3] fixed absolute to relative pathes

---
 static/index.html | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/static/index.html b/static/index.html
index 3f62e15..cdee90e 100644
--- a/static/index.html
+++ b/static/index.html
@@ -101,25 +101,15 @@ <h1 id="h1id"></h1>
                         </form>
 
                         <script>
-                        // Variables for environment infos (PROD INT)
+                        // Variables for host infos
                         var hostlocation = window.location.origin;
                         var hostname = window.location.hostname;
-                        var hostenvironment = "";
-						var postjobsurl = "";
-
-                        if (hostname.includes("l0t2511a")) {
-                          hostenvironment  = "PROD";
-                        } else if (hostname.includes("l8t2511a")){
-                          hostenvironment = "INT";
-                        } else {
-                          hostenvironment = "UNKNOWN";
-                        };											
+						var postjobsurl = "";										
                         
-                        document.getElementById("titleid").innerHTML = "KARP GUI ".concat(hostenvironment);
-                        document.getElementById("h1id").innerHTML = "KARP - KADAS Routing Packager ".concat(hostenvironment);
+                        document.getElementById("titleid").innerHTML = "KARP GUI ".concat(hostname);
+                        document.getElementById("h1id").innerHTML = "KARP - KADAS Routing Packager ".concat(hostname);
                          
                         postjobsurl = hostlocation.concat("/api/v1/jobs/");
-                        //document.getElementById("jobposturl").innerHTML = postjobsurl;
                         
                         // Variables for extent
                         var sw = 0.0;
@@ -249,7 +239,7 @@ <h1 id="h1id"></h1>
                         formElement.addEventListener("submit", handler);
 
                         </script>
-                <p style="color: gray; font-size:8pt">v.1.0</p>
+                <p style="color: gray; font-size:8pt">v.1.1</p>
         </div>
 
         <div id="middlepane" style="width: 2%; float:left; ">

From cc8d6fb047ddf633c28230ed7eb87310d005a5b2 Mon Sep 17 00:00:00 2001
From: Simon Bach <simon.bach@swisstopo.ch>
Date: Fri, 5 Jul 2024 10:51:38 +0200
Subject: [PATCH 3/3] more fixes

---
 static/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/index.html b/static/index.html
index cdee90e..cac0ec5 100644
--- a/static/index.html
+++ b/static/index.html
@@ -88,7 +88,7 @@ <h1 id="h1id"></h1>
                                 <label for="provider">Provider:</label>
                                 <input type="text" id="provider" name="provider" value="osm" style="background-color:Gainsboro" readonly><br>
 
-                                <label for="bbox">Boundingbox:<span id="env2"></span></label>
+                                <label for="bbox">Boundingbox:</label>
                                 <input type="text" id="bbox" name="bbox" placeholder="Use the map to draw the boundingbox or enter comma separated list w,s,e,n" required><br>
 
                                 <label for="desc">Description:</label>
