feat: tracker location based on multiple location providers #5

Merged
localhorst merged 19 commits from feature/ttn-location-algo into main 2025-01-02 14:57:34 +01:00
3 changed files with 12 additions and 11 deletions
Showing only changes of commit 16d49c9940 - Show all commits
+3 -3
View File
@@ -28,7 +28,8 @@ router.post(
async (req: Request, res: Response) => {
try {
const message = req.body as TtnMessage;
const { lp_ttn_end_device_uplinks_id } =
// Create uplink record
const { lp_ttn_end_device_uplinks_id, latitude, longitude } =
await lpTtnEndDeviceUplinksService.createUplink({
device_id: message.end_device_ids.device_id,
application_ids:
@@ -78,8 +79,7 @@ router.post(
latitude: g.latitude,
longitude: g.longitude,
})),
gnssLocation:
gnssLocation: { latitude, longitude }
};
domainEventEmitter.emit(TtnMessageReceivedEventName, event);
+2 -2
View File
@@ -12,7 +12,7 @@ export type TtnMessageReceivedEvent = {
altitude: number;
}[];
gnssLocation: {
longitude: number;
altitude: number;
latitude: number | undefined;
longitude: number | undefined;
localhorst marked this conversation as resolved Outdated
Outdated
Review

Hier habe ich Mist erzählt statt:

latitude: number | undefined; longitude: number | undefined;

geht auch einfach

latitude?: number; longitude?: number;

Hier habe ich Mist erzählt statt: `latitude: number | undefined; longitude: number | undefined;` geht auch einfach `latitude?: number; longitude?: number;`
}
};
@@ -13,12 +13,12 @@ domainEventEmitter.on(
async (event: TtnMessageReceivedEvent) => {
console.log(event);
var wifi_based_latitude!: number;
var wifi_based_longitude!: number;
var gnss_based_latitude!: number; // Should this be set here?
var gnss_based_longitude!: number; // Should this be set here?
var ttn_gw_based_latitude!: number;
var ttn_gw_based_longitude!: number;
var wifi_based_latitude: number;
var wifi_based_longitude: number;
var gnss_based_latitude: number;
var gnss_based_longitude: number;
var ttn_gw_based_latitude: number | undefined = undefined;
var ttn_gw_based_longitude: number | undefined = undefined;
localhorst marked this conversation as resolved Outdated
Outdated
Review

Das ! kann weg.

Das ! kann weg.
Outdated
Review

Bzw. kann alles weg, wird nicht verwendet

Bzw. kann alles weg, wird nicht verwendet
if (!event.ttnGateways || event.ttnGateways.length === 0) {
console.log("No TTN Gateway location received!")
3
@@ -54,6 +54,7 @@ domainEventEmitter.on(
lp_ttn_end_device_uplinks_id: event.lp_ttn_end_device_uplinks_id,
ttn_gw_latitude: ttn_gw_based_latitude,
ttn_gw_longitude: ttn_gw_based_longitude,
//TODO: Add gnss location
});
1