clean up
This commit is contained in:
parent
8951fe646b
commit
f94413a678
4 changed files with 4 additions and 51 deletions
|
@ -321,7 +321,6 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
// Create the scheduler
|
// Create the scheduler
|
||||||
auto scheduler = std::make_unique<Scheduler>(input_file, work_dir, elev_src);
|
auto scheduler = std::make_unique<Scheduler>(input_file, work_dir, elev_src);
|
||||||
// auto scheduler = std::unique_ptr<Scheduler>(new Scheduler(input_file, work_dir, elev_src));
|
|
||||||
|
|
||||||
// Add any debug
|
// Add any debug
|
||||||
scheduler->set_debug( debug_dir, debug_runway_defs, debug_pavement_defs, debug_taxiway_defs, debug_feature_defs );
|
scheduler->set_debug( debug_dir, debug_runway_defs, debug_pavement_defs, debug_taxiway_defs, debug_feature_defs );
|
||||||
|
|
|
@ -199,32 +199,7 @@ bool Scheduler::IsAirportDefinition( char* line, const std::string& icao )
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LAND_RUNWAY_CODE:
|
default:
|
||||||
case WATER_RUNWAY_CODE:
|
|
||||||
case HELIPAD_CODE:
|
|
||||||
case PAVEMENT_CODE:
|
|
||||||
case LINEAR_FEATURE_CODE:
|
|
||||||
case BOUNDARY_CODE:
|
|
||||||
case NODE_CODE:
|
|
||||||
case BEZIER_NODE_CODE:
|
|
||||||
case CLOSE_NODE_CODE:
|
|
||||||
case CLOSE_BEZIER_NODE_CODE:
|
|
||||||
case TERM_NODE_CODE:
|
|
||||||
case TERM_BEZIER_NODE_CODE:
|
|
||||||
case AIRPORT_VIEWPOINT_CODE:
|
|
||||||
case AIRPLANE_STARTUP_LOCATION_CODE:
|
|
||||||
case LIGHT_BEACON_CODE:
|
|
||||||
case WINDSOCK_CODE:
|
|
||||||
case TAXIWAY_SIGN:
|
|
||||||
case LIGHTING_OBJECT:
|
|
||||||
case COMM_FREQ1_CODE:
|
|
||||||
case COMM_FREQ2_CODE:
|
|
||||||
case COMM_FREQ3_CODE:
|
|
||||||
case COMM_FREQ4_CODE:
|
|
||||||
case COMM_FREQ5_CODE:
|
|
||||||
case COMM_FREQ6_CODE:
|
|
||||||
case COMM_FREQ7_CODE:
|
|
||||||
case END_OF_FILE :
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -426,29 +401,7 @@ bool Scheduler::AddAirports( long start_pos, tgRectangle* boundingBox )
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TAXIWAY_CODE:
|
default:
|
||||||
case PAVEMENT_CODE:
|
|
||||||
case LINEAR_FEATURE_CODE:
|
|
||||||
case BOUNDARY_CODE:
|
|
||||||
case NODE_CODE:
|
|
||||||
case BEZIER_NODE_CODE:
|
|
||||||
case CLOSE_NODE_CODE:
|
|
||||||
case CLOSE_BEZIER_NODE_CODE:
|
|
||||||
case TERM_NODE_CODE:
|
|
||||||
case TERM_BEZIER_NODE_CODE:
|
|
||||||
case AIRPORT_VIEWPOINT_CODE:
|
|
||||||
case AIRPLANE_STARTUP_LOCATION_CODE:
|
|
||||||
case LIGHT_BEACON_CODE:
|
|
||||||
case WINDSOCK_CODE:
|
|
||||||
case TAXIWAY_SIGN:
|
|
||||||
case LIGHTING_OBJECT:
|
|
||||||
case COMM_FREQ1_CODE:
|
|
||||||
case COMM_FREQ2_CODE:
|
|
||||||
case COMM_FREQ3_CODE:
|
|
||||||
case COMM_FREQ4_CODE:
|
|
||||||
case COMM_FREQ5_CODE:
|
|
||||||
case COMM_FREQ6_CODE:
|
|
||||||
case COMM_FREQ7_CODE:
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -216,6 +216,7 @@ bool TGNodes::get_geod_edge( const SGBucket& b, std::vector<SGGeod>& north, std:
|
||||||
ur = Point( east_compare + fgPoint3_Epsilon, north_compare + fgPoint3_Epsilon );
|
ur = Point( east_compare + fgPoint3_Epsilon, north_compare + fgPoint3_Epsilon );
|
||||||
exact_bb = Fuzzy_bb(ll, ur);
|
exact_bb = Fuzzy_bb(ll, ur);
|
||||||
result.clear();
|
result.clear();
|
||||||
|
|
||||||
tg_kd_tree.search(std::back_inserter( result ), exact_bb);
|
tg_kd_tree.search(std::back_inserter( result ), exact_bb);
|
||||||
for ( it = result.begin(); it != result.end(); ++it ) {
|
for ( it = result.begin(); it != result.end(); ++it ) {
|
||||||
north.push_back( SGGeod::fromDegM( boost::get<0>(*it).x(), boost::get<0>(*it).y(), boost::get<1>(*it) ) );
|
north.push_back( SGGeod::fromDegM( boost::get<0>(*it).x(), boost::get<0>(*it).y(), boost::get<1>(*it) ) );
|
||||||
|
|
|
@ -125,7 +125,7 @@ public:
|
||||||
|
|
||||||
bool get_nodes_inside( const SGGeod& min, const SGGeod& max, std::vector<TGNode*>& points ) const;
|
bool get_nodes_inside( const SGGeod& min, const SGGeod& max, std::vector<TGNode*>& points ) const;
|
||||||
|
|
||||||
// Find a;; the nodes on the tile edges
|
// Find all the nodes on the tile edges
|
||||||
bool get_geod_edge( const SGBucket& b, std::vector<SGGeod>& north, std::vector<SGGeod>& south, std::vector<SGGeod>& east, std::vector<SGGeod>& west ) const;
|
bool get_geod_edge( const SGBucket& b, std::vector<SGGeod>& north, std::vector<SGGeod>& south, std::vector<SGGeod>& east, std::vector<SGGeod>& west ) const;
|
||||||
|
|
||||||
// return a point list of wgs84 nodes
|
// return a point list of wgs84 nodes
|
||||||
|
|
Loading…
Add table
Reference in a new issue