From 522787c173e8d83599f9ab9af4b5ddc1671edb8d Mon Sep 17 00:00:00 2001 From: fredb Date: Sun, 14 Jun 2009 16:22:35 +0000 Subject: [PATCH] Retrieve the full pavement/taxiway description, made of several words --- src/Airports/apt_loader.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Airports/apt_loader.cxx b/src/Airports/apt_loader.cxx index 36eeabb64..f78198798 100644 --- a/src/Airports/apt_loader.cxx +++ b/src/Airports/apt_loader.cxx @@ -143,7 +143,7 @@ public: // frequency entries (ignore) } else if ( line_id == 110 ) { pavement = true; - parsePavementLine850(simgear::strutils::split(line)); + parsePavementLine850(simgear::strutils::split(line, 0, 4)); } else if ( line_id >= 111 && line_id <= 114 ) { if ( pavement ) parsePavementNodeLine850(line_id, simgear::strutils::split(line)); @@ -403,6 +403,8 @@ private: { if ( token.size() >= 5 ) { pavement_ident = token[4]; + if ( !pavement_ident.empty() && pavement_ident[pavement_ident.size()-1] == '\r' ) + pavement_ident.erase( pavement_ident.size()-1 ); } else { pavement_ident = "xx"; }