From 32a8e6c9361e520c120352ee9a496903b433ea4c Mon Sep 17 00:00:00 2001
From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:59:01 +0100
Subject: [PATCH 1/2] Correct assistnow data loading error handling

Fixes #2243
---
 js/ublox/UBLOX.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/js/ublox/UBLOX.js b/js/ublox/UBLOX.js
index 438f55451..200f59651 100644
--- a/js/ublox/UBLOX.js
+++ b/js/ublox/UBLOX.js
@@ -154,7 +154,11 @@ var ublox = (function () {
 
         if (successCallback != null) {
             req.onload = (event) => {
-                successCallback(req.response);
+                if(req.status == 200) {
+                    successCallback(req.response);
+                } else {
+                    failCallback(event);
+                }
             };
         }
 
@@ -164,13 +168,18 @@ var ublox = (function () {
             }
         }
           
-        req.send(null);
+        try {
+            req.send(null);
+        } catch(error) {
+            GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));
+            console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + error.toString());
+        }
     }
 
 
     function loadError(event) {
         GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));
-        console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + event.toString());
+        console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + event);
     }
 
     // For more info on assistnow, check:

From a7d644e1611583d382c7d21a717e77d2a32e6552 Mon Sep 17 00:00:00 2001
From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com>
Date: Thu, 5 Dec 2024 13:01:12 +0100
Subject: [PATCH 2/2] remove redundant console.log

---
 js/ublox/UBLOX.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/ublox/UBLOX.js b/js/ublox/UBLOX.js
index 200f59651..918fc0659 100644
--- a/js/ublox/UBLOX.js
+++ b/js/ublox/UBLOX.js
@@ -179,7 +179,6 @@ var ublox = (function () {
 
     function loadError(event) {
         GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));
-        console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + event);
     }
 
     // For more info on assistnow, check: