Merge branch 'develop' of https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-GAConnector into develop

file/include/simdata/gate.h

@@ -43,6 +43,7 @@ namespace file
              std::uint8_t radius);
 
         void toFile(std::ofstream &out) const;
+        bool contains(germanairlinesva::geodata::point coordinates) const;
 
         inline const std::string to_string() const
         {

file/include/simdata/simdataXP.h

@@ -7,6 +7,7 @@
 
 #include "simdata/gate.h"
 #include "simdata/runway.h"
+#include "simdata/simDatabase.h"
 #include "util.hpp"
 
 namespace germanairlinesva
@@ -15,20 +16,16 @@ namespace file
 {
   namespace simdata
   {
-    int scan(
-        const std::string defaultFile,
-        const std::string sceneryPack,
-        const std::string logFile,
-        std::map<std::string, std::pair<std::vector<const Gate>, std::vector<const Runway>>>
-            &airports);
+    int scan(const std::string defaultFile,
+             const std::string sceneryPack,
+             const std::string logFile,
+             SimDatabase &airports);
 
-    void makeAirport(
-        const std::string &kind,
-        std::ifstream &infile,
-        std::map<std::string, std::pair<std::vector<const Gate>, std::vector<const Runway>>>
-            &airports,
-        std::ofstream &logfile);
-    void makeGate15(std::vector<const Gate> &gates,
+    void makeAirport(const std::string &kind,
+                     std::ifstream &infile,
+                     SimDatabase &airports,
+                     std::ofstream &logfile);
+    void makeGate15(std::vector<Gate> &gates,
                     const std::vector<std::string> &fields);
     void makeRunway(std::vector<const Runway> &runways,
                     const std::vector<std::string> &fields);