add RasterizeInto and Description (#107)

* add RasterizeInto and Description * fix failing test * add rasterizeinto test coverage * update ci workflows to current versions * revert update ci workflows to current versions for osx
airbusgeo · Apr 19, 2023 · 2de9714 · 2de9714
1 parent 29f4bb1
commit 2de9714
Show file tree

Hide file tree

Showing 8 changed files with 450 additions and 308 deletions.
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -20,6 +20,6 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Tests
         run: go test . -race
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -13,7 +13,7 @@ jobs:
       GODEBUG: cgocheck=2
     strategy:
       matrix:
-        go: [ '1.18', '1.19' ]
+        go: [ '1.19', '1.20' ]
     name: Go ${{ matrix.go }} + GDAL on ubuntu 20.04 test
     steps:
       - name: APT
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        gdal: [ 'release/3.3', 'release/3.4', 'release/3.5', 'master' ]
+        gdal: [ 'release/3.4', 'release/3.5', 'release/3.6', 'master' ]
     steps:
       - name: optgdal
         run: sudo mkdir /optgdal && sudo chown -R $USER /optgdal
@@ -52,8 +52,8 @@ jobs:
       GODEBUG: cgocheck=2
     strategy:
       matrix:
-        go: [ '1.18', '1.19' ]
-        gdal: [  'release/3.3', 'release/3.4', 'release/3.5', 'master' ]
+        go: [ '1.19', '1.20' ]
+        gdal: [  'release/3.4', 'release/3.5', 'release/3.6', 'master' ]
     name: Go ${{ matrix.go }} + GDAL ${{ matrix.gdal }} test
     steps:
       - name: APT
@@ -91,12 +91,12 @@ jobs:
         env:
           PKG_CONFIG_PATH: /optgdal/lib/pkgconfig/
       - name: Send coverage
-        if: ${{ matrix.go == '1.19' && matrix.gdal == 'master' }}
+        if: ${{ matrix.go == '1.20' && matrix.gdal == 'master' }}
         uses: shogo82148/actions-goveralls@v1
         with:
           path-to-profile: profile.cov
       - name: golangci-lint
-        if: ${{ matrix.go == '1.19' && matrix.gdal == 'master' }}
+        if: ${{ matrix.go == '1.20' && matrix.gdal == 'master' }}
         uses: reviewdog/action-golangci-lint@v1
         env:
           PKG_CONFIG_PATH: /optgdal/lib/pkgconfig/

diff --git a/errors.go b/errors.go
@@ -125,8 +125,10 @@ func ErrLogger(fn ErrorHandler) interface {
 	PolygonizeOption
 	RasterizeGeometryOption
 	RasterizeOption
+	RasterizeIntoOption
 	SetColorInterpOption
 	SetColorTableOption
+	SetDescriptionOption
 	SetGeometryOption
 	SetFieldValueOption
 	SetNoDataOption
@@ -263,6 +265,9 @@ func (ec errorCallback) setIntersectionOpt(o *intersectionOpts) {
 func (ec errorCallback) setMetadataOpt(o *metadataOpts) {
 	o.errorHandler = ec.fn
 }
+func (ec errorCallback) setDescriptionOpt(o *setDescriptionOpts) {
+	o.errorHandler = ec.fn
+}
 func (ec errorCallback) setNewFeatureOpt(o *newFeatureOpts) {
 	o.errorHandler = ec.fn
 }
@@ -281,6 +286,9 @@ func (ec errorCallback) setRasterizeGeometryOpt(o *rasterizeGeometryOpts) {
 func (ec errorCallback) setRasterizeOpt(o *rasterizeOpts) {
 	o.errorHandler = ec.fn
 }
+func (ec errorCallback) setRasterizeIntoOpt(o *rasterizeIntoOpts) {
+	o.errorHandler = ec.fn
+}
 func (ec errorCallback) setSetColorInterpOpt(ndo *setColorInterpOpts) {
 	ndo.errorHandler = ec.fn
 }

diff --git a/godal.cpp b/godal.cpp
@@ -135,6 +135,11 @@ void godalClearMetadata(cctx *ctx, GDALMajorObjectH mo, char *cdom) {
 	}
 	godalUnwrap();
 }
+void godalSetDescription(cctx *ctx, GDALMajorObjectH mo, char *desc) {
+	godalWrap(ctx);
+	GDALSetDescription(mo,desc);
+	godalUnwrap();
+}
 
 void godalSetRasterColorInterpretation(cctx *ctx, GDALRasterBandH bnd, GDALColorInterp ci) {
 	godalWrap(ctx);
@@ -735,7 +740,7 @@ void godalFillNoData(cctx *ctx, GDALRasterBandH in, GDALRasterBandH mask, int ma
 	godalUnwrap();
 }
 
-GDALDatasetH godalRasterize(cctx *ctx, char *dstName, GDALDatasetH ds, char **switches) {
+GDALDatasetH godalRasterize(cctx *ctx, char *dstName, GDALDatasetH dstDS, GDALDatasetH ds, char **switches) {
 	godalWrap(ctx);
 	GDALRasterizeOptions *ropts = GDALRasterizeOptionsNew(switches,nullptr);
 	if(failed(ctx)) {
@@ -744,7 +749,7 @@ GDALDatasetH godalRasterize(cctx *ctx, char *dstName, GDALDatasetH ds, char **sw
 		return nullptr;
 	}
 	int usageErr=0;
-	GDALDatasetH ret = GDALRasterize(dstName, nullptr, ds, ropts, &usageErr);
+	GDALDatasetH ret = GDALRasterize(dstName, dstDS, ds, ropts, &usageErr);
 	GDALRasterizeOptionsFree(ropts);
 	if(ret==nullptr || usageErr!=0) {
 		forceError(ctx);
@@ -1679,7 +1684,6 @@ void VSIInstallGoHandler(cctx *ctx, const char *pszPrefix, size_t bufferSize, si
 	godalUnwrap();
 }
 
-
 void test_godal_error_handling(cctx *ctx) {
 	godalWrap(ctx);
 	CPLDebug("godal","this is a debug message");