Closes #53 with simple tests (this obsoletes PR #57 and PR #65)

Changes

@@ -1,7 +1,11 @@
 Revision history for Perl extension Geo::GDAL::FFI
 
-0.11 unreleased
+0.12 unreleased
+
+0.11 December 19, 2023
     - Removed use of to FFI::Platypus::Declare, now discouraged.
+    - Add Layer::GetFeatureCount method
+    - Bugfixes
 
 0.10 July 10, 2023
      - Add dependency to FFI::Platypus::Declare

lib/Geo/GDAL/FFI.pm

@@ -26,7 +26,7 @@ use Geo::GDAL::FFI::GeomFieldDefn;
 use Geo::GDAL::FFI::Feature;
 use Geo::GDAL::FFI::Geometry;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 our $DEBUG = 0;
 
 our @ISA = qw(Exporter);
@@ -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');
@@ -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');

lib/Geo/GDAL/FFI/Band.pm

@@ -6,7 +6,7 @@ use Carp;
 use FFI::Platypus::Buffer;
 use base 'Geo::GDAL::FFI::Object';
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub DESTROY {
     my $self = shift;

lib/Geo/GDAL/FFI/Dataset.pm

@@ -6,7 +6,7 @@ use Carp;
 use base 'Geo::GDAL::FFI::Object';
 use Scalar::Util qw /blessed/;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub DESTROY {
     my $self = shift;

lib/Geo/GDAL/FFI/Driver.pm

@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use base 'Geo::GDAL::FFI::Object';
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub GetName {
     my $self = shift;

lib/Geo/GDAL/FFI/Feature.pm

@@ -7,7 +7,7 @@ use Carp;
 use Encode qw(decode encode);
 use FFI::Platypus::Buffer;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub new {
     my ($class, $defn) = @_;

lib/Geo/GDAL/FFI/FeatureDefn.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub new {
     my ($class, $args) = @_;

lib/Geo/GDAL/FFI/FieldDefn.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub new {
     my ($class, $args) = @_;

lib/Geo/GDAL/FFI/GeomFieldDefn.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub new {
     my ($class, $args) = @_;

lib/Geo/GDAL/FFI/Geometry.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 my %ref;
 

lib/Geo/GDAL/FFI/Layer.pm

@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use base 'Geo::GDAL::FFI::Object';
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub DESTROY {
     my $self = shift;

lib/Geo/GDAL/FFI/Object.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub GetDescription {
     my $self = shift;

lib/Geo/GDAL/FFI/SpatialReference.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub new {
     my ($class, $arg, @arg) = @_;

lib/Geo/GDAL/FFI/VSI.pm

@@ -7,7 +7,7 @@ use Carp;
 use FFI::Platypus::Buffer;
 require Exporter;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(Mkdir Rmdir ReadDir FOpen Unlink Rename);

lib/Geo/GDAL/FFI/VSI/File.pm

@@ -6,7 +6,7 @@ use Encode qw(decode encode);
 use Carp;
 use FFI::Platypus::Buffer;
 
-our $VERSION = 0.1100;
+our $VERSION = 0.1200;
 
 sub Open {
     my ($class, $path, $access) = @_;

t/00.t

@@ -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");
+    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");
 

t/transform.t

@@ -0,0 +1,61 @@
+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 = qw/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;
+    my $res = Geo::GDAL::FFI::OCTTransform($ct, 4, \@x, \@y, \@$z);
+    is($res, 1, "Coordinate transformation 3D worked");
+    is_deeply([@x, @y], \@result, "Checking resulting coordinates");
+
+    @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);
+    $res = Geo::GDAL::FFI::OCTTransformEx($ct, 4, \@x, \@y, \@$z, \@ps);
+    is($res, 1, "Coordinate transformation 3D with pabSuccess worked");
+    is_deeply([@x, @y], \@result, "Checking resulting coordinates");
+    is(scalar @ps, 4, "Resulting pabSuccess is an array of size 4");
+    is_deeply(\@ps, [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);
+    $res = Geo::GDAL::FFI::OCTTransform4D($ct, 4, \@x, \@y, \@$z, \@$t, \@ps);
+    is($res, 1, "Coordinate transformation 4D worked");
+    is_deeply([@x, @y, @ps], [@result, 1, 1, 1, 1], "Checking resulting coordinates");
+
+    @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);
+    $res = Geo::GDAL::FFI::OCTTransform4DWithErrorCodes($ct, 4, \@x, \@y, \@$z, \@$t, \@ps);
+    is($res, 1, "Coordinate transformation 4D worked");
+    is_deeply([@x, @y], \@result, "Checking resulting coordinates");
+    is(scalar @ps, 4, "Resulting pabSuccess is an array of size 4");
+    is_deeply(\@ps, [0, 0, 0, 0], "Resulting pabSuccess is SUCCESS(i.e. 0) x 4" );
+}
+
+done_testing();

t/vsistdout.t

@@ -19,9 +19,10 @@ use JSON;
     sub write {
         my $line = shift;
         push @output, $line;
+        return 1;
     }
     sub close {
-        push @output, "end";
+        return 1;
     }
     sub output {
         my $output = join '', @output;
@@ -33,31 +34,34 @@ use JSON;
 # test vsistdout redirection
 if(1){
     # create a small layer and copy it to vsistdout with redirection
-    my $layer = GetDriver('Memory')->Create->CreateLayer({GeometryType => 'None'});
+    my $ds = GetDriver('Memory')->Create;
+    my $layer = $ds->CreateLayer({GeometryType => 'None'});
     $layer->CreateField(value => 'Integer');
     $layer->CreateGeomField(geom => 'Point');
-    my $feature = Geo::GDAL::FFI::Feature->new($layer->GetDefn);
-    $feature->SetField(value => 12);
-    $feature->SetGeomField(geom => [WKT => 'POINT(1 1)']);
-    $layer->CreateFeature($feature);
-
+    for my $i (1..2) {
+        my $feature = Geo::GDAL::FFI::Feature->new($layer->GetDefn);
+        $feature->SetField(value => 12);
+        $feature->SetGeomField(geom => [WKT => "POINT(1 $i)"]);
+        $layer->CreateFeature($feature);
+    }
+    $ds->FlushCache;
     my $output = Output->new;
     my $gdal = Geo::GDAL::FFI->get_instance;
     $gdal->SetWriter($output);
     GetDriver('GeoJSON')->Create('/vsistdout')->CopyLayer($layer);
     $gdal->CloseWriter;
 
     my $ret = $output->output;
-    ok($ret eq
-       '{"type": "FeatureCollection",'.
-       '"features": '.
-       '[{ "type": "Feature", "id": 0, "properties": '.
-       '{ "value": 12 }, "geometry": { "type": "Point", '.
-       '"coordinates": [ 1.0, 1.0 ] } }]}end', 
+    $ret = decode_json $ret;
+
+    my $exp = decode_json (get_expected_json_data());
+
+    is_deeply ($ret, $exp,
     "Redirect vsistdout to write/close methods of a class.");
 
 }
 
+
 # test Translate
 if(1){
     my $ds = GetDriver('GTiff')->Create('/vsimem/test.tiff', 10);
@@ -66,3 +70,38 @@ if(1){
 }
 
 done_testing();
+
+
+sub get_expected_json_data {
+    my $json = <<'EOJSON'
+{
+    "type": "FeatureCollection",
+    "features": [{
+            "type": "Feature",
+            "id": 0,
+            "properties": {
+                "value": 12
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [1.0, 1.0]
+            }
+        }, {
+            "type": "Feature",
+            "id": 1,
+            "properties": {
+                "value": 12
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [1.0, 2.0]
+            }
+        }
+    ]
+}
+EOJSON
+   ; 
+    return $json;
+}
+
+