autotest: adjustments for PROJ 9.6

Author: rouault

autotest/gdrivers/jp2metadata.py

@@ -40,7 +40,7 @@ def test_jp2metadata_1():
     ds = gdal.Open("data/jpeg2000/erdas_foo.jp2")
     wkt = ds.GetProjectionRef()
     gt = ds.GetGeoTransform()
-    assert wkt.startswith('PROJCS["ETRS89')
+    assert wkt.startswith('PROJCS["ETRS89') or wkt.startswith('PROJCS["EUREF-FIN')
     expected_gt = (356000.0, 0.5, 0.0, 7596000.0, 0.0, -0.5)
     for i in range(6):
         assert gt[i] == pytest.approx(expected_gt[i], abs=1e-5)

autotest/osr/osr_basic.py

@@ -2023,7 +2023,9 @@ def test_osr_basic_is_dynamic():
 
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4258)  # ETRS89 (generic), using datum ensemble
-    assert not srs.IsDynamic()
+    # Just run it. Prior to PROJ 9.6, this was not a dynamic CRS
+    # Since PROJ 9.6, it is a dynamic CRS.
+    srs.IsDynamic()
 
     srs = osr.SpatialReference()
     srs.SetFromUserInput(