Pleiades metadata reader: fix PR #5090 related to RPC of Pleiades Neo (…

…#5132)
OSGeo · Jan 19, 2022 · 3feb1f9 · 3feb1f9
1 parent 3158da9
commit 3feb1f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
@@ -108,7 +108,7 @@ def _test_jp2metadata(file_path):
 
 
 def test_jp2metadata_2():
-    # Pleiades product description http://www.cscrs.itu.edu.tr/assets/downloads/PleiadesUserGuide.pdf
+    # Pleiades product description https://content.satimagingcorp.com/media/pdf/User_Guide_Pleiades.pdf
     file_path = 'data/jpeg2000/IMG_md_ple_R1C1.jp2'
     _test_jp2metadata(file_path)
 

diff --git a/gcore/mdreader/reader_pleiades.cpp b/gcore/mdreader/reader_pleiades.cpp
@@ -314,15 +314,6 @@ static const char * const apszRPCTXT20ValItems[] =
     nullptr
 };
 
-static const char * const apszRPCTXT20ValItemsLonLat[] =
-{
-    RPC_LAT_NUM_COEFF,
-    RPC_LAT_DEN_COEFF,
-    RPC_LON_NUM_COEFF,
-    RPC_LON_DEN_COEFF,
-    nullptr
-};
-
 char** GDALMDReaderPleiades::LoadRPCXmlFile()
 {
     CPLXMLNode* pNode = CPLParseXMLFile(m_osRPBSourceFilename);
@@ -338,6 +329,15 @@ char** GDALMDReaderPleiades::LoadRPCXmlFile()
     {
         papszRawRPCList = ReadXMLToList(pGRFMNode->psChild, papszRawRPCList);
     }
+    else
+    {
+        pGRFMNode = CPLSearchXMLNode(pNode, "=Rational_Function_Model");
+
+        if(pGRFMNode != nullptr)
+        {
+            papszRawRPCList = ReadXMLToList(pGRFMNode->psChild, papszRawRPCList);
+        }
+    }
 
     if( nullptr == papszRawRPCList )
     {
@@ -422,7 +422,7 @@ char** GDALMDReaderPleiades::LoadRPCXmlFile()
             }
             else {
                  pszValue = CSLFetchNameValue(papszRawRPCList,
-                 CPLSPrintf("ImagetoGround_Values.%s_%d", apszRPCTXT20ValItemsLonLat[i], j));
+                 CPLSPrintf("GroundtoImage_Values.%s_%d", apszRPCTXT20ValItems[i], j));
                  if(nullptr != pszValue){
                     value = value + " " + CPLString(pszValue);
                  }