ogr2ogr: adjust tests for -wrapdateline w.r.t derived geographic CRS

rouault · rouault · commit 3ccaf135cfcb · 2025-11-20T17:09:56.000+01:00
diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
@@ -6072,7 +6072,8 @@ SetupCT(TargetLayerInfo *psInfo, OGRLayer *poSrcLayer, bool bTransform,
         if (bWrapDateline)
         {
             if (bTransform && poCT != nullptr && poOutputSRS != nullptr &&
-                poOutputSRS->IsGeographic())
+                poOutputSRS->IsGeographic() &&
+                !poOutputSRS->IsDerivedGeographic())
             {
                 papszTransformOptions =
                     CSLAddString(papszTransformOptions, "WRAPDATELINE=YES");
@@ -6084,7 +6085,8 @@ SetupCT(TargetLayerInfo *psInfo, OGRLayer *poSrcLayer, bool bTransform,
                         CSLAddString(papszTransformOptions, soOffset);
                 }
             }
-            else if (poSourceSRS != nullptr && poSourceSRS->IsGeographic())
+            else if (poSourceSRS != nullptr && poSourceSRS->IsGeographic() &&
+                     !poSourceSRS->IsDerivedGeographic())
             {
                 papszTransformOptions =
                     CSLAddString(papszTransformOptions, "WRAPDATELINE=YES");

Original file line number	Diff line number	Diff line change
`@@ -6072,7 +6072,8 @@ SetupCT(TargetLayerInfo psInfo, OGRLayer poSrcLayer, bool bTransform,`
`6072`	`6072`	`if (bWrapDateline)`
`6073`	`6073`	`{`
`6074`	`6074`	`if (bTransform && poCT != nullptr && poOutputSRS != nullptr &&`
`6075`		`- poOutputSRS->IsGeographic())`
	`6075`	`+ poOutputSRS->IsGeographic() &&`
	`6076`	`+ !poOutputSRS->IsDerivedGeographic())`
`6076`	`6077`	`{`
`6077`	`6078`	`papszTransformOptions =`
`6078`	`6079`	`CSLAddString(papszTransformOptions, "WRAPDATELINE=YES");`
`@@ -6084,7 +6085,8 @@ SetupCT(TargetLayerInfo psInfo, OGRLayer poSrcLayer, bool bTransform,`
`6084`	`6085`	`CSLAddString(papszTransformOptions, soOffset);`
`6085`	`6086`	`}`
`6086`	`6087`	`}`
`6087`		`- else if (poSourceSRS != nullptr && poSourceSRS->IsGeographic())`
	`6088`	`+ else if (poSourceSRS != nullptr && poSourceSRS->IsGeographic() &&`
	`6089`	`+ !poSourceSRS->IsDerivedGeographic())`
`6088`	`6090`	`{`
`6089`	`6091`	`papszTransformOptions =`
`6090`	`6092`	`CSLAddString(papszTransformOptions, "WRAPDATELINE=YES");`