Merge branch 'master' into bump-compat

JuliaGeo · Oct 9, 2024 · 557ebfc · 557ebfc
2 parents ac5d917 + b596c9b
commit 557ebfc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/coord.jl b/src/coord.jl
@@ -86,8 +86,8 @@ function Transformation(
 end
 
 function Transformation(
-    source_crs::GFT.CoordinateReferenceSystemFormat,
-    target_crs::GFT.CoordinateReferenceSystemFormat;
+    source_crs::Union{GFT.CoordinateReferenceSystemFormat,GFT.MixedFormat{<:MaybeGFTCRS}},
+    target_crs::Union{GFT.CoordinateReferenceSystemFormat,GFT.MixedFormat{<:MaybeGFTCRS}};
     always_xy::Bool = false,
     direction::PJ_DIRECTION = PJ_FWD,
     area::Ptr{PJ_AREA} = C_NULL,

diff --git a/test/libproj.jl b/test/libproj.jl
@@ -203,19 +203,29 @@ end
     source_crs = GFT.EPSG("EPSG:4326")
     target_crs = GFT.EPSG("EPSG:32628")
 
-    trans = Proj.Transformation(source_crs, target_crs, always_xy = false)
+    trans = Proj.Transformation(source_crs, target_crs, always_xy = true)
     info = Proj.proj_pj_info(trans.pj)
     description1 = unsafe_string(info.definition)
 
+    # crs as WellKnownText{CRS}
+    # verbose to work around the lack of a GFT blessed implementation in Proj
+    source_crs = GFT.WellKnownText(GFT.CRS(), GFT.val(GFT.ESRIWellKnownText(Proj.CRS("EPSG:4326"))))
+    target_crs = GFT.WellKnownText(GFT.CRS(), GFT.val(GFT.ESRIWellKnownText(Proj.CRS("EPSG:32628"))))
+
+    trans = Proj.Transformation(source_crs, target_crs, always_xy = true)
+    info = Proj.proj_pj_info(trans.pj)
+    description2 = unsafe_string(info.definition)
+
     #crs as txt
     source_crs = "EPSG:4326"
     target_crs = "EPSG:32628"
 
-    trans = Proj.Transformation(source_crs, target_crs, always_xy = false)
+    trans = Proj.Transformation(source_crs, target_crs, always_xy = true)
     info = Proj.proj_pj_info(trans.pj)
-    description2 = unsafe_string(info.definition)
+    description_true = unsafe_string(info.definition)
 
-    @test description1 == description2
+    @test description1 == description_true
+    @test description2 == description_true
 end
 
 @testset "bounds" begin