From 6f82aa3bcbcb6526f956409709e02a120eb09695 Mon Sep 17 00:00:00 2001 From: David Burken Date: Wed, 3 Jan 2018 13:18:09 -0500 Subject: [PATCH] Update getNiirs(...) to pick up key "nitf.csexra.predicted_niirs". --- coms/src/oms/DataInfo.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/coms/src/oms/DataInfo.cpp b/coms/src/oms/DataInfo.cpp index 3e58869..293abef 100644 --- a/coms/src/oms/DataInfo.cpp +++ b/coms/src/oms/DataInfo.cpp @@ -3227,13 +3227,19 @@ void oms::DataInfo::getNiirs( const ossimKeywordlist& kwl, if ( niirs.empty()) { - keys.clear(); - ossimString regExp = "\\.niirs$"; // any tag ending in .niirs. - kwl.findAllKeysThatMatch( keys, regExp ); - if ( keys.size() ) + // NITF Exploitation Reference Data(CSEXRA): + niirs = kwl.findKey( std::string("nitf.csexra.predicted_niirs") ); + + if ( niirs.empty()) { - // Taking first one... - niirs = kwl.findKey( keys[0].string() ); + keys.clear(); + ossimString regExp = "\\.niirs$"; // any tag ending in .niirs. + kwl.findAllKeysThatMatch( keys, regExp ); + if ( keys.size() ) + { + // Taking first one... + niirs = kwl.findKey( keys[0].string() ); + } } } }