gps-track: simplify gps value handling

This commit is contained in:
Christian Hesse 2018-09-13 12:21:54 +02:00
parent 6ee7232408
commit dcf795464b

View file

@ -7,17 +7,9 @@
:global "identity"; :global "identity";
:global "gps-track-url"; :global "gps-track-url";
:local gpslat; :local gps [ / system gps monitor once as-value ];
:local gpslon;
:local gpsvalid;
/ system gps monitor once do={ if ($gps->"valid" = true) do={
:set $gpslat $("latitude");
:set $gpslon $("longitude");
:set $gpsvalid $("valid");
}
if ($gpsvalid) do={
:tool fetch mode=http \ :tool fetch mode=http \
url=$"gps-track-url" \ url=$"gps-track-url" \
check-certificate=yes-without-crl \ check-certificate=yes-without-crl \
@ -25,11 +17,13 @@ if ($gpsvalid) do={
http-method=post \ http-method=post \
http-content-type="application/json" \ http-content-type="application/json" \
http-data=("{" . \ http-data=("{" . \
"\"lat\":\"" . $gpslat . "\"," . \ "\"lat\":\"" . ($gps->"latitude") . "\"," . \
"\"lon\":\"" . $gpslon . "\"," . \ "\"lon\":\"" . ($gps->"longitude") . "\"," . \
"\"identity\":\"" . $identity . "\"" . \ "\"identity\":\"" . $identity . "\"" . \
"}"); "}");
:log debug ("Sending gps data for tracking: " . \ :log debug ("Sending GPS data for tracking: " . \
"lat: " . $gpslat . " " . \ "lat: " . ($gps->"latitude") . " " . \
"lon: " . $gpslon); "lon: " . ($gps->"longitude"));
} else={
:log debug ("GPS data not valid.");
} }