AirMap: remove SITA registration numbers

src/MissionManager/AirMapManager.cc

@@ -223,8 +223,8 @@ void AirMapRestrictionManager::_addPolygonToList(const airmap::Geometry::Polygon
         list.append(new PolygonAirspaceRestriction(polygonArray));
 
     } else {
-        // TODO: support that?
-        qWarning() << "Empty polygon, or Polygon with holes. Size: "<<polygon.size();
+        // no need to support those (they are rare, and in most cases, there's a more restrictive polygon filling the hole)
+        qCDebug(AirMapManagerLog) << "Empty polygon, or Polygon with holes. Size: "<<polygon.size();
     }
 }
 
@@ -889,9 +889,6 @@ void AirMapManager::setToolbox(QGCToolbox* toolbox)
     connect(ap->userName(),   &Fact::rawValueChanged, this, &AirMapManager::_settingsChanged);
     connect(ap->password(),   &Fact::rawValueChanged, this, &AirMapManager::_settingsChanged);
 
-    connect(ap->sitaUserReg(),   &Fact::rawValueChanged, this, &AirMapManager::_settingsChanged);
-    connect(ap->sitaUavReg(),   &Fact::rawValueChanged, this, &AirMapManager::_settingsChanged);
-
     _settingsChanged();
 
 }

src/Settings/AirMap.SettingsGroup.json

@@ -22,17 +22,5 @@
     "shortDescription": "AirMap Password",
     "type":             "string",
     "defaultValue":     ""
-},
-{
-    "name":             "sitaUavReg",
-    "shortDescription": "AirMap SITA UAV Registration",
-    "type":             "string",
-    "defaultValue":     ""
-},
-{
-    "name":             "sitaUserReg",
-    "shortDescription": "AirMap SITA User Registration",
-    "type":             "string",
-    "defaultValue":     ""
 }
 ]

src/Settings/AirMapSettings.cc

@@ -20,8 +20,6 @@ DECLARE_SETTINGGROUP(AirMap)
     INIT_SETTINGFACT(clientID);
     INIT_SETTINGFACT(userName);
     INIT_SETTINGFACT(password);
-    INIT_SETTINGFACT(sitaUavReg);
-    INIT_SETTINGFACT(sitaUserReg);
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
     qmlRegisterUncreatableType<AirMapSettings>("QGroundControl.SettingsManager", 1, 0, "AirMapSettings", "Reference only");
 }
@@ -30,5 +28,3 @@ DECLARE_SETTINGSFACT(AirMapSettings, apiKey)
 DECLARE_SETTINGSFACT(AirMapSettings, clientID)
 DECLARE_SETTINGSFACT(AirMapSettings, userName)
 DECLARE_SETTINGSFACT(AirMapSettings, password)
-DECLARE_SETTINGSFACT(AirMapSettings, sitaUavReg)
-DECLARE_SETTINGSFACT(AirMapSettings, sitaUserReg)

src/Settings/AirMapSettings.h

@@ -24,7 +24,5 @@ public:
     DEFINE_SETTINGFACT(clientID)
     DEFINE_SETTINGFACT(userName)
     DEFINE_SETTINGFACT(password)
-    DEFINE_SETTINGFACT(sitaUavReg)
-    DEFINE_SETTINGFACT(sitaUserReg)
 
 };

src/ui/preferences/GeneralSettings.qml

@@ -531,16 +531,6 @@ QGCView {
                             QGCLabel        {text: qsTr("Password:");  width: _labelWidth; anchors.verticalCenter: parent.verticalCenter }
                             FactTextField   {fact: QGroundControl.settingsManager.airMapSettings.password; width: _editFieldWidth; anchors.verticalCenter: parent.verticalCenter; echoMode: TextInput.Password }
                         }
-                        Row {
-                            spacing:    ScreenTools.defaultFontPixelWidth
-                            QGCLabel        {text: qsTr("SITA UAV Reg:");  width: _labelWidth; anchors.verticalCenter: parent.verticalCenter }
-                            FactTextField   {fact: QGroundControl.settingsManager.airMapSettings.sitaUavReg; width: _editFieldWidth; anchors.verticalCenter: parent.verticalCenter }
-                        }
-                        Row {
-                            spacing:    ScreenTools.defaultFontPixelWidth
-                            QGCLabel        {text: qsTr("SITA User Reg:");  width: _labelWidth; anchors.verticalCenter: parent.verticalCenter }
-                            FactTextField   {fact: QGroundControl.settingsManager.airMapSettings.sitaUserReg; width: _editFieldWidth; anchors.verticalCenter: parent.verticalCenter }
-                        }
                     }
                 }
                 //-----------------------------------------------------------------