From 60cd0b5f64b52919b2f088a16c90ced8ef20d310 Mon Sep 17 00:00:00 2001
From: chen0088 <chenmenghuan3@huawei.com>
Date: Thu, 16 Jun 2022 11:10:18 +0800
Subject: [PATCH] modify gps location

Signed-off-by: chen0088 <chenmenghuan3@huawei.com>
---
 .../cameraoperator/client/src/dcamera_client.cpp     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
index 86e22ebd..8b427a38 100644
--- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
+++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
@@ -470,15 +470,19 @@ void DCameraClient::SetQualityAndGpsLocation(const std::shared_ptr<Camera::Camer
     if (ret == CAM_META_SUCCESS) {
         DHLOGI("DCameraClient::SetQualityAndGpsLocation %s find camera gpsCoordinates item",
             GetAnonyString(cameraId_).c_str());
-        double gpsCoordinates[2] = {-1.0, -1.0};
+        double gpsCoordinates[3] = {-1.0, -1.0, -1.0};
         if (memcpy_s(gpsCoordinates, sizeof(gpsCoordinates), item.data.d, sizeof(gpsCoordinates)) != EOK) {
             DHLOGE("DCameraClient::SetQualityAndGpsLocation memcpy_s gpsCoordinates failed");
             return;
         }
         DHLOGI("DCameraClient::SetQualityAndGpsLocation %s photo capture settings set "
-            "gpsCoordinates[0]: %f, gpsCoordinates[1]: %f",
-            GetAnonyString(cameraId_).c_str(), gpsCoordinates[0], gpsCoordinates[1]);
-        photoCaptureSettings->SetGpsLocation(gpsCoordinates[0], gpsCoordinates[1]);
+            "gpsCoordinates[0]: %f, gpsCoordinates[1]: %f, gpsCoordinates[2]: %f",
+            GetAnonyString(cameraId_).c_str(), gpsCoordinates[0], gpsCoordinates[1], gpsCoordinates[2]);
+        std::unique_ptr<CameraStandard::Location> location = std::make_unique<CameraStandard::Location>();
+        location->latitude =  gpsCoordinates[0];
+        location->longitude =  gpsCoordinates[1];
+        location->altitude =  gpsCoordinates[2];
+        photoCaptureSettings->SetLocation(location);
     }
     return;
 }
-- 
Gitee