Merging dev into master

ossimlabs · Jan 5, 2018 · 21601d6 · 21601d6
2 parents ead95fa + 6f82aa3
commit 21601d6
Showing 1 changed file with 12 additions and 6 deletions.
diff --git 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() );
+            }
          }
       }
    }