From f94413a6787d8563dac1862ee3cb78296283da4e Mon Sep 17 00:00:00 2001 From: scttgs0 Date: Mon, 27 Mar 2023 00:28:05 -0500 Subject: [PATCH] clean up --- src/Airports/GenAirports850/main.cxx | 1 - src/Airports/GenAirports850/scheduler.cxx | 51 +---------------------- src/Lib/terragear/tg_nodes.cxx | 1 + src/Lib/terragear/tg_nodes.hxx | 2 +- 4 files changed, 4 insertions(+), 51 deletions(-) diff --git a/src/Airports/GenAirports850/main.cxx b/src/Airports/GenAirports850/main.cxx index cc57954d..adf49a36 100644 --- a/src/Airports/GenAirports850/main.cxx +++ b/src/Airports/GenAirports850/main.cxx @@ -321,7 +321,6 @@ int main(int argc, char **argv) // Create the scheduler auto scheduler = std::make_unique(input_file, work_dir, elev_src); - // auto scheduler = std::unique_ptr(new Scheduler(input_file, work_dir, elev_src)); // Add any debug scheduler->set_debug( debug_dir, debug_runway_defs, debug_pavement_defs, debug_taxiway_defs, debug_feature_defs ); diff --git a/src/Airports/GenAirports850/scheduler.cxx b/src/Airports/GenAirports850/scheduler.cxx index a844151e..37e2affb 100644 --- a/src/Airports/GenAirports850/scheduler.cxx +++ b/src/Airports/GenAirports850/scheduler.cxx @@ -199,32 +199,7 @@ bool Scheduler::IsAirportDefinition( char* line, const std::string& icao ) } break; - case LAND_RUNWAY_CODE: - 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 : + default: break; } } @@ -426,29 +401,7 @@ bool Scheduler::AddAirports( long start_pos, tgRectangle* boundingBox ) } break; - case TAXIWAY_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: + default: break; } } diff --git a/src/Lib/terragear/tg_nodes.cxx b/src/Lib/terragear/tg_nodes.cxx index b855599f..2adaf8b8 100644 --- a/src/Lib/terragear/tg_nodes.cxx +++ b/src/Lib/terragear/tg_nodes.cxx @@ -216,6 +216,7 @@ bool TGNodes::get_geod_edge( const SGBucket& b, std::vector& north, std: ur = Point( east_compare + fgPoint3_Epsilon, north_compare + fgPoint3_Epsilon ); exact_bb = Fuzzy_bb(ll, ur); result.clear(); + tg_kd_tree.search(std::back_inserter( result ), exact_bb); 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) ) ); diff --git a/src/Lib/terragear/tg_nodes.hxx b/src/Lib/terragear/tg_nodes.hxx index a4c9c6fd..78a8b21f 100644 --- a/src/Lib/terragear/tg_nodes.hxx +++ b/src/Lib/terragear/tg_nodes.hxx @@ -125,7 +125,7 @@ public: bool get_nodes_inside( const SGGeod& min, const SGGeod& max, std::vector& 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& north, std::vector& south, std::vector& east, std::vector& west ) const; // return a point list of wgs84 nodes