From d9503f99fbe37f7553d9524d368b2b7f7150f57b Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 5 Oct 2019 10:16:10 -0700 Subject: [PATCH] Better handling of invalid coordinates --- src/FlightMap/MapItems/MissionItemIndicatorDrag.qml | 1 + src/FlightMap/MapItems/MissionLineView.qml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml index bcdef05af..1b91c6af1 100644 --- a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml +++ b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml @@ -23,6 +23,7 @@ Rectangle { height: _itemIndicatorHeight + (_touchMarginVertical * 2) color: "transparent" z: QGroundControl.zOrderMapItems + 1 // Above item icons + visible: itemCoordinate.isValid // Properties which must be specific by consumer property var mapControl ///< Map control which contains this item diff --git a/src/FlightMap/MapItems/MissionLineView.qml b/src/FlightMap/MapItems/MissionLineView.qml index 4f9fe11d6..0d9865903 100644 --- a/src/FlightMap/MapItems/MissionLineView.qml +++ b/src/FlightMap/MapItems/MissionLineView.qml @@ -24,6 +24,6 @@ MapItemView { line.color: "#be781c" // Hack, can't get palette to work in here z: QGroundControl.zOrderWaypointLines - path: object ? [ object.coordinate1, object.coordinate2 ] : [ ] + path: object && object.coordinate1.isValid && object.coordinate2.isValid ? [ object.coordinate1, object.coordinate2 ] : [] } } -- 2.22.0