diff --git a/src/MeasurementComplexItem/MeasurementComplexItem.cc b/src/MeasurementComplexItem/MeasurementComplexItem.cc index 1ccbb4fcbb164778bbbcbd32aa9c8ca7709a30b2..7c0fa29126d5a32c39a497608dc56e5bc13df4a2 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 02963b7609f0011723e051350a70dbc1225ef124..b338a04acfe838d00c8bde8b9b6d2711e2a4c57c 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 7458cda8ea793110c2fee2dd3ad000f14dda73ba..10b5ee7353e5e370bcccb11b1b9939d0c47234dd 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 bool toJson(const T &p, QJsonObject &value) { p, traits::Type2Type()); // If T has no member altitude() // replace it by 0.0; - value[altKey] = altitude; + value[altKey] = double(altitude); return true; }