James Turner: Here's a trivial patch, when you have a moment:
- removes various members from FGRunway which no-one was using - any of these can be trivially re-instated if and when someone actually wants to use them - but right now they're simply bloating up FGRunway, which we have lots of, because it currently includes all the taxiways in Robin's data. - that's it.
This commit is contained in:
parent
da96156c30
commit
554dba0f3f
4 changed files with 6 additions and 30 deletions
|
@ -94,7 +94,6 @@ public:
|
|||
int getGate() const { return gateId; }
|
||||
double getLeadInAngle() const { return leadInAngle; }
|
||||
const string& getRunway() const { return rwy._rwy_no; }
|
||||
const string& getRunwayId() const { return rwy._id; }
|
||||
void setRepeat(bool r) { repeat = r; }
|
||||
bool getRepeat(void) const { return repeat; }
|
||||
void restart(void);
|
||||
|
|
|
@ -210,18 +210,11 @@ bool fgAirportDBLoad( FGAirportList *airports,
|
|||
double stopway1 = atof( stop[0].c_str() );
|
||||
double stopway2 = atof( stop[1].c_str() );
|
||||
|
||||
string lighting_flags = token[9];
|
||||
int surface_code = atoi( token[10].c_str() );
|
||||
string shoulder_code = token[11];
|
||||
int marking_code = atoi( token[12].c_str() );
|
||||
double smoothness = atof( token[13].c_str() );
|
||||
bool dist_remaining = (atoi( token[14].c_str() ) == 1 );
|
||||
|
||||
FGRunway rwy(last_apt_id, rwy_no, lon, lat, heading, length,
|
||||
FGRunway rwy(rwy_no, lon, lat, heading, length,
|
||||
width, displ_thresh1, displ_thresh2,
|
||||
stopway1, stopway2, lighting_flags, surface_code,
|
||||
shoulder_code, marking_code, smoothness,
|
||||
dist_remaining);
|
||||
stopway1, stopway2, surface_code);
|
||||
runways.push_back(rwy);
|
||||
} else if ( line_id == 18 ) {
|
||||
// beacon entry (ignore)
|
||||
|
|
|
@ -46,15 +46,13 @@ FGRunway::FGRunway()
|
|||
{
|
||||
}
|
||||
|
||||
FGRunway::FGRunway( const string& id, const string& rwy_no,
|
||||
FGRunway::FGRunway(const string& rwy_no,
|
||||
const double longitude, const double latitude,
|
||||
const double heading, const double length,
|
||||
const double width,
|
||||
const double displ_thresh1, const double displ_thresh2,
|
||||
const double stopway1, const double stopway2,
|
||||
const string& lighting_flags, const int surface_code,
|
||||
const string& shoulder_code, const int marking_code,
|
||||
const double smoothness, const bool dist_remaining )
|
||||
const int surface_code)
|
||||
{
|
||||
_rwy_no = rwy_no;
|
||||
if (rwy_no[0] == 'x') {
|
||||
|
@ -72,7 +70,6 @@ FGRunway::FGRunway( const string& id, const string& rwy_no,
|
|||
}
|
||||
}
|
||||
|
||||
_id = id;
|
||||
_lon = longitude;
|
||||
_lat = latitude;
|
||||
_heading = heading;
|
||||
|
@ -83,12 +80,7 @@ FGRunway::FGRunway( const string& id, const string& rwy_no,
|
|||
_stopway1 = stopway1;
|
||||
_stopway2 = stopway2;
|
||||
|
||||
_lighting_flags = lighting_flags;
|
||||
_surface_code = surface_code;
|
||||
_shoulder_code = shoulder_code;
|
||||
_marking_code = marking_code;
|
||||
_smoothness = smoothness;
|
||||
_dist_remaining = dist_remaining;
|
||||
}
|
||||
|
||||
string FGRunway::reverseIdent(const string& aRunwayIdent)
|
||||
|
|
|
@ -34,15 +34,13 @@ class FGRunway
|
|||
public:
|
||||
FGRunway();
|
||||
|
||||
FGRunway(const std::string& id, const std::string& rwy_no,
|
||||
FGRunway(const std::string& rwy_no,
|
||||
const double longitude, const double latitude,
|
||||
const double heading, const double length,
|
||||
const double width,
|
||||
const double displ_thresh1, const double displ_thresh2,
|
||||
const double stopway1, const double stopway2,
|
||||
const std::string& lighting_flags, const int surface_code,
|
||||
const std::string& shoulder_code, const int marking_code,
|
||||
const double smoothness, const bool dist_remaining);
|
||||
const int surface_code);
|
||||
|
||||
/**
|
||||
* given a runway identifier (06, 18L, 31R) compute the identifier for the
|
||||
|
@ -58,7 +56,6 @@ public:
|
|||
|
||||
bool isTaxiway() const;
|
||||
|
||||
std::string _id;
|
||||
std::string _rwy_no;
|
||||
std::string _type; // runway / taxiway
|
||||
|
||||
|
@ -72,12 +69,7 @@ public:
|
|||
double _stopway1;
|
||||
double _stopway2;
|
||||
|
||||
std::string _lighting_flags;
|
||||
int _surface_code;
|
||||
std::string _shoulder_code;
|
||||
int _marking_code;
|
||||
double _smoothness;
|
||||
bool _dist_remaining;
|
||||
};
|
||||
|
||||
typedef std::vector<FGRunway> FGRunwayVector;
|
||||
|
|
Loading…
Add table
Reference in a new issue