From a6af99f550d402d501121a1d5234a659487fed74 Mon Sep 17 00:00:00 2001 From: "Morten W. Hansen" Date: Thu, 20 Jun 2024 14:19:03 +0200 Subject: [PATCH 1/3] bug fix? --- nansat/exporter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nansat/exporter.py b/nansat/exporter.py index 25c50a87..53884972 100644 --- a/nansat/exporter.py +++ b/nansat/exporter.py @@ -437,8 +437,8 @@ def _post_proc_thredds(self, fill_value = None if '_FillValue' in inp_var.ncattrs(): fill_value = inp_var._FillValue - if '_FillValue' in band_metadata[inp_var_name]: - fill_value = band_metadata['_FillValue'] + elif '_FillValue' in band_metadata[inp_var_name]: + fill_value = band_metadata[inp_var_name]['_FillValue'] dimensions = ('time', ) + inp_var.dimensions out_var = Exporter._copy_nc_var(inp_var, nc_out, inp_var_name, inp_var.dtype, dimensions, fill_value=fill_value, zlib=zlib) From ed63700a83a9b76e3d385e40a39ea44931040d46 Mon Sep 17 00:00:00 2001 From: Morten Wergeland Hansen Date: Tue, 25 Jun 2024 11:30:09 +0200 Subject: [PATCH 2/3] bug fix --- nansat/exporter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nansat/exporter.py b/nansat/exporter.py index 25c50a87..63138afe 100644 --- a/nansat/exporter.py +++ b/nansat/exporter.py @@ -438,7 +438,7 @@ def _post_proc_thredds(self, if '_FillValue' in inp_var.ncattrs(): fill_value = inp_var._FillValue if '_FillValue' in band_metadata[inp_var_name]: - fill_value = band_metadata['_FillValue'] + fill_value = band_metadata[inp_var_name]['_FillValue'] dimensions = ('time', ) + inp_var.dimensions out_var = Exporter._copy_nc_var(inp_var, nc_out, inp_var_name, inp_var.dtype, dimensions, fill_value=fill_value, zlib=zlib) From 7e576c3ffa1e1f1c223ebe84d2af0d7206ec06c7 Mon Sep 17 00:00:00 2001 From: Morten Wergeland Hansen Date: Tue, 25 Jun 2024 15:04:24 +0200 Subject: [PATCH 3/3] Adjust gcp sizes --- nansat/mappers/sentinel1.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nansat/mappers/sentinel1.py b/nansat/mappers/sentinel1.py index 57e7faba..90c1d11f 100644 --- a/nansat/mappers/sentinel1.py +++ b/nansat/mappers/sentinel1.py @@ -157,9 +157,13 @@ def test2(gcp_dim): logging.debug("GCPY size: %d" % gcp_y) logging.debug("GCPX size: %d" % gcp_x) + logging.debug("Pixel(s) size: %d" % pixel.size) if gcp_y*gcp_x != pixel.size: - raise ValueError("GCP dimension mismatch") + if gcp_y*gcp_x > pixel.size: + gcp_x, gcp_y = test1(gcp_x-1, gcp_y-1) + if gcp_y*gcp_x != pixel.size: + raise ValueError("GCP dimension mismatch") return int(gcp_y), int(gcp_x)