From 01f073e67b5b10e28264bd5cae3dba93a71cf278 Mon Sep 17 00:00:00 2001 From: Philip Abbey Date: Sun, 25 Aug 2024 13:50:29 +0100 Subject: [PATCH] Update BackgroundServiceDelegate.mc Only submitting non-null values to HA, not fake zeros for null values. --- source/BackgroundServiceDelegate.mc | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/source/BackgroundServiceDelegate.mc b/source/BackgroundServiceDelegate.mc index 6726f1e..c248cde 100644 --- a/source/BackgroundServiceDelegate.mc +++ b/source/BackgroundServiceDelegate.mc @@ -102,17 +102,28 @@ class BackgroundServiceDelegate extends System.ServiceDelegate { accuracy = 10; break; } + + var data = { "gps_accuracy" => accuracy }; + // Only add the non-null fields as all the values are optional in Home Assistant, and it avoid submitting fake values. + if (position.position != null) { + data.put("gps", position.position.toDegrees()); + } + if (position.speed != null) { + data.put("speed", Math.round(position.speed)); + } + if (position.heading != null) { + data.put("course", Math.round(position.heading * 180 / Math.PI)); + } + if (position.altitude != null) { + data.put("altitude", Math.round(position.altitude)); + } + // System.println("BackgroundServiceDelegate onTemporalEvent(): data = " + data.toString()); + Communications.makeWebRequest( (Properties.getValue("api_url") as Lang.String) + "/webhook/" + (Properties.getValue("webhook_id") as Lang.String), { "type" => "update_location", - "data" => { - "gps" => position.position == null ? [0.0, 0.0] : position.position.toDegrees(), - "gps_accuracy" => accuracy, - "speed" => Math.round(position.speed == null ? 0 : position.speed), - "course" => Math.round(position.heading == null ? 0 : position.heading * 180 / Math.PI), - "altitude" => Math.round(position.altitude == null ? 0 : position.altitude), - } + "data" => data, }, { :method => Communications.HTTP_REQUEST_METHOD_POST,