Merge pull request #589 from VATSIM-UK/blank-intention-codes

Fixes #560 - Use empty string as default intention code

Author: kristiankunc

src/plugin/intention/IntentionCodeCollectionFactory.cpp

@@ -122,11 +122,12 @@ namespace UKControllerPlugin::IntentionCode {
         if (!codes.is_array()) {
             LogWarning("Intention codes dependency is invalid");
             // Add the fallback - full airfield ICAO
-            collection->Add(std::make_shared<IntentionCodeModel>(
-                -1,
-                std::make_unique<FullAirfieldIdentifier>(),
-                std::make_unique<AllOf>(std::list<std::shared_ptr<Condition>>({})),
-                std::unique_ptr<IntentionCodeMetadata>(new IntentionCodeMetadata)));
+            collection->Add(
+                std::make_shared<IntentionCodeModel>(
+                    -1,
+                    std::make_unique<FullAirfieldIdentifier>(),
+                    std::make_unique<AllOf>(std::list<std::shared_ptr<Condition>>({})),
+                    std::unique_ptr<IntentionCodeMetadata>(new IntentionCodeMetadata)));
             return collection;
         }
 
@@ -137,21 +138,24 @@ namespace UKControllerPlugin::IntentionCode {
             }
 
             auto metadata = std::unique_ptr<IntentionCodeMetadata>(new IntentionCodeMetadata);
-            collection->Add(std::make_shared<IntentionCodeModel>(
-                code.at("id").get<int>(),
-                MakeCode(code.at("code")),
-                std::make_unique<AllOf>(MakeConditions(code.at("conditions"), generator, activeControllers, *metadata))
+            collection->Add(
+                std::make_shared<IntentionCodeModel>(
+                    code.at("id").get<int>(),
+                    MakeCode(code.at("code")),
+                    std::make_unique<AllOf>(
+                        MakeConditions(code.at("conditions"), generator, activeControllers, *metadata))
 
-                    ,
-                std::move(metadata)));
+                        ,
+                    std::move(metadata)));
         }
 
-        // Add full airfield icao fallback
-        collection->Add(std::make_shared<IntentionCodeModel>(
-            -1,
-            std::make_unique<FullAirfieldIdentifier>(),
-            std::make_unique<AllOf>(std::list<std::shared_ptr<Condition>>({})),
-            std::unique_ptr<IntentionCodeMetadata>(new IntentionCodeMetadata)));
+        // Add blank as fallback
+        collection->Add(
+            std::make_shared<IntentionCodeModel>(
+                -1,
+                std::make_unique<SingleCode>(""),
+                std::make_unique<AllOf>(std::list<std::shared_ptr<Condition>>({})),
+                std::unique_ptr<IntentionCodeMetadata>(new IntentionCodeMetadata)));
 
         LogInfo("Loaded " + std::to_string(collection->Count()) + " intention codes");
         return collection;

test/plugin/intention/IntentionCodeCollectionFactoryTest.cpp

@@ -433,7 +433,8 @@ namespace UKControllerPluginTest::IntentionCode {
         EXPECT_EQ(-1, intention->Id());
 
         try {
-            static_cast<void>(dynamic_cast<const FullAirfieldIdentifier&>(intention->Generator()));
+            static_cast<void>(dynamic_cast<const SingleCode&>(intention->Generator()));
+            EXPECT_EQ("", dynamic_cast<const SingleCode&>(intention->Generator()).Code());
         } catch (std::bad_cast&) {
             FAIL();
         }