c

rspatial · Dec 19, 2024 · 545fb19 · 545fb19
1 parent f6f5554
commit 545fb19
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/gdal_algs.cpp b/src/gdal_algs.cpp
@@ -33,6 +33,35 @@
 #include <sstream>
 
 
+/*
+GDAL 3.10
+
+std::vector<double> SpatRaster::extract_interpolate(std::vector<double> x, std::vector<double> y, std::string algo) {
+
+	GDALRIOResampleAlg eInterpolation = GRIORA_Bilinear ;
+	size_t n = x.size();
+	std::vector<double> out(n, NAN);
+	double value;
+	GDALDatasetH hDs;
+	
+	SpatOptions opt;
+	if (!open_gdal(hDs, 0, false, opt)) {
+		setError("cannot open dataset");
+		return(out);
+	}
+	
+	GDALRasterBandH poBand = GDALGetRasterBand(hDs, 1);
+	for (size_t i=0; i<n; i++) {
+		if (GDALInterpolateAtPoint(pbBand, x[i], y[1],  eInterpolation, &value) == CE_None) {
+			out[i] = value;
+		}
+	}
+	GDALClose( hDs );
+	return out;
+}	
+*/
+
+
 SpatGeom getPolygonsGeom2(OGRGeometry *poGeometry) {
 	SpatGeom g(polygons);
 	OGRPoint ogrPt;

diff --git a/src/spatRaster.h b/src/spatRaster.h
@@ -664,6 +664,8 @@ class SpatRaster {
 		std::vector<std::vector<std::vector<double>>> extractVector(SpatVector v, bool touches, bool small, std::string method, bool cells, bool xy, bool weights, bool exact, SpatOptions &opt);
 		std::vector<double> extractVectorFlat(SpatVector v, std::vector<std::string> funs, bool narm, bool touches, bool small, std::string method, bool cells, bool xy, bool weights, bool exact, SpatOptions &opt);
 
+//		std::vector<double> extract_interpolate(std::vector<double> x, std::vector<double> y, std::string algo);
+
 
 		std::vector<double> vectCells(SpatVector v, bool touches, bool small, std::string method, bool weights, bool exact, SpatOptions &opt);
 		std::vector<double> extCells(SpatExtent ext);

diff --git a/src/write_gdal.cpp b/src/write_gdal.cpp
@@ -1139,7 +1139,6 @@ bool SpatRaster::update_meta(bool names, bool crs, bool ext, SpatOptions &opt) {
 		return false;
 	}
 	GDALDatasetH hDS;
-	GDALRasterBandH poBand;
 	size_t n=0;
 	for (size_t i=0; i<nsrc(); i++) {
 		if (source[i].memory) continue;
@@ -1150,7 +1149,7 @@ bool SpatRaster::update_meta(bool names, bool crs, bool ext, SpatOptions &opt) {
 		}
 		if (names) {
 			for (size_t b=0; b < source[i].nlyr; b++) {
-				poBand = GDALGetRasterBand(hDS, b+1);
+				GDALRasterBandH poBand = GDALGetRasterBand(hDS, b+1);
 				if (GDALGetRasterAccess(poBand) == GA_Update) {
 					GDALSetDescription(poBand, source[i].names[b].c_str());
 				}