From 7be6245ed373949ee6aceff17ef604f5edb43f78 Mon Sep 17 00:00:00 2001 From: Philip Schell Date: Thu, 27 Jun 2019 11:07:05 +0200 Subject: [PATCH] #13 fixing issue with port when using proxy --- CHANGELOG | 131 +++++++++++++++++++++++++--- Lora-Map/Lora-Map.csproj | 1 + Lora-Map/resources/admin/js/menu.js | 12 +-- Lora-Map/resources/js/functions.js | 2 +- Lora-Map/resources/js/map.js | 4 +- Lora-Map/resources/js/marker.js | 4 +- Lora-Map/resources/js/menu.js | 4 +- 7 files changed, 131 insertions(+), 27 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 49a90e9..c753726 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,14 +1,117 @@ -1.1.1 Add Debian package config -1.1.2 #2 Show versions number in Site -1.1.3 #1 Click on icon and show details -1.1.4 #3 Create icons for devices -1.1.5 Add support for alert button -1.1.6 #5 Create admin area -1.1.7 #8 Editor for Names -1.2.0 #4 Possible to Ex and Import Setting -1.2.1 #6 Load the map from the Device -1.2.2 Bugfix, if only recieve panic packet with gps data, update the marker on the map also -1.2.3 #9 display polygons and marker on the map -1.2.4 Can draw Textmarkers on the Map, use MGRS (UTM) on the Map -1.2.5 #10 text Letzer Datenempfang is too long when scrollbar is there and #11 set textsize for every zoomlevel -1.2.6 New Types of marker for person \ No newline at end of file +# Changelogs + +## 1.2.8 +### New Features +* +### Bugfixes +* Implement #13 fixing issue with port when using proxy +### Changes +* + +## 1.2.7 +### New Features +* Add support to display camera values that counts people. needs to be on a mqtt toipc camera/counting +* Display Crowd-Density Data on Map +### Bugfixes +* Rename Adminmodel.cs to AdminModel.cs, cause it sould be Uppercase! +* Fix a Parsing Bug in Lora-Map/Model/PositionItem.cs +### Changes +* Move the Dockerfile to the parent project Repository + +## 1.2.6 +### New Features +* New types of marker for a person, so you can add drawing inside + +## 1.2.5 +### New Features +* Implement #10 text Letzer Datenempfang is too long when scrollbar is there +### Bugfixes +* Implement #11 set textsize for every zoomlevel +### Changes +* Add an link to kml to geojson converter + +## 1.2.4 +### New Features +* Possible to draw textmarkers on map (eg. for static text in a polygon) +* Now using MGRS as default output + +## 1.2.3 +### New Features +* Implement #9 display polygons and marker on the map +### Bugfixes +* change the wort get to post +### Changes +* Default zoomlevel is now 16 + +## 1.2.2 +### Bugfixes +* When only recieve a panic packet with gps data, update also the normal location on the map + +## 1.2.1 +### New Features +* Implement #6 Load the map from the Device +### Bugfixes +* Show now output 200 of images from Webserver +### Changes +* Now layers.png is also exported + +## 1.2.0 +### New Features +* Implement #4 Possible to Ex and Import Settings +### Bugfixes +* Move username and password to configfile +### Changes +* Verifiy names.json when sending +* Add logger to Programm + +## 1.1.7 +### New Features +* Implement #8 Editor for Names and Icons +### Bugfixes +* Fixing missing dependencys of Mono.System.Web in deb packet +* Fixing a Bug when map is not running on port 8080 +### Changes +* New Batterylevels +* Change textcolors in Marker.svg + +## 1.1.6 +### New Features +* new Levels for Battery, so that is ~ 1/5 of time for each Icon +* #5 Create adminpannel + +## 1.1.5 +### New Features +* Shows a red border on the marker on the map, when the panicbutton is pressed +* Icons are now created by a script from the SVG directly, so all big marker icons are SVGs +* Icons are also now shown in the marker list +* Using Leaflet 1.4.0 now +* Menu with new markers +### Bugfixes +* Times are now complete in UTC internaly and will calculated in the browser to local time. +### Changes +* requests.conf must now have a section `js/map.js` instead of `js/nav.js` +* names.json format has changed + +## 1.1.4 +### New Features +* Implement #3 Create icons for devices + +## 1.1.3 +### New Features +* Implement #1 Click on icon and show details + +## 1.1.2 +### New Features +* Implement #2 Show versions number in Site + +## 1.1.1 +### New Features +* Add Debian package config + +## 1.1.0.0 +### New Features +* Change to new JSON format, and make it usable for more than one listener + +## 1.0.0.0 +### New Features +* First Version, only used as a testoutput for debugging tracker \ No newline at end of file diff --git a/Lora-Map/Lora-Map.csproj b/Lora-Map/Lora-Map.csproj index 09d470f..2b1ffda 100644 --- a/Lora-Map/Lora-Map.csproj +++ b/Lora-Map/Lora-Map.csproj @@ -79,6 +79,7 @@ + PreserveNewest diff --git a/Lora-Map/resources/admin/js/menu.js b/Lora-Map/resources/admin/js/menu.js index 7202629..c94175d 100644 --- a/Lora-Map/resources/admin/js/menu.js +++ b/Lora-Map/resources/admin/js/menu.js @@ -5,7 +5,7 @@ NamesEditor.ParseJson(ajaxnames.responseText); } }; - ajaxnames.open("GET", "http://{%REQUEST_URL_HOST%}/admin/get_json_names", true); + ajaxnames.open("GET", "/admin/get_json_names", true); ajaxnames.send(); } @@ -23,11 +23,11 @@ function menu_eximport() { ExImport.ParseJson(ajaxnames.responseText, ajaxgeo.responseText); } }; - ajaxgeo.open("GET", "http://{%REQUEST_URL_HOST%}/admin/get_json_geo", true); + ajaxgeo.open("GET", "/admin/get_json_geo", true); ajaxgeo.send(); } }; - ajaxnames.open("GET", "http://{%REQUEST_URL_HOST%}/admin/get_json_names", true); + ajaxnames.open("GET", "/admin/get_json_names", true); ajaxnames.send(); } @@ -150,7 +150,7 @@ var NamesEditor = { } } }; - savenames.open("POST", "http://{%REQUEST_URL_HOST%}/admin/set_json_names", true); + savenames.open("POST", "/admin/set_json_names", true); savenames.send(JSON.stringify(namejson)); }, Delete: function (el) { @@ -341,7 +341,7 @@ var ExImport = { } } }; - savenames.open("POST", "http://{%REQUEST_URL_HOST%}/admin/set_json_names", true); + savenames.open("POST", "/admin/set_json_names", true); savenames.send(document.getElementById("ex_names").value); }, SaveGeo: function () { @@ -355,7 +355,7 @@ var ExImport = { } } }; - savegeo.open("POST", "http://{%REQUEST_URL_HOST%}/admin/set_json_geo", true); + savegeo.open("POST", "/admin/set_json_geo", true); savegeo.send(document.getElementById("ex_geo").value); } }; \ No newline at end of file diff --git a/Lora-Map/resources/js/functions.js b/Lora-Map/resources/js/functions.js index c595df6..8873c70 100644 --- a/Lora-Map/resources/js/functions.js +++ b/Lora-Map/resources/js/functions.js @@ -4,7 +4,7 @@ timecorrectionrunner(); function timecorrectionrunner() { var timecorrection = new XMLHttpRequest(); timecorrection.onreadystatechange = parseAjaxTimecorrection; - timecorrection.open("GET", "http://{%REQUEST_URL_HOST%}/currenttime", true); + timecorrection.open("GET", "/currenttime", true); timecorrection.send(); } diff --git a/Lora-Map/resources/js/map.js b/Lora-Map/resources/js/map.js index 275dd3e..226b4f0 100644 --- a/Lora-Map/resources/js/map.js +++ b/Lora-Map/resources/js/map.js @@ -45,7 +45,7 @@ function GetMapLayers() { } } }; - layergetter.open("GET", "http://{%REQUEST_URL_HOST%}/getlayer", true); + layergetter.open("GET", "/getlayer", true); layergetter.send(); } @@ -100,7 +100,7 @@ function GetGeoLayer() { } } }; - geogetter.open("GET", "http://{%REQUEST_URL_HOST%}/getgeo", true); + geogetter.open("GET", "/getgeo", true); geogetter.send(); } diff --git a/Lora-Map/resources/js/marker.js b/Lora-Map/resources/js/marker.js index d0b022f..996efeb 100644 --- a/Lora-Map/resources/js/marker.js +++ b/Lora-Map/resources/js/marker.js @@ -2,12 +2,12 @@ function datarunner() { var loc = new XMLHttpRequest(); loc.onreadystatechange = parseAjaxLoc; - loc.open("GET", "http://{%REQUEST_URL_HOST%}/loc", true); + loc.open("GET", "/loc", true); loc.send(); var panic = new XMLHttpRequest(); panic.onreadystatechange = parseAjaxPanic; - panic.open("GET", "http://{%REQUEST_URL_HOST%}/panic", true); + panic.open("GET", "/panic", true); panic.send(); } diff --git a/Lora-Map/resources/js/menu.js b/Lora-Map/resources/js/menu.js index 775dad4..a2ae642 100644 --- a/Lora-Map/resources/js/menu.js +++ b/Lora-Map/resources/js/menu.js @@ -134,7 +134,7 @@ function createOverviewElement(positionItem, id) { function update_pannels_admin() { var testadmin = new XMLHttpRequest(); testadmin.onreadystatechange = parseAjaxPannelAdmin; - testadmin.open("GET", "http://{%REQUEST_URL_HOST%}/admin", true); + testadmin.open("GET", "/admin", true); testadmin.send(); } @@ -153,7 +153,7 @@ function parseAjaxPannelAdmin() { function submitloginform() { var adminlogin = new XMLHttpRequest(); adminlogin.onreadystatechange = parseAjaxLogin; - adminlogin.open("POST", "http://{%REQUEST_URL_HOST%}/admin/login", true); + adminlogin.open("POST", "/admin/login", true); adminlogin.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); adminlogin.send("user=" + encodeURI(document.getElementById("pannels_admin_name").value) + "&pass=" + encodeURI(document.getElementById("pannels_admin_pass").value)); }