Namespaces and formatting
This commit is contained in:
1 parent
42acea35bb
commit
eafe0b18f6
21 files changed
+493
-433
No files matched your search
@@ -1,5 +1,5 @@
|
||||
#ifndef GERMANAIRLINESVA_FILE_SIMDATA_SIMDATAXP_H
|
||||
#define GERMANAIRLINESVA_FILE_SIMDATA_SIMDATAXP_H
|
||||
#ifndef GERMANAIRLINESVA_FILE_SIMDATA_SIMDATAESP_H
|
||||
#define GERMANAIRLINESVA_FILE_SIMDATA_SIMDATAESP_H
|
||||
|
||||
#include <cstdint>
|
||||
#include <fstream>
|
||||
@@ -55,7 +55,7 @@ namespace file
|
||||
log << "<FILE> " << runwaysFile << std::endl;
|
||||
|
||||
while (std::getline(runways, line)) {
|
||||
std::vector<std::string> fields = util::split(line, ',');
|
||||
std::vector<std::string> fields = utilities::split(line, ',');
|
||||
// New ICAO
|
||||
if (currentIcao != nullptr && *currentIcao != fields[0]) {
|
||||
tmpAirportRunways[*currentIcao] = tmpRunways;
|
||||
@@ -85,20 +85,21 @@ namespace file
|
||||
designator = "0" + designator;
|
||||
}
|
||||
|
||||
struct geodata::point start = {std::stod(fields[2]),
|
||||
std::stod(fields[3])};
|
||||
tmpRunways.emplace_back(designator,
|
||||
start,
|
||||
geodata::toMetre(std::stod(fields[8])),
|
||||
geodata::toMetre(std::stod(fields[6])),
|
||||
std::stod(fields[5]) + std::stod(fields[9]));
|
||||
struct utilities::geodata::point start = {std::stod(fields[2]),
|
||||
std::stod(fields[3])};
|
||||
tmpRunways.emplace_back(
|
||||
designator,
|
||||
start,
|
||||
utilities::geodata::toMetre(std::stod(fields[8])),
|
||||
utilities::geodata::toMetre(std::stod(fields[6])),
|
||||
std::stod(fields[5]) + std::stod(fields[9]));
|
||||
|
||||
log << "\t<RUNWAY> " << line << std::endl;
|
||||
}
|
||||
|
||||
currentIcao = nullptr;
|
||||
while (std::getline(gates, line)) {
|
||||
std::vector<std::string> fields = util::split(line, ',');
|
||||
std::vector<std::string> fields = utilities::split(line, ',');
|
||||
// New ICAO
|
||||
if (currentIcao != nullptr && *currentIcao != fields[0]) {
|
||||
tmpAirportGates[*currentIcao] = tmpGates;
|
||||
|
||||
Reference in new issue
Block a user