From 76215f0aadf5b8a06af4f87fed9fb153aea5e470 Mon Sep 17 00:00:00 2001
From: Valentin Platzgummer <valentin.platzgummer@ymail.com>
Date: Thu, 15 Apr 2021 11:24:19 +0200
Subject: [PATCH] Measurement Complex Item load -> sync issue (tile alt = nan)
 solved

---
 src/MeasurementComplexItem/MeasurementComplexItem.cc     | 4 ++--
 src/MeasurementComplexItem/geometry/GeoArea.cc           | 9 ++++++++-
 .../include/messages/geographic_msgs/geopoint.h          | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/MeasurementComplexItem/MeasurementComplexItem.cc b/src/MeasurementComplexItem/MeasurementComplexItem.cc
index 1ccbb4fcb..7c0fa2912 100644
--- a/src/MeasurementComplexItem/MeasurementComplexItem.cc
+++ b/src/MeasurementComplexItem/MeasurementComplexItem.cc
@@ -497,7 +497,7 @@ void MeasurementComplexItem::save(QJsonArray &planItems) {
 
     // Variant names.
     QJsonArray jsonVariantNames;
-    for (auto const &name : _variantNames) {
+    for (auto &&name : _variantNames) {
       jsonVariantNames.append(name);
     }
     saveObject[variantNamesKey] = jsonVariantNames;
@@ -1209,7 +1209,7 @@ bool MeasurementComplexItem::stopEditing(bool doUpdate) {
       _updateRoute();
     }
 
-    if (correct && isDifferent) {
+    if (correct) {
       _syncTiles();
     }
 
diff --git a/src/MeasurementComplexItem/geometry/GeoArea.cc b/src/MeasurementComplexItem/geometry/GeoArea.cc
index 02963b760..b338a04ac 100644
--- a/src/MeasurementComplexItem/geometry/GeoArea.cc
+++ b/src/MeasurementComplexItem/geometry/GeoArea.cc
@@ -40,8 +40,15 @@ bool GeoArea::loadFromJson(const QJsonObject &json, QString &errorString) {
                                          errorString)) {
     qWarning() << errorString;
     return false;
-  }
+  } else {
 
+    // set altitude to 0
+    for (int i = 0; i < this->count(); ++i) {
+      auto vertex = this->vertexCoordinate(i);
+      vertex.setAltitude(0);
+      this->adjustVertex(i, vertex);
+    }
+  }
   return true;
 }
 
diff --git a/src/comm/ros_bridge/include/messages/geographic_msgs/geopoint.h b/src/comm/ros_bridge/include/messages/geographic_msgs/geopoint.h
index 7458cda8e..10b5ee735 100644
--- a/src/comm/ros_bridge/include/messages/geographic_msgs/geopoint.h
+++ b/src/comm/ros_bridge/include/messages/geographic_msgs/geopoint.h
@@ -105,7 +105,7 @@ template <class T> bool toJson(const T &p, QJsonObject &value) {
       p, traits::Type2Type<Components>()); // If T has no member altitude()
                                            // replace it by 0.0;
 
-  value[altKey] = altitude;
+  value[altKey] = double(altitude);
   return true;
 }
 
-- 
2.22.0