old wima files removed

Paths/KlingenbachKlein.wima

-{
-    "AreaItems": [
-        {
-            "AreaType": "Measurement Area",
-            "BorderPolygonOffset": 6,
-            "BottomLayerAltitude": 5,
-            "LayerDistance": 1,
-            "NumberOfLayers": 1,
-            "ShowBorderPolygon": 0,
-            "maxAltitude": 30,
-            "polygon": [
-                [
-                    47.767875513636454,
-                    16.53043285498356
-                ],
-                [
-                    47.767996632271384,
-                    16.530579999131646
-                ],
-                [
-                    47.76784223516915,
-                    16.53070246118625
-                ],
-                [
-                    47.76777418124312,
-                    16.530481637145055
-                ]
-            ]
-        },
-        {
-            "AreaType": "Service Area",
-            "BorderPolygonOffset": 6,
-            "ShowBorderPolygon": 0,
-            "maxAltitude": 30,
-            "polygon": [
-                [
-                    47.76777317830783,
-                    16.530413969584316
-                ],
-                [
-                    47.76785089069791,
-                    16.530667046992818
-                ],
-                [
-                    47.76775614544286,
-                    16.5307494063876
-                ],
-                [
-                    47.76766140001518,
-                    16.530447230100037
-                ]
-            ]
-        }
-    ],
-    "MissionItems": {
-        "fileType": "Plan",
-        "geoFence": {
-            "circles": [
-            ],
-            "polygons": [
-            ],
-            "version": 2
-        },
-        "groundStation": "QGroundControl",
-        "mission": {
-            "cruiseSpeed": 15,
-            "firmwareType": 3,
-            "hoverSpeed": 1,
-            "items": [
-                {
-                    "autoContinue": true,
-                    "command": 22,
-                    "doJumpId": 1,
-                    "frame": 3,
-                    "params": [
-                        15,
-                        0,
-                        0,
-                        null,
-                        47.76776040370392,
-                        16.530569413178814,
-                        8
-                    ],
-                    "type": "SimpleItem"
-                },
-                {
-                    "TransectStyleComplexItem": {
-                        "CameraCalc": {
-                            "AdjustedFootprintFrontal": 25,
-                            "AdjustedFootprintSide": 25,
-                            "CameraName": "Manual (no camera specs)",
-                            "DistanceToSurface": 15,
-                            "DistanceToSurfaceRelative": true,
-                            "version": 1
-                        },
-                        "CameraShots": 0,
-                        "CameraTriggerInTurnAround": true,
-                        "FollowTerrain": false,
-                        "HoverAndCapture": false,
-                        "Items": [
-                            {
-                                "autoContinue": true,
-                                "command": 16,
-                                "doJumpId": 2,
-                                "frame": 3,
-                                "params": [
-                                    0,
-                                    0,
-                                    0,
-                                    null,
-                                    47.767881573082065,
-                                    16.530440216459883,
-                                    15
-                                ],
-                                "type": "SimpleItem"
-                            },
-                            {
-                                "autoContinue": true,
-                                "command": 16,
-                                "doJumpId": 3,
-                                "frame": 3,
-                                "params": [
-                                    0,
-                                    0,
-                                    0,
-                                    null,
-                                    47.76787098888673,
-                                    16.530563032107995,
-                                    15
-                                ],
-                                "type": "SimpleItem"
-                            },
-                            {
-                                "autoContinue": true,
-                                "command": 16,
-                                "doJumpId": 4,
-                                "frame": 3,
-                                "params": [
-                                    0,
-                                    0,
-                                    0,
-                                    null,
-                                    47.7678626911699,
-                                    16.530686236245202,
-                                    15
-                                ],
-                                "type": "SimpleItem"
-                            }
-                        ],
-                        "Refly90Degrees": false,
-                        "TurnAroundDistance": 10,
-                        "VisualTransectPoints": [
-                            [
-                                47.767881573082065,
-                                16.530440216459883
-                            ],
-                            [
-                                47.76787098888673,
-                                16.530563032107995
-                            ],
-                            [
-                                47.7678626911699,
-                                16.530686236245202
-                            ]
-                        ],
-                        "version": 1
-                    },
-                    "complexItemType": "circularSurvey",
-                    "deltaAlpha": 3,
-                    "deltaR": 5,
-                    "fixedDirection": false,
-                    "polygon": [
-                        [
-                            47.767875513636454,
-                            16.53043285498356
-                        ],
-                        [
-                            47.767996632271384,
-                            16.530579999131646
-                        ],
-                        [
-                            47.76784223516915,
-                            16.53070246118625
-                        ],
-                        [
-                            47.76777418124312,
-                            16.530481637145055
-                        ]
-                    ],
-                    "referencePointAlt": 0,
-                    "referencePointLat": 47.77086091347008,
-                    "referencePointLong": 16.531071041719485,
-                    "reverse": false,
-                    "transectMinLength": 15,
-                    "type": "ComplexItem",
-                    "version": 1
-                },
-                {
-                    "AMSLAltAboveTerrain": null,
-                    "Altitude": 0,
-                    "AltitudeMode": 1,
-                    "autoContinue": true,
-                    "command": 21,
-                    "doJumpId": 8,
-                    "frame": 3,
-                    "params": [
-                        0,
-                        0,
-                        0,
-                        null,
-                        47.76776040370392,
-                        16.530569413178814,
-                        0
-                    ],
-                    "type": "SimpleItem"
-                }
-            ],
-            "plannedHomePosition": [
-                47.76776040370392,
-                16.530569413178814,
-                178
-            ],
-            "vehicleType": 2,
-            "version": 2
-        },
-        "rallyPoints": {
-            "points": [
-            ],
-            "version": 2
-        },
-        "version": 1
-    }
-}

QGCExternalLibs.pri

@@ -198,7 +198,7 @@ contains (DEFINES, DISABLE_AIRMAP) {
 
 # GeograpicLib (TODO: add Windows support!)
 LinuxBuild {
-    LIBS += -L$$BASEDIR/libs/libGeographic/ -lGeographic # libGeograpic.so.17
+    LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so.17
 }
 
 # google or-tools (TODO: add Windows support!)

QGCExternalLibs.pri.orig

-#
-# [REQUIRED] Add support for <inttypes.h> to Windows.
-#
-WindowsBuild {
-    INCLUDEPATH += libs/lib/msinttypes
-}
-
-#
-# [REQUIRED] Add support for the MAVLink communications protocol.
-#
-# By default MAVLink dialect is hardwired to arudpilotmega. The reason being
-# the current codebase supports both PX4 and APM flight stack. PX4 flight stack
-# only uses common MAVLink specifications, whereas APM flight stack uses custom
-# MAVLink specifications which adds to common. So by using the adupilotmega dialect
-# QGC can support both in the same codebase.
-
-# Once the mavlink helper routines include support for multiple dialects within
-# a single compiled codebase this hardwiring of dialect can go away. But until then
-# this "workaround" is needed.
-
-# In the mean time, it’s possible to define a completely different dialect by defining the
-# location and name below.
-
-# check for user defined settings in user_config.pri if not already set as qmake argument
-isEmpty(MAVLINKPATH_REL) {
-    exists(user_config.pri):infile(user_config.pri, MAVLINKPATH_REL) {
-        MAVLINKPATH_REL = $$fromfile(user_config.pri, MAVLINKPATH_REL)
-        message($$sprintf("Using user-supplied relativ mavlink path '%1' specified in user_config.pri", $$MAVLINKPATH_REL))
-    } else {
-        MAVLINKPATH_REL = libs/mavlink/include/mavlink/v2.0
-    }
-}
-
-isEmpty(MAVLINKPATH) {
-    exists(user_config.pri):infile(user_config.pri, MAVLINKPATH) {
-        MAVLINKPATH     = $$fromfile(user_config.pri, MAVLINKPATH)
-        message($$sprintf("Using user-supplied mavlink path '%1' specified in user_config.pri", $$MAVLINKPATH))
-    } else {
-        MAVLINKPATH     = $$BASEDIR/$$MAVLINKPATH_REL
-    }
-}
-
-isEmpty(MAVLINK_CONF) {
-    exists(user_config.pri):infile(user_config.pri, MAVLINK_CONF) {
-        MAVLINK_CONF = $$fromfile(user_config.pri, MAVLINK_CONF)
-        message($$sprintf("Using user-supplied mavlink dialect '%1' specified in user_config.pri", $$MAVLINK_CONF))
-    } else {
-        MAVLINK_CONF = ardupilotmega
-    }
-}
-
-# If defined, all APM specific MAVLink messages are disabled
-contains (CONFIG, QGC_DISABLE_APM_MAVLINK) {
-    message("Disable APM MAVLink support")
-    DEFINES += NO_ARDUPILOT_DIALECT
-    CONFIG  += ArdupilotDisabled
-} else {
-    CONFIG  += ArdupilotEnabled
-}
-
-# First we select the dialect, checking for valid user selection
-# Users can override all other settings by specifying MAVLINK_CONF as an argument to qmake
-!isEmpty(MAVLINK_CONF) {
-    message($$sprintf("Using MAVLink dialect '%1'.", $$MAVLINK_CONF))
-}
-
-# Then we add the proper include paths dependent on the dialect.
-INCLUDEPATH += $$MAVLINKPATH
-
-exists($$MAVLINKPATH/common) {
-    !isEmpty(MAVLINK_CONF) {
-        count(MAVLINK_CONF, 1) {
-            exists($$MAVLINKPATH/$$MAVLINK_CONF) {
-                INCLUDEPATH += $$MAVLINKPATH/$$MAVLINK_CONF
-                DEFINES += $$sprintf('QGC_USE_%1_MESSAGES', $$upper($$MAVLINK_CONF))
-            } else {
-                error($$sprintf("MAVLink dialect '%1' does not exist at '%2'!", $$MAVLINK_CONF, $$MAVLINKPATH_REL))
-            }
-        } else {
-            error(Only a single mavlink dialect can be specified in MAVLINK_CONF)
-        }
-    } else {
-        INCLUDEPATH += $$MAVLINKPATH/common
-    }
-} else {
-    error($$sprintf("MAVLink folder does not exist at '%1'! Run 'git submodule init && git submodule update' on the command line.",$$MAVLINKPATH_REL))
-}
-
-#
-# [REQUIRED] EIGEN matrix library
-# NOMINMAX constant required to make internal min/max work.
-INCLUDEPATH += libs/eigen
-DEFINES += NOMINMAX
-
-#
-# [REQUIRED] shapelib library
-INCLUDEPATH += libs/shapelib
-SOURCES += \
-    libs/shapelib/shpopen.c \
-    libs/shapelib/safileio.c
-
-#
-# [REQUIRED] QWT plotting library dependency. Provides plotting capabilities.
-#
-!MobileBuild {
-include(libs/qwt.pri)
-DEPENDPATH += libs/qwt
-INCLUDEPATH += libs/qwt
-}
-
-#
-# [REQUIRED] SDL dependency. Provides joystick/gamepad support.
-# The SDL is packaged with QGC for the Mac and Windows. Linux support requires installing the SDL
-# library (development libraries and static binaries).
-#
-MacBuild {
-    INCLUDEPATH += \
-        $$BASEDIR/libs/lib/Frameworks/SDL2.framework/Headers
-
-    LIBS += \
-        -F$$BASEDIR/libs/lib/Frameworks \
-        -framework SDL2
-} else:LinuxBuild {
-    PKGCONFIG = sdl2
-} else:WindowsBuild {
-    INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include
-
-    contains(QT_ARCH, i386) {
-        LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x86
-    } else {
-        LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x64
-    }
-    LIBS += \
-        -lSDL2main \
-        -lSDL2
-}
-
-AndroidBuild {
-    contains(QT_ARCH, arm) {
-        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so
-        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so
-    } else {
-        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so
-        ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libssl.so
-    }
-}
-
-#
-# [OPTIONAL] Zeroconf for UDP links
-#
-contains (DEFINES, DISABLE_ZEROCONF) {
-    message("Skipping support for Zeroconf (manual override from command line)")
-    DEFINES -= DISABLE_ZEROCONF
-# Otherwise the user can still disable this feature in the user_config.pri file.
-} else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_ZEROCONF) {
-    message("Skipping support for Zeroconf (manual override from user_config.pri)")
-# Mac support is built into OS
-} else:MacBuild|iOSBuild {
-    message("Including support for Zeroconf (Bonjour)")
-    DEFINES += QGC_ZEROCONF_ENABLED
-} else {
-    message("Skipping support for Zeroconf (unsupported platform)")
-}
-
-
-#
-# [OPTIONAL] AirMap Support
-#
-contains (DEFINES, DISABLE_AIRMAP) {
-    message("Skipping support for AirMap (manual override from command line)")
-# Otherwise the user can still disable this feature in the user_config.pri file.
-} else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_AIRMAP) {
-    message("Skipping support for AirMap (manual override from user_config.pri)")
-} else {
-    AIRMAPD_PATH    = $$PWD/libs/airmapd
-    AIRMAP_QT_PATH  = Qt.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
-    message(Looking for Airmap in $$AIRMAP_QT_PATH)
-    MacBuild {
-        exists($${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH) {
-            message("Including support for AirMap for macOS")
-            LIBS += -L$${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH -lairmap-qt
-            DEFINES += QGC_AIRMAP_ENABLED
-        }
-    } else:LinuxBuild {
-        exists($${AIRMAPD_PATH}/linux/$$AIRMAP_QT_PATH) {
-            message("Including support for AirMap for Linux")
-            LIBS += -L$${AIRMAPD_PATH}/linux/$$AIRMAP_QT_PATH -lairmap-qt
-            DEFINES += QGC_AIRMAP_ENABLED
-        }
-    } else {
-        message("Skipping support for Airmap (unsupported platform)")
-    }
-    contains (DEFINES, QGC_AIRMAP_ENABLED) {
-        INCLUDEPATH += \
-            $${AIRMAPD_PATH}/include
-    }
-}
-
-# GeograpicLib (TODO: add Windows support!)
-LinuxBuild {
-<<<<<<< HEAD
-    LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so
-=======
-    LIBS += -L$$BASEDIR/libs/libGeographic/ -lGeographic # libGeograpic.so.17
->>>>>>> 04ee2738cf3faf30a352fc899ffc529912826c01
-}
-
-# google or-tools (TODO: add Windows support!)
-LinuxBuild {
-    INCLUDEPATH += $$BASEDIR/libs/or-tools-src-ubuntu/include
-    LIBS += -L$$BASEDIR/libs/or-tools-src-ubuntu/lib -lortools # libortools.so
-    # dependencies
-    LIBS += -L$$BASEDIR/libs/or-tools-src-ubuntu/lib -lglog # libglog.so
-    LIBS += -L$$BASEDIR/libs/or-tools-src-ubuntu/lib -lprotobuf # libprotobuf.so
-}
-# ros_bride deps
-LinuxBuild {
-    # boost
-    INCLUDEPATH += -L/usr/include/boost
-    LIBS += -lboost_system # 1.65.1
-    # ssl
-    LIBS += -lssl
-    LIBS += -lcrypto
-}