From c60342087cc5bc7e678069d028ecd535d878f77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CMattLuck-NOAA=E2=80=9D?= Date: Thu, 8 Aug 2024 10:27:42 -0400 Subject: [PATCH 1/5] Mosaic depths and extents --- tools/inundate_mosaic_wrapper.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/inundate_mosaic_wrapper.py b/tools/inundate_mosaic_wrapper.py index 5b274122a..2e68e9a6b 100644 --- a/tools/inundate_mosaic_wrapper.py +++ b/tools/inundate_mosaic_wrapper.py @@ -122,20 +122,20 @@ def produce_mosaicked_inundation( if depths_raster is not None: mosaic_output = depths_raster - if mosaic_output is not None: - # Call Mosaic_inundation - mosaic_file_path = Mosaic_inundation( - map_file.copy(), - mosaic_attribute=mosaic_attribute, - mosaic_output=mosaic_output, - mask=mask, - unit_attribute_name=unit_attribute_name, - nodata=elev_raster_ndv, - remove_inputs=remove_intermediate, - verbose=verbose, - is_mosaic_for_branches=is_mosaic_for_branches, - inundation_polygon=inundation_polygon, - ) + if mosaic_output is not None: + # Call Mosaic_inundation + mosaic_file_path = Mosaic_inundation( + map_file.copy(), + mosaic_attribute=mosaic_attribute, + mosaic_output=mosaic_output, + mask=mask, + unit_attribute_name=unit_attribute_name, + nodata=elev_raster_ndv, + remove_inputs=remove_intermediate, + verbose=verbose, + is_mosaic_for_branches=is_mosaic_for_branches, + inundation_polygon=inundation_polygon, + ) fh.vprint("Mosaicking complete.", verbose) From 3dd420b4c9a4c0254574ab1cdaa19dcdfc1e6e6e Mon Sep 17 00:00:00 2001 From: MattLuck-NOAA Date: Fri, 9 Aug 2024 10:03:08 -0600 Subject: [PATCH 2/5] Update CHANGELOG --- docs/CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 537a7d2ee..34e0ffc43 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. We follow the [Semantic Versioning 2.0.0](http://semver.org/) format. +## v4.5.x.x - 2024-08-09 - [PR#1246](https://github.com/NOAA-OWP/inundation-mapping/pull/1246) + +Indents the mosaicking block so that `inundate_mosaic_wrapper.py` mosaics both inundation extents and depths. + +### Changes + +- `tools/inundate_mosaic_wrapper.py`: Moves mosaicking inside `for` loop. + +

+ ## v4.5.4.4 - 2024-08-02 - [PR#1238](https://github.com/NOAA-OWP/inundation-mapping/pull/1238) Prior to this fix, fim_post_processing.sh took just under 4 hours to reset permissions on all files and folder under the entire run. On closer inspection, it was updating permissions for all HUC folders where were already correct. A few other folders needed to have permission updates added. This will speed that up significantly. From 6d1103f42ac780faae250cbccb9eeffa97789077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CRobHanna-NOAA=E2=80=9D?= <“Robert.Hanna@NOAA.gov”> Date: Fri, 13 Sep 2024 17:04:42 +0000 Subject: [PATCH 3/5] fix changelog --- docs/CHANGELOG.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1bf3af8c9..cf06070fe 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,18 @@ All notable changes to this project will be documented in this file. We follow the [Semantic Versioning 2.0.0](http://semver.org/) format. + +## v4.5.7.1- 2024-09-13 - [PR#1246](https://github.com/NOAA-OWP/inundation-mapping/pull/1246) + +Indents the mosaicking block so that `inundate_mosaic_wrapper.py` mosaics both inundation extents and depths. + +### Changes + +- `tools/inundate_mosaic_wrapper.py`: Moves mosaicking inside `for` loop. + +

+ + ## v4.5.6.0 - 2024-08-23 - [PR#1253](https://github.com/NOAA-OWP/inundation-mapping/pull/1253) Upgrades Python packages and dependencies and fixes backwards incompatibilities with new version of `geopandas`. Major changes include: @@ -40,16 +52,6 @@ Updated the gauge crosswalk and SRC adjustment routine to use the ras2fim v2 fil

-## v4.5.x.x - 2024-08-09 - [PR#1246](https://github.com/NOAA-OWP/inundation-mapping/pull/1246) - -Indents the mosaicking block so that `inundate_mosaic_wrapper.py` mosaics both inundation extents and depths. - -### Changes - -- `tools/inundate_mosaic_wrapper.py`: Moves mosaicking inside `for` loop. - -

- ## v4.5.4.4 - 2024-08-02 - [PR#1238](https://github.com/NOAA-OWP/inundation-mapping/pull/1238) Prior to this fix, fim_post_processing.sh took just under 4 hours to reset permissions on all files and folder under the entire run. On closer inspection, it was updating permissions for all HUC folders where were already correct. A few other folders needed to have permission updates added. This will speed that up significantly. From 3ad4f8ffc6bde0191628ba52114f43c32db82ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CRobHanna-NOAA=E2=80=9D?= <“Robert.Hanna@NOAA.gov”> Date: Fri, 13 Sep 2024 17:05:06 +0000 Subject: [PATCH 4/5] fix changelog again --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index cf06070fe..2e9d80fbc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. We follow the [Semantic Versioning 2.0.0](http://semver.org/) format. -## v4.5.7.1- 2024-09-13 - [PR#1246](https://github.com/NOAA-OWP/inundation-mapping/pull/1246) +## v4.5.7.1 - 2024-09-13 - [PR#1246](https://github.com/NOAA-OWP/inundation-mapping/pull/1246) Indents the mosaicking block so that `inundate_mosaic_wrapper.py` mosaics both inundation extents and depths. From d952bdcfb9d45169ddcee77ad5c5f70100355f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CRobHanna-NOAA=E2=80=9D?= <“Robert.Hanna@NOAA.gov”> Date: Fri, 13 Sep 2024 19:43:34 +0000 Subject: [PATCH 5/5] fix changelog --- docs/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 994f755ba..898cb56f4 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -11,6 +11,8 @@ Indents the mosaicking block so that `inundate_mosaic_wrapper.py` mosaics both i - `tools/inundate_mosaic_wrapper.py`: Moves mosaicking inside `for` loop.

+ + ## v4.5.7.0 - 2024-09-13 - [PR#1267](https://github.com/NOAA-OWP/inundation-mapping/pull/1267) `pyogrio` seems to have a difficulty writing files when all values in a column are null (None or nan). The workaround here is to use `fiona` for writing files where `pyogrio` is explicitly set in geopandas (gpd) by `gpd.options.io_engine = "pyogrio"`.