check fixes

Author: mdsumner

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: vapour
 Title: Access to the 'Geospatial Data Abstraction Library' ('GDAL')
-Version: 0.11.0.9001
+Version: 0.12.0
 Authors@R: c(person("Michael", "Sumner", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-2471-7511")), 
              person("Simon", "Wotherspoon", role = "ctb", comment = "RasterIO configuration for resampling options"), 
              person("Mark", "Padgham", role = "ctb", comment = "helped get started :)"), 

NEWS.md

@@ -1,4 +1,8 @@
-# vapour dev
+# vapour 0.12.0
+
+* Fixed a number of unused variable warnings, found from mac_release test on CRAN. 
+
+* Removed test that guarded for 0x0 output from GDAL, thanks to CRAN. 
 
 * Stream reading now restored. 
 

cran-comments.md

@@ -1,4 +1,4 @@
 
-## vapour 0.11.0
+## vapour 0.12.0
 
-Fixed bashisms, thanks! 
+Fixed failing test that simply indicated older GDAL behaviour. s 

inst/WORDLIST

@@ -228,6 +228,7 @@ sds
 sp
 spatstat
 sql
+sqlite
 src
 srs
 sst

inst/include/gdalarrowstream/gdalvectorstream.h

@@ -149,8 +149,6 @@ inline Rcpp::List ogr_layer_setup(Rcpp::CharacterVector datasource,
   OGRPolygon poly;
   OGRLinearRing ring;
 
-  // set spatial filter?
-  bool use_extent_filter = false;
   if (ex.length() == 4) {
         if (ex[1] <= ex[0] || ex[3] <= ex[2]) {
           if (ex[1] <= ex[0]) {
@@ -160,7 +158,6 @@ inline Rcpp::List ogr_layer_setup(Rcpp::CharacterVector datasource,
             Rcpp::warning("extent filter invalid (ymax <= ymin), ignoring");
           }
         } else {
-          use_extent_filter = true;
           ring.addPoint(ex[0], ex[2]); //xmin, ymin
           ring.addPoint(ex[0], ex[3]); //xmin, ymax
           ring.addPoint(ex[1], ex[3]); //xmax, ymax
@@ -236,13 +233,14 @@ inline Rcpp::List read_gdal_stream(
                                         drivers,
                                         extent,
                                         width);
-  OGRDataSource* poDS = (OGRDataSource*)(R_ExternalPtrAddr(prep[0]));
+  
   OGRLayer* poLayer = (OGRLayer*)R_ExternalPtrAddr(prep[1]);
   auto stream_out = reinterpret_cast<struct ArrowArrayStream*>(
     R_ExternalPtrAddr(stream_xptr));
 
   OGRSpatialReference* crs = poLayer->GetSpatialRef();
-  char* wkt_out;
+  
+  
   std::string wkt_str;
   if (crs != nullptr) {
     char* wkt_out;
@@ -267,9 +265,7 @@ inline Rcpp::List read_gdal_stream(
     num_features = -1;
   }
 
-  if (! Rcpp::CharacterVector::is_na(query[0])) {
-		//poDS->ReleaseResultSet(poLayer);
-  }
+
 
   return Rcpp::List::create(wkt_str, Rcpp::NumericVector::create(num_features));
 }

inst/include/gdalreadwrite/gdalreadwrite.h

@@ -100,14 +100,18 @@ inline CharacterVector gdal_create(CharacterVector filename,
   }
 
   char *pszWKT = nullptr;
+  OGRErr err; 
+  
 #if GDAL_VERSION_MAJOR >= 3
   const char *optionsWKT[3] = { "MULTILINE=YES", "FORMAT=WKT2", NULL };
-  OGRErr err = oSRS.exportToWkt(&pszWKT, optionsWKT);
+  err = oSRS.exportToWkt(&pszWKT, optionsWKT);
 #else
-  OGRErr err = oSRS.exportToWkt(&pszWKT);
+  err = oSRS.exportToWkt(&pszWKT);
 #endif
 
-  
+  if (err != OGRERR_NONE) {
+     Rcpp::stop("failed to export CRS to WKT"); 
+  }
   GDALDriverH hDriver;
   hDriver = GDALGetDriverByName(driver[0]);
   if( hDriver == nullptr ) {

src/00_raster_block_io.cpp

@@ -78,6 +78,9 @@ Rcpp::NumericVector vapour_read_raster_value_cpp(CharacterVector dsource,
 
   }
   GDALClose(ds); 
+  if (err != OGRERR_NONE) {
+    Rcpp::stop("failed to read band values"); 
+  }
   return vals; 
 }
 

tests/testthat/test-warper.R

@@ -46,8 +46,10 @@ test_that("warper no transformation works", {
 
 test_that("warper no transformation and no dimension works", {
   expect_that(vapour_warp_raster(f, extent = c(145, 146, -50, -48)), is_a("list"))
-  expect_error(vapour_warp_raster(f, extent = c(145, 146, -50, -48), projection = "+proj=laea"), 
-               "could not be processed")
+  ## this used to give 0x0 output which is disallowed, GDAL now harmlessly returns a missing value with 1x1 dim
+  # expect_error(vapour_warp_raster(f, extent = c(145, 146, -50, -48), projection = "+proj=laea"), 
+  #              "could not be processed")
+  
 
 })