server/sql/tables.sql

@@ -18,8 +18,8 @@ CREATE TABLE IF NOT EXISTS wifi_scan (
     lp_ttn_end_device_uplinks_id UUID,
     mac VARCHAR(255),
     rssi NUMERIC,
-    latitude DOUBLE NOT NULL,
+    latitude DOUBLE,
-    longitude DOUBLE NOT NULL,
+    longitude DOUBLE,
     created_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     FOREIGN KEY (lp_ttn_end_device_uplinks_id) REFERENCES lp_ttn_end_device_uplinks(lp_ttn_end_device_uplinks_id)

server/src/eventHandler/ttnMessageReceivedEventHandler.ts

@@ -7,7 +7,6 @@ import { container } from "tsyringe";
 import { LocationService } from "../services/locationService";
 import { WifiScanService } from "../services/wifiScanService";
 import { getLocationForWifiMemoized } from "../proxy/wigle";
-import { WifiScan } from "../models/wifiScan";
 
 const locationService = container.resolve(LocationService);
 const wifiScanService = container.resolve(WifiScanService);
@@ -55,37 +54,33 @@ const CalculateWifiLocation = async (event: TtnMessageReceivedEvent) => {
     console.log("No WiFi scans received!")
   } else {
     // Process Wi-Fi data to compute weighted location
-    let wifiScans = await Promise.all(
+    const wifiScans = await Promise.all(
       event.wifis.map(async (wifi) => {
         // Create new WiFi Scan entry if wigle.net reported location
-        const apiResponse = await getLocationForWifiMemoized(wifi.mac);;
+        const apiResponse = await getLocationForWifiMemoized(wifi.mac);
-        // Only return valid data wifiScans (location for MAC was found)
-        if ((apiResponse?.success == true) && (apiResponse.totalResults > 0)) {
         return {
           lp_ttn_end_device_uplinks_id: event.lp_ttn_end_device_uplinks_id,
           mac: wifi.mac,
           rssi: wifi.rssi,
-            latitude: apiResponse?.results[0].trilat,
+          latitude: apiResponse?.results[0]?.trilat,
-            longitude: apiResponse?.results[0].trilong,
+          longitude: apiResponse?.results[0]?.trilong,
-          }
+        };
-        }
-        return undefined;
       })
     );
 
-    const wifiScansFiltered = wifiScans.filter(w => (w !== undefined));
+    await wifiScanService.createWifiScans(wifiScans);
 
-    // Store valid wifiScans into DB
-    const locatedWifiScans = await wifiScanService.createWifiScans(wifiScansFiltered);
-
-    if (locatedWifiScans.length !== 0) {
     const { totalWeight, weightedLatitude, weightedLongitude } =
-        locatedWifiScans.reduce(
+      wifiScans.reduce(
         (acc, { latitude, longitude, rssi }) => {
+          if (latitude && longitude && rssi !== 0) {
             const weight = 1 / Math.abs(rssi);
+
             acc.totalWeight += weight;
             acc.weightedLatitude += latitude * weight;
             acc.weightedLongitude += longitude * weight;
+          }
+
           return acc;
         },
         {
@@ -101,7 +96,6 @@ const CalculateWifiLocation = async (event: TtnMessageReceivedEvent) => {
 
     console.log("Tracker location based on WiFi Scan location:", virtualLocation);
   }
-  }
   return {
     wifi_latitude: virtualLocation.latitude,
     wifi_longitude: virtualLocation.longitude,

server/src/proxy/wigle.ts

@@ -54,14 +54,9 @@ export const getLocationForWifi = async (
         Authorization: `Basic ${process.env.WIGLE_TOKEN}`,
       },
     });
-    if (response.ok) {
     return await response.json();
-    }
-    console.log(response.status);
-    return undefined;
-
   } catch (error) {
-    console.error("Error during call of API wigle.net:", error);
+    console.error("Fehler beim Aufruf des Services:", error);
   }
 };