From 8768f0503799e571f9aafaff554d0419c881915c Mon Sep 17 00:00:00 2001
From: Nathan C <me@nathanc.tech>
Date: Thu, 22 Feb 2024 00:42:25 -0500
Subject: [PATCH] fix: don't vec3 if no postals, allow use in metadata with
 config flag

---
 callcommands/CHANGEMEconfig_callcommands.lua |  4 +++-
 callcommands/sv_callcommands.lua             | 10 +++++++++-
 callcommands/version_callcommands.json       |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/callcommands/CHANGEMEconfig_callcommands.lua b/callcommands/CHANGEMEconfig_callcommands.lua
index 5a8f4b0..e6a5aaf 100644
--- a/callcommands/CHANGEMEconfig_callcommands.lua
+++ b/callcommands/CHANGEMEconfig_callcommands.lua
@@ -18,7 +18,9 @@ local config  = {
     },
     enablePanic = true,
     -- adds an emergency call when panic button is pressed
-    addPanicCall = true
+    addPanicCall = true,
+
+    usePositionForMetadata = false,
 }
 
 if config.enabled then
diff --git a/callcommands/sv_callcommands.lua b/callcommands/sv_callcommands.lua
index 4c84b4f..fe7b308 100644
--- a/callcommands/sv_callcommands.lua
+++ b/callcommands/sv_callcommands.lua
@@ -146,7 +146,11 @@
                     if location == '' then
                         location = LocationCache[source] ~= nil and LocationCache[source].location or 'Unknown'
                     elseif type(location) == 'vector3' then
-                        postal = getPostalFromVector3(location)
+                        if isPluginLoaded("postals") then
+                            postal = getPostalFromVector3(location)
+                        else
+                            postal = "Unknown"
+                        end
                     end
                     -- send an event to be consumed by other resources
                     local uid = uuid()
@@ -181,6 +185,10 @@
                             data['metaData']['x'] = LocationCache[source].coordinates.x
                             data['metaData']['y'] = LocationCache[source].coordinates.y
                             data['metaData']['z'] = LocationCache[source].coordinates.z
+                        elseif type(location) == "vector3" and pluginConfig.usePositionForMetadata then
+                            data['metaData']['x'] = location.x
+                            data['metaData']['y'] = location.y
+                            data['metaData']['z'] = location.z
                         else
                             debugLog("Warning: location cache was nil, not sending position")
                         end
diff --git a/callcommands/version_callcommands.json b/callcommands/version_callcommands.json
index f409170..2767f4f 100644
--- a/callcommands/version_callcommands.json
+++ b/callcommands/version_callcommands.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.7.2",
+    "version": "1.7.3",
     "check_url": "https://raw.githubusercontent.com/Sonoran-Software/sonoran_callcommands/master/callcommands/version_callcommands.json",
     "download_url": "https://github.com/Sonoran-Software/sonoran_callcommands/",
     "minCoreVersion": "2.8.10",