Merge pull request #272 from TwinFan/Next

v4.0.0

.gitmodules

@@ -1,4 +1,10 @@
 [submodule "Lib/XPMP2"]
 	path = Lib/XPMP2
 	url = https://github.com/TwinFan/XPMP2
-	branch = master
+	branch = master
+[submodule "Lib/parson"]
+	path = Lib/parson
+	url = https://github.com/kgabis/parson
+[submodule "Lib/metaf"]
+	path = Lib/metaf
+	url = https://github.com/TwinFan/metaf

CMakeLists.txt

@@ -21,11 +21,11 @@ else()
 endif()
 
 project(LiveTraffic
-        VERSION 3.6.0
+        VERSION 4.0.0
         DESCRIPTION "LiveTraffic X-Plane plugin")
+set(VERSION_BETA 0)
 
 # Building a Beta version can be demanded via ENV variable 'version_beta' being set to 1
-set(VERSION_BETA 0)
 if(DEFINED ENV{version_beta})
     if ($ENV{version_beta} GREATER 0)
         set(VERSION_BETA 1)
@@ -141,6 +141,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/ImGui")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/ImGui/misc/cpp")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/ImgWindow")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/Font")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/metaf/include")
 
 ################################################################################
 # Source groups
@@ -184,6 +185,7 @@ set(Header_Files
     Lib/ImgWindow/SystemGL.h
     Lib/Font/IconsFontAwesome5.h
     Lib/Font/fa-solid-900.inc
+    Lib/metaf/include/metaf.hpp
     Lib/XPMP2/inc/XPCAircraft.h
     Lib/XPMP2/inc/XPMPMultiplayer.h
     Lib/XPMP2/lib/fmod/logo/FMOD_Logo.h

Include/Constants.h

@@ -49,6 +49,7 @@ constexpr double M_per_FT   = 0.3048;   // meter per 1 foot
 constexpr int M_per_KM      = 1000;
 constexpr double KT_per_M_per_S = 1.94384;  // 1m/s = 1.94384kt
 constexpr double NM_per_KM  = 1000.0 / double(M_per_NM);
+constexpr double M_per_SM   = 1609.344; ///< meters per statute mile
 constexpr int SEC_per_M     = 60;       // 60 seconds per minute
 constexpr int SEC_per_H     = 3600;     // 3600 seconds per hour
 constexpr int H_per_D       = 24;       // 24 hours per day
@@ -67,7 +68,7 @@ constexpr double TEMP_LAPS_R    = -0.0065f;     ///< K/m
 
 //MARK: Flight Data-related
 constexpr unsigned MAX_TRANSP_ICAO = 0xFFFFFF;  // max transponder ICAO code (24bit)
-constexpr int    MAX_NUM_AIRCRAFT   = 200;      ///< maximum number of aircraft allowed to be rendered
+constexpr int    MAX_NUM_AIRCRAFT   = 300;      ///< maximum number of aircraft allowed to be rendered
 constexpr double FLIGHT_LOOP_INTVL  = -5.0;     // call ourselves every 5 frames
 constexpr double AC_MAINT_INTVL     = 2.0;      // seconds (calling a/c maintenance periodically)
 constexpr double TIME_REQU_POS      = 0.5;      // seconds before reaching current 'to' position we request calculation of next position
@@ -270,6 +271,7 @@ constexpr const char* REMOTE_SIGNATURE      =  "TwinFan.plugin.XPMP2.Remote";
 #define HELP_SET_OUTPUT_CH      "setup/installation/foreflight"     // currently the same as ForeFlight, which is the only output channel
 #define HELP_SET_CH_FOREFLIGHT  "setup/installation/foreflight"
 #define HELP_SET_ACLABELS       "setup/configuration/settings-a-c-labels"
+#define HELP_SET_WEATHER        "setup/configuration/settings-weather"
 #define HELP_SET_ADVANCED       "setup/configuration/settings-advanced"
 #define HELP_SET_CSL            "setup/configuration/settings-csl"
 #define HELP_SET_DEBUG          "setup/configuration/settings-debug"
@@ -367,7 +369,7 @@ constexpr int SERR_LEN = 100;                   // size of buffer for IO error t
 #define ERR_CFG_FILE_OPEN_OUT   "Could not create config file '%s': %s"
 #define ERR_CFG_FILE_WRITE      "Could not write into config file '%s': %s"
 #define ERR_CFG_FILE_OPEN_IN    "Could not open '%s': %s"
-#define ERR_CFG_FILE_VER        "Config file '%s' first line: Unsupported format or version: %s"
+#define ERR_CFG_FILE_VER        "Config file '%s' first line: Unsupported format or version: '%s'"
 #define ERR_CFG_FILE_VER_UNEXP  "Config file '%s' first line: Unexpected version %s, expected %s...trying to continue"
 #define ERR_CFG_FILE_IGNORE     "Ignoring unkown entry '%s' from config file '%s'"
 #define ERR_CFG_FILE_WORDS      "Expected two words (key, value) in config file '%s', line '%s': ignored"

Include/CoordCalc.h

@@ -34,11 +34,11 @@
 //
 /// Square, ie. a^2
 template <class T>
-inline T sqr (T a) { return a*a; }
+inline T sqr (const T a) { return a*a; }
 
 /// Pythagoras square, ie. a^2 + b^2
 template <class T>
-inline T pyth2 (T a, T b) { return sqr(a) + sqr(b); }
+inline T pyth2 (const T a, const T b) { return sqr(a) + sqr(b); }
 
 //
 //MARK: Degree/Radian conversion
@@ -392,7 +392,9 @@ struct positionTy {
 
     // normalizes to -90/+90 lat, -180/+180 lon, 360° heading, return *this
     positionTy& normalize();
-    // is a good valid position?
+    // has a position and altitude?
+    bool hasPosAlt () const { return !std::isnan(lat()) && !std::isnan(lon()) && !std::isnan(alt_m()); }
+    // is a good valid normalized position incl timestamp?
     bool isNormal (bool bAllowNanAltIfGnd = false) const;
     // is fully valid? (isNormal + heading, pitch, roll)?
     bool isFullyValid() const;