Done with Version 2.5

Akaflieg-Freiburg · Mar 11, 2021 · 0654724 · 0654724
1 parent 7bd4be4
commit 0654724
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/3rdParty/enrouteText b/3rdParty/enrouteText
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ option(BUILD_DOC "Build developer documentation" OFF)
 # Project data
 #
 
-project(enroute VERSION 2.4.6)
+project(enroute VERSION 2.5.0)
 set(APP_ID de.akaflieg_freiburg.enroute)
 math(EXPR PROJECT_VERSION_CODE 10000*${PROJECT_VERSION_MAJOR}+100*${PROJECT_VERSION_MINOR}+${PROJECT_VERSION_PATCH})
 add_compile_definitions(PROJECT_VERSION="${PROJECT_VERSION}")

diff --git a/src/Navigation_FLARMAdaptor.cpp b/src/Navigation_FLARMAdaptor.cpp
@@ -133,6 +133,7 @@ Navigation::FLARMAdaptor::FLARMAdaptor(QObject *parent) : QObject(parent) {
 
     // Uncomment one of the lines below to start this class in simulation mode.
     QString simulatorFileName;
+//    simulatorFileName = "/home/kebekus/Software/standards/FLARM/helluva_lot_aircraft.txt";
 //    simulatorFileName = "/home/kebekus/Software/standards/FLARM/expiry-hard.txt";
 //    simulatorFileName = "/home/kebekus/Software/standards/FLARM/expiry-soft.txt";
 //    simulatorFileName = "/home/kebekus/Software/standards/FLARM/many_opponents.txt";
@@ -350,16 +351,6 @@ void Navigation::FLARMAdaptor::processFLARMMessage(QString msg)
             vDistInM = qQNaN();
         }
 
-        // Ground speed it optimal. If ground speed is zero that means:
-        // target is on the ground. Ignore these targets!
-        auto groundSpeedInMPS = arguments[8].toDouble(&ok);
-        if (!ok) {
-            groundSpeedInMPS = qQNaN();
-        }
-        if (groundSpeedInMPS == 0.0) {
-            return;
-        }
-
         // Climb rate is optional
         auto climbRateInMPS = arguments[9].toDouble(&ok);
         if (!ok) {
@@ -402,10 +393,25 @@ void Navigation::FLARMAdaptor::processFLARMMessage(QString msg)
         if (targetType == u"C") {
             type = Navigation::Traffic::Airship;
         }
+        if (targetType == u"D") {
+            type = Navigation::Traffic::Drone;
+        }
         if (targetType == u"F") {
             type = Navigation::Traffic::StaticObstacle;
         }
 
+
+        // Ground speed it optimal. If ground speed is zero that means:
+        // target is on the ground. Ignore these targets, unless they are known static obstacles!
+        auto groundSpeedInMPS = arguments[8].toDouble(&ok);
+        if (!ok) {
+            groundSpeedInMPS = qQNaN();
+        }
+        if ((groundSpeedInMPS == 0.0) && (type != Navigation::Traffic::StaticObstacle)) {
+            return;
+        }
+
+
         // Target ID is optional
         auto targetID = arguments[5];
 

diff --git a/src/Navigation_Traffic.cpp b/src/Navigation_Traffic.cpp
@@ -222,6 +222,7 @@ void Navigation::Traffic::setDescription()
         break;
     default:
         results << tr("Traffic");
+        break;
     }
 
     if (!_positionInfo.coordinate().isValid()) {

diff --git a/src/qml/items/MFM.qml b/src/qml/items/MFM.qml
@@ -278,7 +278,11 @@ Item {
 
         MapItemView { // Traffic opponents
             model: flarmAdaptor.trafficObjects4QML
-            delegate: Component { Traffic { trafficInfo: model.modelData } }
+            delegate: Component {
+                Traffic {
+                    trafficInfo: model.modelData
+                }
+            }
         }
 
         MapItemView {
+73 −73		assets/enroute_de.ts
+195 −83		assets/enroute_fr.ts
+73 −73		assets/enroute_it.ts
+73 −73		assets/enroute_pl.ts
+4 −5		manual/01-intro/01-think.rst
+222 −0		manual/01-intro/02-getting_started.rst
+0 −291		manual/01-intro/getting_started.rst
+110 −1		manual/03-reference/map_data.rst
+54 −0		manual/04-appendix/collection.rst
+2 −2		manual/04-appendix/licenses.rst
+2 −0		manual/04-appendix/technical.rst
+10 −0		manual/conf.py
+5 −7		manual/index.rst
+4 −0		manual/latexPreamble.tex.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -222,6 +222,7 @@ void Navigation::Traffic::setDescription() @@
             break;
         default:
             results << tr("Traffic");
+            break;
         }
         if (!_positionInfo.coordinate().isValid()) {
@@ Expand Down @@