Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added tests for issue #53, followup to PR #57. #65

Closed
wants to merge 15 commits into from
Closed

Added tests for issue #53, followup to PR #57. #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
32c067f
Changes for use of double[] instead of pointers for some funcs
fpl Sep 14, 2023
dfc8740
Added tests for issue #53, followup to PR #57.
fpl Nov 15, 2023
bd3fa0b
Removed use of now discouraged FFI::Platypus::Declare module.
fpl Sep 21, 2023
236eacd
Fixing missing () in File.pm
fpl Sep 22, 2023
8d51e54
Fixed typo in Geometry.pm (closes: #54)
fpl Sep 21, 2023
e7c1514
Add Layer::GetFeatureCount method
shawnlaffan Oct 24, 2023
5154e27
Tests: clear data set variable before re-using
shawnlaffan Oct 24, 2023
52bfcc4
Tests: Close newly written dataset before reading
shawnlaffan Oct 24, 2023
720a034
Tests: undef a layer to ensure a dataset var is closed properly
shawnlaffan Oct 25, 2023
cafd2cc
POD: add GetFeatureCount
shawnlaffan Oct 27, 2023
1b965ce
Add note about dataset object destruction with layers
shawnlaffan Oct 27, 2023
890d5e4
VSIStdoutSetRedirection: return what the write method returns or 1 as…
Nov 12, 2023
714a08f
Fix spelling errors.
Nov 12, 2023
ef77036
Adding fixes to have coherent FFI signatures.
fpl Nov 17, 2023
0915176
Fixed OCTTransform4D() call in t/transform.t
fpl Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/Geo/GDAL/FFI.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,9 @@ $ffi->attach('GDALInitGCPs' => [qw/int opaque/] => 'void');
$ffi->attach('GDALDeinitGCPs' => [qw/int opaque/] => 'void');
$ffi->attach('GDALDuplicateGCPs' => [qw/int opaque/] => 'opaque');
$ffi->attach('GDALGCPsToGeoTransform' => [qw/int opaque double* int/] => 'int');
$ffi->attach('GDALInvGeoTransform' => [qw/double* double*/] => 'int');
$ffi->attach('GDALApplyGeoTransform' => [qw/double* double double double* double*/] => 'void');
$ffi->attach('GDALComposeGeoTransforms' => [qw/double* double* double*/] => 'void');
$ffi->attach('GDALInvGeoTransform' => [qw/double[] double[]/] => 'int');
$ffi->attach('GDALApplyGeoTransform' => [qw/double[6] double double double* double*/] => 'void');
$ffi->attach('GDALComposeGeoTransforms' => [qw/double[6] double[6] double[6]/] => 'void');
$ffi->attach('GDALGetMetadataDomainList' => [qw/opaque/] => 'opaque');
$ffi->attach('GDALGetMetadata' => [qw/opaque string/] => 'opaque');
$ffi->attach('GDALSetMetadata' => [qw/opaque opaque string/] => 'int');
Expand Down Expand Up @@ -1509,11 +1509,11 @@ $ffi->attach('OCTGetSourceCS' => [qw/opaque/] => 'opaque');
$ffi->attach('OCTGetTargetCS' => [qw/opaque/] => 'opaque');
$ffi->attach('OCTGetInverse' => [qw/opaque/] => 'opaque');
$ffi->attach('OCTDestroyCoordinateTransformation' => [qw/opaque/] => 'void');
$ffi->attach('OCTTransform' => [qw/opaque int double* double* double*/] => 'int');
$ffi->attach('OCTTransformEx' => [qw/opaque int double* double* double* int*/] => 'int');
$ffi->attach('OCTTransform4D' => [qw/opaque int double* double* double* double* int*/] => 'int');
$ffi->attach('OCTTransform4DWithErrorCodes' => [qw/opaque int double* double* double* double* int*/] => 'int');
$ffi->attach('OCTTransformBounds' => [qw/opaque double double double double double* double* double* double* int/] => 'int');
$ffi->attach('OCTTransform' => [qw/opaque int double[] double[] double[]/] => 'int');
$ffi->attach('OCTTransformEx' => [qw/opaque int double[] double[] double[] int[]/] => 'int');
$ffi->attach('OCTTransform4D' => [qw/opaque int double[] double[] double[] double[] int[]/] => 'int');
$ffi->attach('OCTTransform4DWithErrorCodes' => [qw/opaque int double[] double[] double[] double[] int[]/] => 'int');
$ffi->attach('OCTTransformBounds' => [qw/opaque double double double double double[] double[] double[] double[] int/] => 'int');
# from apps/gdal_utils.h
$ffi->attach('GDALInfoOptionsNew' => [qw/opaque opaque/] => 'opaque');
$ffi->attach('GDALInfoOptionsFree' => [qw/opaque/] => 'void');
Expand Down
5 changes: 5 additions & 0 deletions t/00.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ if(1){
is($p, $ogc_wkt, "Set/get projection string");
my $transform = [10,2,0,20,0,3];
$ds->SetGeoTransform($transform);
my $inv = [0,0,0,0,0,0];
ok(Geo::GDAL::FFI::GDALInvGeoTransform($transform, $inv) && "@$inv" eq "-5 0.5 0 -6.66666666666667 0 0.333333333333333", "Invert geotransform");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be split into two tests? Store the result of the transform call into a scalar variable. It can be checked using the is function. Then use an is_deeply test to check the expected array values.

my ($x, $y);
Geo::GDAL::FFI::GDALApplyGeoTransform($transform,5,5,\$x,\$y);
ok($x == 20 && $y == 35, "Applied geotransform to pixel coords");
my $t = $ds->GetGeoTransform;
is_deeply($t, $transform, "Set/get geotransform");

Expand Down
55 changes: 55 additions & 0 deletions t/transform.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
use v5.10;
use strict;
use warnings;
use Carp;
use Geo::GDAL::FFI;
use Test::More;

# test about SRS transformations API by using a simple extent (4 points) in UTM33 -> WGS84

if(1) {
my $source_srs = Geo::GDAL::FFI::SpatialReference->new( EPSG => 4326 );
my $target_srs = Geo::GDAL::FFI::SpatialReference->new( EPSG => 32633 );
my $ct = Geo::GDAL::FFI::OCTNewCoordinateTransformation($$source_srs, $$target_srs);

my @extent = (16.509888, 41.006911, 17.084248, 41.370581);

my @ul = ($extent[0], $extent[1]);
my @lr = ($extent[2], $extent[3]);
my @ur = ($lr[0],$ul[1]);
my @ll = ($ul[0],$lr[1]);
my $result = "3358768.81711923 3391240.32068776 3348976.84626544 3401215.87353221 2019470.50927319 2094945.30821076 2088830.64307375 2025411.23009774";

my @x = ($ul[0], $lr[0], $ur[0], $ll[0]);
my @y = ($ul[1], $lr[1], $ur[1], $ll[1]);
my $z = undef;
ok(Geo::GDAL::FFI::OCTTransform($ct, 4, \@x, \@y, \@$z), "Coordinate transformation 3D worked");
ok(qq/@x @y/ eq $result, "Resulting coordinates");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also better done using is_deeply.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for similar cases below.


@x = ($ul[0], $lr[0], $ur[0], $ll[0]);
@y = ($ul[1], $lr[1], $ur[1], $ll[1]);
$z = undef;
my @ps = (0,0,0,0);
ok(Geo::GDAL::FFI::OCTTransformEx($ct, 4, \@x, \@y, \@$z, \@ps), "Coordinate transformation 3D with pabSuccess worked");
ok(qq/@x @y/ eq $result, "Resulting coordinates");
ok(scalar @ps == 4 && qq/@ps/ eq qq/1 1 1 1/, "Resulting pabSuccess is TRUE x 4" );

@x = ($ul[0], $lr[0], $ur[0], $ll[0]);
@y = ($ul[1], $lr[1], $ur[1], $ll[1]);
$z = undef;
my $t = undef;
@ps = (0,0,0,0);
ok(Geo::GDAL::FFI::OCTTransform4D($ct, 4, \@x, \@y, \@$z, \@$t, \@ps), "Coordinate transformation 4D worked");
ok(qq/@x @y/ eq $result && qq/@ps/ eq qq/1 1 1 1/, "Resulting coordinates");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is better written using is_deeply.

my $exp_results = [...];  #  set up expected values
is_deeply ([@x, @y], $exp_result, "Resulting coordinates match");
is_deeply (\@ps, [qw/1 1 1 1/], "Resulting coordinates match, (ps array)");

The is and is_deeply type tests give better feedback when a test fails, i.e they say what was found and was was expected. ok just says there was a failure.


@x = ($ul[0], $lr[0], $ur[0], $ll[0]);
@y = ($ul[1], $lr[1], $ur[1], $ll[1]);
$z = undef;
$t = undef;
@ps = (0,0,0,0);
ok(Geo::GDAL::FFI::OCTTransform4DWithErrorCodes($ct, 4, \@x, \@y, \@$z, \@$t, \@ps), "Coordinate transformation 4D worked");
ok(qq/@x @y/ eq $result, "Resulting coordinates");
ok(scalar @ps == 4 && qq/@ps/ eq qq/0 0 0 0/, "Resulting pabSuccess is SUCCESS(i.e. 0) x 4" );
}

done_testing();
Loading